use system libnet #43012

4 files changed, 47 insertions, 4 deletions

diff --git a/net-analyzer/paketto/ChangeLog b/net-analyzer/paketto/ChangeLog
index 0c11c3c4c036..358d12880ee9 100644
--- a/net-analyzer/paketto/ChangeLog
+++ b/net-analyzer/paketto/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-analyzer/paketto
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.5 2003/09/18 16:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.6 2004/02/27 20:14:03 vapier Exp $
 
 *paketto-1.10-r1 (20 Mar 2003)
 
+  27 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to use system libnet instead of built in one #43012.
+
   18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
   Add gcc3 patch #28894 and protect local libnet from system version #28982.
 
diff --git a/net-analyzer/paketto/files/1.10-libnet-1.0.patch b/net-analyzer/paketto/files/1.10-libnet-1.0.patch
new file mode 100644
index 000000000000..532024d9b39b
--- /dev/null
+++ b/net-analyzer/paketto/files/1.10-libnet-1.0.patch
@@ -0,0 +1,38 @@
+diff -U 0 -r paketto-1.10.orig/configure paketto-1.10/configure
+--- paketto-1.10.orig/configure	2004-02-27 14:43:51.218810376 -0500
++++ paketto-1.10/configure	2004-02-27 14:45:12.830403528 -0500
+@@ -1019 +1019 @@
+-  --with-libnet-bin=DIR   define location of libnet-config
++  --with-libnet-bin=DIR   define location of libnet-1.0-config
+@@ -7404,0 +7405 @@
++dxp_libnet_builtin=no
+@@ -7438,2 +7438,2 @@
+-	# Extract the first word of "libnet-config", so it can be a program name with args.
+-set dummy libnet-config; ac_word=$2
++	# Extract the first word of "libnet-1.0-config", so it can be a program name with args.
++set dummy libnet-1.0-config; ac_word=$2
+@@ -7479 +7479 @@
+-		echo "Could not find libnet-config in the path: $dxp_libnet_config_path."
++		echo "Could not find libnet-1.0-config in the path: $dxp_libnet_config_path."
+@@ -7485,2 +7485,2 @@
+-		DXP_LIBNET_FLAGS="`libnet-config --defines` -I$srcdir/Libnet-1.0.2a/include"
+-		DXP_LIBNET_LIBS="-lnet -L$srcdir/Libnet-1.0.2a/lib"
++		DXP_LIBNET_FLAGS="`libnet-1.0-config --defines` -I$srcdir/Libnet-1.0.2a/include"
++		DXP_LIBNET_LIBS="-lnet-1.0 -L$srcdir/Libnet-1.0.2a/lib"
+@@ -7490,2 +7490,2 @@
+-		DXP_LIBNET_FLAGS="`libnet-config --defines -I$dxp_libnet_root/include/libnet`"
+-		DXP_LIBNET_LIBS="-lnet -L$dxp_libnet_root/lib"
++		DXP_LIBNET_FLAGS="`libnet-1.0-config --defines` -I$dxp_libnet_root/include/libnet"
++		DXP_LIBNET_LIBS="-lnet-1.0 -L$dxp_libnet_root/lib"
+diff -U 0 -r paketto-1.10.orig/src/lc.c paketto-1.10/src/lc.c
+--- paketto-1.10.orig/src/lc.c	2004-02-27 14:43:51.222809768 -0500
++++ paketto-1.10/src/lc.c	2004-02-27 14:44:07.895275168 -0500
+@@ -2 +2 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -U 0 -r paketto-1.10.orig/src/paketto.h paketto-1.10/src/paketto.h
+--- paketto-1.10.orig/src/paketto.h	2004-02-27 14:43:51.222809768 -0500
++++ paketto-1.10/src/paketto.h	2004-02-27 14:44:04.379809600 -0500
+@@ -7 +7 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/paketto/files/digest-paketto-1.10-r1 b/net-analyzer/paketto/files/digest-paketto-1.10-r1
index 52e2b75dc258..935a21aaff24 100644
--- a/net-analyzer/paketto/files/digest-paketto-1.10-r1
+++ b/net-analyzer/paketto/files/digest-paketto-1.10-r1
@@ -1 +1 @@
-MD5 7fd82af09a6493f24c8681f7bbf03898 paketto-1.10.tar.gz 90010
+MD5 7fd82af09a6493f24c8681f7bbf03898 paketto-1.10.tar.gz 900104
diff --git a/net-analyzer/paketto/paketto-1.10-r1.ebuild b/net-analyzer/paketto/paketto-1.10-r1.ebuild
index 2464cdc1edbf..a875f1602622 100644
--- a/net-analyzer/paketto/paketto-1.10-r1.ebuild
+++ b/net-analyzer/paketto/paketto-1.10-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.3 2003/09/18 16:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.4 2004/02/27 20:14:03 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Paketto Keiretsu - experimental TCP/IP tools - scanrand, minewt, lc, phentropy, paratrace"
 HOMEPAGE="http://www.doxpara.com/"
@@ -20,11 +22,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
 }
 
 src_compile() {
 	# --with-libnet-bin=/usr --with-pcap-lib=/usr --with-pcap-inc=/usr --with-tm-inc=/usr"
-	export PATH="${S}/Libnet-1.0.2a:${PATH}"
 	econf || die
 	emake || die
 }