update to Ethereal version 0.9.16. also switch to glib2/gtk2.

net/ethereal/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.77 2003/10/08 19:35:30 jcs Exp $
+# $OpenBSD: Makefile,v 1.78 2003/11/04 17:42:43 jakob Exp $
 
 COMMENT=	"network protocol analyzer"
 
-VERSION=	0.9.15
+VERSION=	0.9.16
 DISTNAME=	ethereal-${VERSION}
 CATEGORIES=	net x11
 
@@ -29,13 +29,18 @@ SEPARATE_BUILD=		concurrent
 FLAVORS=	no_x11 snmp adns
 FLAVOR?=
 
+CONFIGURE_ARGS+=	--enable-gtk2 \
+			--with-glib-prefix=${LOCALBASE}
+LIB_DEPENDS+=		glib-2.0.0.0,gthread-2.0.0.0::devel/glib2
+
 .if ${FLAVOR:L:Mno_x11}
-LIB_DEPENDS+=		glib.1.2,gmodule.1.2::devel/glib
+USE_X11=		No
 CONFIGURE_ARGS+=	--disable-ethereal
 .else
 USE_X11=		Yes
-LIB_DEPENDS+=		gtk.1.2,gdk.1.2::x11/gtk+
+CONFIGURE_ARGS+=	--enable-ethereal \
-CONFIGURE_ARGS+=	--enable-ethereal
+			--with-gtk-prefix=${LOCALBASE}
+LIB_DEPENDS+=		gdk_pixbuf-2.0.0.0,gdk-x11-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
 .endif
 
 .if ${FLAVOR:L:Msnmp}

net/ethereal/distinfo

@@ -1,3 +1,3 @@
-MD5 (ethereal-0.9.15.tar.gz) = 44b1fafae16c7235700d50fabf0b7079
+MD5 (ethereal-0.9.16.tar.gz) = 52860154b252c9c974de939893388dd3
-RMD160 (ethereal-0.9.15.tar.gz) = 0af135bda3e7d71186d9bd1a8094260f5b52f63c
+RMD160 (ethereal-0.9.16.tar.gz) = 7350b142971aa5fa85bc30d3747af1fa3b36a74f
-SHA1 (ethereal-0.9.15.tar.gz) = 1d45cf0832c1858553ac8656283f4fe5dffa9eae
+SHA1 (ethereal-0.9.16.tar.gz) = 1118e43387d566ed7c234e92d7dafa3e77670795

net/ethereal/patches/patch-gtk_proto_draw_c

@@ -0,0 +1,27 @@
+$OpenBSD: patch-gtk_proto_draw_c,v 1.1 2003/11/04 17:42:44 jakob Exp $
+--- gtk/proto_draw.c.orig	2003-11-04 00:24:40.000000000 +0100
++++ gtk/proto_draw.c	2003-11-04 18:08:45.000000000 +0100
+@@ -1058,6 +1058,7 @@ packet_hex_print_common(GtkTextView *bv,
+       /* Have we gone from reverse to plain? */
+       if (reverse && (reverse != newreverse)) {
+         convline = g_locale_to_utf8(line, cur, NULL, &newsize, NULL);
++        if (convline == NULL) convline = g_strndup (line, cur);
+         gtk_text_buffer_insert_with_tags_by_name(buf, &iter, convline, newsize,
+                                                  revstyle, NULL);
+         g_free(convline);
+@@ -1072,6 +1073,7 @@ packet_hex_print_common(GtkTextView *bv,
+       /* Have we gone from plain to reversed? */
+       if (!reverse && (reverse != newreverse)) {
+         convline = g_locale_to_utf8(line, cur, NULL, &newsize, NULL);
++        if (convline == NULL) convline = g_strndup (line, cur);
+         gtk_text_buffer_insert_with_tags_by_name(buf, &iter, convline, newsize,
+                                                  "plain", NULL);
+         g_free(convline);
+@@ -1081,6 +1083,7 @@ packet_hex_print_common(GtkTextView *bv,
+     }
+     /* Print remaining part of line */
+     convline = g_locale_to_utf8(line, cur, NULL, &newsize, NULL);
++    if (convline == NULL) convline = g_strndup (line, cur);
+     gtk_text_buffer_insert_with_tags_by_name(buf, &iter, convline, newsize,
+                                              reverse ? revstyle : "plain",
+                                              NULL);

net/ethereal/patches/patch-plugins_asn1_packet-asn1_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-plugins_asn1_packet-asn1_c,v 1.1 2003/11/04 17:42:44 jakob Exp $
+--- plugins/asn1/packet-asn1.c.orig	2003-11-03 00:12:35.000000000 +0100
++++ plugins/asn1/packet-asn1.c	2003-11-04 18:09:05.000000000 +0100
+@@ -87,7 +87,9 @@
+ 
+ #include "plugins/plugin_api_defs.h"
+ 
++#ifdef DISSECTOR_WITH_GUI
+ #include <gtk/gtk.h>
++#endif
+ 
+ #include <ipproto.h>
+ 

net/ethereal/pkg/PFRAG.no-shared

@@ -1,4 +1,8 @@
-@comment $OpenBSD: PFRAG.no-shared,v 1.17 2003/10/05 22:24:16 jakob Exp $
+@comment $OpenBSD: PFRAG.no-shared,v 1.18 2003/11/04 17:42:44 jakob Exp $
+lib/ethereal/plugins/${VERSION}/acn.a
+lib/ethereal/plugins/${VERSION}/acn.la
+lib/ethereal/plugins/${VERSION}/asn1.a
+lib/ethereal/plugins/${VERSION}/asn1.la
 lib/ethereal/plugins/${VERSION}/artnet.a
 lib/ethereal/plugins/${VERSION}/artnet.la
 lib/ethereal/plugins/${VERSION}/coseventcomm.a

net/ethereal/pkg/PFRAG.shared

@@ -1,4 +1,10 @@
-@comment $OpenBSD: PFRAG.shared,v 1.20 2003/10/05 22:24:16 jakob Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.21 2003/11/04 17:42:44 jakob Exp $
+lib/ethereal/plugins/${VERSION}/acn.a
+lib/ethereal/plugins/${VERSION}/acn.la
+lib/ethereal/plugins/${VERSION}/acn.so
+lib/ethereal/plugins/${VERSION}/asn1.a
+lib/ethereal/plugins/${VERSION}/asn1.la
+lib/ethereal/plugins/${VERSION}/asn1.so
 lib/ethereal/plugins/${VERSION}/artnet.a
 lib/ethereal/plugins/${VERSION}/artnet.la
 lib/ethereal/plugins/${VERSION}/artnet.so