Fri Jul 8 11:01:49 2011 UTC ()
depend on libgcrypt explicitely
(gnutls used to pull it in for us, but this will be cleaned up)


(drochner)
diff -r1.64 -r1.65 pkgsrc/net/wireshark/Makefile
cvs diff -r1.64 -r1.65 pkgsrc/net/wireshark/Makefile (switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2011/06/01 07:21:53 1.64
+++ pkgsrc/net/wireshark/Makefile 2011/07/08 11:01:49 1.65
@@ -1,56 +1,57 @@ @@ -1,56 +1,57 @@
1# $NetBSD: Makefile,v 1.64 2011/06/01 07:21:53 tron Exp $ 1# $NetBSD: Makefile,v 1.65 2011/07/08 11:01:49 drochner Exp $
2 2
3DISTNAME= wireshark-1.4.7 3DISTNAME= wireshark-1.4.7
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.wireshark.org/download/src/ \ 5MASTER_SITES= http://www.wireshark.org/download/src/ \
6 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 6 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9OWNER= tron@NetBSD.org 9OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 10HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 11COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= ethereal-[0-9]* 16CONFLICTS+= ethereal-[0-9]*
17 17
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= gmake perl pkg-config yacc lex 19USE_TOOLS+= gmake perl pkg-config yacc lex
20 20
21USE_LIBTOOL= YES 21USE_LIBTOOL= YES
22SHLIBTOOL_OVERRIDE= # empty 22SHLIBTOOL_OVERRIDE= # empty
23CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* 23CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
24 24
25GNU_CONFIGURE= YES 25GNU_CONFIGURE= YES
26CONFIGURE_ARGS+= --enable-static=no 26CONFIGURE_ARGS+= --enable-static=no
27CONFIGURE_ARGS+= --enable-threads 27CONFIGURE_ARGS+= --enable-threads
28CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 28CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
29CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 29CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
32CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} 32CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
33CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} 33CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
34 34
35PTHREAD_OPTS+= require 35PTHREAD_OPTS+= require
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38.include "options.mk" 38.include "options.mk"
39 39
40.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 40.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
41USE_BUILTIN.libpcap= no 41USE_BUILTIN.libpcap= no
42.endif 42.endif
43 43
44# wireshark no longer builds with NetBSD 3.x provided zlib 44# wireshark no longer builds with NetBSD 3.x provided zlib
45BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 45BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
46 46
47.include "../../devel/glib2/buildlink3.mk" 47.include "../../devel/glib2/buildlink3.mk"
48.include "../../devel/pcre/buildlink3.mk" 48.include "../../devel/pcre/buildlink3.mk"
49.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
50.include "../../net/libpcap/buildlink3.mk" 50.include "../../net/libpcap/buildlink3.mk"
51.include "../../devel/libsmi/buildlink3.mk" 51.include "../../devel/libsmi/buildlink3.mk"
 52.include "../../security/libgcrypt/buildlink3.mk"
52.include "../../security/gnutls/buildlink3.mk" 53.include "../../security/gnutls/buildlink3.mk"
53.include "../../security/openssl/buildlink3.mk" 54.include "../../security/openssl/buildlink3.mk"
54 55
55.include "../../mk/pthread.buildlink3.mk" 56.include "../../mk/pthread.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"