Received: by mail.netbsd.org (Postfix, from userid 605) id 30E1584ECA; Tue, 11 Sep 2018 11:43:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3D50384EC8 for ; Tue, 11 Sep 2018 11:43:34 +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 ebJMDvfSo-XL for ; Tue, 11 Sep 2018 11:43:33 +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 8966584D7D for ; Tue, 11 Sep 2018 11:43:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 82A76FBF8; Tue, 11 Sep 2018 11:43:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1536666213296330" MIME-Version: 1.0 Date: Tue, 11 Sep 2018 11:43:33 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/wireshark To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180911114333.82A76FBF8@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. --_----------=_1536666213296330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Sep 11 11:43:33 UTC 2018 Modified Files: pkgsrc/net/wireshark: options.mk Log Message: wireshark: fix PLIST for Darwin To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/wireshark/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1536666213296330 Content-Disposition: inline Content-Length: 1975 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/wireshark/options.mk diff -u pkgsrc/net/wireshark/options.mk:1.20 pkgsrc/net/wireshark/options.mk:1.21 --- pkgsrc/net/wireshark/options.mk:1.20 Sun Sep 2 21:49:05 2018 +++ pkgsrc/net/wireshark/options.mk Tue Sep 11 11:43:33 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.20 2018/09/02 21:49:05 wiz Exp $ +# $NetBSD: options.mk,v 1.21 2018/09/11 11:43:33 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= gtk3 lua @@ -49,28 +49,25 @@ install-gtk-desktop: CONFIGURE_ARGS+= --without-gtk .endif -# We might install the qt front end one day as well, -# so have a generic icon target .if empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5) CONFIGURE_ARGS+= --disable-wireshark .else CONFIGURE_ARGS+= --enable-wireshark PLIST.mans= yes INSTALLATION_DIRS+= share/applications -. if ${OPSYS} != "Darwin" PLIST.icons= yes POST_INSTALL_TARGETS+= install-icons INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps ICON_SIZES= 16 32 48 MIMEICON_SIZES= 16 24 32 48 64 128 256 -. for d in ${ICON_SIZES} +. for d in ${ICON_SIZES} INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps -. endfor +. endfor -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes -. endfor +. endfor .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -79,11 +76,10 @@ INSTALLATION_DIRS+= share/icons/hicolor/ install-icons: ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \ ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png -. endfor -. endif +. endfor .endif .if !empty(PKG_OPTIONS:Mlua) --_----------=_1536666213296330--