diff options
| author | tmclaugh <tmclaugh@FreeBSD.org> | 2006-05-05 09:43:24 +0800 |
|---|---|---|
| committer | tmclaugh <tmclaugh@FreeBSD.org> | 2006-05-05 09:43:24 +0800 |
| commit | 611ec0008bbefaf2788163f20c36df7a6397e69a (patch) | |
| tree | 1528b9331f45dda2309835babcfa61ac37ca0974 | |
| parent | 127ee757ff8591435453189625c415cb0a323513 (diff) | |
| download | freebsd-ports-gnome-611ec0008bbefaf2788163f20c36df7a6397e69a.tar.gz freebsd-ports-gnome-611ec0008bbefaf2788163f20c36df7a6397e69a.tar.zst freebsd-ports-gnome-611ec0008bbefaf2788163f20c36df7a6397e69a.zip | |
- Add optional dependency on gnutls if it is installed or via WITH_GNUTLS.
(gnutls support cannot be disabled if it is present.)
- Replace manual openssl check with USE_OPENSSL
Approved by: marcus
| -rw-r--r-- | net/ethereal/Makefile | 13 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 8b099c44a6ef..c2dfed03976a 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -23,8 +23,10 @@ USE_ICONV= yes USE_GCC= 3.4+ USE_GNOME= gnometarget WANT_GNOME= yes +USE_OPENSSL= yes CONFIGURE_ENV= MIBDIRS="/dev/null" -CONFIGURE_ARGS+= --program-transform-name="" +CONFIGURE_ARGS+= --program-transform-name="" \ + --with-ssl=/usr MAKE_ENV= MIBDIRS="/dev/null" INSTALLS_SHLIB= yes @@ -85,10 +87,6 @@ CONFIGURE_ARGS+= --enable-ipv6=no EXTRA_PATCHES+= ${FILESDIR}/extra-patch-capture_loop.h .endif -.if exists(/usr/include/openssl/crypto.h) -CONFIGURE_ARGS+= --with-ssl=/usr -.endif - # XXX - untested .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads @@ -115,6 +113,11 @@ CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-adns=no .endif +.if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS) +LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-libgnutls-prefix=${LOCALBASE} +.endif + MAN1+= dumpcap.1 tethereal.1 MAN4+= ethereal-filter.4 diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 8b099c44a6ef..c2dfed03976a 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -23,8 +23,10 @@ USE_ICONV= yes USE_GCC= 3.4+ USE_GNOME= gnometarget WANT_GNOME= yes +USE_OPENSSL= yes CONFIGURE_ENV= MIBDIRS="/dev/null" -CONFIGURE_ARGS+= --program-transform-name="" +CONFIGURE_ARGS+= --program-transform-name="" \ + --with-ssl=/usr MAKE_ENV= MIBDIRS="/dev/null" INSTALLS_SHLIB= yes @@ -85,10 +87,6 @@ CONFIGURE_ARGS+= --enable-ipv6=no EXTRA_PATCHES+= ${FILESDIR}/extra-patch-capture_loop.h .endif -.if exists(/usr/include/openssl/crypto.h) -CONFIGURE_ARGS+= --with-ssl=/usr -.endif - # XXX - untested .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads @@ -115,6 +113,11 @@ CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-adns=no .endif +.if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS) +LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-libgnutls-prefix=${LOCALBASE} +.endif + MAN1+= dumpcap.1 tethereal.1 MAN4+= ethereal-filter.4 |