ports/94650: [PATCH] www/linux-{firefox, seamonkey} add desktop file
Pawel Pekala
c0rn at o2.pl
Sat Mar 18 19:20:16 UTC 2006
>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 at 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 <bsd.port.mk>
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:
More information about the freebsd-ports-bugs
mailing list