FreeBSD Port: ethereal-0.10.3

[bill fumerola]

On Tue, Jul 20, 2004 at 12:17:28AM -0700, Kris Kennaway wrote:
> I asked billf last week about this, but it looks like it still has not
> been updated.  If some other committer can step in to help, the
> various PRs assigned about this problem are well and truly in the
> "Maintainer timeout" category by now.

i've tested gtk1 but haven't tested gtk2 (which is now preferred w/
ethereal authors). gtk2 pre-reqs (pango, which links to libX11 which
references getpwuid_r) fails in the link stage due to pthread problems.
i'm updating my machine to be a more recent -stable so i can test gtk2.

patch attached; anyone who can successfully build/run this with gtk2 can
feel free to commit it.

-- 
- bill fumerola / fumerola at yahoo-inc.com / billf at FreeBSD.org


-------------- next part --------------
? ethereal-0.10.5.tgz
? ethereal.patch
? work
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/ethereal/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile	30 Mar 2004 19:53:07 -0000	1.73
+++ Makefile	20 Jul 2004 21:10:23 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.3
+PORTVERSION=	0.10.5
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
@@ -17,6 +17,7 @@
 MAINTAINER=	billf at FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
 
+USE_PERL5_BUILD=yes
 USE_BZIP2=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -41,11 +42,11 @@
 .if !defined(WITHOUT_X11)
 MAN1+=		ethereal.1
 PLIST_SUB+=	ETHEREAL=bin/ethereal
-.if defined(WITH_GTK2) || (${HAVE_GNOME:Mgtk20}!="")
-USE_GNOME=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2=yes
+.if defined(WITHOUT_GTK2)
+USE_GNOME=	gtk12 glib12
+CONFIGURE_ARGS+=	--disable-gtk2
 .else
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20 glib20
 .endif
 .else
 PLIST_SUB+=	ETHEREAL="@comment ethereal not built"
@@ -53,11 +54,11 @@
 CONFIGURE_ARGS+=	--enable-ethereal=no \
 			--disable-gtktest \
 			--with-gtk-prefix=/nonexistant \
-			--enable-gtk2=no
+			--disable-gtk2 
 .endif
 
 USE_LIBTOOL_VER=13
-LIBTOOLFILES=	configure epan/configure wiretap/configure doc/configure \
+LIBTOOLFILES=	configure wiretap/configure doc/configure \
 	      	plugins/gryphon/configure
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/ethereal/distinfo,v
retrieving revision 1.43
diff -u -r1.43 distinfo
--- distinfo	30 Mar 2004 19:53:07 -0000	1.43
+++ distinfo	20 Jul 2004 21:10:23 -0000
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.3.tar.bz2) = 6902272eb5304f57db76bf91abe453d1
-SIZE (ethereal-0.10.3.tar.bz2) = 4840005
+MD5 (ethereal-0.10.5.tar.bz2) = 26d5672935ac8bd0793fcd2ad0b4833f
+SIZE (ethereal-0.10.5.tar.bz2) = 4984584
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/ethereal/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- pkg-plist	30 Mar 2004 19:53:07 -0000	1.19
+++ pkg-plist	20 Jul 2004 21:10:23 -0000
@@ -48,11 +48,15 @@
 lib/libwiretap.la
 lib/libwiretap.so
 lib/libwiretap.so.0
+share/ethereal/AUTHORS-SHORT
 share/ethereal/diameter/dictionary.dtd
 share/ethereal/diameter/dictionary.xml
 share/ethereal/diameter/mobileipv4.xml
 share/ethereal/diameter/nasreq.xml
 share/ethereal/diameter/sunping.xml
+share/ethereal/editcap.html
+share/ethereal/ethereal-filter.html
+share/ethereal/ethereal.html
 share/ethereal/help/capture_filters.txt
 share/ethereal/help/capturing.txt
 share/ethereal/help/display_filters.txt
@@ -61,7 +65,11 @@
 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
+share/ethereal/tethereal.html
+share/ethereal/text2pcap.html
 @dirrm lib/ethereal/plugins/%%PORTVERSION%%
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal