ports/56083: Update ethereal to version 0.9.14 and allow for gtk2

[Rolf Grossmann]

>Number:         56083
>Category:       ports
>Synopsis:       Update ethereal to version 0.9.14 and allow for gtk2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 28 06:40:00 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Rolf Grossmann
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
PROGTECH GmbH
>Environment:
System: FreeBSD ptserver 4.8-STABLE FreeBSD 4.8-STABLE #1: Wed Aug 20 16:23:54 CEST 2003     grossman at ptserver:/export/freebsd/FreeBSD/cvs/src/sys/compile/PTSERVER  i386

>Description:
The given patch will update ethereal to version 0.9.14 and while I was at it,
I also added some support for using gtk2 instead of the old gtk. I know the
old gtk libraries are not going away any time soon, but I'm still trying not
having to use them. The code is trying to detect which version is installed,
defaulting to the existing (old) gtk. Just look at the patch.

Best regards, Rolf
	
>How-To-Repeat:
	Install ethereal port.

>Fix:

diff -bru /usr/ports/net/ethereal/Makefile ethereal/Makefile
--- /usr/ports/net/ethereal/Makefile	Sat Jul 12 05:08:44 2003
+++ ethereal/Makefile	Thu Aug 28 02:03:43 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.14
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/%SUBDIR%/ \
@@ -18,6 +18,9 @@
 MAINTAINER=	billf at FreeBSD.org
 COMMENT=	An X11/GTK network analyzer/capture tool
 
+WANT_GNOME=	yes
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_SNMP)
 LIB_DEPENDS=	netsnmp.5:${PORTSDIR}/net/net-snmp
 .endif
@@ -26,7 +29,12 @@
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 .if !defined(WITHOUT_X11)
 USE_X_PREFIX=	yes
+.if defined(WITH_GTK2) || (${HAVE_GNOME:Mgtk20}!="")
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=	--enable-gtk2
+.else
 USE_GNOME=	gtk12
+.endif
 MAN1+=		ethereal.1
 PLIST_SUB+=	ETHEREAL=bin/ethereal
 .else
@@ -58,4 +66,4 @@
 	${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/man/man1
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -bru /usr/ports/net/ethereal/distinfo ethereal/distinfo
--- /usr/ports/net/ethereal/distinfo	Sat Jul 12 05:08:44 2003
+++ ethereal/distinfo	Tue Aug 26 16:59:51 2003
@@ -1 +1 @@
-MD5 (ethereal-0.9.13.tar.gz) = 0d3942b1352d690342ae444afffdb3e6
+MD5 (ethereal-0.9.14.tar.gz) = 5bcd7fff4bc6c662a00c429eed2c9e9d

>Release-Note:
>Audit-Trail:
>Unformatted: