4 files changed, 30 insertions, 9 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 2729c28d368a..599000b79107 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	seamonkey
 PORTVERSION=	1.0
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	.en-US.linux-i686
+PORTREVISION=	3
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -21,11 +21,12 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/l
 		${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
-BROWSER_NAME=	${PKGNAMEPREFIX}${PORTNAME}
+BROWSER_NAME=	${UNIQUENAME}
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -33,15 +34,24 @@ FDIR=		${PREFIX}/lib/${BROWSER_NAME}
 
 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
+PREFS_FILE=	${WRKSRC}/defaults/pref/browser-prefs.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}
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/linux-seamonkey.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
 	${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
@@ -50,7 +60,7 @@ post-install:
 # Maintainer section
 create-plist:
 	${ECHO_CMD} bin/%%BROWSER_NAME%% > ${PLIST}
-	${ECHO_CMD} lib/%%BROWSER_NAME%%/%%BROWSER_NAME%%-bin >> ${PLIST}
+	${ECHO_CMD} share/applications/%%BROWSER_NAME%%.desktop >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \
 		${SED} -e "s#^${PORTNAME}#lib/%%BROWSER_NAME%%#" | ${SORT} >> ${PLIST}
 	${ECHO_CMD} lib/%%BROWSER_NAME%%/linkfarm >> ${PLIST}
@@ -59,5 +69,6 @@ create-plist:
 		-type l -delete >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \
 		${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-seamonkey/files/linux-seamonkey.desktop.in b/www/linux-seamonkey/files/linux-seamonkey.desktop.in
new file mode 100644
index 000000000000..1ac7b609d6f3
--- /dev/null
+++ b/www/linux-seamonkey/files/linux-seamonkey.desktop.in
@@ -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 --git a/www/linux-seamonkey/files/run b/www/linux-seamonkey/files/run
new file mode 100644
index 000000000000..1a2485251c33
--- /dev/null
+++ b/www/linux-seamonkey/files/run
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 70281b33a34f..134c4ecd281c 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -1,5 +1,5 @@
 bin/%%BROWSER_NAME%%
-lib/%%BROWSER_NAME%%/%%BROWSER_NAME%%-bin
+share/applications/%%BROWSER_NAME%%.desktop
 lib/%%BROWSER_NAME%%/LICENSE
 lib/%%BROWSER_NAME%%/README
 lib/%%BROWSER_NAME%%/chrome/US.jar
@@ -501,3 +501,4 @@ lib/%%BROWSER_NAME%%/linkfarm
 @dirrm lib/%%BROWSER_NAME%%/init.d
 @dirrm lib/%%BROWSER_NAME%%/plugins
 @dirrm lib/%%BROWSER_NAME%%
+@dirrmtry share/applications