pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/wireshark compensate for missing "libgnutls-config...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd8d4bd12ec8
branches:  trunk
changeset: 560787:fd8d4bd12ec8
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Jun 25 09:38:25 2009 +0000

description:
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:

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

diffs (47 lines):

diff -r 4575251327ee -r fd8d4bd12ec8 net/wireshark/Makefile
--- a/net/wireshark/Makefile    Thu Jun 25 06:42:10 2009 +0000
+++ b/net/wireshark/Makefile    Thu Jun 25 09:38:25 2009 +0000
@@ -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-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 @@
 # 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 -r 4575251327ee -r fd8d4bd12ec8 net/wireshark/files/libgnutls-config
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/wireshark/files/libgnutls-config      Thu Jun 25 09:38:25 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index