From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 18 19:20:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D86B16A41F for ; Sat, 18 Mar 2006 19:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE4C243D46 for ; Sat, 18 Mar 2006 19:20:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2IJKFPA095661 for ; Sat, 18 Mar 2006 19:20:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2IJKFZ1095660; Sat, 18 Mar 2006 19:20:15 GMT (envelope-from gnats) Resent-Date: Sat, 18 Mar 2006 19:20:15 GMT Resent-Message-Id: <200603181920.k2IJKFZ1095660@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5880416A428 for ; Sat, 18 Mar 2006 19:15:59 +0000 (UTC) (envelope-from c0rn@o2.pl) Received: from kogut.o2.pl (kogut.o2.pl [212.126.20.60]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC4DD43D7F for ; Sat, 18 Mar 2006 19:15:51 +0000 (GMT) (envelope-from c0rn@o2.pl) Received: from blaviken.slowicza.org (abog55.neoplus.adsl.tpnet.pl [83.8.22.55]) by kogut.o2.pl (o2.pl Mailer 2.0.1) with ESMTP id 0970C1D3D05; Sat, 18 Mar 2006 18:48:39 +0100 (CET) Message-Id: <1142704152.98176@blaviken.slowicza.org> Date: Sat, 18 Mar 2006 18:49:12 +0100 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: infofarmer@gmail.com Subject: ports/94650: [PATCH] www/linux-{firefox, seamonkey} add desktop file X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 19:20:16 -0000 >Number: 94650 >Category: ports >Synopsis: [PATCH] www/linux-{firefox,seamonkey} add desktop file >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 Mar 18 19:20:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: FreeBSD 5.4-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD 5.4-RELEASE-p11 #2: Thu Feb 2 21:14:41 CET 2006 root@blaviken.slowicza.org:/usr/src/sys/i386/compile/CORN >Description: >How-To-Repeat: >Fix: --- moz.diff begins here --- diff -urN /usr/ports/www/linux-firefox/Makefile linux-firefox/Makefile --- /usr/ports/www/linux-firefox/Makefile Sun Feb 19 19:25:44 2006 +++ linux-firefox/Makefile Sat Mar 18 18:43:51 2006 @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR?= firefox/releases/${PORTVERSION}/linux-i686/en-US @@ -32,11 +32,12 @@ PLIST_SUB+= FIREFOX_NAME=${FIREFOX_NAME} SUB_LIST+= FIREFOX_NAME=${FIREFOX_NAME} -SUB_FILES= linkfarm pkg-message +SUB_FILES= linkfarm pkg-message linux-firefox.desktop PKGMESSAGE= ${WRKDIR}/pkg-message do-install: ${INSTALL} -d ${FDIR} + ${CP} ${WRKDIR}/linux-firefox.desktop ${PREFIX}/share/applications ${CP} -R ${WRKSRC}/ ${FDIR} ${LN} -sf ${FDIR}/firefox ${PREFIX}/bin/${FIREFOX_NAME} ${LN} -sf ${FDIR}/firefox-bin ${FDIR}/${FIREFOX_NAME}-bin @@ -49,6 +50,7 @@ # Maintainer section create-plist: ${ECHO_CMD} bin/%%FIREFOX_NAME%% > ${PLIST} + ${ECHO_CMD} share/applications/%%FIREFOX_NAME%%.desktop >> ${PLIST} ${ECHO_CMD} lib/%%FIREFOX_NAME%%/%%FIREFOX_NAME%%-bin >> ${PLIST} cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \ ${SED} -e "s#^${PORTNAME}#lib/%%FIREFOX_NAME%%#" | ${SORT} >> ${PLIST} diff -urN /usr/ports/www/linux-firefox/files/linux-firefox.desktop.in linux-firefox/files/linux-firefox.desktop.in --- /usr/ports/www/linux-firefox/files/linux-firefox.desktop.in Thu Jan 1 01:00:00 1970 +++ linux-firefox/files/linux-firefox.desktop.in Sat Mar 18 18:20:49 2006 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Firefox (Linux binary) +Exec=linux-firefox %U +Icon=firefox +StartupNotify=false +Type=Application +Categories=Application;Network; +MimeType=text/html;text/xml;application/xthml+xml; diff -urN /usr/ports/www/linux-firefox/pkg-plist linux-firefox/pkg-plist --- /usr/ports/www/linux-firefox/pkg-plist Sat Dec 3 22:09:11 2005 +++ linux-firefox/pkg-plist Sat Mar 18 18:28:00 2006 @@ -1,4 +1,5 @@ bin/%%FIREFOX_NAME%% +share/applications/%%FIREFOX_NAME%%.desktop lib/%%FIREFOX_NAME%%/%%FIREFOX_NAME%%-bin lib/%%FIREFOX_NAME%%/.autoreg lib/%%FIREFOX_NAME%%/browserconfig.properties diff -urN /usr/ports/www/linux-seamonkey/Makefile linux-seamonkey/Makefile --- /usr/ports/www/linux-seamonkey/Makefile Sun Feb 19 19:25:44 2006 +++ linux-seamonkey/Makefile Sat Mar 18 18:46:11 2006 @@ -7,7 +7,7 @@ PORTNAME= seamonkey PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= .en-US.linux-i686 CATEGORIES= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -33,11 +33,12 @@ PLIST_SUB+= BROWSER_NAME=${BROWSER_NAME} SUB_LIST+= BROWSER_NAME=${BROWSER_NAME} -SUB_FILES= linkfarm pkg-message +SUB_FILES= linkfarm pkg-message linux-seamonkey.desktop PKGMESSAGE= ${WRKDIR}/pkg-message do-install: ${INSTALL} -d ${FDIR} + ${CP} ${WRKDIR}/%%BROWSER_NAME%%.desktop ${PREFIX}/share/applications ${CP} -pR ${WRKSRC}/ ${FDIR}/ ${LN} -sf ${FDIR}/${PORTNAME} ${PREFIX}/bin/${BROWSER_NAME} ${LN} -sf ${FDIR}/${PORTNAME}-bin ${FDIR}/${BROWSER_NAME}-bin @@ -50,6 +51,7 @@ # Maintainer section create-plist: ${ECHO_CMD} bin/%%BROWSER_NAME%% > ${PLIST} + ${ECHO_CMD} share/applications/%%BROWSER_NAME%%.desktop >> ${PLIST} ${ECHO_CMD} lib/%%BROWSER_NAME%%/%%BROWSER_NAME%%-bin >> ${PLIST} cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \ ${SED} -e "s#^${PORTNAME}#lib/%%BROWSER_NAME%%#" | ${SORT} >> ${PLIST} @@ -59,5 +61,5 @@ -type l -delete >> ${PLIST} cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \ ${SED} -e "s#^${PORTNAME}#@dirrm lib/%%BROWSER_NAME%%#" >> ${PLIST} - + .include diff -urN /usr/ports/www/linux-seamonkey/files/linux-seamonkey.desktop.in linux-seamonkey/files/linux-seamonkey.desktop.in --- /usr/ports/www/linux-seamonkey/files/linux-seamonkey.desktop.in Thu Jan 1 01:00:00 1970 +++ linux-seamonkey/files/linux-seamonkey.desktop.in Sat Mar 18 18:39:47 2006 @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Seamonkey (Linux binary) +Exec=linux-seamonkey %U +StartupNotify=false +Type=Application +Categories=Application;Network; +MimeType=text/html;text/xml;application/xthml+xml; diff -urN /usr/ports/www/linux-seamonkey/pkg-plist linux-seamonkey/pkg-plist --- /usr/ports/www/linux-seamonkey/pkg-plist Thu Feb 2 18:41:51 2006 +++ linux-seamonkey/pkg-plist Sat Mar 18 18:33:04 2006 @@ -1,4 +1,5 @@ bin/%%BROWSER_NAME%% +share/applications/%%BROWSER_NAME%%.desktop lib/%%BROWSER_NAME%%/%%BROWSER_NAME%%-bin lib/%%BROWSER_NAME%%/LICENSE lib/%%BROWSER_NAME%%/README --- moz.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: