fix gnu patch

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index d32d1f434d979bfedec590098c264620aeeccd9d..baf3bcfe26195841d3a1b5fd83744dae2fc155b6 100644 (file)
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.38 2011/11/07 12:48:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.39 2011/11/07 13:54:04 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org>
+  freebsd-mk-defs-9.0_rc1.ebuild, +files/freebsd-mk-defs-9.0-gnu.patch:
+  fix gnu patch
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org>
   files/freebsd-mk-defs-9.0-gentoo.patch:

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
new file mode 100644 (file)
index 0000000..a591622
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
@@ -0,0 +1,36 @@
+Index: work/share/mk/bsd.lib.mk
+===================================================================
+--- work.orig/share/mk/bsd.lib.mk
++++ work/share/mk/bsd.lib.mk
+@@ -245,13 +245,6 @@ _EXTRADEPEND:
+ 
+ .if !target(install)
+ 
+-.if defined(PRECIOUSLIB)
+-.if !defined(NO_FSCHG)
+-SHLINSTALLFLAGS+= -fschg
+-.endif
+-SHLINSTALLFLAGS+= -S
+-.endif
+-
+ _INSTALLFLAGS:=       ${INSTALLFLAGS}
+ .for ie in ${INSTALLFLAGS_EDIT}
+ _INSTALLFLAGS:=       ${_INSTALLFLAGS${ie}}
+Index: work/share/mk/bsd.prog.mk
+===================================================================
+--- work.orig/share/mk/bsd.prog.mk
++++ work/share/mk/bsd.prog.mk
+@@ -134,13 +134,6 @@ _EXTRADEPEND:
+ 
+ .if !target(install)
+ 
+-.if defined(PRECIOUSPROG)
+-.if !defined(NO_FSCHG)
+-INSTALLFLAGS+= -fschg
+-.endif
+-INSTALLFLAGS+= -S
+-.endif
+-
+ _INSTALLFLAGS:=       ${INSTALLFLAGS}
+ .for ie in ${INSTALLFLAGS_EDIT}
+ _INSTALLFLAGS:=       ${_INSTALLFLAGS${ie}}

diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild
index c413686d218f24d399a9d12218c13ee1208ee768..8e128b099ce142c96df9d88a68bb4917830da682 100644 (file)
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild,v 1.1 2011/11/07 12:26:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild,v 1.2 2011/11/07 13:54:04 aballier Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ S="${WORKDIR}/share/mk"
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
-       use userland_GNU && epatch "${FILESDIR}/${PN}-8.0-gnu.patch"
+       use userland_GNU && epatch "${FILESDIR}/${PN}-9.0-gnu.patch"
 }
 
 src_compile() { :; }