Updated to version 0.9.12.

This release fixes several off-by-one and integer overflow errors
discovered by Timo Sirainen.  See the following url for more details:

  http://www.ethereal.com/appnotes/enpa-sa-00009.html

Changes:

- don't build and install static plugins anymore
- use .tar.bz2 distfile
- add more MASTER_SITES (also add one for older distfiles)
- sync DESC with the new description on HOMEPAGE

- TCP sequence number analysis received a few improvements.
- General packet reassembly has been improved.
- The "Follow TCP Stream" window now allows you to filter out
  the current stream.
- The Vines code received significant updates.
- Several enhancements were made to the text2pcap utility.
- New protocols:
  ArtNET, IPX WAN, Intel ANS, iSNS, NLSP, WKSSVC
- Updated protocols:
  802.11 ACAP, AFP, AIM, AJP, ASAP, BGP, CLNP, CPHA, DCE/RPC, DSI, EAP,
  IP, IPMI, IPX, IPv6, ISIS, ISUP, IUA, Kerberos, LDAP, M2PA, M2TP, M2UA,
  M3UA, MGCP, MTP2, MTP3, MTP3MG, Modbus/TCP, NDMP, NDPS, NFS, NLSP, PGM,
  Q.931, RANAP, RPC, RSVP, SCCP, SCCPMG, SCTP, SMB, SNMP, SPX, SSH, SUA,
  TCP, Telnet, Vines, WBXML, WSP, WTP
- Updated capture file support:
  Netxray

Based on a patch by Quentin Garnier via PR pkg/21431.

11 files changed, 322 insertions, 22 deletions

diff --git a/net/ethereal/DESCR b/net/ethereal/DESCR
index 5c569a6bb4b..620c23078c9 100644
--- a/net/ethereal/DESCR
+++ b/net/ethereal/DESCR
@@ -1,6 +1,6 @@
-Ethereal is a network protocol analyzer for Unix. It allows you to
-examine data from a live network, or from a capture file on disk.
-One of the goals of the project is to have an application that is
-similar in functionality to Network Associates' NetXRay or the AG
-Group's EtherPeek. Although these are both excellent products,
-neither of them runs under Unix.
+Ethereal is a free network protocol analyzer for Unix and Windows.
+It allows you to examine data from a live network or from a capture file
+on disk.  You can interactively browse the capture data, viewing summary
+and detail information for each packet.  Ethereal has several powerful
+features, including a rich display filter language and the ability to view
+the reconstructed stream of a TCP session.
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 466d0aed44c..bab463cffa7 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile,v 1.75 2003/05/02 11:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2003/05/05 16:49:49 salo Exp $
+#
 
-DISTNAME=		ethereal-0.9.11
-PKGREVISION=	1
+DISTNAME=		ethereal-0.9.12
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.ethereal.com/pub/ethereal/ \
-			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/
+			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \
+			ftp://ftp.planetmirror.com/pub/ethereal/ \
+			ftp://gd.tuwien.ac.at/infosys/security/ethereal/ \
+			http://www.ethereal.com/distribution/ \
+			http://ftp.sunet.se/pub/network/monitoring/ethereal/ \
+			http://ethereal.netarc.jp/distribution/ \
+			ftp://ftp.ethereal.com/pub/ethereal/old-versions/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		frueauf@netbsd.org
 HOMEPAGE=		http://www.ethereal.com/
@@ -15,9 +22,10 @@ USE_X11=		YES
 USE_PERL5=		build
 
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--enable-static=no
 CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-net-snmp=${BUILDLINK_PREFIX.net-snmp}
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index 4675b25a34e..844adb33553 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,29 +1,24 @@
-@comment $NetBSD: PLIST,v 1.7 2003/03/09 04:12:02 salo Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/05/05 16:49:49 salo Exp $
 bin/editcap
 bin/ethereal
 bin/idl2eth
 bin/mergecap
 bin/tethereal
 bin/text2pcap
-lib/ethereal/plugins/${PKGVERSION}/coseventcomm.a
+lib/ethereal/plugins/${PKGVERSION}/artnet.la
+lib/ethereal/plugins/${PKGVERSION}/artnet.so
 lib/ethereal/plugins/${PKGVERSION}/coseventcomm.la
 lib/ethereal/plugins/${PKGVERSION}/coseventcomm.so
-lib/ethereal/plugins/${PKGVERSION}/cosnaming.a
 lib/ethereal/plugins/${PKGVERSION}/cosnaming.la
 lib/ethereal/plugins/${PKGVERSION}/cosnaming.so
-lib/ethereal/plugins/${PKGVERSION}/docsis.a
 lib/ethereal/plugins/${PKGVERSION}/docsis.la
 lib/ethereal/plugins/${PKGVERSION}/docsis.so
-lib/ethereal/plugins/${PKGVERSION}/gryphon.a
 lib/ethereal/plugins/${PKGVERSION}/gryphon.la
 lib/ethereal/plugins/${PKGVERSION}/gryphon.so
-lib/ethereal/plugins/${PKGVERSION}/megaco.a
 lib/ethereal/plugins/${PKGVERSION}/megaco.la
 lib/ethereal/plugins/${PKGVERSION}/megaco.so
-lib/ethereal/plugins/${PKGVERSION}/mgcp.a
 lib/ethereal/plugins/${PKGVERSION}/mgcp.la
 lib/ethereal/plugins/${PKGVERSION}/mgcp.so
-lib/ethereal/plugins/${PKGVERSION}/pcli.a
 lib/ethereal/plugins/${PKGVERSION}/pcli.la
 lib/ethereal/plugins/${PKGVERSION}/pcli.so
 man/man1/editcap.1
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index acc73918a3c..c03c07cfef5 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,11 @@
-$NetBSD: distinfo,v 1.18 2003/03/12 15:10:46 salo Exp $
+$NetBSD: distinfo,v 1.19 2003/05/05 16:49:49 salo Exp $
 
-SHA1 (ethereal-0.9.11.tar.gz) = ecf9aa9067aacd3e9e7f6bbd8f5dc7133e58f11e
-Size (ethereal-0.9.11.tar.gz) = 4457475 bytes
+SHA1 (ethereal-0.9.12.tar.bz2) = ce7a0086d63fd152645319fbad96bc4241b4fc73
+Size (ethereal-0.9.12.tar.bz2) = 3708148 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
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
new file mode 100644
index 00000000000..427888f47f1
--- /dev/null
+++ b/net/ethereal/patches/patch-aa
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..fb03a8eefa7
--- /dev/null
+++ b/net/ethereal/patches/patch-ab
@@ -0,0 +1,139 @@
+$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
new file mode 100644
index 00000000000..08edee8beec
--- /dev/null
+++ b/net/ethereal/patches/patch-ac
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..e1b8cc574b2
--- /dev/null
+++ b/net/ethereal/patches/patch-ad
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..3be0b025634
--- /dev/null
+++ b/net/ethereal/patches/patch-ae
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..2a919262738
--- /dev/null
+++ b/net/ethereal/patches/patch-af
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..4eba92f87a2
--- /dev/null
+++ b/net/ethereal/patches/patch-ag
@@ -0,0 +1,24 @@
+$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: