Index: linux-mozilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/linux-mozilla/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- linux-mozilla/Makefile	25 Apr 2006 14:03:20 -0000	1.49
+++ linux-mozilla/Makefile	7 May 2006 09:51:51 -0000
@@ -9,61 +9,13 @@
 PORTVERSION=	1.7.13
 DISTVERSIONPREFIX=	i686-pc-linux-gnu-
 PORTREVISION=	1
-CATEGORIES=	www linux
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+CATEGORIES=	www
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}${PORTVERSION}
-PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	infofarmer@gmail.com
 COMMENT=	The open source, standards compliant web browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
-NO_BUILD=	yes
-ONLY_FOR_ARCHS=	i386 amd64
-APP_NAME=	${UNIQUENAME}
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-FDIR=		${PREFIX}/lib/${APP_NAME}
-
-PLIST_SUB+=	APP_NAME=${APP_NAME}
-SUB_LIST+=	APP_NAME=${APP_NAME}
-SUB_FILES=	linkfarm pkg-message linux-mozilla.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}/${APP_NAME}.desktop ${PREFIX}/share/applications
-	${CP} -pR ${WRKSRC}/ ${FDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${FDIR}/
-	${INSTALL_SCRIPT} ${FILESDIR}/run ${PREFIX}/bin/${APP_NAME}
-	${ECHO} 'cd ${PREFIX} && exec ${FDIR}/${PORTNAME}' >> ${PREFIX}/bin/${APP_NAME}
-
-post-install:
-	@${SH} ${FDIR}/linkfarm
-	@${CAT} ${PKGMESSAGE}
-
-# Maintainer section
-create-plist:
-	${ECHO_CMD} bin/%%APP_NAME%% > ${PLIST}
-	${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST}
-	cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \
-		${SED} -e "s#^${PORTNAME}#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST}
-	${ECHO_CMD} lib/%%APP_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @unexec ${FIND} %%PREFIX%%/lib/%%APP_NAME%%/plugins \
-		-type l -delete >> ${PLIST}
-	cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \
-	${SED} -e "s#^${PORTNAME}#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
-	${ECHO_CMD} @dirrmtry share/applications >> ${PLIST}
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../linux-seamonkey/Makefile.common"
+.include <bsd.port.mk>
Index: linux-mozilla/files/linkfarm.in
===================================================================
RCS file: linux-mozilla/files/linkfarm.in
diff -N linux-mozilla/files/linkfarm.in
--- linux-mozilla/files/linkfarm.in	25 Apr 2006 14:03:20 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Run this after installing Beonex, Mozilla or Netscape plugins
-cd	%%PREFIX%%/lib/%%APP_NAME%%/plugins
-find -L . -type l -delete
-find	%%X11BASE%%/lib/linux-beonex/plugins \
-	%%X11BASE%%/lib/netscape-linux/plugins \
-	%%X11BASE%%/lib/flash \
-	%%X11BASE%%/lib/linux-mozilla/plugins \
-	%%X11BASE%%/lib/linux-netscape*/plugins \
-	%%X11BASE%%/lib/linux-flashplugin6 \
-	%%X11BASE%%/lib/linux-flashplugin7 \
-	%%LOCALBASE%%/linux-sun-jdk1.4.2/jre/plugin/i386/ns610-gcc32 \
-	%%LOCALBASE%%/linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
-	%%LOCALBASE%%/linux-blackdown-jdk1.4.2/jre/plugin/i386/mozilla \
-	-type f -maxdepth 1 -exec ln -s {} \; 2>/dev/null
-ln -sf	%%X11BASE%%/lib/linux-adobesvg/libNPSVG3.so . 2>/dev/null
-
-exit 0
Index: linux-mozilla/files/linux-mozilla.desktop.in
===================================================================
RCS file: /home/pcvs/ports/www/linux-mozilla/files/linux-mozilla.desktop.in,v
retrieving revision 1.1
diff -u -r1.1 linux-mozilla.desktop.in
--- linux-mozilla/files/linux-mozilla.desktop.in	25 Apr 2006 14:03:20 -0000	1.1
+++ linux-mozilla/files/linux-mozilla.desktop.in	7 May 2006 09:51:51 -0000
@@ -1,103 +1,103 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Mozilla Web Browser (Linux binary)
-Name[az]=Mozilla Veb Səyyahı
-Name[bg]=Интернет браузър (Mozilla)
-Name[bs]=Mozilla web preglednik
-Name[ca]=Navegador web Mozilla
-Name[cs]=Prohlížeč WWW Mozilla
-Name[cy]=Y Porwr Gwe Mozilla
-Name[da]=Mozilla - internetbrowser
-Name[de]=Mozilla Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Mozilla
-Name[en_CA]=Mozilla Web Browser
-Name[en_GB]=Mozilla Web Browser
-Name[es]=Navegador Web Mozilla
-Name[et]=Mozilla veebibrauser
-Name[eu]=Mozilla web arakatzailea
-Name[fa]=مرورگر وب Mozilla
-Name[fi]=Mozilla, WWW-selain
-Name[fr]=Navigateur Web Mozilla
-Name[ga]=Brabhsálaí Lín Mozilla
-Name[he]=דפדפן Mozilla
-Name[hr]=Mozilla Web preglednik
-Name[hu]=Mozilla webböngésző
-Name[id]=Web Browser Mozilla
-Name[it]=Browser web Mozilla
-Name[ja]=Mozilla ウェブ・ブラウザ
-Name[ko]=Mozilla 웹 브라우저
-Name[li]=Mozilla Web Browser
-Name[lt]=Mozilla web naršyklė
-Name[mk]=Mozilla Веб Прелистувач
-Name[mn]=Mozilla веб хөтөч
-Name[ms]=Pelungsur Web Mozilla
-Name[nb]=Mozilla nettleser
-Name[nl]=Mozilla webbrowser
-Name[nn]=Mozilla nettlesar
-Name[no]=Mozilla nettleser
-Name[pl]=Przeglądarka WWW Mozilla
-Name[pt]=Navegador Web Mozilla
-Name[pt_BR]=Navegador Web Mozilla
-Name[ro]=Navigatorul Mozilla
-Name[sl]=Spletni brskalnik Mozilla
-Name[sq]=Mozilla - Shfletuesi Web
-Name[sv]=Webbläsaren Mozilla
-Name[tk]=Mozilla Web Ahtarçisi
-Name[tr]=Mozilla Web Tarayıcı
-Name[uk]=Переглядач web Mozilla
-Name[vi]=Trình Duyệt Web Mozilla
-Name[wa]=Betchteu waibe mozilla
-Name[zh_CN]=Mozilla Web 浏览器
-Name[zh_TW]=Mozilla 網頁瀏覽器
-GenericName=Mozilla Web Browser
-GenericName[az]=Mozilla Veb Səyyahı
-GenericName[bg]=Интернет браузър (Mozilla)
-GenericName[bs]=Mozilla web preglednik
-GenericName[ca]=Navegador web Mozilla
-GenericName[cs]=Prohlížeč WWW Mozilla
-GenericName[cy]=Y Porwr Gwe Mozilla
-GenericName[da]=Mozilla - internetbrowser
-GenericName[de]=Mozilla Webbrowser
-GenericName[el]=Περιηγητής Διαδικτύου Mozilla
-GenericName[en_CA]=Mozilla Web Browser
-GenericName[en_GB]=Mozilla Web Browser
-GenericName[es]=Navegador Web Mozilla
-GenericName[et]=Mozilla veebibrauser
-GenericName[eu]=Mozilla web arakatzailea
-GenericName[fa]=مرورگر وب Mozilla
-GenericName[fi]=Mozilla, WWW-selain
-GenericName[fr]=Navigateur Web Mozilla
-GenericName[ga]=Brabhsálaí Lín Mozilla
-GenericName[he]=דפדפן Mozilla
-GenericName[hr]=Mozilla Web preglednik
-GenericName[hu]=Mozilla webböngésző
-GenericName[id]=Web Browser Mozilla
-GenericName[it]=Browser web Mozilla
-GenericName[ja]=Mozilla ウェブ・ブラウザ
-GenericName[ko]=Mozilla 웹 브라우저
-GenericName[li]=Mozilla Web Browser
-GenericName[lt]=Mozilla web naršyklė
-GenericName[mk]=Mozilla Веб Прелистувач
-GenericName[mn]=Mozilla веб хөтөч
-GenericName[ms]=Pelungsur Web Mozilla
-GenericName[nb]=Mozilla nettleser
-GenericName[nl]=Mozilla webbrowser
-GenericName[nn]=Mozilla nettlesar
-GenericName[no]=Mozilla nettleser
-GenericName[pl]=Przeglądarka WWW Mozilla
-GenericName[pt]=Navegador Web Mozilla
-GenericName[pt_BR]=Navegador Web Mozilla
-GenericName[ro]=Navigatorul Mozilla
-GenericName[sl]=Spletni brskalnik Mozilla
-GenericName[sq]=Mozilla - Shfletuesi Web
-GenericName[sv]=Webbläsaren Mozilla
-GenericName[tk]=Mozilla Web Ahtarçisi
-GenericName[tr]=Mozilla Web Tarayıcı
-GenericName[uk]=Переглядач web Mozilla
-GenericName[vi]=Trình Duyệt Web Mozilla
-GenericName[wa]=Betchteu waibe mozilla
-GenericName[zh_CN]=Mozilla Web 浏览器
-GenericName[zh_TW]=Mozilla 網頁瀏覽器
+Name=Mozilla Web Browser (Linux)
+Name[az]=Mozilla Veb Səyyahı (Linux)
+Name[bg]=Интернет браузър (Mozilla) (Linux)
+Name[bs]=Mozilla web preglednik (Linux)
+Name[ca]=Navegador web Mozilla (Linux)
+Name[cs]=Prohlížeč WWW Mozilla (Linux)
+Name[cy]=Y Porwr Gwe Mozilla (Linux)
+Name[da]=Mozilla - internetbrowser (Linux)
+Name[de]=Mozilla Webbrowser (Linux)
+Name[el]=Περιηγητής Διαδικτύου Mozilla (Linux)
+Name[en_CA]=Mozilla Web Browser (Linux)
+Name[en_GB]=Mozilla Web Browser (Linux)
+Name[es]=Navegador Web Mozilla (Linux)
+Name[et]=Mozilla veebibrauser (Linux)
+Name[eu]=Mozilla web arakatzailea (Linux)
+Name[fa]=مرورگر وب Mozilla (Linux)
+Name[fi]=Mozilla, WWW-selain (Linux)
+Name[fr]=Navigateur Web Mozilla (Linux)
+Name[ga]=Brabhsálaí Lín Mozilla (Linux)
+Name[he]=דפדפן Mozilla (Linux)
+Name[hr]=Mozilla Web preglednik (Linux)
+Name[hu]=Mozilla webböngésző (Linux)
+Name[id]=Web Browser Mozilla (Linux)
+Name[it]=Browser web Mozilla (Linux)
+Name[ja]=Mozilla ウェブ・ブラウザ (Linux)
+Name[ko]=Mozilla 웹 브라우저 (Linux)
+Name[li]=Mozilla Web Browser (Linux)
+Name[lt]=Mozilla web naršyklė (Linux)
+Name[mk]=Mozilla Веб Прелистувач (Linux)
+Name[mn]=Mozilla веб хөтөч (Linux)
+Name[ms]=Pelungsur Web Mozilla (Linux)
+Name[nb]=Mozilla nettleser (Linux)
+Name[nl]=Mozilla webbrowser (Linux)
+Name[nn]=Mozilla nettlesar (Linux)
+Name[no]=Mozilla nettleser (Linux)
+Name[pl]=Przeglądarka WWW Mozilla (Linux)
+Name[pt]=Navegador Web Mozilla (Linux)
+Name[pt_BR]=Navegador Web Mozilla (Linux)
+Name[ro]=Navigatorul Mozilla (Linux)
+Name[sl]=Spletni brskalnik Mozilla (Linux)
+Name[sq]=Mozilla - Shfletuesi Web (Linux)
+Name[sv]=Webbläsaren Mozilla (Linux)
+Name[tk]=Mozilla Web Ahtarçisi (Linux)
+Name[tr]=Mozilla Web Tarayıcı (Linux)
+Name[uk]=Переглядач web Mozilla (Linux)
+Name[vi]=Trình Duyệt Web Mozilla (Linux)
+Name[wa]=Betchteu waibe linux-mozilla (Linux)
+Name[zh_CN]=Mozilla Web 浏览器 (Linux)
+Name[zh_TW]=Mozilla 網頁瀏覽器 (Linux)
+GenericName=Mozilla Web Browser (Linux)
+GenericName[az]=Mozilla Veb Səyyahı (Linux)
+GenericName[bg]=Интернет браузър (Mozilla) (Linux)
+GenericName[bs]=Mozilla web preglednik (Linux)
+GenericName[ca]=Navegador web Mozilla (Linux)
+GenericName[cs]=Prohlížeč WWW Mozilla (Linux)
+GenericName[cy]=Y Porwr Gwe Mozilla (Linux)
+GenericName[da]=Mozilla - internetbrowser (Linux)
+GenericName[de]=Mozilla Webbrowser (Linux)
+GenericName[el]=Περιηγητής Διαδικτύου Mozilla (Linux)
+GenericName[en_CA]=Mozilla Web Browser (Linux)
+GenericName[en_GB]=Mozilla Web Browser (Linux)
+GenericName[es]=Navegador Web Mozilla (Linux)
+GenericName[et]=Mozilla veebibrauser (Linux)
+GenericName[eu]=Mozilla web arakatzailea (Linux)
+GenericName[fa]=مرورگر وب Mozilla (Linux)
+GenericName[fi]=Mozilla, WWW-selain (Linux)
+GenericName[fr]=Navigateur Web Mozilla (Linux)
+GenericName[ga]=Brabhsálaí Lín Mozilla (Linux)
+GenericName[he]=דפדפן Mozilla (Linux)
+GenericName[hr]=Mozilla Web preglednik (Linux)
+GenericName[hu]=Mozilla webböngésző (Linux)
+GenericName[id]=Web Browser Mozilla (Linux)
+GenericName[it]=Browser web Mozilla (Linux)
+GenericName[ja]=Mozilla ウェブ・ブラウザ (Linux)
+GenericName[ko]=Mozilla 웹 브라우저 (Linux)
+GenericName[li]=Mozilla Web Browser (Linux)
+GenericName[lt]=Mozilla web naršyklė (Linux)
+GenericName[mk]=Mozilla Веб Прелистувач (Linux)
+GenericName[mn]=Mozilla веб хөтөч (Linux)
+GenericName[ms]=Pelungsur Web Mozilla (Linux)
+GenericName[nb]=Mozilla nettleser (Linux)
+GenericName[nl]=Mozilla webbrowser (Linux)
+GenericName[nn]=Mozilla nettlesar (Linux)
+GenericName[no]=Mozilla nettleser (Linux)
+GenericName[pl]=Przeglądarka WWW Mozilla (Linux)
+GenericName[pt]=Navegador Web Mozilla (Linux)
+GenericName[pt_BR]=Navegador Web Mozilla (Linux)
+GenericName[ro]=Navigatorul Mozilla (Linux)
+GenericName[sl]=Spletni brskalnik Mozilla (Linux)
+GenericName[sq]=Mozilla - Shfletuesi Web (Linux)
+GenericName[sv]=Webbläsaren Mozilla (Linux)
+GenericName[tk]=Mozilla Web Ahtarçisi (Linux)
+GenericName[tr]=Mozilla Web Tarayıcı (Linux)
+GenericName[uk]=Переглядач web Mozilla (Linux)
+GenericName[vi]=Trình Duyệt Web Mozilla (Linux)
+GenericName[wa]=Betchteu waibe linux-mozilla (Linux)
+GenericName[zh_CN]=Mozilla Web 浏览器 (Linux)
+GenericName[zh_TW]=Mozilla 網頁瀏覽器 (Linux)
 Comment=Browse the web
 Comment[ar]=تصفح الانترنت
 Comment[az]=Vebi gəzin
@@ -160,10 +160,10 @@
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=mozilla %U
+Exec=linux-mozilla %U
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/main-window.xpm
+Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;
Index: linux-mozilla/files/pkg-message.in
===================================================================
RCS file: linux-mozilla/files/pkg-message.in
diff -N linux-mozilla/files/pkg-message.in
--- linux-mozilla/files/pkg-message.in	25 Apr 2006 14:03:20 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-** After adding plugins to (Linux) Mozilla, Firefox
-** Seamonkey or Flock run
-** %%PREFIX%%/lib/%%APP_NAME%%/linkfarm as root
-** to make them available to %%APP_NAME%%
Index: linux-mozilla/files/run
===================================================================
RCS file: linux-mozilla/files/run
diff -N linux-mozilla/files/run
--- linux-mozilla/files/run	25 Apr 2006 14:03:20 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-#!/bin/sh