diff options
| -rw-r--r-- | sys-apps/net-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/net-tools/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/net-tools/net-tools-1.60-r7.ebuild | 33 |
3 files changed, 27 insertions, 16 deletions
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog index c7480330d6f8..3eadcbcb8fcc 100644 --- a/sys-apps/net-tools/ChangeLog +++ b/sys-apps/net-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/net-tools # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.19 2003/05/18 21:36:52 dragon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.20 2003/06/18 22:45:50 msterret Exp $ + + 18 Jun 2003; <msterret@gentoo.org> net-tools-1.60-r7.ebuild: + Add support for use static (bug 22450) based on code from Sascha Silbe + Use sed -i *net-tools-1.60-r7 (18 May 2003) diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index 86979aa9400d..9390a27ee03c 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -1,5 +1,5 @@ -MD5 fa40f8c0a017cbfdfd3463b6b3055a92 ChangeLog 3840 -MD5 9f2b773c95973817537f36ce81683a32 net-tools-1.60-r7.ebuild 2546 +MD5 8b6c3a69e60e40032188b3cdbe804a34 ChangeLog 3992 MD5 97c6879f072588bdaa14c894380672f4 net-tools-1.60-r6.ebuild 2278 +MD5 6000f3b18b28e3e02d99451ccd3f285c net-tools-1.60-r7.ebuild 2669 MD5 a959c1cde872578cac11854c55ab9d55 files/digest-net-tools-1.60-r6 145 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r7 148 diff --git a/sys-apps/net-tools/net-tools-1.60-r7.ebuild b/sys-apps/net-tools/net-tools-1.60-r7.ebuild index 42fb78900016..4fab4379321a 100644 --- a/sys-apps/net-tools/net-tools-1.60-r7.ebuild +++ b/sys-apps/net-tools/net-tools-1.60-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.1 2003/05/18 21:36:52 dragon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.2 2003/06/18 22:45:53 msterret Exp $ inherit eutils @@ -12,11 +12,18 @@ HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/" SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips" -IUSE="nls build" +IUSE="nls build static" -DEPEND="nls? ( sys-devel/gettext )" +DEPEND="nls? ( sys-devel/gettext ) + >=sys-apps/sed-4" src_unpack() { + + if [ "`use static`" ] ; then + CFLAGS="${CFLAGS} -static" + LDFLAGS="${LDFLAGS} -static" + fi + PATCHDIR=${WORKDIR}/${P}-gentoo unpack ${A} @@ -36,23 +43,23 @@ src_unpack() { cp ${PATCHDIR}/net-tools-1.60-config.h config.h cp ${PATCHDIR}/net-tools-1.60-config.make config.make - cp Makefile Makefile.orig - sed -e "s:-O2 -Wall -g:${CFLAGS}:" Makefile.orig > Makefile + sed -i \ + -e "s:-O2 -Wall -g:${CFLAGS}:" \ + -e "/^LOPTS =/ s/\$/${CFLAGS}/" Makefile || + die "sed Makefile failed" - cd man - cp Makefile Makefile.orig - sed -e "s:/usr/man:/usr/share/man:" Makefile.orig > Makefile + sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile || \ + die "sed man/Makefile failed" cp -f ${PATCHDIR}/ether-wake.c ${S} cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US - cd ${S} if [ -z "`use nls`" ] ; then - mv config.h config.h.orig - sed 's:\(#define I18N\) 1:\1 0:' config.h.orig > config.h + sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h || \ + die "sed config.h failed" - mv config.make config.make.orig - sed 's:I18N=1:I18N=0:' config.make.orig > config.make + sed -i -e 's:I18N=1:I18N=0:' config.make || + die "sed config.make failed" fi touch config.{h,make} # sync timestamps |