Gentoo Archives: gentoo-commits

From: "Patrick McLean (chutzpah)" <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/ntfs3g/files: ntfs3g-2014.2.15-dont-put-things-in-root.patch
Date: Fri, 30 Jan 2015 22:09:13
Message-Id: 20150130220908.68A6D10B73@oystercatcher.gentoo.org
1 chutzpah 15/01/30 22:09:08
2
3 Modified: ntfs3g-2014.2.15-dont-put-things-in-root.patch
4 Log:
5 Update "dont-put-things-in-root" patch to build properly with USE=-ntfsprogs (bug #538230).
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
8
9 Revision Changes Path
10 1.2 sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch?r1=1.1&r2=1.2
15
16 Index: ntfs3g-2014.2.15-dont-put-things-in-root.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ntfs3g-2014.2.15-dont-put-things-in-root.patch 29 Jan 2015 08:20:05 -0000 1.1
23 +++ ntfs3g-2014.2.15-dont-put-things-in-root.patch 30 Jan 2015 22:09:08 -0000 1.2
24 @@ -1,12 +1,13 @@
25 diff -ur ntfs-3g_ntfsprogs-2014.2.15.orig/ntfsprogs/Makefile.am ntfs-3g_ntfsprogs-2014.2.15/ntfsprogs/Makefile.am
26 --- ntfs-3g_ntfsprogs-2014.2.15.orig/ntfsprogs/Makefile.am 2015-01-29 00:12:51.786936314 -0800
27 +++ ntfs-3g_ntfsprogs-2014.2.15/ntfsprogs/Makefile.am 2015-01-29 00:13:59.156442369 -0800
28 -@@ -140,8 +140,7 @@
29 +@@ -140,8 +140,8 @@
30 # mkfs.ntfs[.8] hard link
31
32 install-exec-hook:
33 - $(INSTALL) -d $(DESTDIR)/sbin
34 - $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
35 ++ $(INSTALL) -d $(DESTDIR)/$(sbindir)
36 + $(LN_S) -f mkntfs $(DESTDIR)/$(sbindir)/mkfs.ntfs
37
38 install-data-hook:
39 @@ -14,13 +15,14 @@
40 diff -ur ntfs-3g_ntfsprogs-2014.2.15.orig/src/Makefile.am ntfs-3g_ntfsprogs-2014.2.15/src/Makefile.am
41 --- ntfs-3g_ntfsprogs-2014.2.15.orig/src/Makefile.am 2015-01-29 00:12:51.789936248 -0800
42 +++ ntfs-3g_ntfsprogs-2014.2.15/src/Makefile.am 2015-01-29 00:14:00.570411008 -0800
43 -@@ -68,9 +68,8 @@
44 +@@ -68,9 +68,9 @@
45
46 if ENABLE_MOUNT_HELPER
47 install-exec-local: install-rootbinPROGRAMS
48 - $(MKDIR_P) "$(DESTDIR)/sbin"
49 - $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
50 - $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
51 ++ $(MKDIR_P) "$(DESTDIR)/$(sbindir)"
52 + $(LN_S) -f "../bin/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
53 + $(LN_S) -f "../bin/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
54 endif