ports/59855: [PATCH] ethereal-0.9.16 uses adns

[Roman Neuhauser]

>Number:         59855
>Category:       ports
>Synopsis:       [PATCH] ethereal-0.9.16 uses adns
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 30 11:10:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Roman Neuhauser
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD freepuppy.bellavista.cz 4.8-STABLE FreeBSD 4.8-STABLE #3: Tue Aug 26 12:34:53 CEST 2003 roman at freepuppy.bellavista.cz:/usr/obj/usr/src/sys/FREEPUPPY2_5 i386


	
>Description:
    Ethereal has a --with-adns switch. ./configure tests for presence of the
    library even if --with-adns is not specified, and if it finds it, the build
    fails later on because /usr/local/lib is not in -L.

    This PR supercedes ports/58954.

>How-To-Repeat:
	cd /usr/ports/dns/adns && make install
    cd /usr/ports/net/ethereal && make install
>Fix:

	

--- net-ethereal-0.9.16-WITH_ADNS.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ethereal/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- Makefile	18 Nov 2003 03:19:37 -0000	1.63
+++ Makefile	30 Nov 2003 18:46:17 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.9.14
-PORTREVISION=	1
+PORTVERSION=	0.9.16
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/%SUBDIR%/ \
@@ -52,6 +51,14 @@
 CONFIGURE_ARGS+=	--enable-snmp=no --without-ucdsnmp --without-net-snmp
 .endif
 
+.if defined(WITH_ADNS) || (!defined(WITHOUT_ADNS) && exists(${LOCALBASE}/lib/adns.so))
+LIB_DEPENDS+=	adns.1:${PORTSDIR}/dns/adns
+CONFIGURE_ARGS+=	--with-adns=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-adns
+.endif
+
 MAN1+=		editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1
+MAN4+=		ethereal-filter.4
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/ethereal/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- distinfo	7 Sep 2003 12:36:40 -0000	1.41
+++ distinfo	30 Nov 2003 18:44:43 -0000
@@ -1 +1 @@
-MD5 (ethereal-0.9.14.tar.gz) = 5bcd7fff4bc6c662a00c429eed2c9e9d
+MD5 (ethereal-0.9.16.tar.gz) = 52860154b252c9c974de939893388dd3
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/ethereal/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	11 Jul 2003 20:19:02 -0000	1.17
+++ pkg-plist	30 Nov 2003 18:44:43 -0000
@@ -4,8 +4,12 @@
 bin/mergecap
 bin/tethereal
 bin/text2pcap
+lib/ethereal/plugins/%%PORTVERSION%%/acn.la
+lib/ethereal/plugins/%%PORTVERSION%%/acn.so
 lib/ethereal/plugins/%%PORTVERSION%%/artnet.la
 lib/ethereal/plugins/%%PORTVERSION%%/artnet.so
+lib/ethereal/plugins/%%PORTVERSION%%/asn1.la
+lib/ethereal/plugins/%%PORTVERSION%%/asn1.so
 lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la
 lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
 lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la
@@ -14,6 +18,8 @@
 lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
 lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
 lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
+lib/ethereal/plugins/%%PORTVERSION%%/lwres.la
+lib/ethereal/plugins/%%PORTVERSION%%/lwres.so
 lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
 lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
 lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
--- net-ethereal-0.9.16-WITH_ADNS.patch ends here ---


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