4 files changed, 106 insertions, 29 deletions

diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile
index 2beff7ed485b..a03cd767bcd6 100644
--- a/net/libtrace/Makefile
+++ b/net/libtrace/Makefile
@@ -1,29 +1,26 @@
-# New ports collection makefile for:	libtrace
-# Date created:				Mon Oct  8 20:32:57 PDT 2007
-# Whom:					Matt Peterson <matt@peterson.org>
-#
+# Created by: Matt Peterson <matt@peterson.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libtrace
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.15
 CATEGORIES=	net
-MASTER_SITES=	http://research.wand.net.nz/software/libtrace/ \
-		http://matt.peterson.org/FreeBSD/ports/
+MASTER_SITES=	http://research.wand.net.nz/software/libtrace/
 
 MAINTAINER=	matt@peterson.org
-COMMENT=	C library for network device, raw & compressed network flows
+COMMENT=	C library for network packet capture and processing
+
+LIB_DEPENDS=	pcap:${PORTSDIR}/net/libpcap
 
 CONFIGURE_ARGS=	--with-libpcap=${LOCALBASE}
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 
-MAN1=		traceanon.1 traceconvert.1 tracefilter.1 tracemerge.1  tracepktdump.1 \
-		tracereport.1 tracertstats.1 tracesplit.1 tracesplit_dir.1 tracestats.1 \
-		tracesummary.1
+MAN1=	traceanon.1 traceconvert.1 tracefilter.1 tracemerge.1 \
+	tracereport.1 tracertstats.1 tracesplit.1 tracepktdump.1 \
+	tracesplit_dir.1 tracestats.1 tracesummary.1 tracereplay.1 \
+	tracediff.1 traceends.1 tracetop.1 tracetopends.1
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -31,10 +28,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900000
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libtrace/distinfo b/net/libtrace/distinfo
index 2dd0f53db68d..6d28baa97ff4 100644
--- a/net/libtrace/distinfo
+++ b/net/libtrace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtrace-3.0.6.tar.bz2) = a87e2ca91f19838c9876b582ad1cf275d6f41cade0a847757b8e844f39cb6afa
-SIZE (libtrace-3.0.6.tar.bz2) = 457661
+SHA256 (libtrace-3.0.15.tar.gz) = 720a80e54205cee1c038a4e272c76606a3c6146103067210a60a77fa8932cb1c
+SIZE (libtrace-3.0.15.tar.gz) = 1436159
diff --git a/net/libtrace/pkg-descr b/net/libtrace/pkg-descr
index 8baedd8c54a8..d0935293a814 100644
--- a/net/libtrace/pkg-descr
+++ b/net/libtrace/pkg-descr
@@ -1,5 +1,11 @@
-libtrace is a library for trace processing. It supports multiple input methods,
-including device capture, raw and gz-compressed trace, and sockets; and mulitple
-input formats, including pcap and DAG.
+libtrace is a library for capturing and processing network traffic, similar to
+libpcap. Libtrace supports multiple trace formats for both input and output
+including live device capture, DAG hardware capture and off-line trace files
+(both compressed and uncompressed).
+
+More information about libtrace can be found on the libtrace webpage.
 
 WWW: http://research.wand.net.nz/software/libtrace.php
+
+Original port created by Matt Peterson <matt at peterson.org>
+Updated for FreeBSD 9.0 by Shane Alcock <salcock at waikato.ac.nz>
diff --git a/net/libtrace/pkg-plist b/net/libtrace/pkg-plist
index fe29f0e8a556..d95e3237b7a9 100644
--- a/net/libtrace/pkg-plist
+++ b/net/libtrace/pkg-plist
@@ -1,26 +1,35 @@
 bin/traceanon
 bin/traceconvert
+bin/tracediff
+bin/traceends
 bin/tracefilter
 bin/tracemerge
 bin/tracepktdump
+bin/tracereplay
 bin/tracereport
 bin/tracertstats
 bin/tracesplit
 bin/tracesplit_dir
 bin/tracestats
 bin/tracesummary
+bin/tracetop
+bin/tracetopends
 include/dagformat.h
 include/daglegacy.h
 include/erftypes.h
 include/libpacketdump.h
 include/libtrace.h
-include/libtraceio.h
 include/lt_inttypes.h
 include/rt_protocol.h
+include/wandio.h
 lib/libpacketdump.a
 lib/libpacketdump.la
 lib/libpacketdump.so
 lib/libpacketdump.so.3
+lib/libpacketdump/eth_0.a
+lib/libpacketdump/eth_0.la
+lib/libpacketdump/eth_0.so
+lib/libpacketdump/eth_0.so.0
 lib/libpacketdump/eth_2048.a
 lib/libpacketdump/eth_2048.la
 lib/libpacketdump/eth_2048.so
@@ -33,7 +42,10 @@ lib/libpacketdump/eth_33024.a
 lib/libpacketdump/eth_33024.la
 lib/libpacketdump/eth_33024.so
 lib/libpacketdump/eth_33024.so.0
-lib/libpacketdump/eth_34525.protocol
+lib/libpacketdump/eth_34525.a
+lib/libpacketdump/eth_34525.la
+lib/libpacketdump/eth_34525.so
+lib/libpacketdump/eth_34525.so.0
 lib/libpacketdump/eth_34887.a
 lib/libpacketdump/eth_34887.la
 lib/libpacketdump/eth_34887.so
@@ -46,6 +58,10 @@ lib/libpacketdump/eth_34958.a
 lib/libpacketdump/eth_34958.la
 lib/libpacketdump/eth_34958.so
 lib/libpacketdump/eth_34958.so.0
+lib/libpacketdump/ip_0.a
+lib/libpacketdump/ip_0.la
+lib/libpacketdump/ip_0.so
+lib/libpacketdump/ip_0.so.0
 lib/libpacketdump/ip_1.a
 lib/libpacketdump/ip_1.la
 lib/libpacketdump/ip_1.so
@@ -62,7 +78,15 @@ lib/libpacketdump/ip_33.a
 lib/libpacketdump/ip_33.la
 lib/libpacketdump/ip_33.so
 lib/libpacketdump/ip_33.so.0
-lib/libpacketdump/ip_41.protocol
+lib/libpacketdump/ip_41.so
+lib/libpacketdump/ip_43.a
+lib/libpacketdump/ip_43.la
+lib/libpacketdump/ip_43.so
+lib/libpacketdump/ip_43.so.0
+lib/libpacketdump/ip_44.a
+lib/libpacketdump/ip_44.la
+lib/libpacketdump/ip_44.so
+lib/libpacketdump/ip_44.so.0
 lib/libpacketdump/ip_47.a
 lib/libpacketdump/ip_47.la
 lib/libpacketdump/ip_47.so
@@ -72,10 +96,22 @@ lib/libpacketdump/ip_6.a
 lib/libpacketdump/ip_6.la
 lib/libpacketdump/ip_6.so
 lib/libpacketdump/ip_6.so.0
+lib/libpacketdump/ip_60.a
+lib/libpacketdump/ip_60.la
+lib/libpacketdump/ip_60.so
+lib/libpacketdump/ip_60.so.0
+lib/libpacketdump/ip_89.a
+lib/libpacketdump/ip_89.la
+lib/libpacketdump/ip_89.so
+lib/libpacketdump/ip_89.so.0
 lib/libpacketdump/link_0.a
 lib/libpacketdump/link_0.la
 lib/libpacketdump/link_0.so
 lib/libpacketdump/link_0.so.0
+lib/libpacketdump/link_1.a
+lib/libpacketdump/link_1.la
+lib/libpacketdump/link_1.so
+lib/libpacketdump/link_1.so.0
 lib/libpacketdump/link_10.a
 lib/libpacketdump/link_10.la
 lib/libpacketdump/link_10.so
@@ -103,9 +139,53 @@ lib/libpacketdump/link_6.a
 lib/libpacketdump/link_6.la
 lib/libpacketdump/link_6.so
 lib/libpacketdump/link_6.so.0
+lib/libpacketdump/link_9.a
+lib/libpacketdump/link_9.la
+lib/libpacketdump/link_9.so
+lib/libpacketdump/link_9.so.0
+lib/libpacketdump/ospf2_1.a
+lib/libpacketdump/ospf2_1.la
+lib/libpacketdump/ospf2_1.so
+lib/libpacketdump/ospf2_1.so.0
+lib/libpacketdump/ospf2_1000.a
+lib/libpacketdump/ospf2_1000.la
+lib/libpacketdump/ospf2_1000.so
+lib/libpacketdump/ospf2_1000.so.0
+lib/libpacketdump/ospf2_1001.a
+lib/libpacketdump/ospf2_1001.la
+lib/libpacketdump/ospf2_1001.so
+lib/libpacketdump/ospf2_1001.so.0
+lib/libpacketdump/ospf2_1002.a
+lib/libpacketdump/ospf2_1002.la
+lib/libpacketdump/ospf2_1002.so
+lib/libpacketdump/ospf2_1002.so.0
+lib/libpacketdump/ospf2_1003.a
+lib/libpacketdump/ospf2_1003.la
+lib/libpacketdump/ospf2_1003.so
+lib/libpacketdump/ospf2_1003.so.0
+lib/libpacketdump/ospf2_1004.a
+lib/libpacketdump/ospf2_1004.la
+lib/libpacketdump/ospf2_1004.so
+lib/libpacketdump/ospf2_1004.so.0
+lib/libpacketdump/ospf2_1005.a
+lib/libpacketdump/ospf2_1005.la
+lib/libpacketdump/ospf2_1005.so
+lib/libpacketdump/ospf2_1005.so.0
+lib/libpacketdump/ospf2_4.a
+lib/libpacketdump/ospf2_4.la
+lib/libpacketdump/ospf2_4.so
+lib/libpacketdump/ospf2_4.so.0
+lib/libpacketdump/ospf2_5.a
+lib/libpacketdump/ospf2_5.la
+lib/libpacketdump/ospf2_5.so
+lib/libpacketdump/ospf2_5.so.0
 lib/libpacketdump/ppp_33.so
 lib/libtrace.a
 lib/libtrace.la
 lib/libtrace.so
 lib/libtrace.so.3
-@dirrmtry lib/libpacketdump
+lib/libwandio.a
+lib/libwandio.la
+lib/libwandio.so
+lib/libwandio.so.1
+@dirrm lib/libpacketdump