diff options
| author | Bill Fumerola <billf@FreeBSD.org> | 2002-02-05 00:42:05 +0000 |
|---|---|---|
| committer | Bill Fumerola <billf@FreeBSD.org> | 2002-02-05 00:42:05 +0000 |
| commit | a60834462be6ab921bd1e067d04ac59127c31cc5 (patch) | |
| tree | 1211fe7cc8b69f3176cdf0636355499efd5d775c | |
| parent | upgrade to 0.45, disable IPv6 until a new patch is generated by KAME. (diff) | |
ethereal:
add hooks for only building tethereal, which doesn't require X
build with SNMP dissection (requires ucd-snmp) by default
add tethereal as a slave port to ethereal
Notes
Notes:
svn path=/head/; revision=54216
| -rw-r--r-- | net/Makefile | 1 | ||||
| -rw-r--r-- | net/ethereal/Makefile | 24 | ||||
| -rw-r--r-- | net/ethereal/pkg-plist | 2 | ||||
| -rw-r--r-- | net/tethereal/Makefile | 18 | ||||
| -rw-r--r-- | net/tshark/Makefile | 18 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 24 | ||||
| -rw-r--r-- | net/wireshark/pkg-plist | 2 |
7 files changed, 75 insertions, 14 deletions
diff --git a/net/Makefile b/net/Makefile index 4b01f5f93bda..f9c722d6aa10 100644 --- a/net/Makefile +++ b/net/Makefile @@ -455,6 +455,7 @@ SUBDIR += tdetect SUBDIR += telnetx SUBDIR += telserv + SUBDIR += tethereal SUBDIR += thcrut SUBDIR += tightvnc SUBDIR += tik diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 1ec36358bf33..120d777edcbe 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -16,26 +16,38 @@ MASTER_SITE_SUBDIR= . old-versions MAINTAINER= billf@FreeBSD.org -.if defined(WITH_SNMP) +.if !defined(WITHOUT_SNMP) LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp .endif +.if !defined(WITHOUT_X11) USE_X_PREFIX= yes USE_GTK= yes +MAN1+= ethereal.1 +PLIST_SUB+= ETHEREAL=bin/ethereal +.else +PLIST_SUB+= ETHEREAL="@comment ethereal not built" +LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12 +CONFIGURE_ARGS+= --enable-ethereal=no \ + --disable-gtktest +CONFIGURE_ENV+= GLIB_CONFIG=${LOCALBASE}/bin/glib12-config +.endif + USE_LIBTOOL= yes LIBTOOLFILES= configure epan/configure wiretap/configure -.if defined(WITH_SNMP) -CONFIGURE_ARGS+= --enable-snmp=yes +PLIST_SUB+= PORTVERSION=${PORTVERSION} + +.if !defined(WITHOUT_SNMP) +CONFIGURE_ARGS+= --enable-snmp=yes \ + --with-ucdsnmp=${LOCALBASE}/lib .if exists(/usr/include/openssl/crypto.h) CONFIGURE_ARGS+= --with-ssl=/usr .endif .else CONFIGURE_ARGS+= --enable-snmp=no .endif -PLIST_SUB= PORTVERSION=${PORTVERSION} -MAN1= editcap.1 ethereal.1 idl2eth.1 mergecap.1 tethereal.1 \ - text2pcap.1 +MAN1+= editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1 pre-install: .for i in ${MAN1} diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist index 87fef9818052..de05835b4cdf 100644 --- a/net/ethereal/pkg-plist +++ b/net/ethereal/pkg-plist @@ -1,5 +1,5 @@ bin/editcap -bin/ethereal +%%ETHEREAL%% bin/idl2eth bin/mergecap bin/tethereal diff --git a/net/tethereal/Makefile b/net/tethereal/Makefile new file mode 100644 index 000000000000..64e7f0216b31 --- /dev/null +++ b/net/tethereal/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: tethereal +# Date created: 4 February 2002 +# Whom: Bill Fumerola <billf@mu.org> +# A slave of ports collection makefile for: ethereal +# Date created: 10 August 1998 +# Whom: Bill Fumerola <billf@chc-chimes.com> +# +# $FreeBSD$ +# + +PKGNAMEPREFIX= t +CATEGORIES= net ipv6 + +MASTERDIR= ${.CURDIR}/../ethereal + +WITHOUT_X11= yes + +.include "${MASTERDIR}/Makefile" diff --git a/net/tshark/Makefile b/net/tshark/Makefile new file mode 100644 index 000000000000..64e7f0216b31 --- /dev/null +++ b/net/tshark/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: tethereal +# Date created: 4 February 2002 +# Whom: Bill Fumerola <billf@mu.org> +# A slave of ports collection makefile for: ethereal +# Date created: 10 August 1998 +# Whom: Bill Fumerola <billf@chc-chimes.com> +# +# $FreeBSD$ +# + +PKGNAMEPREFIX= t +CATEGORIES= net ipv6 + +MASTERDIR= ${.CURDIR}/../ethereal + +WITHOUT_X11= yes + +.include "${MASTERDIR}/Makefile" diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 1ec36358bf33..120d777edcbe 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -16,26 +16,38 @@ MASTER_SITE_SUBDIR= . old-versions MAINTAINER= billf@FreeBSD.org -.if defined(WITH_SNMP) +.if !defined(WITHOUT_SNMP) LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp .endif +.if !defined(WITHOUT_X11) USE_X_PREFIX= yes USE_GTK= yes +MAN1+= ethereal.1 +PLIST_SUB+= ETHEREAL=bin/ethereal +.else +PLIST_SUB+= ETHEREAL="@comment ethereal not built" +LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12 +CONFIGURE_ARGS+= --enable-ethereal=no \ + --disable-gtktest +CONFIGURE_ENV+= GLIB_CONFIG=${LOCALBASE}/bin/glib12-config +.endif + USE_LIBTOOL= yes LIBTOOLFILES= configure epan/configure wiretap/configure -.if defined(WITH_SNMP) -CONFIGURE_ARGS+= --enable-snmp=yes +PLIST_SUB+= PORTVERSION=${PORTVERSION} + +.if !defined(WITHOUT_SNMP) +CONFIGURE_ARGS+= --enable-snmp=yes \ + --with-ucdsnmp=${LOCALBASE}/lib .if exists(/usr/include/openssl/crypto.h) CONFIGURE_ARGS+= --with-ssl=/usr .endif .else CONFIGURE_ARGS+= --enable-snmp=no .endif -PLIST_SUB= PORTVERSION=${PORTVERSION} -MAN1= editcap.1 ethereal.1 idl2eth.1 mergecap.1 tethereal.1 \ - text2pcap.1 +MAN1+= editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1 pre-install: .for i in ${MAN1} diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 87fef9818052..de05835b4cdf 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -1,5 +1,5 @@ bin/editcap -bin/ethereal +%%ETHEREAL%% bin/idl2eth bin/mergecap bin/tethereal |