- Update to 1.5.0.1

- Depend on hicolor-icons-theme
- Add an ugly hack to prevent hangs
- Add OPSYS/ARCH to user-agent vendor string
- Install .desktop entry [1]

PR:		ports/93313, ports/94650 [1]
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com> (maintainer),
		Pawel Pekala <c0rn@o2.pl> [1]
Approved by:	Andrew Pantyukhin <infofarmer@gmail.com> (maintainer) [1]

7 files changed, 260 insertions, 238 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 08480151d844..962136bc3cc5 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:   linux-firefox
-# Date created:                                2004-09-17
-# Whom:                                        voisine
+# New ports collection makefile for:	linux-firefox
+# Date created:				2004-09-17
+# Whom:					voisine
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	1.5.0.1
 CATEGORIES?=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}/linux-i686/en-US
@@ -20,27 +19,37 @@ RUN_DEPENDS?=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/
 		${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
 		${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango\
 		${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
-		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
+		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
+		${LINUXBASE}/usr/share/icons/hicolor/index.theme:${PORTSDIR}/x11-themes/linux-hicolor-icon-theme
 
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-FIREFOX_NAME=	${PKGNAMEPREFIX}${PORTNAME}
+BROWSER_NAME=	${UNIQUENAME}
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-FDIR=		${PREFIX}/lib/${FIREFOX_NAME}
+FDIR=		${PREFIX}/lib/${BROWSER_NAME}
 
-PLIST_SUB+=	FIREFOX_NAME=${FIREFOX_NAME}
-SUB_LIST+=	FIREFOX_NAME=${FIREFOX_NAME}
-SUB_FILES=	linkfarm pkg-message
+PLIST_SUB+=	BROWSER_NAME=${BROWSER_NAME}
+SUB_LIST+=	BROWSER_NAME=${BROWSER_NAME}
+SUB_FILES=	linkfarm pkg-message linux-firefox.desktop
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PREFS_FILE=	${WRKSRC}/defaults/pref/firefox.js
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${ECHO} 'pref("general.useragent.vendor", "'${OPSYS}'");' >> ${PREFS_FILE}
+	@${ECHO} 'pref("general.useragent.vendorSub", "'${ARCH}'");' >> ${PREFS_FILE}
 
 do-install:
 	${INSTALL} -d ${FDIR}
-	${CP} -R ${WRKSRC}/ ${FDIR}
-	${LN} -sf ${FDIR}/firefox ${PREFIX}/bin/${FIREFOX_NAME}
-	${LN} -sf ${FDIR}/firefox-bin ${FDIR}/${FIREFOX_NAME}-bin
-	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${FDIR}
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/linux-firefox.desktop ${PREFIX}/share/applications
+	${CP} -pR ${WRKSRC}/ ${FDIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${FDIR}/
+	${INSTALL_SCRIPT} ${FILESDIR}/run ${PREFIX}/bin/${BROWSER_NAME}
+	${ECHO} 'cd ${PREFIX} && exec ${FDIR}/${PORTNAME}' >> ${PREFIX}/bin/${BROWSER_NAME}
 
 post-install:
 	@${SH} ${FDIR}/linkfarm
@@ -48,15 +57,16 @@ post-install:
 
 # Maintainer section
 create-plist:
-	${ECHO_CMD} bin/%%FIREFOX_NAME%% > ${PLIST}
-	${ECHO_CMD} lib/%%FIREFOX_NAME%%/%%FIREFOX_NAME%%-bin >> ${PLIST}
+	${ECHO_CMD} bin/%%BROWSER_NAME%% > ${PLIST}
+	${ECHO_CMD} share/applications/%%BROWSER_NAME%%.desktop >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \
-		${SED} -e "s#^${PORTNAME}#lib/%%FIREFOX_NAME%%#" | ${SORT} >> ${PLIST}
-	${ECHO_CMD} lib/%%FIREFOX_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @exec %%PREFIX%%/lib/%%FIREFOX_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @unexec ${FIND} %%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins \
+		${SED} -e "s#^${PORTNAME}#lib/%%BROWSER_NAME%%#" | ${SORT} >> ${PLIST}
+	${ECHO_CMD} lib/%%BROWSER_NAME%%/linkfarm >> ${PLIST}
+	${ECHO_CMD} @exec %%PREFIX%%/lib/%%BROWSER_NAME%%/linkfarm >> ${PLIST}
+	${ECHO_CMD} @unexec ${FIND} %%PREFIX%%/lib/%%BROWSER_NAME%%/plugins \
 		-type l -delete >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \
-		${SED} -e "s#^${PORTNAME}#@dirrm lib/%%FIREFOX_NAME%%#" >> ${PLIST}
+		${SED} -e "s#^${PORTNAME}#@dirrm lib/%%BROWSER_NAME%%#" >> ${PLIST}
+	${ECHO_CMD} @dirrmtry share/applications >> ${PLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 87ff948064a9..dbd103efda56 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-1.5.tar.gz) = b63fcdf4863e59c93d2a29df853b6046
-SHA256 (firefox-1.5.tar.gz) = 8c32e059a6ec0bca094ffa6c73c000322b77e7e6a7d1dc826ec114787f8858e5
-SIZE (firefox-1.5.tar.gz) = 8444956
+MD5 (firefox-1.5.0.1.tar.gz) = 8c0bfe18adbf713205faede7664c6650
+SHA256 (firefox-1.5.0.1.tar.gz) = 0f3dd285a1872edd44da76668c06276da6cdc92075880bfad0dbab4e74a96cd8
+SIZE (firefox-1.5.0.1.tar.gz) = 8453707
diff --git a/www/linux-firefox/files/linkfarm.in b/www/linux-firefox/files/linkfarm.in
index e27161e1cd08..38310a4c61b8 100644
--- a/www/linux-firefox/files/linkfarm.in
+++ b/www/linux-firefox/files/linkfarm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Run this after installing Beonex, Mozilla or Netscape plugins
-cd	%%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins
+cd	%%PREFIX%%/lib/%%BROWSER_NAME%%/plugins
 find -L . -type l -delete
 find	%%X11BASE%%/lib/linux-beonex/plugins \
 	%%X11BASE%%/lib/netscape-linux/plugins \
diff --git a/www/linux-firefox/files/linux-firefox.desktop.in b/www/linux-firefox/files/linux-firefox.desktop.in
new file mode 100644
index 000000000000..aa5c58960321
--- /dev/null
+++ b/www/linux-firefox/files/linux-firefox.desktop.in
@@ -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 --git a/www/linux-firefox/files/pkg-message.in b/www/linux-firefox/files/pkg-message.in
index 16784949b089..a2d23f1e2482 100644
--- a/www/linux-firefox/files/pkg-message.in
+++ b/www/linux-firefox/files/pkg-message.in
@@ -1,4 +1,4 @@
 ** After adding plugins to (Linux) Beonex,
 ** Mozilla or Netscape, run
-** %%PREFIX%%/lib/%%FIREFOX_NAME%%/linkfarm as root
-** to make them available to %%FIREFOX_NAME%%.
+** %%PREFIX%%/lib/%%BROWSER_NAME%%/linkfarm as root
+** to make them available to %%BROWSER_NAME%%.
diff --git a/www/linux-firefox/files/run b/www/linux-firefox/files/run
new file mode 100644
index 000000000000..1a2485251c33
--- /dev/null
+++ b/www/linux-firefox/files/run
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 53f3ab8d9ed7..252cb8032a1a 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -1,209 +1,211 @@
-bin/%%FIREFOX_NAME%%
-lib/%%FIREFOX_NAME%%/%%FIREFOX_NAME%%-bin
-lib/%%FIREFOX_NAME%%/.autoreg
-lib/%%FIREFOX_NAME%%/browserconfig.properties
-lib/%%FIREFOX_NAME%%/chrome/browser.jar
-lib/%%FIREFOX_NAME%%/chrome/browser.manifest
-lib/%%FIREFOX_NAME%%/chrome/classic.jar
-lib/%%FIREFOX_NAME%%/chrome/classic.manifest
-lib/%%FIREFOX_NAME%%/chrome/comm.jar
-lib/%%FIREFOX_NAME%%/chrome/comm.manifest
-lib/%%FIREFOX_NAME%%/chrome/en-US.jar
-lib/%%FIREFOX_NAME%%/chrome/en-US.manifest
-lib/%%FIREFOX_NAME%%/chrome/icons/default/default.xpm
-lib/%%FIREFOX_NAME%%/chrome/pippki.jar
-lib/%%FIREFOX_NAME%%/chrome/pippki.manifest
-lib/%%FIREFOX_NAME%%/chrome/reporter.jar
-lib/%%FIREFOX_NAME%%/chrome/reporter.manifest
-lib/%%FIREFOX_NAME%%/chrome/toolkit.jar
-lib/%%FIREFOX_NAME%%/chrome/toolkit.manifest
-lib/%%FIREFOX_NAME%%/components/browser.xpt
-lib/%%FIREFOX_NAME%%/components/jsconsole-clhandler.js
-lib/%%FIREFOX_NAME%%/components/libjar50.so
-lib/%%FIREFOX_NAME%%/components/libjsd.so
-lib/%%FIREFOX_NAME%%/components/libmozgnome.so
-lib/%%FIREFOX_NAME%%/components/libnkgnomevfs.so
-lib/%%FIREFOX_NAME%%/components/libxpinstall.so
-lib/%%FIREFOX_NAME%%/components/nsBrowserContentHandler.js
-lib/%%FIREFOX_NAME%%/components/nsBrowserGlue.js
-lib/%%FIREFOX_NAME%%/components/nsCloseAllWindows.js
-lib/%%FIREFOX_NAME%%/components/nsDictionary.js
-lib/%%FIREFOX_NAME%%/components/nsExtensionManager.js
-lib/%%FIREFOX_NAME%%/components/nsFilePicker.js
-lib/%%FIREFOX_NAME%%/components/nsHelperAppDlg.js
-lib/%%FIREFOX_NAME%%/components/nsInterfaceInfoToIDL.js
-lib/%%FIREFOX_NAME%%/components/nsProxyAutoConfig.js
-lib/%%FIREFOX_NAME%%/components/nsSetDefaultBrowser.js
-lib/%%FIREFOX_NAME%%/components/nsSidebar.js
-lib/%%FIREFOX_NAME%%/components/nsUpdateService.js
-lib/%%FIREFOX_NAME%%/components/nsXmlRpcClient.js
-lib/%%FIREFOX_NAME%%/defaults/autoconfig/platform.js
-lib/%%FIREFOX_NAME%%/defaults/autoconfig/prefcalls.js
-lib/%%FIREFOX_NAME%%/defaults/pref/channel-prefs.js
-lib/%%FIREFOX_NAME%%/defaults/pref/firefox-l10n.js
-lib/%%FIREFOX_NAME%%/defaults/pref/firefox.js
-lib/%%FIREFOX_NAME%%/defaults/pref/reporter.js
-lib/%%FIREFOX_NAME%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX_NAME%%/defaults/profile/chrome/userChrome-example.css
-lib/%%FIREFOX_NAME%%/defaults/profile/chrome/userContent-example.css
-lib/%%FIREFOX_NAME%%/defaults/profile/localstore.rdf
-lib/%%FIREFOX_NAME%%/defaults/profile/mimeTypes.rdf
-lib/%%FIREFOX_NAME%%/defaults/profile/prefs.js
-lib/%%FIREFOX_NAME%%/defaults/profile/search.rdf
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/chrome.manifest
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/chrome/inspector.jar
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/components/inspector.xpt
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/components/libinspector.so
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
-lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/install.rdf
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/libqfaservices.so
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/qfaservices.xpt
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/talkback/master.ini
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback.so
-lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/install.rdf
-lib/%%FIREFOX_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-lib/%%FIREFOX_NAME%%/firefox
-lib/%%FIREFOX_NAME%%/firefox-bin
-lib/%%FIREFOX_NAME%%/greprefs/all.js
-lib/%%FIREFOX_NAME%%/greprefs/security-prefs.js
-lib/%%FIREFOX_NAME%%/greprefs/xpinstall.js
-lib/%%FIREFOX_NAME%%/icons/document.png
-lib/%%FIREFOX_NAME%%/icons/mozicon128.png
-lib/%%FIREFOX_NAME%%/icons/mozicon16.xpm
-lib/%%FIREFOX_NAME%%/icons/mozicon50.xpm
-lib/%%FIREFOX_NAME%%/libmozjs.so
-lib/%%FIREFOX_NAME%%/libnspr4.so
-lib/%%FIREFOX_NAME%%/libnss3.so
-lib/%%FIREFOX_NAME%%/libnssckbi.so
-lib/%%FIREFOX_NAME%%/libplc4.so
-lib/%%FIREFOX_NAME%%/libplds4.so
-lib/%%FIREFOX_NAME%%/libsmime3.so
-lib/%%FIREFOX_NAME%%/libsoftokn3.chk
-lib/%%FIREFOX_NAME%%/libsoftokn3.so
-lib/%%FIREFOX_NAME%%/libssl3.so
-lib/%%FIREFOX_NAME%%/libxpcom.so
-lib/%%FIREFOX_NAME%%/libxpcom_compat.so
-lib/%%FIREFOX_NAME%%/libxpcom_core.so
-lib/%%FIREFOX_NAME%%/libxpistub.so
-lib/%%FIREFOX_NAME%%/mozilla-xremote-client
-lib/%%FIREFOX_NAME%%/plugins/libnullplugin.so
-lib/%%FIREFOX_NAME%%/readme.txt
-lib/%%FIREFOX_NAME%%/removed-files
-lib/%%FIREFOX_NAME%%/res/EditorOverride.css
-lib/%%FIREFOX_NAME%%/res/arrow.gif
-lib/%%FIREFOX_NAME%%/res/arrowd.gif
-lib/%%FIREFOX_NAME%%/res/broken-image.gif
-lib/%%FIREFOX_NAME%%/res/charsetData.properties
-lib/%%FIREFOX_NAME%%/res/charsetalias.properties
-lib/%%FIREFOX_NAME%%/res/cmessage.txt
-lib/%%FIREFOX_NAME%%/res/dtd/mathml.dtd
-lib/%%FIREFOX_NAME%%/res/dtd/xhtml11.dtd
-lib/%%FIREFOX_NAME%%/res/entityTables/html40Latin1.properties
-lib/%%FIREFOX_NAME%%/res/entityTables/html40Special.properties
-lib/%%FIREFOX_NAME%%/res/entityTables/html40Symbols.properties
-lib/%%FIREFOX_NAME%%/res/entityTables/htmlEntityVersions.properties
-lib/%%FIREFOX_NAME%%/res/entityTables/mathml20.properties
-lib/%%FIREFOX_NAME%%/res/entityTables/transliterate.properties
-lib/%%FIREFOX_NAME%%/res/fonts/fontEncoding.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfont.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontCMEX10.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontCMSY10.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontMTExtra.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontMath1.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontMath2.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontMath4.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontPUA.properties
-lib/%%FIREFOX_NAME%%/res/fonts/mathfontSymbol.properties
-lib/%%FIREFOX_NAME%%/res/fonts/pangoFontEncoding.properties
-lib/%%FIREFOX_NAME%%/res/forms.css
-lib/%%FIREFOX_NAME%%/res/grabber.gif
-lib/%%FIREFOX_NAME%%/res/hiddenWindow.html
-lib/%%FIREFOX_NAME%%/res/html.css
-lib/%%FIREFOX_NAME%%/res/html/gopher-audio.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-binary.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-find.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-image.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-menu.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-movie.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-sound.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-telnet.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-text.gif
-lib/%%FIREFOX_NAME%%/res/html/gopher-unknown.gif
-lib/%%FIREFOX_NAME%%/res/langGroups.properties
-lib/%%FIREFOX_NAME%%/res/language.properties
-lib/%%FIREFOX_NAME%%/res/loading-image.gif
-lib/%%FIREFOX_NAME%%/res/mathml.css
-lib/%%FIREFOX_NAME%%/res/quirk.css
-lib/%%FIREFOX_NAME%%/res/svg.css
-lib/%%FIREFOX_NAME%%/res/table-add-column-after-active.gif
-lib/%%FIREFOX_NAME%%/res/table-add-column-after-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-add-column-after.gif
-lib/%%FIREFOX_NAME%%/res/table-add-column-before-active.gif
-lib/%%FIREFOX_NAME%%/res/table-add-column-before-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-add-column-before.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-after-active.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-after-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-after.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-before-active.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-before-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-add-row-before.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-column-active.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-column-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-column.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-row-active.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-row-hover.gif
-lib/%%FIREFOX_NAME%%/res/table-remove-row.gif
-lib/%%FIREFOX_NAME%%/res/ua.css
-lib/%%FIREFOX_NAME%%/res/unixcharset.properties
-lib/%%FIREFOX_NAME%%/res/viewsource.css
-lib/%%FIREFOX_NAME%%/run-mozilla.sh
-lib/%%FIREFOX_NAME%%/searchplugins/amazondotcom.png
-lib/%%FIREFOX_NAME%%/searchplugins/amazondotcom.src
-lib/%%FIREFOX_NAME%%/searchplugins/answers.png
-lib/%%FIREFOX_NAME%%/searchplugins/answers.src
-lib/%%FIREFOX_NAME%%/searchplugins/creativecommons.png
-lib/%%FIREFOX_NAME%%/searchplugins/creativecommons.src
-lib/%%FIREFOX_NAME%%/searchplugins/eBay.gif
-lib/%%FIREFOX_NAME%%/searchplugins/eBay.src
-lib/%%FIREFOX_NAME%%/searchplugins/google.gif
-lib/%%FIREFOX_NAME%%/searchplugins/google.src
-lib/%%FIREFOX_NAME%%/searchplugins/yahoo.gif
-lib/%%FIREFOX_NAME%%/searchplugins/yahoo.src
-lib/%%FIREFOX_NAME%%/updater
-lib/%%FIREFOX_NAME%%/updater.ini
-lib/%%FIREFOX_NAME%%/xpicleanup
-lib/%%FIREFOX_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%FIREFOX_NAME%%/linkfarm
-@unexec find %%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins -type l -delete
-@dirrm lib/%%FIREFOX_NAME%%/chrome/icons/default
-@dirrm lib/%%FIREFOX_NAME%%/chrome/icons
-@dirrm lib/%%FIREFOX_NAME%%/chrome
-@dirrm lib/%%FIREFOX_NAME%%/defaults/pref
-@dirrm lib/%%FIREFOX_NAME%%/defaults/profile/chrome
-@dirrm lib/%%FIREFOX_NAME%%/defaults/profile
-@dirrm lib/%%FIREFOX_NAME%%/defaults/autoconfig
-@dirrm lib/%%FIREFOX_NAME%%/defaults
-@dirrm lib/%%FIREFOX_NAME%%/searchplugins
-@dirrm lib/%%FIREFOX_NAME%%/components
-@dirrm lib/%%FIREFOX_NAME%%/plugins
-@dirrm lib/%%FIREFOX_NAME%%/res/fonts
-@dirrm lib/%%FIREFOX_NAME%%/res/dtd
-@dirrm lib/%%FIREFOX_NAME%%/res/html
-@dirrm lib/%%FIREFOX_NAME%%/res/entityTables
-@dirrm lib/%%FIREFOX_NAME%%/res
-@dirrm lib/%%FIREFOX_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/components
-@dirrm lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/chrome
-@dirrm lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/defaults/preferences
-@dirrm lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org/defaults
-@dirrm lib/%%FIREFOX_NAME%%/extensions/inspector@mozilla.org
-@dirrm lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components/talkback
-@dirrm lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org/components
-@dirrm lib/%%FIREFOX_NAME%%/extensions/talkback@mozilla.org
-@dirrm lib/%%FIREFOX_NAME%%/extensions
-@dirrm lib/%%FIREFOX_NAME%%/icons
-@dirrm lib/%%FIREFOX_NAME%%/greprefs
-@dirrm lib/%%FIREFOX_NAME%%
+bin/%%BROWSER_NAME%%
+share/applications/%%BROWSER_NAME%%.desktop
+lib/%%BROWSER_NAME%%/.autoreg
+lib/%%BROWSER_NAME%%/browserconfig.properties
+lib/%%BROWSER_NAME%%/chrome/browser.jar
+lib/%%BROWSER_NAME%%/chrome/browser.manifest
+lib/%%BROWSER_NAME%%/chrome/classic.jar
+lib/%%BROWSER_NAME%%/chrome/classic.manifest
+lib/%%BROWSER_NAME%%/chrome/comm.jar
+lib/%%BROWSER_NAME%%/chrome/comm.manifest
+lib/%%BROWSER_NAME%%/chrome/en-US.jar
+lib/%%BROWSER_NAME%%/chrome/en-US.manifest
+lib/%%BROWSER_NAME%%/chrome/icons/default/default.xpm
+lib/%%BROWSER_NAME%%/chrome/pippki.jar
+lib/%%BROWSER_NAME%%/chrome/pippki.manifest
+lib/%%BROWSER_NAME%%/chrome/reporter.jar
+lib/%%BROWSER_NAME%%/chrome/reporter.manifest
+lib/%%BROWSER_NAME%%/chrome/toolkit.jar
+lib/%%BROWSER_NAME%%/chrome/toolkit.manifest
+lib/%%BROWSER_NAME%%/components/browser.xpt
+lib/%%BROWSER_NAME%%/components/jsconsole-clhandler.js
+lib/%%BROWSER_NAME%%/components/libjar50.so
+lib/%%BROWSER_NAME%%/components/libjsd.so
+lib/%%BROWSER_NAME%%/components/libmozgnome.so
+lib/%%BROWSER_NAME%%/components/libnkgnomevfs.so
+lib/%%BROWSER_NAME%%/components/libxpinstall.so
+lib/%%BROWSER_NAME%%/components/nsBrowserContentHandler.js
+lib/%%BROWSER_NAME%%/components/nsBrowserGlue.js
+lib/%%BROWSER_NAME%%/components/nsCloseAllWindows.js
+lib/%%BROWSER_NAME%%/components/nsDictionary.js
+lib/%%BROWSER_NAME%%/components/nsExtensionManager.js
+lib/%%BROWSER_NAME%%/components/nsFilePicker.js
+lib/%%BROWSER_NAME%%/components/nsHelperAppDlg.js
+lib/%%BROWSER_NAME%%/components/nsInterfaceInfoToIDL.js
+lib/%%BROWSER_NAME%%/components/nsProxyAutoConfig.js
+lib/%%BROWSER_NAME%%/components/nsSetDefaultBrowser.js
+lib/%%BROWSER_NAME%%/components/nsSidebar.js
+lib/%%BROWSER_NAME%%/components/nsUpdateService.js
+lib/%%BROWSER_NAME%%/components/nsXmlRpcClient.js
+lib/%%BROWSER_NAME%%/defaults/autoconfig/platform.js
+lib/%%BROWSER_NAME%%/defaults/autoconfig/prefcalls.js
+lib/%%BROWSER_NAME%%/defaults/pref/channel-prefs.js
+lib/%%BROWSER_NAME%%/defaults/pref/firefox-l10n.js
+lib/%%BROWSER_NAME%%/defaults/pref/firefox.js
+lib/%%BROWSER_NAME%%/defaults/pref/reporter.js
+lib/%%BROWSER_NAME%%/defaults/profile/bookmarks.html
+lib/%%BROWSER_NAME%%/defaults/profile/chrome/userChrome-example.css
+lib/%%BROWSER_NAME%%/defaults/profile/chrome/userContent-example.css
+lib/%%BROWSER_NAME%%/defaults/profile/localstore.rdf
+lib/%%BROWSER_NAME%%/defaults/profile/mimeTypes.rdf
+lib/%%BROWSER_NAME%%/defaults/profile/prefs.js
+lib/%%BROWSER_NAME%%/defaults/profile/search.rdf
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/chrome.manifest
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/chrome/inspector.jar
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/components/inspector.xpt
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/components/libinspector.so
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/install.rdf
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/chrome.manifest
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/libqfaservices.so
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/qfaservices.xpt
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/talkback/master.ini
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback.so
+lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/install.rdf
+lib/%%BROWSER_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/%%BROWSER_NAME%%/firefox
+lib/%%BROWSER_NAME%%/firefox-bin
+lib/%%BROWSER_NAME%%/greprefs/all.js
+lib/%%BROWSER_NAME%%/greprefs/security-prefs.js
+lib/%%BROWSER_NAME%%/greprefs/xpinstall.js
+lib/%%BROWSER_NAME%%/icons/document.png
+lib/%%BROWSER_NAME%%/icons/mozicon128.png
+lib/%%BROWSER_NAME%%/icons/mozicon16.xpm
+lib/%%BROWSER_NAME%%/icons/mozicon50.xpm
+lib/%%BROWSER_NAME%%/libmozjs.so
+lib/%%BROWSER_NAME%%/libnspr4.so
+lib/%%BROWSER_NAME%%/libnss3.so
+lib/%%BROWSER_NAME%%/libnssckbi.so
+lib/%%BROWSER_NAME%%/libplc4.so
+lib/%%BROWSER_NAME%%/libplds4.so
+lib/%%BROWSER_NAME%%/libsmime3.so
+lib/%%BROWSER_NAME%%/libsoftokn3.chk
+lib/%%BROWSER_NAME%%/libsoftokn3.so
+lib/%%BROWSER_NAME%%/libssl3.so
+lib/%%BROWSER_NAME%%/libxpcom.so
+lib/%%BROWSER_NAME%%/libxpcom_compat.so
+lib/%%BROWSER_NAME%%/libxpcom_core.so
+lib/%%BROWSER_NAME%%/libxpistub.so
+lib/%%BROWSER_NAME%%/mozilla-xremote-client
+lib/%%BROWSER_NAME%%/plugins/libnullplugin.so
+lib/%%BROWSER_NAME%%/readme.txt
+lib/%%BROWSER_NAME%%/removed-files
+lib/%%BROWSER_NAME%%/res/EditorOverride.css
+lib/%%BROWSER_NAME%%/res/arrow.gif
+lib/%%BROWSER_NAME%%/res/arrowd.gif
+lib/%%BROWSER_NAME%%/res/broken-image.gif
+lib/%%BROWSER_NAME%%/res/charsetData.properties
+lib/%%BROWSER_NAME%%/res/charsetalias.properties
+lib/%%BROWSER_NAME%%/res/cmessage.txt
+lib/%%BROWSER_NAME%%/res/dtd/mathml.dtd
+lib/%%BROWSER_NAME%%/res/dtd/xhtml11.dtd
+lib/%%BROWSER_NAME%%/res/entityTables/html40Latin1.properties
+lib/%%BROWSER_NAME%%/res/entityTables/html40Special.properties
+lib/%%BROWSER_NAME%%/res/entityTables/html40Symbols.properties
+lib/%%BROWSER_NAME%%/res/entityTables/htmlEntityVersions.properties
+lib/%%BROWSER_NAME%%/res/entityTables/mathml20.properties
+lib/%%BROWSER_NAME%%/res/entityTables/transliterate.properties
+lib/%%BROWSER_NAME%%/res/fonts/fontEncoding.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfont.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontCMEX10.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontCMSY10.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontMTExtra.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontMath1.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontMath2.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontMath4.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontPUA.properties
+lib/%%BROWSER_NAME%%/res/fonts/mathfontSymbol.properties
+lib/%%BROWSER_NAME%%/res/fonts/pangoFontEncoding.properties
+lib/%%BROWSER_NAME%%/res/forms.css
+lib/%%BROWSER_NAME%%/res/grabber.gif
+lib/%%BROWSER_NAME%%/res/hiddenWindow.html
+lib/%%BROWSER_NAME%%/res/html.css
+lib/%%BROWSER_NAME%%/res/html/gopher-audio.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-binary.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-find.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-image.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-menu.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-movie.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-sound.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-telnet.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-text.gif
+lib/%%BROWSER_NAME%%/res/html/gopher-unknown.gif
+lib/%%BROWSER_NAME%%/res/langGroups.properties
+lib/%%BROWSER_NAME%%/res/language.properties
+lib/%%BROWSER_NAME%%/res/loading-image.gif
+lib/%%BROWSER_NAME%%/res/mathml.css
+lib/%%BROWSER_NAME%%/res/quirk.css
+lib/%%BROWSER_NAME%%/res/svg.css
+lib/%%BROWSER_NAME%%/res/table-add-column-after-active.gif
+lib/%%BROWSER_NAME%%/res/table-add-column-after-hover.gif
+lib/%%BROWSER_NAME%%/res/table-add-column-after.gif
+lib/%%BROWSER_NAME%%/res/table-add-column-before-active.gif
+lib/%%BROWSER_NAME%%/res/table-add-column-before-hover.gif
+lib/%%BROWSER_NAME%%/res/table-add-column-before.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-after-active.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-after-hover.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-after.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-before-active.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-before-hover.gif
+lib/%%BROWSER_NAME%%/res/table-add-row-before.gif
+lib/%%BROWSER_NAME%%/res/table-remove-column-active.gif
+lib/%%BROWSER_NAME%%/res/table-remove-column-hover.gif
+lib/%%BROWSER_NAME%%/res/table-remove-column.gif
+lib/%%BROWSER_NAME%%/res/table-remove-row-active.gif
+lib/%%BROWSER_NAME%%/res/table-remove-row-hover.gif
+lib/%%BROWSER_NAME%%/res/table-remove-row.gif
+lib/%%BROWSER_NAME%%/res/ua.css
+lib/%%BROWSER_NAME%%/res/unixcharset.properties
+lib/%%BROWSER_NAME%%/res/viewsource.css
+lib/%%BROWSER_NAME%%/run-mozilla.sh
+lib/%%BROWSER_NAME%%/searchplugins/amazondotcom.png
+lib/%%BROWSER_NAME%%/searchplugins/amazondotcom.src
+lib/%%BROWSER_NAME%%/searchplugins/answers.png
+lib/%%BROWSER_NAME%%/searchplugins/answers.src
+lib/%%BROWSER_NAME%%/searchplugins/creativecommons.png
+lib/%%BROWSER_NAME%%/searchplugins/creativecommons.src
+lib/%%BROWSER_NAME%%/searchplugins/eBay.gif
+lib/%%BROWSER_NAME%%/searchplugins/eBay.src
+lib/%%BROWSER_NAME%%/searchplugins/google.gif
+lib/%%BROWSER_NAME%%/searchplugins/google.src
+lib/%%BROWSER_NAME%%/searchplugins/yahoo.gif
+lib/%%BROWSER_NAME%%/searchplugins/yahoo.src
+lib/%%BROWSER_NAME%%/updater
+lib/%%BROWSER_NAME%%/updater.ini
+lib/%%BROWSER_NAME%%/xpicleanup
+lib/%%BROWSER_NAME%%/linkfarm
+@exec %%PREFIX%%/lib/%%BROWSER_NAME%%/linkfarm
+@unexec /usr/bin/find %%PREFIX%%/lib/%%BROWSER_NAME%%/plugins -type l -delete
+@dirrm lib/%%BROWSER_NAME%%/chrome/icons/default
+@dirrm lib/%%BROWSER_NAME%%/chrome/icons
+@dirrm lib/%%BROWSER_NAME%%/chrome
+@dirrm lib/%%BROWSER_NAME%%/defaults/pref
+@dirrm lib/%%BROWSER_NAME%%/defaults/profile/chrome
+@dirrm lib/%%BROWSER_NAME%%/defaults/profile
+@dirrm lib/%%BROWSER_NAME%%/defaults/autoconfig
+@dirrm lib/%%BROWSER_NAME%%/defaults
+@dirrm lib/%%BROWSER_NAME%%/searchplugins
+@dirrm lib/%%BROWSER_NAME%%/components
+@dirrm lib/%%BROWSER_NAME%%/plugins
+@dirrm lib/%%BROWSER_NAME%%/res/fonts
+@dirrm lib/%%BROWSER_NAME%%/res/dtd
+@dirrm lib/%%BROWSER_NAME%%/res/html
+@dirrm lib/%%BROWSER_NAME%%/res/entityTables
+@dirrm lib/%%BROWSER_NAME%%/res
+@dirrm lib/%%BROWSER_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/components
+@dirrm lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/chrome
+@dirrm lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/defaults/preferences
+@dirrm lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org/defaults
+@dirrm lib/%%BROWSER_NAME%%/extensions/inspector@mozilla.org
+@dirrm lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components/talkback
+@dirrm lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org/components
+@dirrm lib/%%BROWSER_NAME%%/extensions/talkback@mozilla.org
+@dirrm lib/%%BROWSER_NAME%%/extensions
+@dirrm lib/%%BROWSER_NAME%%/icons
+@dirrm lib/%%BROWSER_NAME%%/greprefs
+@dirrm lib/%%BROWSER_NAME%%
+@dirrmtry share/applications