ports/163045: [net/wireshark] patch that add .desktop and install one icon

Olivier Cochard-Labbé olivier at cochard.me
Sat Dec 3 23:10:11 UTC 2011


>Number:         163045
>Category:       ports
>Synopsis:       [net/wireshark] patch that add .desktop and install one icon
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 03 23:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Cochard-Labbé
>Release:        9.0-RC2
>Organization:
BSD Router Project
>Environment:
FreeBSD bigdev.bsdrp.net 9.0-RC2 FreeBSD 9.0-RC2 #0: Fri Nov 25 03:24:28 CET 2011     root at bigdev.bsdrp.net:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Hi,
installing net/wireshark didn't generate a .desktop file and didn't install any icons file bring with the wireshark sources.
This patch fix this.

There is a "official" wireshark.desktop included with the source, but I've choose the easy way by using the DESKTOP_ENTRIES method.
I've choose to install only one icon file, but there are lot's of icon files on the wireshark source "image" folder.

Regards,

>How-To-Repeat:

>Fix:
Applying this patch.

Patch attached with submission follows:

diff -ruN wireshark.old/Makefile wireshark/Makefile
--- wireshark.old/Makefile	2011-12-03 23:31:14.000000000 +0100
+++ wireshark/Makefile	2011-12-04 00:00:54.000000000 +0100
@@ -2,11 +2,12 @@
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf at chc-chimes.com>
 #
-# $FreeBSD: ports/net/wireshark/Makefile,v 1.173 2011/09/11 00:40:29 marcus Exp $
+# $FreeBSD$
 #
 
 PORTNAME?=	wireshark
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
     		http://wireshark.osmirror.nl/download/src/ \
@@ -38,6 +39,10 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-funit-at-a-time
 
+DESKTOP_ENTRIES="Wireshark" "Network Analyzer" \
+		"${DATADIR}/hi48-app-wireshark.png" \
+		"wireshark" "System;Monitor;GTK;" true
+
 WIRESHARK_LIBS=
 
 .for x in capinfos editcap idl2wrs mergecap rawshark text2pcap dftest randpkt
@@ -164,5 +169,7 @@
 	@${REINPLACE_CMD} -e 's|lua5\.1|lua${LUA_VER_STR}|g ; \
 	    	s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \
 		${WRKSRC}/configure
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png ${DATADIR}
 
 .include <bsd.port.post.mk>
diff -ruN wireshark.old/pkg-plist wireshark/pkg-plist
--- wireshark.old/pkg-plist	2011-12-03 23:31:14.000000000 +0100
+++ wireshark/pkg-plist	2011-12-03 23:55:47.000000000 +0100
@@ -105,6 +105,7 @@
 %%DATADIR%%/help/getting_started.txt
 %%DATADIR%%/help/overview.txt
 %%DATADIR%%/help/toc
+%%DATADIR%%/hi48-app-wireshark.png
 %%DATADIR%%/idl2wrs.html
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list