CVS commit: pkgsrc/net/wireshark

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jan 13 22:32:53 UTC 2018

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST

Log Message:
wireshark: fix pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/wireshark/PLIST

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.178 pkgsrc/net/wireshark/Makefile:1.179
--- pkgsrc/net/wireshark/Makefile:1.178 Fri Jan 12 22:25:18 2018
+++ pkgsrc/net/wireshark/Makefile       Sat Jan 13 22:32:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.178 2018/01/12 22:25:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.179 2018/01/13 22:32:53 rillig Exp $
 
 DISTNAME=      wireshark-2.4.4
 CATEGORIES=    net
@@ -31,23 +31,23 @@ CONFIGURE_ENV+=             ac_cv_path_LEXDUMMY=${T
 
 PTHREAD_OPTS+=         require
 
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 1.10.5
-REPLACE_PYTHON+=       help/faq.py
-REPLACE_PYTHON+=       tools/asn2deb
-REPLACE_PYTHON+=       tools/asn2wrs.py
-REPLACE_PYTHON+=       tools/dfilter-test.py
-REPLACE_PYTHON+=       tools/ftsanity.py
-REPLACE_PYTHON+=       tools/html2text.py
-REPLACE_PYTHON+=       tools/idl2deb
-REPLACE_PYTHON+=       tools/indexcap.py
-REPLACE_PYTHON+=       tools/make-dissector-reg.py
-REPLACE_PYTHON+=       tools/make-tap-reg.py
-REPLACE_PYTHON+=       tools/msnchat
-REPLACE_PYTHON+=       tools/ncp2222.py
-REPLACE_PYTHON+=       tools/netscreen2dump.py
-REPLACE_PYTHON+=       tools/pkt-from-core.py
-REPLACE_PYTHON+=       tools/rdps.py
+REPLACE_PYTHON+=               help/faq.py
+REPLACE_PYTHON+=               tools/asn2deb
+REPLACE_PYTHON+=               tools/asn2wrs.py
+REPLACE_PYTHON+=               tools/dfilter-test.py
+REPLACE_PYTHON+=               tools/ftsanity.py
+REPLACE_PYTHON+=               tools/html2text.py
+REPLACE_PYTHON+=               tools/idl2deb
+REPLACE_PYTHON+=               tools/indexcap.py
+REPLACE_PYTHON+=               tools/make-dissector-reg.py
+REPLACE_PYTHON+=               tools/make-tap-reg.py
+REPLACE_PYTHON+=               tools/msnchat
+REPLACE_PYTHON+=               tools/ncp2222.py
+REPLACE_PYTHON+=               tools/netscreen2dump.py
+REPLACE_PYTHON+=               tools/pkt-from-core.py
+REPLACE_PYTHON+=               tools/rdps.py
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -62,7 +62,7 @@ CONFIGURE_ARGS.Darwin+=       --disable-osx-de
 post-install: ${POST_INSTALL_TARGETS}
 
 # wireshark no longer builds with NetBSD 3.x provided zlib
-BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.1
 
 # wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
 # to hide deprecated prototypes. This leads to pointer truncation.

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.33 pkgsrc/net/wireshark/PLIST:1.34
--- pkgsrc/net/wireshark/PLIST:1.33     Wed Jan  3 11:09:41 2018
+++ pkgsrc/net/wireshark/PLIST  Sat Jan 13 22:32:53 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2018/01/03 11:09:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.34 2018/01/13 22:32:53 rillig Exp $
 bin/capinfos
 bin/captype
 bin/dftest
@@ -12,8 +12,8 @@ bin/reordercap
 bin/sharkd
 bin/text2pcap
 bin/tshark
-${PLIST.gtk3}bin/wireshark-gtk
 ${PLIST.qt}bin/wireshark
+${PLIST.gtk3}bin/wireshark-gtk
 lib/libwireshark.la
 lib/libwiretap.la
 lib/libwscodecs.la