Update tcpreplay to 3.4.1.

Changes since 3.1.1:
    - Sendpacket method did not match documentation (#361)
    - Fix compile issue on systems without err.h (#363)
    - Fix tcpprep --mac not processing non-IPv4 packets (#369)
    - Always build tcpreplay w/ editing features as tcpreplay-edit (#372)
    - Fix potential tcpbridge issues under OS X & *BSD (#373)
    - Fix crash on 4 byte strictly aligned systems (#377)
    - Add MTU truncation to tcprewrite/tcpreplay-edit (#379)
    - Add libdnet and remove libnet support for sending packets (#302)
    - Fix numerous 802.11 decoder bugs (#325)
    - Fix compile issue under Linux (#326)
    - Fix Mbps/sec nonsense (#327)
    - Fix tcprewrite crash when packets have no L3+ data (#328)
    - Clean up err.c/err.h code and improve performance for non-debug builds (#331)
    - Fix timesdiv() timer code (#332)
    - Improve high-performance packet sending via multiple packets/interval (#334)
    - Fix statistics report errors (#335)
    - Fix BPF filters not being used in tcpbridge (#336)
    - Improve tcpbridge performance (#337)
    - Only use two libpcap handles for tcpbridge (#338)
    - Fix autotools usage errors (#340)
    - Clean up 'make test' results (#341)
    - Update to AutoGen/AutoOpts 5.9.7 (#342)
    - Fix compiler warnings from GCC 4.2 (#344)
    - Fix numerous memory corruption bugs in libtcpedit DLT plugin code (#345)
    - Add support for editing IPv4 TOS/DiffServ/ECN (#348)
    - Update autotools to more recent versions (#349)
    - Report injection method via -V (#352)
    - Fix DLT_USER l2len check bug (#353)
    - Replace man2html w/ groff (#354)
    - Fix false pcap_inject() detection under Windows/Winpcap (#355)
    - tcpbridge now builds under Win32/Cygwin
    - libdnet is no longer an option for Win32/Cygwin (#57)
    - tcpbridge now supports --listnics (#357)
    - Fix (again) tcpbridge --unidir assert error (#308)
    - Fix tcpbridge bug where all packets that were sent were all zeros
    - Fix tcpbridge not honoring --include/exclude flags (#311)
    - Fix ip_in_cidr() debug messages (#312)
    - Report packets which have timestamps which go backwards in time (#315)
    - Clean up --sleep-accel code to use options struct (#316)
    - Remove really old and out of date RPM .spec file (#317)
    - Warn when sending on non-Ethernet interface (#318)
    - Re-enable tcpreplay --listnics (#319)
    - Fix sendpacket always reporting using PF_PACKET, even when it doesn't (#322)
    - Fix major packet timing issue under old versions of glibc (#324)
    - Fix limitation of PF_PACKET only supporting Ethernet (#123)
    - Fix (again) /dev/bpf detection in FreeBSD 8.0 (#292)
    - Document building code from Subversion under Cygwin (#304)
    - Fix --enable-force-* under Linux (#305)
    - Fix tcpbridge --unidir assert error (#308)
    - Improve tcpreplay timing accuracy between packets (#41)
    - Add tcprewrite fragroute support (#42)
    - Fix tcprewrite --efcs option (#277)
    - Updated Win32/Cygwin documentation (#280)
    - Add dmalloc support (#282)
    - Fix tcpprep broken handling of VLAN tagged frames (#290)
    - Fix tcprewrite crash when cache file has NO_SEND packets (#291)
    - Fix /dev/bpf detection in FreeBSD 8.0 (#292)
    - Add tcprewrite --ttl editing option (#294)
    - Fix autoconf AM_PROG_CC_C_O warning (#295)
    - Add tcpprep --reverse option to split by matching client addresses (#297)
    - Update version of autoconf to 1.10.1 (#298)
    - Improved GNU Autogen detection and warnings (#299)
    - Track EAGAIN errors separately from ENOBUFS (#301)
    - Automatically detect Winpcap on Cygwin (#303)
    - Fix linker error with --enable-tcpreplay-edit and --enable-dynamic-link (#288)
    - Fix compile errors with Sun Studio compiler (#286)
    - Fix crash in tcpreplay when --enable-tcpreplay-edit (#281)
    - Display if --enable-tcpreplay-edit in -V (#283)
    - Fix compile issue under Linux and other OS's (#275)
    - Enable source MAC spoofing for OS X (#142, #151)
        * Tcpreplay now requires OS X 10.5 (Leopard)
    - Fix crash/memory access error with tcpreplay -N (#273)
    - Fix tcprewrite segfault in 'make test' under Linux (#200)
    - Major performance improvement in tcpprep for large pcaps (#261)
    - Fix strsignal already defined error under Cygwin/Windows (#199)
    - Fix compile errors for older versions of GCC (#201)
    - Remove flowreplay code (#262)
    - Fix DLT rewrite code causing corrupted ethernet protocol type (#268)
    - Try to fix inet_aton() issue under Solaris (#260)
    - Return a more useful error message when tcpprep fails (#187)
    - Add Tomahawk test tool client/server detection algorithm (#186)
    - Improved AutoGen support (#191)
    - Improved documentation (#164, #198)
    - Added Doxygen markup (#176)
    - configure now honors --with-tcpdump flag (#192)
    - configure now defaults to --enable-64bits which breaks backwards
        compatibility in certain situations.  Use --disable-64bits if this
        concerns you (#195)
    - Use safe_free() to detect bugs earlier in development (#197)

5 files changed, 88 insertions, 9 deletions

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index fc146c42108..2112f695ea7 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:31 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/02 17:35:43 minskim Exp $
 
-DISTNAME=	tcpreplay-3.1.1
+DISTNAME=	tcpreplay-3.4.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
 
@@ -10,10 +10,12 @@ COMMENT=	Replay saved tcpdump or snoop files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.7.2
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.0
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
+CONFIGURE_ARGS+=	--enable-dynamic-link
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/tcpreplay/PLIST b/net/tcpreplay/PLIST
index 07c5aff70ab..4f8cbdb6f10 100644
--- a/net/tcpreplay/PLIST
+++ b/net/tcpreplay/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/05/02 16:23:50 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/05/02 17:35:43 minskim Exp $
 bin/tcpbridge
 bin/tcpprep
 bin/tcpreplay
+bin/tcpreplay-edit
 bin/tcprewrite
-lib/libopts.la
 man/man1/tcpbridge.1
 man/man1/tcpprep.1
 man/man1/tcpreplay.1
+man/man1/tcpreplay-edit.1
 man/man1/tcprewrite.1
diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo
index e7f439830b4..ac815ae8ede 100644
--- a/net/tcpreplay/distinfo
+++ b/net/tcpreplay/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/08/20 21:06:15 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2009/05/02 17:35:43 minskim Exp $
 
-SHA1 (tcpreplay-3.1.1.tar.gz) = ed3a8f4eda921d547036f7f4c4fe0ed3910c4d5e
-RMD160 (tcpreplay-3.1.1.tar.gz) = a54ae490e7264f6e30b336536667a92b76ddcf8c
-Size (tcpreplay-3.1.1.tar.gz) = 801068 bytes
+SHA1 (tcpreplay-3.4.1.tar.gz) = f5984c6bea651bf52fe1d5ba1224e74727e9e859
+RMD160 (tcpreplay-3.4.1.tar.gz) = 454bb5bce242311161964f487b5b9b5dfd1298bb
+Size (tcpreplay-3.4.1.tar.gz) = 872412 bytes
+SHA1 (patch-aa) = d3549d5e77c1d639deb55f00cebafc355879b4bd
+SHA1 (patch-ab) = f01ac80d1c659bff4f1cfdb582f424f86dc5d28c
diff --git a/net/tcpreplay/patches/patch-aa b/net/tcpreplay/patches/patch-aa
new file mode 100644
index 00000000000..5b386db5271
--- /dev/null
+++ b/net/tcpreplay/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.3 2009/05/02 17:35:43 minskim Exp $
+
+--- configure.ac.orig	2009-02-04 13:18:11.000000000 -0800
++++ configure.ac
+@@ -350,9 +350,9 @@ AC_ARG_WITH(libpcap,
+         	LPCAPINC="${testdir}/include/pcap.h"
+ 	        LPCAPINCDIR="${testdir}/include"
+ 	        if test $dynamic_link = yes; then
+-				if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
++				if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then
+ 		            LPCAPLIB="-L${testdir}/lib64 -lpcap"
+-				elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
++				elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then
+ 					LPCAPLIB="-L${testdir}/lib -lpcap"
+ 				else
+ 					AC_ERROR([Unable to find libpcap in ${testdir}])
+@@ -773,7 +773,7 @@ libdnet_version=
+ enable_fragroute=no
+ trydnetdir=/usr/local
+ 
+-if test $have_cygwin == no ; then
++if test $have_cygwin = no ; then
+ 	AC_MSG_CHECKING(for libdnet)
+ 	AC_ARG_WITH(libdnet,
+ 	    AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]),
+@@ -1122,7 +1122,7 @@ case $host in
+ 	;;
+ esac])
+ 
+-AM_CONDITIONAL([ENABLE_OSX_FRAMEWORKS], test "$osx_frameworks" == "yes")
++AM_CONDITIONAL([ENABLE_OSX_FRAMEWORKS], test "$osx_frameworks" = "yes")
+ 
+ AC_ARG_WITH(testnic2,
+     AC_HELP_STRING([--with-testnic2=NIC2], [Select an optional 2nd network card to use for testing]),
+@@ -1211,4 +1211,3 @@ Please see: http://tcpreplay.synfin.net/
+ Please report any bugs!	http://tcpreplay.synfin.net/trac/newticket])
+ 	;;
+ esac
+-
diff --git a/net/tcpreplay/patches/patch-ab b/net/tcpreplay/patches/patch-ab
new file mode 100644
index 00000000000..f9596ec5312
--- /dev/null
+++ b/net/tcpreplay/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1 2009/05/02 17:35:43 minskim Exp $
+
+--- configure.orig	2009-02-04 13:07:26.000000000 -0800
++++ configure
+@@ -9824,7 +9824,11 @@ darwin* | rhapsody*)
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  if test .$module = .yes ; then
++    shrext_cmds=".so"
++  else
++    shrext_cmds=".dylib"
++  fi
+ 
+   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+@@ -22072,7 +22076,7 @@ libdnet_version=
+ enable_fragroute=no
+ trydnetdir=/usr/local
+ 
+-if test $have_cygwin == no ; then
++if test $have_cygwin = no ; then
+ 	{ $as_echo "$as_me:$LINENO: checking for libdnet" >&5
+ $as_echo_n "checking for libdnet... " >&6; }
+ 
+@@ -22806,7 +22810,7 @@ esac
+ fi
+ 
+ 
+- if test "$osx_frameworks" == "yes"; then
++ if test "$osx_frameworks" = "yes"; then
+   ENABLE_OSX_FRAMEWORKS_TRUE=
+   ENABLE_OSX_FRAMEWORKS_FALSE='#'
+ else