diff options
| author | drochner <drochner> | 2009-06-25 09:38:25 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-06-25 09:38:25 +0000 |
| commit | 864d11606a8a8e09843bcb69b86a6863c23d415b (patch) | |
| tree | 7a949aa61d1a6d297f4dae8d0d9b68daed6307dc /net | |
| parent | 93cba12e1e5bf9e6cad57415e6cf572d6d98cbae (diff) | |
| download | pkgsrc-864d11606a8a8e09843bcb69b86a6863c23d415b.tar.gz | |
compensate for missing "libgnutls-config" in gnutls-1.8.0, so that
SSL support is built in again
approved by tron The Maintainer
bump PKGREVISION
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireshark/Makefile | 10 | ||||
| -rw-r--r-- | net/wireshark/files/libgnutls-config | 10 |
2 files changed, 19 insertions, 1 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index e5cbcc67957..85109762ca9 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2009/05/23 08:12:08 tron Exp $ +# $NetBSD: Makefile,v 1.33 2009/06/25 09:38:25 drochner Exp $ DISTNAME= wireshark-1.0.8 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} @@ -28,6 +29,8 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} +# XXX work around missing "libgnutls-config" in gnutls-2.8 +CONFIGURE_ENV+= LIBGNUTLS_CONFIG=${WRKDIR}/libgnutls-config PTHREAD_OPTS+= require @@ -41,6 +44,11 @@ USE_BUILTIN.libpcap= no # wireshark no longer builds with NetBSD 3.x provided zlib BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 +pre-configure: + ${SED} "s|@SH@|${SH}|" <${FILESDIR}/libgnutls-config \ + >${WRKDIR}/libgnutls-config + ${CHMOD} +x ${WRKDIR}/libgnutls-config + .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/net/wireshark/files/libgnutls-config b/net/wireshark/files/libgnutls-config new file mode 100644 index 00000000000..84e9e872d6b --- /dev/null +++ b/net/wireshark/files/libgnutls-config @@ -0,0 +1,10 @@ +#!@SH@ +# $NetBSD: libgnutls-config,v 1.1 2009/06/25 09:38:25 drochner Exp $ + +if [ $1 = "--version" ]; then + arg=--modversion +else + arg=$1 +fi + +pkg-config $arg gnutls |