diff options
author | Marcelo Góes <vanquirius@gentoo.org> | 2005-04-17 17:02:16 +0000 |
---|---|---|
committer | Marcelo Góes <vanquirius@gentoo.org> | 2005-04-17 17:02:16 +0000 |
commit | c7acfee69bee3bc166549403132d152bedd3e376 (patch) | |
tree | dcb6257c734faf92c0a99f7d0a506d0731531d07 /net-analyzer | |
parent | added vserver-sources-2.0_pre1 (diff) | |
download | gentoo-2-c7acfee69bee3bc166549403132d152bedd3e376.tar.gz gentoo-2-c7acfee69bee3bc166549403132d152bedd3e376.tar.bz2 gentoo-2-c7acfee69bee3bc166549403132d152bedd3e376.zip |
prevent file collision
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/nstats/ChangeLog | 7 | ||||
-rw-r--r-- | net-analyzer/nstats/Manifest | 15 | ||||
-rw-r--r-- | net-analyzer/nstats/files/nstats-0.4-makefile.patch | 11 | ||||
-rw-r--r-- | net-analyzer/nstats/nstats-0.4.ebuild | 11 |
4 files changed, 27 insertions, 17 deletions
diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog index 0408318b7a8e..bae31f6fbe07 100644 --- a/net-analyzer/nstats/ChangeLog +++ b/net-analyzer/nstats/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/nstats # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.8 2005/01/29 05:12:51 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.9 2005/04/17 17:02:16 vanquirius Exp $ + + 17 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> + +files/nstats-0.4-makefile.patch, nstats-0.4.ebuild: + Patching makefile to install bmon as bmon.nstats. This prevents a file + collision with net-analyzer/bmon. 29 Jan 2005; Daniel Black <dragonheart@gentoo.org> nstats-0.4.ebuild: changed net-libs/libpcap depend to virtual/libcap diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest index 6d9001ea3758..58883fb95147 100644 --- a/net-analyzer/nstats/Manifest +++ b/net-analyzer/nstats/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 cac0aa8dba00c56253bb2d292c482b7b nstats-0.4.ebuild 752 MD5 72866ec45b7979298c56bf08bb7cd94b ChangeLog 896 -MD5 b8c10f9e3e5a10adbb057b5fdd7e1c2c nstats-0.4.ebuild 677 MD5 471824686805ceb0bc7fbffbfe341a4b metadata.xml 266 -MD5 436fb40a1859860df36dbcf6ba534dcc files/digest-nstats-0.4 61 MD5 e254a6da19563f0f805c36e922d82892 files/nstats-0.3.2-r2-gentoo.diff 543 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFB+xtcmdTrptrqvGERAo1iAJ9cbXO5RCtwN+cBGqLWo+pkXYaTQACfWTOy -+PoiVipszxJnIGxLNCqXqm0= -=j4WB ------END PGP SIGNATURE----- +MD5 9f496f20339069acfc493469277a05bb files/nstats-0.4-makefile.patch 478 +MD5 436fb40a1859860df36dbcf6ba534dcc files/digest-nstats-0.4 61 diff --git a/net-analyzer/nstats/files/nstats-0.4-makefile.patch b/net-analyzer/nstats/files/nstats-0.4-makefile.patch new file mode 100644 index 000000000000..31e034d1e012 --- /dev/null +++ b/net-analyzer/nstats/files/nstats-0.4-makefile.patch @@ -0,0 +1,11 @@ +--- nstats-0.4.orig/Makefile 2005-04-17 13:53:43.000000000 -0300 ++++ nstats-0.4/Makefile 2005-04-17 13:53:24.000000000 -0300 +@@ -53,7 +53,7 @@ + mkdir -p $(DESTDIR)$(prefix)/bin/ + mkdir -p $(DESTDIR)$(mandir)/man8/ + install nstats $(DESTDIR)$(prefix)/bin/ +- install bmon $(DESTDIR)$(prefix)/bin/ ++ install bmon $(DESTDIR)$(prefix)/bin/bmon.nstats + install cmon $(DESTDIR)$(prefix)/bin/ + install nmon $(DESTDIR)$(prefix)/bin/ + install man/nstats.8 $(DESTDIR)$(mandir)/man8/ diff --git a/net-analyzer/nstats/nstats-0.4.ebuild b/net-analyzer/nstats/nstats-0.4.ebuild index 5de0dccd661a..03355a6d2dc4 100644 --- a/net-analyzer/nstats/nstats-0.4.ebuild +++ b/net-analyzer/nstats/nstats-0.4.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4.ebuild,v 1.9 2005/01/29 05:12:51 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4.ebuild,v 1.10 2005/04/17 17:02:16 vanquirius Exp $ + +inherit eutils DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" @@ -13,9 +15,10 @@ IUSE="" DEPEND="virtual/libpcap" -src_compile() { - econf || die "./configure failed" - make || die "make failed" +src_unpack(){ + unpack ${A} + #rename bmon to bmon.nstats to avoid conflict with net-analyzer/bmon + epatch ${FILESDIR}/${P}-makefile.patch } src_install () { |