Updated to 0.9.15.

Patch provided by Adrian Portelli <adrianp@stindustries.net> in PR
pkg/22751.

Changes:

New and updated features

  Many often-requested features have been added with this release.  If
  you're running an older version of Ethereal you may want to have a look.

  Conversation List (aka "top talker") support has been added to Ethereal
  and Tethereal.  Protocol statistics in general have been updated.

  Searching capture files has been improved even more -- a new "contains"
  display filter operator that searches for strings in PDUs has been
  added.  The Find dialog now supports case-insensitive searches, hex data
  searches, and more.

  An H.225 dissector has been added.  It can automatically recognize RTP
  and RTCP conversations.

  A preference file has been added for disabled protocols.

  Color filters may now be imported and exported from within Ethereal.

  A new column type has been added for cumulative bytes.


New protocols

  GPRS BSSGP, GPRS NS, H.225, H.263, LWAPP, Laplink, Q.933, STUN


Updated protocols

  ArtNet, BOOTP/DHCP, DCE/RPC, DCERPCSTAT, DHCPv6, DOCSIS, ENIP, Ethernet,
  FCIP, Frame Relay, H.245, HTTP, IPsec, iSCSI, LDAP, LWRES, M2UA, M3UA,
  MEGACO, MTP3, NCP, NDPS, NFS, NTLMSSP, PPTP, Q.931, RPC, SAMR, SCCP,
  SCTP, SIP, SMB, SMPP, SNA, SNMP, SRVLOC, SUA, TCP, TDS, UCD, UDP, WSP,


Updated capture file support

  Support for Accellent 5Views and Endace ERF capture files was added.
  CheckPoint FW-1 and Novell LANalyzer support has been enhanced.

Changes in pkgsrc:

o Now it uses GTK2 by default

10 files changed, 16 insertions, 306 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index e2d9e525411..e1d5579cd0e 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2003/08/02 03:57:14 grant Exp $
+# $NetBSD: Makefile,v 1.84 2003/09/16 21:01:06 xtraeme Exp $
 #
 
-DISTNAME=		ethereal-0.9.14
+DISTNAME=		ethereal-0.9.15
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.ethereal.com/pub/ethereal/ \
 			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \
@@ -25,17 +25,22 @@ USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-static=no
-CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk}
+CONFIGURE_ARGS+=	--enable-gtk2
+CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk2}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-net-snmp=${BUILDLINK_PREFIX.net-snmp}
 CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
+PTHREAD_OPTS=		require
+
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../net/libpcap/buildlink2.mk"
 .include "../../net/net-snmp/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index fd0c149a41b..af00c12e6ce 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/06/13 03:18:20 itojun Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/09/16 21:01:08 xtraeme Exp $
 bin/editcap
 bin/ethereal
 bin/idl2eth
@@ -15,6 +15,8 @@ lib/ethereal/plugins/${PKGVERSION}/docsis.la
 lib/ethereal/plugins/${PKGVERSION}/docsis.so
 lib/ethereal/plugins/${PKGVERSION}/gryphon.la
 lib/ethereal/plugins/${PKGVERSION}/gryphon.so
+lib/ethereal/plugins/${PKGVERSION}/lwres.la
+lib/ethereal/plugins/${PKGVERSION}/lwres.so
 lib/ethereal/plugins/${PKGVERSION}/megaco.la
 lib/ethereal/plugins/${PKGVERSION}/megaco.so
 lib/ethereal/plugins/${PKGVERSION}/mgcp.la
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index f08f5e8cf46..deaa523a861 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,11 +1,4 @@
-$NetBSD: distinfo,v 1.21 2003/07/25 12:47:15 adam Exp $
+$NetBSD: distinfo,v 1.22 2003/09/16 21:01:09 xtraeme Exp $
 
-SHA1 (ethereal-0.9.14.tar.bz2) = a3aacacdd5306146662dd083a7e2681e7d9d201f
-Size (ethereal-0.9.14.tar.bz2) = 3857550 bytes
-SHA1 (patch-aa) = 05d6fa6113a5d7d69eb3f6a75c31c6cdc4d79603
-SHA1 (patch-ab) = 9967c539e2f2db2d13f804c0afdd9e39844bcf8f
-SHA1 (patch-ac) = 3dfac71275da3199b99bcb38d4200172e9e21cc0
-SHA1 (patch-ad) = 41ddececeaf77f2aca586d762d211e44d623aa61
-SHA1 (patch-ae) = dbce753e2bb415ad5e54c48decc3e59720fea8fa
-SHA1 (patch-af) = 1cbc736f52bd5e4c9f1fa0651d7ce3fe3c52d4be
-SHA1 (patch-ag) = fa27dfcee04aa2247841aa0d36c8d57ac2b7824c
+SHA1 (ethereal-0.9.15.tar.bz2) = fc828a105dae1a8693bc7a6b2780504626aa05c7
+Size (ethereal-0.9.15.tar.bz2) = 4019718 bytes
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
deleted file mode 100644
index 427888f47f1..00000000000
--- a/net/ethereal/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2003/05/05 16:49:50 salo Exp $
-
---- plugins/artnet/Makefile.in.orig	2003-05-02 03:11:00.000000000 +0200
-+++ plugins/artnet/Makefile.in	2003-05-05 17:58:52.000000000 +0200
-@@ -180,7 +180,7 @@
- # add them here.
- LIBS = 
- 
--artnet_la_DEPENDENCIES = packet-artnet-static.o
-+@ENABLE_STATIC_TRUE@artnet_la_DEPENDENCIES = packet-artnet-static.o
- 
- CLEANFILES = \
- 	artnet \
-@@ -445,8 +445,8 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-artnet-static.o:	packet-artnet.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-artnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-artnet.c 
-+@ENABLE_STATIC_TRUE@packet-artnet-static.o:	packet-artnet.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-artnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-artnet.c 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
deleted file mode 100644
index fb03a8eefa7..00000000000
--- a/net/ethereal/patches/patch-ab
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/05/05 16:49:51 salo Exp $
-
---- plugins/docsis/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/docsis/Makefile.in	2003-05-05 18:09:07.000000000 +0200
-@@ -179,7 +179,7 @@
- # add them here.
- LIBS = 
- 
--docsis_la_DEPENDENCIES = packet-docsis-static.o packet-bpkmattr-static.o packet-dsarsp-static.o packet-macmgmt-static.o packet-rngrsp-static.o packet-bpkmreq-static.o packet-dscack-static.o packet-map-static.o packet-tlv-static.o packet-bpkmrsp-static.o packet-dscreq-static.o packet-regack-static.o packet-uccreq-static.o packet-dscrsp-static.o packet-regreq-static.o packet-uccrsp-static.o packet-dsaack-static.o packet-dsdreq-static.o packet-regrsp-static.o packet-ucd-static.o packet-dsareq-static.o packet-dsdrsp-static.o packet-rngreq-static.o packet-vendor-static.o
-+@ENABLE_STATIC_TRUE@docsis_la_DEPENDENCIES = packet-docsis-static.o packet-bpkmattr-static.o packet-dsarsp-static.o packet-macmgmt-static.o packet-rngrsp-static.o packet-bpkmreq-static.o packet-dscack-static.o packet-map-static.o packet-tlv-static.o packet-bpkmrsp-static.o packet-dscreq-static.o packet-regack-static.o packet-uccreq-static.o packet-dscrsp-static.o packet-regreq-static.o packet-uccrsp-static.o packet-dsaack-static.o packet-dsdreq-static.o packet-regrsp-static.o packet-ucd-static.o packet-dsareq-static.o packet-dsdrsp-static.o packet-rngreq-static.o packet-vendor-static.o
- 
- CLEANFILES = \
- 	docsis \
-@@ -498,77 +498,77 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-docsis-static.o:	packet-docsis.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-docsis-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-docsis.c 
-+@ENABLE_STATIC_TRUE@packet-docsis-static.o:	packet-docsis.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-docsis-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-docsis.c 
- 
--packet-bpkmattr-static.o: packet-bpkmattr.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-bpkmattr-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmattr.c
-+@ENABLE_STATIC_TRUE@packet-bpkmattr-static.o: packet-bpkmattr.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILe) -c -o packet-bpkmattr-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmattr.c
- 
--packet-dsarsp-static.o:	packet-dsarsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dsarsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsarsp.c
-+@ENABLE_STATIC_TRUE@packet-dsarsp-static.o:	packet-dsarsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dsarsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsarsp.c
- 
--packet-macmgmt-static.o:	packet-macmgmt.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-macmgmt-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-macmgmt.c
-+@ENABLE_STATIC_TRUE@packet-macmgmt-static.o:	packet-macmgmt.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-macmgmt-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-macmgmt.c
- 
--packet-rngrsp-static.o:	packet-rngrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-rngrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngrsp.c
-+@ENABLE_STATIC_TRUE@packet-rngrsp-static.o:	packet-rngrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-rngrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngrsp.c
- 
--packet-bpkmreq-static.o:	packet-bpkmreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-bpkmreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmreq.c
-+@ENABLE_STATIC_TRUE@packet-bpkmreq-static.o:	packet-bpkmreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-bpkmreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmreq.c
- 
--packet-dscack-static.o:	packet-dscack.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dscack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscack.c
-+@ENABLE_STATIC_TRUE@packet-dscack-static.o:	packet-dscack.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dscack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscack.c
- 
--packet-map-static.o:	packet-map.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-map-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-map.c
-+@ENABLE_STATIC_TRUE@packet-map-static.o:	packet-map.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-map-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-map.c
- 
--packet-tlv-static.o:	packet-tlv.c packet-tlv.h moduleinfo.h
--	$(LTCOMPILE) -c -o packet-tlv-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-tlv.c
-+@ENABLE_STATIC_TRUE@packet-tlv-static.o:	packet-tlv.c packet-tlv.h moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-tlv-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-tlv.c
- 
--packet-bpkmrsp-static.o:	packet-bpkmrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-bpkmrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmrsp.c
-+@ENABLE_STATIC_TRUE@packet-bpkmrsp-static.o:	packet-bpkmrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-bpkmrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmrsp.c
- 
--packet-dscreq-static.o:	packet-dscreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dscreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscreq.c
-+@ENABLE_STATIC_TRUE@packet-dscreq-static.o:	packet-dscreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dscreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscreq.c
- 
--packet-regack-static.o:	packet-regack.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-regack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regack.c
-+@ENABLE_STATIC_TRUE@packet-regack-static.o:	packet-regack.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-regack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regack.c
- 
--packet-uccreq-static.o:	packet-uccreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-uccreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccreq.c
-+@ENABLE_STATIC_TRUE@packet-uccreq-static.o:	packet-uccreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-uccreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccreq.c
- 
--packet-dscrsp-static.o:	packet-dscrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dscrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscrsp.c
-+@ENABLE_STATIC_TRUE@packet-dscrsp-static.o:	packet-dscrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dscrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscrsp.c
- 
--packet-regreq-static.o:	packet-regreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-regreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regreq.c
-+@ENABLE_STATIC_TRUE@packet-regreq-static.o:	packet-regreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-regreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regreq.c
- 
--packet-uccrsp-static.o:	packet-uccrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-uccrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccrsp.c
-+@ENABLE_STATIC_TRUE@packet-uccrsp-static.o:	packet-uccrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-uccrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccrsp.c
- 
--packet-dsaack-static.o:	packet-dsaack.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dsaack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsaack.c
-+@ENABLE_STATIC_TRUE@packet-dsaack-static.o:	packet-dsaack.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dsaack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsaack.c
- 
--packet-dsdreq-static.o:	packet-dsdreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dsdreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdreq.c
-+@ENABLE_STATIC_TRUE@packet-dsdreq-static.o:	packet-dsdreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dsdreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdreq.c
- 
--packet-regrsp-static.o:	packet-regrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-regrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regrsp.c
-+@ENABLE_STATIC_TRUE@packet-regrsp-static.o:	packet-regrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-regrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regrsp.c
- 
--packet-ucd-static.o:	packet-ucd.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-ucd-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-ucd.c
-+@ENABLE_STATIC_TRUE@packet-ucd-static.o:	packet-ucd.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-ucd-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-ucd.c
- 
--packet-dsareq-static.o:	packet-dsareq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dsareq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsareq.c
-+@ENABLE_STATIC_TRUE@packet-dsareq-static.o:	packet-dsareq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dsareq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsareq.c
- 
--packet-dsdrsp-static.o:	packet-dsdrsp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-dsdrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdrsp.c
-+@ENABLE_STATIC_TRUE@packet-dsdrsp-static.o:	packet-dsdrsp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-dsdrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdrsp.c
- 
--packet-rngreq-static.o:	packet-rngreq.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-rngreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngreq.c
-+@ENABLE_STATIC_TRUE@packet-rngreq-static.o:	packet-rngreq.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-rngreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngreq.c
- 
--packet-vendor-static.o:	packet-vendor.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-vendor-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-vendor.c
-+@ENABLE_STATIC_TRUE@packet-vendor-static.o:	packet-vendor.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-vendor-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-vendor.c
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-ac b/net/ethereal/patches/patch-ac
deleted file mode 100644
index 08edee8beec..00000000000
--- a/net/ethereal/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/05/05 16:49:51 salo Exp $
-
---- plugins/giop/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/giop/Makefile.in	2003-05-05 18:10:34.000000000 +0200
-@@ -186,8 +186,8 @@
- # add them here.
- LIBS = 
- 
--cosnaming_la_DEPENDENCIES = packet-cosnaming-static.o
--coseventcomm_la_DEPENDENCIES = packet-coseventcomm-static.o
-+@ENABLE_STATIC_TRUE@cosnaming_la_DEPENDENCIES = packet-cosnaming-static.o
-+@ENABLE_STATIC_TRUE@coseventcomm_la_DEPENDENCIES = packet-coseventcomm-static.o
- 
- CLEANFILES = \
- 	cosnaming \
-@@ -460,11 +460,11 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-cosnaming-static.o:	packet-cosnaming.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-cosnaming-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-cosnaming.c 
-+@ENABLE_STATIC_TRUE@packet-cosnaming-static.o:	packet-cosnaming.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-cosnaming-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-cosnaming.c 
- 
--packet-coseventcomm-static.o:	packet-coseventcomm.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-coseventcomm-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-coseventcomm.c 
-+@ENABLE_STATIC_TRUE@packet-coseventcomm-static.o:	packet-coseventcomm.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-coseventcomm-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-coseventcomm.c 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-ad b/net/ethereal/patches/patch-ad
deleted file mode 100644
index e1b8cc574b2..00000000000
--- a/net/ethereal/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/05/05 16:49:52 salo Exp $
-
---- plugins/gryphon/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/gryphon/Makefile.in	2003-05-05 18:11:31.000000000 +0200
-@@ -180,7 +180,7 @@
- # add them here.
- LIBS = 
- 
--gryphon_la_DEPENDENCIES = packet-gryphon-static.o
-+@ENABLE_STATIC_TRUE@gryphon_la_DEPENDENCIES = packet-gryphon-static.o
- 
- CLEANFILES = \
- 	gryphon \
-@@ -445,8 +445,8 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-gryphon-static.o:	packet-gryphon.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-gryphon-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-gryphon.c
-+@ENABLE_STATIC_TRUE@packet-gryphon-static.o:	packet-gryphon.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-gryphon-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-gryphon.c
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-ae b/net/ethereal/patches/patch-ae
deleted file mode 100644
index 3be0b025634..00000000000
--- a/net/ethereal/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/05/05 16:49:52 salo Exp $
-
---- plugins/megaco/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/megaco/Makefile.in	2003-05-05 18:12:38.000000000 +0200
-@@ -179,7 +179,7 @@
- # add them here.
- LIBS = 
- 
--megaco_la_DEPENDENCIES = packet-megaco-static.o
-+@ENABLE_STATIC_TRUE@megaco_la_DEPENDENCIES = packet-megaco-static.o
- 
- CLEANFILES = \
- 	megaco \
-@@ -444,8 +444,8 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-megaco-static.o:	packet-megaco.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c 
-+@ENABLE_STATIC_TRUE@packet-megaco-static.o:	packet-megaco.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-af b/net/ethereal/patches/patch-af
deleted file mode 100644
index 2a919262738..00000000000
--- a/net/ethereal/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/05/05 16:49:53 salo Exp $
-
---- plugins/mgcp/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/mgcp/Makefile.in	2003-05-05 18:13:20.000000000 +0200
-@@ -180,7 +180,7 @@
- # add them here.
- LIBS = 
- 
--mgcp_la_DEPENDENCIES = packet-mgcp-static.o
-+@ENABLE_STATIC_TRUE@mgcp_la_DEPENDENCIES = packet-mgcp-static.o
- 
- CLEANFILES = \
- 	mgcp \
-@@ -445,8 +445,8 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-mgcp-static.o:	packet-mgcp.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-mgcp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-mgcp.c 
-+@ENABLE_STATIC_TRUE@packet-mgcp-static.o:	packet-mgcp.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-mgcp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-mgcp.c 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/ethereal/patches/patch-ag b/net/ethereal/patches/patch-ag
deleted file mode 100644
index 4eba92f87a2..00000000000
--- a/net/ethereal/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/05/05 16:49:53 salo Exp $
-
---- plugins/pcli/Makefile.in.orig	2003-05-02 03:11:01.000000000 +0200
-+++ plugins/pcli/Makefile.in	2003-05-05 18:13:59.000000000 +0200
-@@ -180,7 +180,7 @@
- # add them here.
- LIBS = 
- 
--pcli_la_DEPENDENCIES = packet-pcli-static.o
-+@ENABLE_STATIC_TRUE@pcli_la_DEPENDENCIES = packet-pcli-static.o
- 
- CLEANFILES = \
- 	pcli \
-@@ -445,8 +445,8 @@
- 	uninstall-am uninstall-info-am uninstall-pluginLTLIBRARIES
- 
- 
--packet-pcli-static.o:	packet-pcli.c moduleinfo.h
--	$(LTCOMPILE) -c -o packet-pcli-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-pcli.c 
-+@ENABLE_STATIC_TRUE@packet-pcli-static.o:	packet-pcli.c moduleinfo.h
-+@ENABLE_STATIC_TRUE@	$(LTCOMPILE) -c -o packet-pcli-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-pcli.c 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: