Received: by mail.netbsd.org (Postfix, from userid 605) id 7839A84D68; Sat, 13 Jan 2018 22:32:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0309F84D65 for ; Sat, 13 Jan 2018 22:32:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SiKFWNlg5zBz for ; Sat, 13 Jan 2018 22:32:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 79ED184D20 for ; Sat, 13 Jan 2018 22:32:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 738ECFBDE; Sat, 13 Jan 2018 22:32:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1515882773144910" MIME-Version: 1.0 Date: Sat, 13 Jan 2018 22:32:53 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/net/wireshark To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20180113223253.738ECFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1515882773144910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1515882773144910 Content-Disposition: inline Content-Length: 2844 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1515882773144910--