diff options
| author | pav <pav@FreeBSD.org> | 2004-02-29 06:58:19 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-02-29 06:58:19 +0800 |
| commit | 60ec4e823b388bdd3180061da5c7b3da038aa492 (patch) | |
| tree | a0ba2230d1fb125ebdd7b278d73080693a3a0617 /net | |
| parent | 88665e561c1f00f298f921a58dfbcf3c9f9b7dcc (diff) | |
| download | freebsd-ports-gnome-60ec4e823b388bdd3180061da5c7b3da038aa492.tar.gz freebsd-ports-gnome-60ec4e823b388bdd3180061da5c7b3da038aa492.tar.zst freebsd-ports-gnome-60ec4e823b388bdd3180061da5c7b3da038aa492.zip | |
- Improve WITH_GTK2 knob:
autodetect
USE_GNOME instead of direct dependency
PR: ports/56083
Submitted by: Rolf Grossmann <grossman@progtech.net>
Approved by: maintainer timeout (2 months)
Diffstat (limited to 'net')
| -rw-r--r-- | net/ethereal/Makefile | 14 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index ceff626e905f..4889033828b7 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -19,17 +19,21 @@ MASTER_SITE_SUBDIR= . old-versions MAINTAINER= billf@FreeBSD.org COMMENT= An X11/GTK network analyzer/capture tool +USE_BZIP2= yes +WANT_GNOME= yes + +.include <bsd.port.pre.mk> + .if !defined(WITHOUT_SNMP) LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp .endif -USE_BZIP2= yes CONFIGURE_ARGS= --program-transform-name="" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .if !defined(WITHOUT_X11) USE_X_PREFIX= yes -.if defined(WITH_GTK2) -LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 +.if defined(WITH_GTK2) || (${HAVE_GNOME:Mgtk20}!="") +USE_GNOME= gtk20 CONFIGURE_ARGS+= --enable-gtk2=yes .else USE_GNOME= gtk12 @@ -60,7 +64,7 @@ CONFIGURE_ARGS+= --enable-snmp=no --without-ucdsnmp --without-net-snmp .if defined(WITH_ADNS) || (!defined(WITHOUT_ADNS) && exists(${LOCALBASE}/lib/adns.so)) LIB_DEPENDS+= adns.1:${PORTSDIR}/dns/adns -CONFIGURE_ARGS+= --with-adns=${LOCALBASE} +.include <bsd.port.post.mk> .else CONFIGURE_ARGS+= --without-adns .endif @@ -68,4 +72,4 @@ CONFIGURE_ARGS+= --without-adns MAN1+= editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1 MAN4+= ethereal-filter.4 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index ceff626e905f..4889033828b7 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -19,17 +19,21 @@ MASTER_SITE_SUBDIR= . old-versions MAINTAINER= billf@FreeBSD.org COMMENT= An X11/GTK network analyzer/capture tool +USE_BZIP2= yes +WANT_GNOME= yes + +.include <bsd.port.pre.mk> + .if !defined(WITHOUT_SNMP) LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp .endif -USE_BZIP2= yes CONFIGURE_ARGS= --program-transform-name="" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .if !defined(WITHOUT_X11) USE_X_PREFIX= yes -.if defined(WITH_GTK2) -LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 +.if defined(WITH_GTK2) || (${HAVE_GNOME:Mgtk20}!="") +USE_GNOME= gtk20 CONFIGURE_ARGS+= --enable-gtk2=yes .else USE_GNOME= gtk12 @@ -60,7 +64,7 @@ CONFIGURE_ARGS+= --enable-snmp=no --without-ucdsnmp --without-net-snmp .if defined(WITH_ADNS) || (!defined(WITHOUT_ADNS) && exists(${LOCALBASE}/lib/adns.so)) LIB_DEPENDS+= adns.1:${PORTSDIR}/dns/adns -CONFIGURE_ARGS+= --with-adns=${LOCALBASE} +.include <bsd.port.post.mk> .else CONFIGURE_ARGS+= --without-adns .endif @@ -68,4 +72,4 @@ CONFIGURE_ARGS+= --without-adns MAN1+= editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1 MAN4+= ethereal-filter.4 -.include <bsd.port.mk> +.include <bsd.port.post.mk> |