diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-07 13:54:04 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-07 13:54:04 +0000 |
| commit | dcf0d13e3cd454a68497bba7b19b344fd16b5ee5 (patch) | |
| tree | 2bdc83e548e8d8f89d804585485683e0008d08fd /sys-freebsd | |
| parent | remove old (diff) | |
| download | gentoo-2-dcf0d13e3cd454a68497bba7b19b344fd16b5ee5.tar.gz gentoo-2-dcf0d13e3cd454a68497bba7b19b344fd16b5ee5.tar.bz2 gentoo-2-dcf0d13e3cd454a68497bba7b19b344fd16b5ee5.zip | |
fix gnu patch
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch | 36 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc1.ebuild | 4 |
3 files changed, 43 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index d32d1f434d97..baf3bcfe2619 100644 --- 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 index 000000000000..a591622b8589 --- /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 c413686d218f..8e128b099ce1 100644 --- 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() { :; } |