Add a wireshark.desktop entry for the GTK+ port,

icons for it and icons for the tcpdump/pcap mimetype.

3 files changed, 69 insertions, 4 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 8f195f5002d..b5adad2211b 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2015/04/25 14:23:48 tnn Exp $
+# $NetBSD: Makefile,v 1.132 2015/05/07 21:40:43 roy Exp $
 
 DISTNAME=	wireshark-1.10.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -57,6 +57,9 @@ REPLACE_PYTHON+=	tools/rdps.py
 USE_BUILTIN.libpcap=	no
 .endif
 
+# Extra post install targets are in options.mk
+post-install: ${POST_INSTALL_TARGETS}
+
 # wireshark no longer builds with NetBSD 3.x provided zlib
 BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
 
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index a8d200d5df4..22d0bac5f2a 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2013/07/04 21:33:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2015/05/07 21:40:43 roy Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -39,6 +39,21 @@ man/man1/text2pcap.1
 man/man1/tshark.1
 ${PLIST.gtk2}man/man1/wireshark.1
 man/man4/wireshark-filter.4
+${PLIST.gtk2}share/applications/wireshark.desktop
+${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png
+${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png
+${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
+${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
 share/wireshark/AUTHORS-SHORT
 share/wireshark/COPYING
 share/wireshark/capinfos.html
diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk
index 5f0b0eede9a..919c460e975 100644
--- a/net/wireshark/options.mk
+++ b/net/wireshark/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2012/08/16 15:11:49 drochner Exp $
+# $NetBSD: options.mk,v 1.8 2015/05/07 21:40:43 roy Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=	gtk2 lua
@@ -7,15 +7,62 @@ PKG_SUGGESTED_OPTIONS=	gtk2 lua
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		gtk2
+PLIST_VARS+=		icons
 
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=	--enable-wireshark
 PLIST.gtk2=		yes
+POST_INSTALL_TARGETS+=	install-gtk-desktop
 .include "../../x11/gtk2/buildlink3.mk"
+
+install-gtk-desktop:
+	${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+
 .else
 CONFIGURE_ARGS+=	--disable-wireshark
 .endif
 
+# We might install the qt front end one day as well,
+# so have a generic icon target
+.if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.icons=		yes
+POST_INSTALL_TARGETS+=	install-icons
+INSTALLATION_DIRS+=	share/applications
+INSTALLATION_DIRS+=	share/icons/hicolor/scalable/apps
+ICON_COLORS=		hi lo
+ICON_SIZES=		16 32 48
+MIMEICON_SIZES=		16 24 32 48 64 128 256
+
+.for c in ${ICON_COLORS}
+.for d in ${ICON_SIZES}
+INSTALLATION_DIRS+=	share/icons/${c}color/${d}x${d}/apps
+.endfor
+.endfor
+
+.for d in ${MIMEICON_SIZES}
+INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/mimetypes
+.endfor
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+
+install-icons:
+	${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
+.for c in ${ICON_COLORS}
+.for d in ${ICON_SIZES}
+	${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \
+		${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png
+.endfor
+.endfor
+
+.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
+
 PLIST_VARS+=		lua
 
 .if empty(PKG_OPTIONS:Mlua)