pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/wireshark



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.

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)



Home | Main Index | Thread Index | Old Index