- Update to 0.10.7

- Add pcre support
- ok'ed frueauf@

From the website:

In order to avoid a naming conflict with the tcpreplay project, the "capinfo"
utility has been renamed to "capinfos".

New and updated features
Search wrapping is now a configurable option.

A lot of material has been added to the Developer's Guide. The User's Guide
has been updated as well.

The "Decode As..." dialog now supports DCERPC and SCTP.

The "Help" menu now includes a link to the wiki.

H.323 call analysis is now supported.

New protocol support
Cisco PAgP, DAAP, Etheric, Ethernet Configuration Testing Protocol, Ethernet
MAC Control Frame, ICE, Kerberos v4, Netscape certificate extensions, PKINIT,
PKIX1EXPLICIT, PKIX1IMPLICIT,

Updated protocol support
AIM, ARTNET, ASN.1 BER, ASN.1 PER, ASN.1, BGP, BOOTP, CIP, CLNP, COPS, DCERPC
MAPI, DCERPC SAMR, DCERPC, DCOM, DHCP, DHCPv6, DIAMETER, DNS, EAP, ENIP, EPM,
GRE, GSM A, GSM MAP, H.225, H.245, H.248 MEGACO, H.450, ISAKMP, iSCSI, iSNS,
ISUP, JFIF, Kerberos, LDAP, LDP, LLC, LWAPP, M2PA, MEGACO, MPLS, NCP 2222, NCP,
NDMP, NetFlow, NTLMSSP, OSCAR-ICQ, OSPF, RADIUS, RSVP, RTCP, RTP, RTSP, SCTP,
SDP, SES, SIP, Skinny, SMB, SNMP, SUA, T.38, TALI, TCAP, TCP, TDS, Teredo,
Time, X.509, X11,

New and updated capture file support
HP-UX nettl, NG Sniffer

3 files changed, 12 insertions, 10 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index caebab43441..4e1acb4791e 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2004/10/09 12:09:15 adrianp Exp $
+# $NetBSD: Makefile,v 1.99 2004/10/31 13:22:53 adrianp Exp $
 
-DISTNAME=	ethereal-0.10.6
+DISTNAME=	ethereal-0.10.7
 PKGREVISION=	# defined1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ethereal.com/distribution/ \
@@ -38,6 +38,7 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-net-snmp
 CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ENV+=		ac_cv_func_pcap_compile_nopcap=no
 
 PTHREAD_OPTS=		require
@@ -49,6 +50,7 @@ USE_BUILTIN.libpcap=	no
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index dd15fea16fb..603b04d4dfd 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2004/09/22 08:09:47 jlam Exp $
-bin/capinfo
+@comment $NetBSD: PLIST,v 1.18 2004/10/31 13:22:54 adrianp Exp $
+bin/capinfos
 bin/dftest
 bin/editcap
 bin/ethereal
@@ -29,7 +29,7 @@ lib/ethereal/plugins/${PKGVERSION}/rudp.la
 lib/ethereal/plugins/${PKGVERSION}/v5ua.la
 lib/libethereal.la
 lib/libwiretap.la
-man/man1/capinfo.1
+man/man1/capinfos.1
 man/man1/editcap.1
 man/man1/ethereal.1
 man/man1/idl2eth.1
@@ -38,9 +38,10 @@ man/man1/tethereal.1
 man/man1/text2pcap.1
 man/man4/ethereal-filter.4
 share/ethereal/AUTHORS-SHORT
-share/ethereal/capinfo.html
+share/ethereal/capinfos.html
 share/ethereal/diameter/dictionary.dtd
 share/ethereal/diameter/dictionary.xml
+share/ethereal/diameter/imscxdx.xml
 share/ethereal/diameter/mobileipv4.xml
 share/ethereal/diameter/nasreq.xml
 share/ethereal/diameter/sunping.xml
@@ -54,7 +55,6 @@ share/ethereal/help/faq.txt
 share/ethereal/help/getting_started.txt
 share/ethereal/help/overview.txt
 share/ethereal/help/toc
-share/ethereal/help/well_known.txt
 share/ethereal/idl2eth.html
 share/ethereal/manuf
 share/ethereal/mergecap.html
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 860096ba0cb..641342d0e28 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2004/08/13 11:31:28 adam Exp $
+$NetBSD: distinfo,v 1.30 2004/10/31 13:22:54 adrianp Exp $
 
-SHA1 (ethereal-0.10.6.tar.bz2) = 638805f0b5a8cbc9dea861a94b0fdefc56e19473
-Size (ethereal-0.10.6.tar.bz2) = 5046796 bytes
+SHA1 (ethereal-0.10.7.tar.bz2) = c1dfd929310a9c421262c4e51bb57b803b1f3036
+Size (ethereal-0.10.7.tar.bz2) = 5170212 bytes