* Add a patch that fixes some localization issues [1]

* Fix a problem with plugins not actually loading
* Hopefully correct some issues with installs erroring out with Error 1
* Conditionalize Xft support (by default it's enabled, but can be disabled
  by defined WITHOUT_XFT)

Submitted by:	Jung-uk Kim <jkim@niksun.com> [1]
Obtained from:	Mozilla's Bugzilla bug 174989 [1]

9 files changed, 426 insertions, 39 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index ad8c0f61a1c4..e4dd833c8f51 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.2b
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -23,12 +24,16 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		Xft2.2:${PORTSDIR}/x11-fonts/Xft
+		freetype.9:${PORTSDIR}/print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+.endif
+
 LATEST_LINK=	mozilla-devel
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -64,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
-		--enable-xft			\
 		--with-system-jpeg=${LOCALBASE}	\
 		--with-system-mng=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
@@ -90,6 +94,10 @@ CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 
+.if !defined(WITHOUT_XFT)
+CONFIGURE_ARGS+=	--enable-xft
+.endif
+
 .include <bsd.port.pre.mk>
 
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -127,11 +135,13 @@ post-build:
 
 pre-install:
 	${TOUCH} -f ${PLIST}
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${ECHO_CMD} bin/mozilla >> ${PLIST}
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${ECHO_CMD} bin/mozilla >> ${PLIST}
+	fi
 	${ECHO_CMD} bin/mozilla-devel >> ${PLIST}
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	fi
 	cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/mozilla-devel/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -144,13 +154,16 @@ do-install:
 	cd ${WRKSRC}/dist/bin && ${FIND} . | \
 		cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla-devel
 	${INSTALL_SCRIPT} ${WRKSRC}/mozilla-devel ${PREFIX}/bin
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
-	${TEST} ! -d ${PREFIX}/lib/browser_plugins && \
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
-		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
+	fi
+	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then
+	    ${MKDIR} ${PREFIX}/lib/browser_plugins
+	fi
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
+	    	${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	fi
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh b/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh
new file mode 100644
index 000000000000..96084fd68646
--- /dev/null
+++ b/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh
@@ -0,0 +1,30 @@
+--- build/unix/run-mozilla.sh.orig	Wed Oct 23 00:08:03 2002
++++ build/unix/run-mozilla.sh	Wed Oct 23 00:08:59 2002
+@@ -355,7 +355,7 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+ if [ -n "$LD_LIBRARYN32_PATH" ]
+ then
+ 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+@@ -392,7 +392,7 @@
+         export XSUNTRANSPORT XSUNSMESIZE
+ fi
+ # Font path for Xft
+-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
++FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+ export FONTCONFIG_PATH
+ 
+ if [ "$moz_debug" -eq 1 ]
+@@ -435,6 +435,9 @@
+ #
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
++
++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
++export MOZ_PLUGIN_PATH
+ 
+ if [ $moz_debug -eq 1 ]
+ then
diff --git a/www/mozilla-devel/files/patch-temp-l10n b/www/mozilla-devel/files/patch-temp-l10n
new file mode 100644
index 000000000000..15788c1c7058
--- /dev/null
+++ b/www/mozilla-devel/files/patch-temp-l10n
@@ -0,0 +1,86 @@
+Index: mozilla/xpfe/global/resources/locale/en-US/brand.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/brand.dtd,v
+retrieving revision 1.9
+diff -u -r1.9 brand.dtd
+--- xpfe/global/resources/locale/en-US/brand.dtd	22 Sep 2002 22:14:25 -0000	1.9
++++ xpfe/global/resources/locale/en-US/brand.dtd	17 Oct 2002 14:11:36 -0000
+@@ -1,4 +1,4 @@
+-<!ENTITY  lang.version          "1.2a">
++<!ENTITY  lang.version          "1.2b">
+ <!ENTITY  brandShortName        "Mozilla">
+ <!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  sidebarName           "Sidebar">
+Index: mozilla/xpfe/global/resources/locale/en-US/region.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/region.dtd,v
+retrieving revision 1.12
+diff -u -r1.12 region.dtd
+--- xpfe/global/resources/locale/en-US/region.dtd	22 Sep 2002 22:14:25 -0000	1.12
++++ xpfe/global/resources/locale/en-US/region.dtd	17 Oct 2002 14:11:36 -0000
+@@ -2,4 +2,4 @@
+ <!ENTITY  vendorURL             "http://www.mozilla.org/">
+ <!ENTITY  releaseURL            "http://www.mozilla.org/releases/">
+ <!ENTITY  getNewThemesURL       "http://mozilla.org/themes/download/">
+-<!ENTITY  content.version       "1.2a">
++<!ENTITY  content.version       "1.2b">
+Index: mozilla/extensions/inspector/resources/content/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/content/contents.rdf,v
+retrieving revision 1.5
+diff -u -r1.5 contents.rdf
+--- extensions/inspector/resources/content/contents.rdf	12 Sep 2002 23:39:25 -0000	1.5
++++ extensions/inspector/resources/content/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -12,7 +12,7 @@
+         chrome:displayName="Document Inspector"
+         chrome:author="Joe Hewitt"
+         chrome:name="inspector"
+-        chrome:localeVersion="0.9.4"
++        chrome:localeVersion="1.2b"
+         chrome:skinVersion="1.2">
+   </RDF:Description>
+ 
+Index: mozilla/extensions/inspector/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- extensions/inspector/resources/locale/en-US/contents.rdf	15 Nov 2001 04:09:28 -0000	1.2
++++ extensions/inspector/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:inspector"
+-	                 chrome:localeVersion="0.9.4"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>
+Index: mozilla/xpfe/components/download-manager/resources/mac/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/download-manager/resources/mac/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- xpfe/components/download-manager/resources/mac/contents.rdf	12 Sep 2002 23:38:32 -0000	1.2
++++ xpfe/components/download-manager/resources/mac/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -11,7 +11,7 @@
+                    chrome:displayName="Mac-specific dl mgr files"
+                    chrome:author="mozilla.org"
+                    chrome:name="dlmgr"
+-                   chrome:localeVersion="1.0.0"
++                   chrome:localeVersion="1.2b"
+                    chrome:skinVersion="1.2">
+   </RDF:Description>
+  
+Index: mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.1
+diff -u -r1.1 contents.rdf
+--- extensions/editor/cascades/resources/locale/en-US/contents.rdf	9 Sep 2002 09:33:17 -0000	1.1
++++ extensions/editor/cascades/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:cascades"
+-	                 chrome:localeVersion="0.1.7"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index ad8c0f61a1c4..e4dd833c8f51 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.2b
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -23,12 +24,16 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		Xft2.2:${PORTSDIR}/x11-fonts/Xft
+		freetype.9:${PORTSDIR}/print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+.endif
+
 LATEST_LINK=	mozilla-devel
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -64,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
-		--enable-xft			\
 		--with-system-jpeg=${LOCALBASE}	\
 		--with-system-mng=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
@@ -90,6 +94,10 @@ CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 
+.if !defined(WITHOUT_XFT)
+CONFIGURE_ARGS+=	--enable-xft
+.endif
+
 .include <bsd.port.pre.mk>
 
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -127,11 +135,13 @@ post-build:
 
 pre-install:
 	${TOUCH} -f ${PLIST}
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${ECHO_CMD} bin/mozilla >> ${PLIST}
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${ECHO_CMD} bin/mozilla >> ${PLIST}
+	fi
 	${ECHO_CMD} bin/mozilla-devel >> ${PLIST}
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	fi
 	cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/mozilla-devel/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -144,13 +154,16 @@ do-install:
 	cd ${WRKSRC}/dist/bin && ${FIND} . | \
 		cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla-devel
 	${INSTALL_SCRIPT} ${WRKSRC}/mozilla-devel ${PREFIX}/bin
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
-	${TEST} ! -d ${PREFIX}/lib/browser_plugins && \
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
-		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
+	fi
+	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then
+	    ${MKDIR} ${PREFIX}/lib/browser_plugins
+	fi
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
+	    	${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	fi
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/seamonkey/files/patch-build_unix_run-mozilla.sh b/www/seamonkey/files/patch-build_unix_run-mozilla.sh
new file mode 100644
index 000000000000..96084fd68646
--- /dev/null
+++ b/www/seamonkey/files/patch-build_unix_run-mozilla.sh
@@ -0,0 +1,30 @@
+--- build/unix/run-mozilla.sh.orig	Wed Oct 23 00:08:03 2002
++++ build/unix/run-mozilla.sh	Wed Oct 23 00:08:59 2002
+@@ -355,7 +355,7 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+ if [ -n "$LD_LIBRARYN32_PATH" ]
+ then
+ 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+@@ -392,7 +392,7 @@
+         export XSUNTRANSPORT XSUNSMESIZE
+ fi
+ # Font path for Xft
+-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
++FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+ export FONTCONFIG_PATH
+ 
+ if [ "$moz_debug" -eq 1 ]
+@@ -435,6 +435,9 @@
+ #
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
++
++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
++export MOZ_PLUGIN_PATH
+ 
+ if [ $moz_debug -eq 1 ]
+ then
diff --git a/www/seamonkey/files/patch-temp-l10n b/www/seamonkey/files/patch-temp-l10n
new file mode 100644
index 000000000000..15788c1c7058
--- /dev/null
+++ b/www/seamonkey/files/patch-temp-l10n
@@ -0,0 +1,86 @@
+Index: mozilla/xpfe/global/resources/locale/en-US/brand.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/brand.dtd,v
+retrieving revision 1.9
+diff -u -r1.9 brand.dtd
+--- xpfe/global/resources/locale/en-US/brand.dtd	22 Sep 2002 22:14:25 -0000	1.9
++++ xpfe/global/resources/locale/en-US/brand.dtd	17 Oct 2002 14:11:36 -0000
+@@ -1,4 +1,4 @@
+-<!ENTITY  lang.version          "1.2a">
++<!ENTITY  lang.version          "1.2b">
+ <!ENTITY  brandShortName        "Mozilla">
+ <!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  sidebarName           "Sidebar">
+Index: mozilla/xpfe/global/resources/locale/en-US/region.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/region.dtd,v
+retrieving revision 1.12
+diff -u -r1.12 region.dtd
+--- xpfe/global/resources/locale/en-US/region.dtd	22 Sep 2002 22:14:25 -0000	1.12
++++ xpfe/global/resources/locale/en-US/region.dtd	17 Oct 2002 14:11:36 -0000
+@@ -2,4 +2,4 @@
+ <!ENTITY  vendorURL             "http://www.mozilla.org/">
+ <!ENTITY  releaseURL            "http://www.mozilla.org/releases/">
+ <!ENTITY  getNewThemesURL       "http://mozilla.org/themes/download/">
+-<!ENTITY  content.version       "1.2a">
++<!ENTITY  content.version       "1.2b">
+Index: mozilla/extensions/inspector/resources/content/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/content/contents.rdf,v
+retrieving revision 1.5
+diff -u -r1.5 contents.rdf
+--- extensions/inspector/resources/content/contents.rdf	12 Sep 2002 23:39:25 -0000	1.5
++++ extensions/inspector/resources/content/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -12,7 +12,7 @@
+         chrome:displayName="Document Inspector"
+         chrome:author="Joe Hewitt"
+         chrome:name="inspector"
+-        chrome:localeVersion="0.9.4"
++        chrome:localeVersion="1.2b"
+         chrome:skinVersion="1.2">
+   </RDF:Description>
+ 
+Index: mozilla/extensions/inspector/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- extensions/inspector/resources/locale/en-US/contents.rdf	15 Nov 2001 04:09:28 -0000	1.2
++++ extensions/inspector/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:inspector"
+-	                 chrome:localeVersion="0.9.4"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>
+Index: mozilla/xpfe/components/download-manager/resources/mac/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/download-manager/resources/mac/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- xpfe/components/download-manager/resources/mac/contents.rdf	12 Sep 2002 23:38:32 -0000	1.2
++++ xpfe/components/download-manager/resources/mac/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -11,7 +11,7 @@
+                    chrome:displayName="Mac-specific dl mgr files"
+                    chrome:author="mozilla.org"
+                    chrome:name="dlmgr"
+-                   chrome:localeVersion="1.0.0"
++                   chrome:localeVersion="1.2b"
+                    chrome:skinVersion="1.2">
+   </RDF:Description>
+  
+Index: mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.1
+diff -u -r1.1 contents.rdf
+--- extensions/editor/cascades/resources/locale/en-US/contents.rdf	9 Sep 2002 09:33:17 -0000	1.1
++++ extensions/editor/cascades/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:cascades"
+-	                 chrome:localeVersion="0.1.7"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index ad8c0f61a1c4..e4dd833c8f51 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.2b
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -23,12 +24,16 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		Xft2.2:${PORTSDIR}/x11-fonts/Xft
+		freetype.9:${PORTSDIR}/print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+.endif
+
 LATEST_LINK=	mozilla-devel
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -64,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
-		--enable-xft			\
 		--with-system-jpeg=${LOCALBASE}	\
 		--with-system-mng=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
@@ -90,6 +94,10 @@ CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 
+.if !defined(WITHOUT_XFT)
+CONFIGURE_ARGS+=	--enable-xft
+.endif
+
 .include <bsd.port.pre.mk>
 
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -127,11 +135,13 @@ post-build:
 
 pre-install:
 	${TOUCH} -f ${PLIST}
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${ECHO_CMD} bin/mozilla >> ${PLIST}
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${ECHO_CMD} bin/mozilla >> ${PLIST}
+	fi
 	${ECHO_CMD} bin/mozilla-devel >> ${PLIST}
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST}
+	fi
 	cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/mozilla-devel/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -144,13 +154,16 @@ do-install:
 	cd ${WRKSRC}/dist/bin && ${FIND} . | \
 		cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla-devel
 	${INSTALL_SCRIPT} ${WRKSRC}/mozilla-devel ${PREFIX}/bin
-	${TEST} ! -x ${PREFIX}/bin/mozilla && ${TEST} ! -L ${PREFIX}/bin/mozilla && \
-	${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
-	${TEST} ! -d ${PREFIX}/lib/browser_plugins && \
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \
-	${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
-		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then
+	    ${LN} -sf ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla
+	fi
+	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then
+	    ${MKDIR} ${PREFIX}/lib/browser_plugins
+	fi
+	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then
+	    ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
+	    	${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so
+	fi
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
new file mode 100644
index 000000000000..96084fd68646
--- /dev/null
+++ b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
@@ -0,0 +1,30 @@
+--- build/unix/run-mozilla.sh.orig	Wed Oct 23 00:08:03 2002
++++ build/unix/run-mozilla.sh	Wed Oct 23 00:08:59 2002
+@@ -355,7 +355,7 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+ if [ -n "$LD_LIBRARYN32_PATH" ]
+ then
+ 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+@@ -392,7 +392,7 @@
+         export XSUNTRANSPORT XSUNSMESIZE
+ fi
+ # Font path for Xft
+-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
++FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+ export FONTCONFIG_PATH
+ 
+ if [ "$moz_debug" -eq 1 ]
+@@ -435,6 +435,9 @@
+ #
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
++
++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
++export MOZ_PLUGIN_PATH
+ 
+ if [ $moz_debug -eq 1 ]
+ then
diff --git a/www/seamonkey2/files/patch-temp-l10n b/www/seamonkey2/files/patch-temp-l10n
new file mode 100644
index 000000000000..15788c1c7058
--- /dev/null
+++ b/www/seamonkey2/files/patch-temp-l10n
@@ -0,0 +1,86 @@
+Index: mozilla/xpfe/global/resources/locale/en-US/brand.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/brand.dtd,v
+retrieving revision 1.9
+diff -u -r1.9 brand.dtd
+--- xpfe/global/resources/locale/en-US/brand.dtd	22 Sep 2002 22:14:25 -0000	1.9
++++ xpfe/global/resources/locale/en-US/brand.dtd	17 Oct 2002 14:11:36 -0000
+@@ -1,4 +1,4 @@
+-<!ENTITY  lang.version          "1.2a">
++<!ENTITY  lang.version          "1.2b">
+ <!ENTITY  brandShortName        "Mozilla">
+ <!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  sidebarName           "Sidebar">
+Index: mozilla/xpfe/global/resources/locale/en-US/region.dtd
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/region.dtd,v
+retrieving revision 1.12
+diff -u -r1.12 region.dtd
+--- xpfe/global/resources/locale/en-US/region.dtd	22 Sep 2002 22:14:25 -0000	1.12
++++ xpfe/global/resources/locale/en-US/region.dtd	17 Oct 2002 14:11:36 -0000
+@@ -2,4 +2,4 @@
+ <!ENTITY  vendorURL             "http://www.mozilla.org/">
+ <!ENTITY  releaseURL            "http://www.mozilla.org/releases/">
+ <!ENTITY  getNewThemesURL       "http://mozilla.org/themes/download/">
+-<!ENTITY  content.version       "1.2a">
++<!ENTITY  content.version       "1.2b">
+Index: mozilla/extensions/inspector/resources/content/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/content/contents.rdf,v
+retrieving revision 1.5
+diff -u -r1.5 contents.rdf
+--- extensions/inspector/resources/content/contents.rdf	12 Sep 2002 23:39:25 -0000	1.5
++++ extensions/inspector/resources/content/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -12,7 +12,7 @@
+         chrome:displayName="Document Inspector"
+         chrome:author="Joe Hewitt"
+         chrome:name="inspector"
+-        chrome:localeVersion="0.9.4"
++        chrome:localeVersion="1.2b"
+         chrome:skinVersion="1.2">
+   </RDF:Description>
+ 
+Index: mozilla/extensions/inspector/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/inspector/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- extensions/inspector/resources/locale/en-US/contents.rdf	15 Nov 2001 04:09:28 -0000	1.2
++++ extensions/inspector/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:inspector"
+-	                 chrome:localeVersion="0.9.4"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>
+Index: mozilla/xpfe/components/download-manager/resources/mac/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/download-manager/resources/mac/contents.rdf,v
+retrieving revision 1.2
+diff -u -r1.2 contents.rdf
+--- xpfe/components/download-manager/resources/mac/contents.rdf	12 Sep 2002 23:38:32 -0000	1.2
++++ xpfe/components/download-manager/resources/mac/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -11,7 +11,7 @@
+                    chrome:displayName="Mac-specific dl mgr files"
+                    chrome:author="mozilla.org"
+                    chrome:name="dlmgr"
+-                   chrome:localeVersion="1.0.0"
++                   chrome:localeVersion="1.2b"
+                    chrome:skinVersion="1.2">
+   </RDF:Description>
+  
+Index: mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/editor/cascades/resources/locale/en-US/contents.rdf,v
+retrieving revision 1.1
+diff -u -r1.1 contents.rdf
+--- extensions/editor/cascades/resources/locale/en-US/contents.rdf	9 Sep 2002 09:33:17 -0000	1.1
++++ extensions/editor/cascades/resources/locale/en-US/contents.rdf	17 Oct 2002 14:11:36 -0000
+@@ -17,5 +17,5 @@
+   </RDF:Description>
+ 
+   <RDF:Description about="urn:mozilla:locale:en-US:cascades"
+-	                 chrome:localeVersion="0.1.7"/>
++	                 chrome:localeVersion="1.2b"/>
+ </RDF:RDF>