summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2018-01-13 22:32:53 +0000
committerrillig <rillig@pkgsrc.org>2018-01-13 22:32:53 +0000
commit267769bd191c4e184c3dfcb915a20027285f0f72 (patch)
treeadfc7028d9ae57b30cf6fb8694a7f4cbd62ef41c
parent93ea70b83ad4a911b702e9bcdc1a7857847c857e (diff)
downloadpkgsrc-267769bd191c4e184c3dfcb915a20027285f0f72.tar.gz
wireshark: fix pkglint warnings
-rw-r--r--net/wireshark/Makefile36
-rw-r--r--net/wireshark/PLIST4
2 files changed, 20 insertions, 20 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index d53a62a4a0d..a12291fe5b0 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -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=${TOOLS_PATH.lex}
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-deploy-target
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.
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 7990a47400e..c9778bec601 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -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