Upgrade to 0.8.2, including a vendor patch (patch-ab) which temporaily fixes

'tethereal' (a tcpdump-like program) until 0.8.3 can be released.

8 files changed, 76 insertions, 12 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 3278ac2..aa2baa3 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   ethereal
-# Version required:    0.8.1
+# Version required:    0.8.2
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ethereal-0.8.1
+DISTNAME=	ethereal-0.8.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 		http://www.linuxberg.com/files/x11/network/ \
@@ -16,13 +16,16 @@ MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}"
 
-MAN1=		ethereal.1
+MAN1=		ethereal.1 tethereal.1 editcap.1
 
 .include <bsd.port.mk>
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 50c809a..b50dc06 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1 +1 @@
-MD5 (ethereal-0.8.1.tar.gz) = 9471bd27d91844a2c84d01c2fcffaecc
+MD5 (ethereal-0.8.2.tar.gz) = addb99fc390b76b2d66cf815bd921db2
diff --git a/net/ethereal/files/patch-ab b/net/ethereal/files/patch-ab
new file mode 100644
index 0000000..30730d8
--- /dev/null
+++ b/net/ethereal/files/patch-ab
@@ -0,0 +1,21 @@
+Index: tethereal.c
+===================================================================
+RCS file: /usr/local/cvsroot/ethereal/tethereal.c,v
+retrieving revision 1.15
+diff -c -r1.15 tethereal.c
+*** tethereal.c	2000/01/24 05:13:45	1.15
+--- tethereal.c	2000/01/26 05:26:50
+***************
+*** 458,463 ****
+--- 458,469 ----
+    int         err, inpkts;
+    char        errmsg[1024+1];
+  
++   /* Initialize the table of conversations. */
++   conversation_init();
++ 
++   /* Initialize protocol-specific variables */
++   init_all_protocols();
++ 
+    ld.linktype       = WTAP_ENCAP_UNKNOWN;
+    ld.pdh            = NULL;
diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist
index 3c6cf0c..05c0dc5 100644
--- a/net/ethereal/pkg-plist
+++ b/net/ethereal/pkg-plist
@@ -1,2 +1,10 @@
+bin/editcap
 bin/ethereal
+bin/tethereal
 etc/manuf
+lib/ethereal/plugins/0.8/gryphon.la
+lib/ethereal/plugins/0.8/gryphon.a
+lib/ethereal/plugins/0.8/gryphon.so
+@dirrm lib/ethereal/plugins/0.8
+@dirrm lib/ethereal/plugins
+@dirrm lib/ethereal
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 3278ac2..aa2baa3 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   ethereal
-# Version required:    0.8.1
+# Version required:    0.8.2
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ethereal-0.8.1
+DISTNAME=	ethereal-0.8.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 		http://www.linuxberg.com/files/x11/network/ \
@@ -16,13 +16,16 @@ MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}"
 
-MAN1=		ethereal.1
+MAN1=		ethereal.1 tethereal.1 editcap.1
 
 .include <bsd.port.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 50c809a..b50dc06 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1 +1 @@
-MD5 (ethereal-0.8.1.tar.gz) = 9471bd27d91844a2c84d01c2fcffaecc
+MD5 (ethereal-0.8.2.tar.gz) = addb99fc390b76b2d66cf815bd921db2
diff --git a/net/wireshark/files/patch-ab b/net/wireshark/files/patch-ab
new file mode 100644
index 0000000..30730d8
--- /dev/null
+++ b/net/wireshark/files/patch-ab
@@ -0,0 +1,21 @@
+Index: tethereal.c
+===================================================================
+RCS file: /usr/local/cvsroot/ethereal/tethereal.c,v
+retrieving revision 1.15
+diff -c -r1.15 tethereal.c
+*** tethereal.c	2000/01/24 05:13:45	1.15
+--- tethereal.c	2000/01/26 05:26:50
+***************
+*** 458,463 ****
+--- 458,469 ----
+    int         err, inpkts;
+    char        errmsg[1024+1];
+  
++   /* Initialize the table of conversations. */
++   conversation_init();
++ 
++   /* Initialize protocol-specific variables */
++   init_all_protocols();
++ 
+    ld.linktype       = WTAP_ENCAP_UNKNOWN;
+    ld.pdh            = NULL;
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 3c6cf0c..05c0dc5 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -1,2 +1,10 @@
+bin/editcap
 bin/ethereal
+bin/tethereal
 etc/manuf
+lib/ethereal/plugins/0.8/gryphon.la
+lib/ethereal/plugins/0.8/gryphon.a
+lib/ethereal/plugins/0.8/gryphon.so
+@dirrm lib/ethereal/plugins/0.8
+@dirrm lib/ethereal/plugins
+@dirrm lib/ethereal