CVS commit: pkgsrc/net/wireshark

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec  3 15:35:15 UTC 2018

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST options.mk

Log Message:
wireshark: pkgsrc improvements

- remove unused configure options
- allow newer Python
- depend on: lz4, libssh, libcares, snappy
- add http2 as an option


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/wireshark/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.200 pkgsrc/net/wireshark/Makefile:1.201
--- pkgsrc/net/wireshark/Makefile:1.200 Mon Dec  3 14:19:24 2018
+++ pkgsrc/net/wireshark/Makefile       Mon Dec  3 15:35:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2018/12/03 14:19:24 wiz Exp $
+# $NetBSD: Makefile,v 1.201 2018/12/03 15:35:15 adam Exp $
 
 DISTNAME=      wireshark-2.6.5
 CATEGORIES=    net
@@ -13,26 +13,22 @@ LICENSE=    gnu-gpl-v2
 CONFLICTS+=            ethereal-[0-9]*
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            gmake perl pkg-config yacc lex
-
 USE_LIBTOOL=           yes
-SHLIBTOOL_OVERRIDE=    # empty
-CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
-
-PKGCONFIG_OVERRIDE+=   wireshark.pc.in
-
+USE_TOOLS+=            gmake perl pkg-config yacc lex
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-static=no
-CONFIGURE_ARGS+=       --with-ssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=       --with-pcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ENV+=                ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
 CONFIGURE_ENV+=                ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
+PKGCONFIG_OVERRIDE+=   wireshark.pc.in
+SHLIBTOOL_OVERRIDE=    # empty
+
+CHECK_PORTABILITY_SKIP+=       packaging/macosx/*/*
 
 PTHREAD_OPTS+=         require
 
 PYTHON_FOR_BUILD_ONLY=         yes
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 1.10.5
 REPLACE_PYTHON+=               help/faq.py
 REPLACE_PYTHON+=               tools/asn2deb
 REPLACE_PYTHON+=               tools/asn2wrs.py
@@ -54,8 +50,6 @@ REPLACE_PYTHON+=              tools/rdps.py
 USE_BUILTIN.libpcap=   no
 .endif
 
-CONFIGURE_ARGS.Darwin+=        --disable-osx-deploy-target
-
 # Extra post install targets are in options.mk
 post-install: ${POST_INSTALL_TARGETS}
 
@@ -69,16 +63,19 @@ BUILDLINK_API_DEPENDS.zlib+=        zlib>=1.2.1
 # [-Wint-conversion]
 BUILDLINK_TRANSFORM+=  rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
 
+.include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libsmi/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../net/libcares/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libsmi/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-.include "../../lang/python/application.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libssh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.38 pkgsrc/net/wireshark/PLIST:1.39
--- pkgsrc/net/wireshark/PLIST:1.38     Mon Sep 10 08:34:06 2018
+++ pkgsrc/net/wireshark/PLIST  Mon Dec  3 15:35:15 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2018/09/10 08:34:06 leot Exp $
+@comment $NetBSD: PLIST,v 1.39 2018/12/03 15:35:15 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -639,7 +639,9 @@ lib/libwscodecs.la
 lib/libwsutil.la
 lib/pkgconfig/wireshark.pc
 lib/wireshark/extcap/androiddump
+lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
+lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
 lib/wireshark/plugins/2.6/codecs/l16mono.la
 lib/wireshark/plugins/2.6/epan/ethercat.la
@@ -658,6 +660,7 @@ lib/wireshark/plugins/2.6/wiretap/usbdum
 man/man1/androiddump.1
 man/man1/capinfos.1
 man/man1/captype.1
+man/man1/ciscodump.1
 man/man1/dftest.1
 man/man1/dumpcap.1
 man/man1/editcap.1
@@ -666,6 +669,7 @@ man/man1/randpkt.1
 man/man1/randpktdump.1
 man/man1/rawshark.1
 man/man1/reordercap.1
+man/man1/sshdump.1
 man/man1/text2pcap.1
 man/man1/tshark.1
 man/man1/udpdump.1

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.21 pkgsrc/net/wireshark/options.mk:1.22
--- pkgsrc/net/wireshark/options.mk:1.21        Tue Sep 11 11:43:33 2018
+++ pkgsrc/net/wireshark/options.mk     Mon Dec  3 15:35:15 2018
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.21 2018/09/11 11:43:33 adam Exp $
+# $NetBSD: options.mk,v 1.22 2018/12/03 15:35:15 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=         gtk3 lua
+PKG_SUPPORTED_OPTIONS=         gtk3 http2 lua
 PKG_OPTIONS_OPTIONAL_GROUPS=   qt
 PKG_OPTIONS_GROUP.qt=          qt4 qt5
 PKG_SUGGESTED_OPTIONS=         qt5 lua
@@ -85,9 +85,15 @@ install-icons:
 .if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_INCOMPATIBLE=     53
 .include "../../lang/lua/buildlink3.mk"
-
 CONFIGURE_ARGS+=       --with-lua=yes
 PLIST.lua=             yes
 .else
 CONFIGURE_ARGS+=       --with-lua=no
 .endif
+
+.if !empty(PKG_OPTIONS:Mhttp2)
+.include "../../www/nghttp2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-nghttp2
+.else
+CONFIGURE_ARGS+=       --without-nghttp2
+.endif