Version bumped. Closes 75198

7 files changed, 65 insertions, 47 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 4069a3a979b9..fdf4b20fddee 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.17 2004/08/03 11:58:31 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.18 2005/01/03 10:35:50 mholzer Exp $
+
+*netperf-2.3 (03 Jan 2005)
+
+  03 Jan 2005; Martin Holzer <mholzer@gentoo.org> +netperf-2.3.ebuild:
+  Version bumped. Closes 75198
 
   03 Aug 2004; David Holm <dholm@gentoo.org> netperf-2.2.4.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index acfd7d933694..a1305026a243 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,9 +1,11 @@
-MD5 b742a22485d4491ee330f8e18f0ff622 ChangeLog 2108
-MD5 838b75f935cc7442f4d17ddcaf36add0 netperf-2.2.ebuild 908
 MD5 c05052518b27c48aa4569aa07615c6a5 netperf-2.2.4.ebuild 1415
+MD5 838b75f935cc7442f4d17ddcaf36add0 netperf-2.2.ebuild 908
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 b742a22485d4491ee330f8e18f0ff622 ChangeLog 2108
+MD5 c05052518b27c48aa4569aa07615c6a5 netperf-2.3.ebuild 1415
+MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
 MD5 a3d32398b2de6ff285e374a73448d17b files/digest-netperf-2.2 68
+MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
 MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
 MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
-MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
-MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
+MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
diff --git a/net-analyzer/netperf/files/digest-netperf-2.2 b/net-analyzer/netperf/files/digest-netperf-2.2
deleted file mode 100644
index cead7babe6bd..000000000000
--- a/net-analyzer/netperf/files/digest-netperf-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78877b60fbcddada6ffc67d6394f650a netperf-2.2alpha.tar.gz 813659
diff --git a/net-analyzer/netperf/files/digest-netperf-2.3 b/net-analyzer/netperf/files/digest-netperf-2.3
new file mode 100644
index 000000000000..a7aa74a04cec
--- /dev/null
+++ b/net-analyzer/netperf/files/digest-netperf-2.3
@@ -0,0 +1 @@
+MD5 df61b8db5e38d58cdf81748635614d33 netperf-2.3.tar.gz 835407
diff --git a/net-analyzer/netperf/netperf-2.2.4.ebuild b/net-analyzer/netperf/netperf-2.2.4.ebuild
index 7b9cd8a78250..f1eb7947226c 100644
--- a/net-analyzer/netperf/netperf-2.2.4.ebuild
+++ b/net-analyzer/netperf/netperf-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.14 2004/10/23 06:41:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.15 2005/01/03 10:35:50 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/net-analyzer/netperf/netperf-2.2.ebuild b/net-analyzer/netperf/netperf-2.2.ebuild
deleted file mode 100644
index 0cc5b7794b7a..000000000000
--- a/net-analyzer/netperf/netperf-2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.ebuild,v 1.12 2004/07/01 20:08:44 squinky86 Exp $
-
-MY_P=${P}alpha
-S=${WORKDIR}/${P}alpha
-DESCRIPTION="This is a brief readme file for the netperf TCP/UDP/sockets/etc
-performance benchmark tools"
-SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
-HOMEPAGE="http://www.netperf.org/"
-
-DEPEND=""
-
-SLOT="0"
-LICENSE="HP"
-KEYWORDS="x86 sparc ia64 alpha"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/netperf-2.2alpha.diff
-}
-
-src_compile() {
-
-	make || die
-}
-
-src_install () {
-
-	exeinto /usr/share/netperf
-	doexe netperf netserver tcp_range_script tcp_stream_script \
-		tcp_rr_script udp_stream_script udp_rr_script snapshot_script
-	dodoc ACKNWLDGMNTS COPYRIGHT README Release_Notes
-
-
-}
diff --git a/net-analyzer/netperf/netperf-2.3.ebuild b/net-analyzer/netperf/netperf-2.3.ebuild
new file mode 100644
index 000000000000..c8243df7b12a
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.3.ebuild,v 1.1 2005/01/03 10:35:50 mholzer Exp $
+
+inherit flag-o-matic
+
+if [[ $PV == *.*.* ]]; then
+	MY_P=${P%.*}pl${PV##*.}	# convert netperf-2.2.4 => netperf-2.2pl4
+	S=${WORKDIR}/${MY_P}
+else
+	MY_P=${P}
+fi
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
+
+IUSE="ipv6"
+
+DEPEND="virtual/libc >=sys-apps/sed-4"
+
+src_compile() {
+	( use macos || use ppc-macos ) || append-flags -DDO_UNIX
+	use ipv6 && append-flags -DDO_IPV6
+	emake CFLAGS="${CFLAGS}" || die
+	sed -i 's:^\(NETHOME=\).*:\1/usr/bin:' *_script
+}
+
+src_install () {
+	# binaries
+	dosbin netserver
+	dobin netperf
+
+	# init.d / conf.d
+	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
+	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+
+	# man pages
+	newman netserver.man netserver.1
+	newman netperf.man netperf.1
+
+	# documentation and example scripts
+	dodoc ACKNWLDGMNTS COPYRIGHT README Release_Notes netperf.ps
+	mkdir ${D}/usr/share/doc/${PF}/examples
+	cp *_script ${D}/usr/share/doc/${PF}/examples
+}