diff options
| author | tnn <tnn@pkgsrc.org> | 2009-07-02 19:13:05 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-07-02 19:13:05 +0000 |
| commit | f02b48181abd6e8ff3c53892244952a0bec7febb (patch) | |
| tree | ea5bf9428431705f4749c8448aa445665677a1b9 /net | |
| parent | 3d9146f6f7a0326d98d5b1c0a4e4c06a3b844c91 (diff) | |
| download | pkgsrc-f02b48181abd6e8ff3c53892244952a0bec7febb.tar.gz | |
use libgnutls-config
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireshark/Makefile | 10 | ||||
| -rw-r--r-- | net/wireshark/files/libgnutls-config | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 85109762ca9..5843fc3659e 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/06/25 09:38:25 drochner Exp $ +# $NetBSD: Makefile,v 1.34 2009/07/02 19:13:05 tnn Exp $ DISTNAME= wireshark-1.0.8 PKGREVISION= 1 @@ -29,8 +29,6 @@ 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 @@ -44,17 +42,13 @@ 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" .include "../../net/libpcap/buildlink3.mk" .include "../../devel/libsmi/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" +.include "../../security/gnutls/libgnutls-config.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/wireshark/files/libgnutls-config b/net/wireshark/files/libgnutls-config deleted file mode 100644 index 84e9e872d6b..00000000000 --- a/net/wireshark/files/libgnutls-config +++ /dev/null @@ -1,10 +0,0 @@ -#!@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 |