[pkgsrc/trunk]: pkgsrc/net/wireshark use libgnutls-config

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77ad931e7d06
branches:  trunk
changeset: 560883:77ad931e7d06
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jul 02 19:13:05 2009 +0000

description:
use libgnutls-config

diffstat:

 net/wireshark/Makefile               |  10 ++--------
 net/wireshark/files/libgnutls-config |  10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diffs (51 lines):

diff -r 2b608eaade84 -r 77ad931e7d06 net/wireshark/Makefile
--- a/net/wireshark/Makefile    Thu Jul 02 18:54:18 2009 +0000
+++ b/net/wireshark/Makefile    Thu Jul 02 19:13:05 2009 +0000
@@ -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-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 @@
 # 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 -r 2b608eaade84 -r 77ad931e7d06 net/wireshark/files/libgnutls-config
--- a/net/wireshark/files/libgnutls-config      Thu Jul 02 18:54:18 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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