Tue Jul 9 08:36:38 2013 UTC ()
Replace python scripts in tools/. Needed during build as indicated by
Joern Clausen in PR 48033. Add build dependency on python.

Bump PKGREVISION because python missing might have affected the generated
files.


(wiz)
diff -r1.104 -r1.105 pkgsrc/net/wireshark/Makefile
cvs diff -r1.104 -r1.105 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2013/07/04 21:33:14 1.104
+++ pkgsrc/net/wireshark/Makefile 2013/07/09 08:36:38 1.105
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.104 2013/07/04 21:33:14 adam Exp $ 1# $NetBSD: Makefile,v 1.105 2013/07/09 08:36:38 wiz Exp $
2 2
3DISTNAME= wireshark-1.10.0 3DISTNAME= wireshark-1.10.0
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://www.wireshark.org/download/src/ \ 6MASTER_SITES= http://www.wireshark.org/download/src/ \
6 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 7 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9OWNER= tron@NetBSD.org 10OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 11HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 12COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14CONFLICTS+= ethereal-[0-9]* 15CONFLICTS+= ethereal-[0-9]*
15 16
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
@@ -22,34 +23,52 @@ CHECK_PORTABILITY_SKIP+=packaging/macosx @@ -22,34 +23,52 @@ CHECK_PORTABILITY_SKIP+=packaging/macosx
22 23
23GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --enable-static=no 25CONFIGURE_ARGS+= --enable-static=no
25CONFIGURE_ARGS+= --enable-threads 26CONFIGURE_ARGS+= --enable-threads
26CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 27CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
27CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 28CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 29CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
29CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 30CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
30CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} 31CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
31CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} 32CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
32 33
33PTHREAD_OPTS+= require 34PTHREAD_OPTS+= require
34 35
 36PYTHON_FOR_BUILD_ONLY= yes
 37REPLACE_PYTHON+= help/faq.py
 38REPLACE_PYTHON+= tools/asn2deb
 39REPLACE_PYTHON+= tools/asn2wrs.py
 40REPLACE_PYTHON+= tools/dfilter-test.py
 41REPLACE_PYTHON+= tools/ftsanity.py
 42REPLACE_PYTHON+= tools/html2text.py
 43REPLACE_PYTHON+= tools/idl2deb
 44REPLACE_PYTHON+= tools/indexcap.py
 45REPLACE_PYTHON+= tools/make-dissector-reg.py
 46REPLACE_PYTHON+= tools/make-tap-reg.py
 47REPLACE_PYTHON+= tools/msnchat
 48REPLACE_PYTHON+= tools/ncp2222.py
 49REPLACE_PYTHON+= tools/netscreen2dump.py
 50REPLACE_PYTHON+= tools/pkt-from-core.py
 51REPLACE_PYTHON+= tools/rdps.py
 52
35.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
36.include "options.mk" 54.include "options.mk"
37 55
38.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 56.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
39USE_BUILTIN.libpcap= no 57USE_BUILTIN.libpcap= no
40.endif 58.endif
41 59
42# wireshark no longer builds with NetBSD 3.x provided zlib 60# wireshark no longer builds with NetBSD 3.x provided zlib
43BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 61BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
44 62
45.include "../../devel/glib2/buildlink3.mk" 63.include "../../devel/glib2/buildlink3.mk"
46.include "../../devel/pcre/buildlink3.mk" 64.include "../../devel/pcre/buildlink3.mk"
47.include "../../devel/zlib/buildlink3.mk" 65.include "../../devel/zlib/buildlink3.mk"
48.include "../../net/libpcap/buildlink3.mk" 66.include "../../net/libpcap/buildlink3.mk"
49.include "../../devel/libsmi/buildlink3.mk" 67.include "../../devel/libsmi/buildlink3.mk"
50.include "../../security/libgcrypt/buildlink3.mk" 68.include "../../security/libgcrypt/buildlink3.mk"
51.include "../../security/gnutls/buildlink3.mk" 69.include "../../security/gnutls/buildlink3.mk"
52.include "../../security/openssl/buildlink3.mk" 70.include "../../security/openssl/buildlink3.mk"
53 71
 72.include "../../lang/python/application.mk"
54.include "../../mk/pthread.buildlink3.mk" 73.include "../../mk/pthread.buildlink3.mk"
55.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"