-- Marge lots of common mozilla-ports tasks into Makefile.common

  o creation of plist (Disabled with NOGECKO_PLIST)
  o install (Disabled with NOGECKO_INSTALL)
  o many common post-patch routines
- Expand post- pre- targets so ports and Makefile.common can use the same
  target
- Makefile.common supports both ${FILESDIR}/mozconfig.in (if exists) and
  now has 3 new variables to add opions to .mozconfig [1]

Ports can use the following:

 NOGECKO_INSTALL
 NOGECKO_PLIST         Do not auto-create plist
 NOMOZCONFIG           Use CONFIGURE_ARGS instead of .mozconfig

 MOZILLA_PLIST_DIRS    Listing of directories to create plist and/or
                        install
 MOZ_PIS_SCRIPTS       List scripts listed in ${FILESDIR} to filter
                        through MOZCONFIG_SED and install with mozilla
                        PIS scripts.
 MOZ_SED_ARGS          Add or replace to MOZ_SED_ARGS

[1]
 MOZ_OPTIONS           Add more configure arguments to .mozconfig
 MOZ_MK_OPTIONS        Add more make arguments to .mozconfig
 MOZ_EXPORT            Add export variables to .mozconfig

 if ${FILESDIR}/mozconfig.in exists and NOMOZCONFIG is not defined
 contents of ${FILESDIR}/mozconfig.in will be filtered through MOZCONFIG_SED
 and added the the end of .mozconfig

I broke the following:
 o Optional extensions (irc, etc) , need to figure out how to handle this

Todo:
 o Handle .desktop the install of .desktop files and icons
 o Handle Java plugins
 o Cleanup/Audit and moving any other common "things" into Makefile.common
 o (maybe) convert all the ${FILESDIR}/mozconfig.in to MOZ_OPTIONS/EXPORT
   variables
 o Add support for ports to set MOZILLA=PORTNAME-devel
 o Figure out how to get the rest of mozconfig-generic.in to work in
   MOZ_EXPORT, the following example does not work

        MOZ_EXPORT=CFLAGS="${CFLAGS}"

        if treats each flag in CFLAGS as a different flag and you end
        up with a bunch of export -O2, export -xxx instead of
        export -O2 -xxx -blah ....
 o Figure out why MOZ_OPIONS+=--prefix=${FAKEDIR} ends up in
   .mozconfig as --prefix=/fake instead of --prefix=${WRKDIR}/fake
   (--prefix is in mozconfig-generic.in for now)
 o testing testing TESTING


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5182 df743ca5-7f9a-e211-a948-0013205c9059

22 files changed, 487 insertions, 789 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a5dc935ca..89a5992cb 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.20 2005/11/18 03:37:32 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.21 2005/11/19 07:34:00 marcus Exp $
 #
 
 PORTNAME=	firefox
@@ -13,40 +13,26 @@ PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-PKGNAMESUFFIX=	${FF_SUFX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-RUN_DEPENDS=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-
+USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-FAKEDIR=	${WRKDIR}/fake
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 
-FIREFOX=	${MOZILLA}
-FF_SUFX=	# -devel
-FF=		${FIREFOX}${FF_SUFX}
-FF_VER=		1.5
-MOZ_RPATH=	${FF}
-
-FIREFOX_ICON=		${FF}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
+FIREFOX_ICON=		${MOZILLA}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${FF}/defaults/pref/firefox.js
-SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
-MOZ_PIS_SCRIPTS=	S50cleanhome
-MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
+SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
+MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 
 OPTIONS=	NEWTAB "Open external links in a new tab" on \
 		SMB "Enable smb:// URI support using gnomevfs" off
@@ -62,31 +48,11 @@ IGNORE=	core dumps on alpha during post-build
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}| ; \
-		s|@FF_SUFX@|${FF_SUFX}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
-		${WRKSRC}/config/autoconf.mk.in
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${FF}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
-.endfor
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
@@ -95,67 +61,23 @@ post-patch:
 .endfor
 
 pre-install:
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
-	@${MKDIR} ${SCRIPTS_DIR}
-	@${MKDIR} ${MOZ_PIS_DIR}
-	@${RM} -rf ${FAKEDIR}/lib/${FF}/extensions
-	${ECHO_CMD} 'share/applications/${FF}.desktop' >> ${PLIST}
+	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${FIREFOX}|${FF}|; \
-		s|-devel||; \
-		s|$${progbase}-bin|${FIREFOX}-bin|' \
-		${FAKEDIR}/bin/firefox \
-		${FAKEDIR}/bin/firefox-config
-	${ECHO_CMD} bin/${FF} >> ${PLIST}
-	${ECHO_CMD} bin/${FF}-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
 		>> ${SYSTEM_PREFS}
 .endif # !defined(WITHOUT_NEWTAB)
-	cd ${FAKEDIR}/lib/${FF} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${FF}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${FF}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${FF} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FF}|${FF}|g; \
-			s|${FAKEDIR}|${PREFIX}|' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${FF} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${FF}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${FF}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${FF} >> ${PLIST}
-	${ECHO_CMD} lib/browser_plugins/.${FF}.keep >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${FF}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${FF}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${FF}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
+	${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST}
+	${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST}
+	${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST}
+# Dirty hack to make sure stuff gets removed right.
+	${SORT} -r ${PLIST} > ${PLIST}.tmp
+	${MV} -f ${PLIST}.tmp ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FF}
-	${CHMOD} 755 ${PREFIX}/lib/${FF}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin/${FF}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin/${FF}-config
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${FF}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -165,30 +87,12 @@ do-install:
 			fi; \
 		done; \
 	fi
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${FF}
-	${MKDIR} ${PREFIX}/include/${FF}
-	${CHMOD} 755 ${PREFIX}/include/${FF}
-	cd ${FAKEDIR}/include/${FF} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FF}
-	cd ${FAKEDIR}/lib/${FF} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FF}
-	${MKDIR} ${PREFIX}/share/idl/${FF}
-	cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${FF}
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
-	${MKDIR} ${PREFIX}/lib/${FF}/chrome/icons/default
-	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
+	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
+	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox/files/patch-config_autoconf.mk.in b/www/firefox/files/patch-config_autoconf.mk.in
index 62548420f..29fe7f8fb 100644
--- a/www/firefox/files/patch-config_autoconf.mk.in
+++ b/www/firefox/files/patch-config_autoconf.mk.in
@@ -5,14 +5,14 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%FIREFOX%%
++includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
  idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
 -mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%FIREFOX%%
++mozappdir	= $(libdir)/%%MOZILLA%%
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
diff --git a/www/firefox/pkg-deinstall.in b/www/firefox/pkg-deinstall.in
index 94bd0d4df..825a801d7 100644
--- a/www/firefox/pkg-deinstall.in
+++ b/www/firefox/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#    $MCom$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,14 +16,8 @@ PATH=/bin:/usr/bin
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
 rm -f ${MOZDIR}/chrome/*.rdf
 rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
 rm -f ${MOZDIR}/components/*.dat
-rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
 
 exit 0
diff --git a/www/firefox/pkg-install.in b/www/firefox/pkg-install.in
deleted file mode 100644
index f101d4c9a..000000000
--- a/www/firefox/pkg-install.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom$
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-FIREFOX=${MOZDIR}/firefox-bin
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-rm -rf ${MOZDIR}/extensions
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
-
-# Instantiate the extension space as root.
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-
-exit 0
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index a5dc935ca..89a5992cb 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.20 2005/11/18 03:37:32 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.21 2005/11/19 07:34:00 marcus Exp $
 #
 
 PORTNAME=	firefox
@@ -13,40 +13,26 @@ PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-PKGNAMESUFFIX=	${FF_SUFX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-RUN_DEPENDS=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-
+USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-FAKEDIR=	${WRKDIR}/fake
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 
-FIREFOX=	${MOZILLA}
-FF_SUFX=	# -devel
-FF=		${FIREFOX}${FF_SUFX}
-FF_VER=		1.5
-MOZ_RPATH=	${FF}
-
-FIREFOX_ICON=		${FF}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
+FIREFOX_ICON=		${MOZILLA}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${FF}/defaults/pref/firefox.js
-SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
-MOZ_PIS_SCRIPTS=	S50cleanhome
-MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
+SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
+MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 
 OPTIONS=	NEWTAB "Open external links in a new tab" on \
 		SMB "Enable smb:// URI support using gnomevfs" off
@@ -62,31 +48,11 @@ IGNORE=	core dumps on alpha during post-build
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}| ; \
-		s|@FF_SUFX@|${FF_SUFX}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
-		${WRKSRC}/config/autoconf.mk.in
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${FF}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
-.endfor
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
@@ -95,67 +61,23 @@ post-patch:
 .endfor
 
 pre-install:
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
-	@${MKDIR} ${SCRIPTS_DIR}
-	@${MKDIR} ${MOZ_PIS_DIR}
-	@${RM} -rf ${FAKEDIR}/lib/${FF}/extensions
-	${ECHO_CMD} 'share/applications/${FF}.desktop' >> ${PLIST}
+	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${FIREFOX}|${FF}|; \
-		s|-devel||; \
-		s|$${progbase}-bin|${FIREFOX}-bin|' \
-		${FAKEDIR}/bin/firefox \
-		${FAKEDIR}/bin/firefox-config
-	${ECHO_CMD} bin/${FF} >> ${PLIST}
-	${ECHO_CMD} bin/${FF}-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
 		>> ${SYSTEM_PREFS}
 .endif # !defined(WITHOUT_NEWTAB)
-	cd ${FAKEDIR}/lib/${FF} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${FF}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${FF}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${FF} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FF}|${FF}|g; \
-			s|${FAKEDIR}|${PREFIX}|' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${FF} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${FF}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${FF}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${FF} >> ${PLIST}
-	${ECHO_CMD} lib/browser_plugins/.${FF}.keep >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${FF}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${FF}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${FF}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
+	${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST}
+	${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST}
+	${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST}
+# Dirty hack to make sure stuff gets removed right.
+	${SORT} -r ${PLIST} > ${PLIST}.tmp
+	${MV} -f ${PLIST}.tmp ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FF}
-	${CHMOD} 755 ${PREFIX}/lib/${FF}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin/${FF}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin/${FF}-config
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${FF}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -165,30 +87,12 @@ do-install:
 			fi; \
 		done; \
 	fi
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${FF}
-	${MKDIR} ${PREFIX}/include/${FF}
-	${CHMOD} 755 ${PREFIX}/include/${FF}
-	cd ${FAKEDIR}/include/${FF} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FF}
-	cd ${FAKEDIR}/lib/${FF} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FF}
-	${MKDIR} ${PREFIX}/share/idl/${FF}
-	cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${FF}
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
-	${MKDIR} ${PREFIX}/lib/${FF}/chrome/icons/default
-	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
+	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
+	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox10/files/patch-config_autoconf.mk.in b/www/firefox10/files/patch-config_autoconf.mk.in
index 62548420f..29fe7f8fb 100644
--- a/www/firefox10/files/patch-config_autoconf.mk.in
+++ b/www/firefox10/files/patch-config_autoconf.mk.in
@@ -5,14 +5,14 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%FIREFOX%%
++includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
  idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
 -mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%FIREFOX%%
++mozappdir	= $(libdir)/%%MOZILLA%%
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
diff --git a/www/firefox10/pkg-deinstall.in b/www/firefox10/pkg-deinstall.in
index 94bd0d4df..825a801d7 100644
--- a/www/firefox10/pkg-deinstall.in
+++ b/www/firefox10/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#    $MCom$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,14 +16,8 @@ PATH=/bin:/usr/bin
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
 rm -f ${MOZDIR}/chrome/*.rdf
 rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
 rm -f ${MOZDIR}/components/*.dat
-rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
 
 exit 0
diff --git a/www/firefox10/pkg-install.in b/www/firefox10/pkg-install.in
deleted file mode 100644
index f101d4c9a..000000000
--- a/www/firefox10/pkg-install.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom$
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-FIREFOX=${MOZDIR}/firefox-bin
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-rm -rf ${MOZDIR}/extensions
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
-
-# Instantiate the extension space as root.
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-
-exit 0
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index d8c882fc9..da569c550 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile,v 1.26 2005/11/14 00:58:39 ahze Exp $
+#    $MCom: ports/www/mozilla/Makefile,v 1.27 2005/11/14 20:03:15 ahze Exp $
 #
 
 PORTNAME=	mozilla
@@ -21,6 +21,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -29,14 +30,14 @@ USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 ALL_TARGET=	default
-MOZ_PIS_DIR=	${FAKEDIR}/lib/${MOZILLA}/init.d
-MOZ_PIS_SCRIPTS=	# No default
 
-MOZ_EXTENSIONS=	default
+MOZ_EXTENSIONS=	# Empty
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-FREETYPE_LIB=	libfreetype.so.9
+
+MOZ_EXPORT+=	MOZ_INTERNAL_LIBART_LGPL=1
+MOZ_MK_OPTIONS+=MOZ_INTERNAL_LIBART_LGPL=1
+MOZ_OPTIONS+=	--enable-svg-renderer-libart --enable-svg \
+		--disable-plaintext-editor-only
 
 OPTIONS=CALENDAR "Enable the Calendar module" off \
 	MAILNEWS "Enable Mail and News modules" on \
@@ -48,7 +49,13 @@ OPTIONS=CALENDAR "Enable the Calendar module" off \
 	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/Makefile.common"
+
+# libart patches
+.if ${OSVERSION} < 500035
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
+.endif
 
 LATEST_LINK=	${MOZILLA}
 
@@ -61,88 +68,55 @@ IGNORE=	core dumps on ${ARCH} during post-build
 BROKEN=	"Calendar requires Composer and Mailnews support."
 .endif
 .if defined(WITHOUT_MAILNEWS)
-CONFIGURE_ENV+=	WITHOUT_MAILNEWS=yes
+MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
 .else
+# mail and news desired, but not LDAP
 .if defined(WITHOUT_LDAP)
-CONFIGURE_ENV+=	WITHOUT_LDAP=yes
+MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
+.else
+MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .endif
 .endif
 
+# TODO, fix option extensions!!
 .if !defined(WITHOUT_CHATZILLA)
-MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
+#MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 .endif
-.if !defined(WITHOUT_XMLTERM)
-MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
+.if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER)
+#MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
 .endif
-CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
+#CONFIGURE_ENV+=	MOZ_EXTENSIONS="${MOZ_EXTENSIONS}"
 
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
-CONFIGURE_ENV+=	WITH_JAVASCRIPT_DEBUGGER=yes
+MOZ_OPTIONS+=	--enable-jsd \
+		--enable-dtd-debug
+.else
+MOZ_OPTIONS+=	--disable-jsd \
+		--disable-dtd-debug
 .endif
 
 .if defined(WITH_CALENDAR)
-CONFIGURE_ARGS+=	--enable-calendar
+MOZ_OPTIONS+=	--enable-calendar
 .endif
 
 .if defined(WITHOUT_COMPOSER)
-CONFIGURE_ARGS+=	--disable-composer
+MOZ_OPTIONS+=	--disable-composer
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g' \
-		${WRKSRC}/build/unix/mozilla-config.in
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		-e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \
-			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|/usr/X11R6|${X11BASE}|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
-	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
-		${WRKSRC}/widget/src/gtk2/nsSound.cpp
-	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
-		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-	@${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \
-		${WRKSRC}/modules/libpref/src/init/all.js
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		< ${FILESDIR}/mozilla.desktop.in > \
 		${WRKDIR}/mozilla.desktop
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
-.endfor
 
 pre-install:
-	${RM} -rf ${FAKEDIR} ${PLIST}
-	${TOUCH} -f ${PLIST}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
-	${MKDIR} ${MOZ_PIS_DIR}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/mozilla \
-		${FAKEDIR}/bin/mozilla-config
-	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
-		${ECHO_CMD} bin/mozilla >> ${PLIST} ; \
-	fi
-	if [ "${MOZILLA}" != "mozilla" ]; then \
-		${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} ; \
-	fi
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -151,56 +125,13 @@ pre-install:
 			fi; \
 		done; \
 	fi
-	${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
-	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
 .if !defined(WITHOUT_MAILNEWS)
 	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 .endif
 	${ECHO_CMD} share/applications/mozilla.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
-			&& ${FIND} -d * -type d | \
-			${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST}
-	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${MOZILLA}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${MOZILLA}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${MOZILLA}
-	${CHMOD} 755 ${PREFIX}/lib/${MOZILLA}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/lib/${MOZILLA}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla-config ${PREFIX}/lib/${MOZILLA}
-	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/bin
-	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
-		${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \
-	fi
-	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \
-		${MKDIR} ${PREFIX}/lib/browser_plugins ; \
-	fi
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -210,29 +141,12 @@ do-install:
 			fi; \
 		done; \
 	fi
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-			${WRKSRC}/build/unix/$${pcfile}.pc; \
-		${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${MOZILLA}
-	${MKDIR} ${PREFIX}/include/${MOZILLA}
-	${CHMOD} 755 ${PREFIX}/include/${MOZILLA}
-	cd ${FAKEDIR}/include/mozilla && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA}
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \
 		${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/idl/${MOZILLA}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA}
 
 post-install:
 	@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-	@-update-desktop-database
 
+.include "${.CURDIR}/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 85b9b582c..d871e78c3 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,5 +1,32 @@
+# Makefile.common handles common tasks and dependencies for mozilla ports.
+#
+# Date created:		12 Nov 2005
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile.common,v 1.6 2005/11/17 07:10:21 marcus Exp $
+#    $MCom: ports/www/mozilla/Makefile.common,v 1.7 2005/11/17 18:18:08 marcus Exp $
+
+# Ports can use the following:
+#
+# NOGECKO_INSTALL
+# NOGECKO_PLIST		Do not auto-create plist
+# NOMOZCONFIG		Use CONFIGURE_ARGS instead of .mozconfig
+#
+# MOZILLA_PLIST_DIRS	Listing of directories to create plist and/or
+#			 install
+# MOZ_PIS_SCRIPTS	List scripts listed in ${FILESDIR} to filter
+#			 through MOZCONFIG_SED and install with mozilla
+#			 PIS scripts.
+# MOZ_SED_ARGS		Add or replace to MOZ_SED_ARGS
+#
+# MOZ_OPTIONS		Add more configure arguments to .mozconfig
+# MOZ_MK_OPTIONS	Add more make arguments to .mozconfig
+# MOZ_EXPORT		Add export variables to .mozconfig
+#
+# if ${FILESDIR}/mozconfig.in exists and NOMOZCONFIG is not defined
+# contents of ${FILESDIR}/mozconfig.in will be filtered through MOZCONFIG_SED
+# and added the the end of .mozconfig
+#
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -28,12 +55,16 @@ FAKEDIR?=	${WRKDIR}/fake
 PLIST?=		${WRKDIR}/plist
 
 KRB5_HOME?=	/usr
+BROWSER_PLUGINS_DIR?=	lib/browser_plugins
+MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
+
 ESD_LIB?=	libesd.so.2
 FREETYPE_LIB?=	libfreetype.so.9
 
 GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
+MOZILLA_PLIST_DIRS?=	bin include lib share/idl
 
 PKGINSTALL?=	${WRKDIR}/pkg-install
 PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
@@ -65,25 +96,77 @@ CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 LIBS+=			${PTHREAD_LIBS}
 
+# Standard options from README
+MOZ_OPTIONS+=	--enable-crypto 	\
+		--disable-tests 	\
+		--enable-default-toolkit=gtk2 \
+		--enable-xft		\
+		--with-pthreads
+# Configure options for install
+MOZ_OPTIONS+=	--x-includes=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib
+# Extensions
+# TODO: Add support for other extensions
+MOZ_OPTIONS+=	--enable-extensions=default
+# others 
+MOZ_OPTIONS+=	--with-system-jpeg=${LOCALBASE} \
+		--with-system-zlib=/usr		\
+		--with-system-png=${LOCALBASE}	\
+		--with-gssapi=${KRB5_HOME}	\
+		--with-system-nspr		\
+		--disable-auto-deps		\
+		--enable-chrome-format=jar	\
+		--disable-cpp-exceptions	\
+		--disable-cpp-rtti		\
+		--disable-glibtest		\
+		--disable-gtktest		\
+		--disable-freetypetest		\
+		--enable-double-buffer		\
+		--enable-mathml			\
+		--disable-installer		\
+		--disable-md			\
+		--disable-pedantic		\
+		--disable-bidi			\
+		--disable-xterm-updates		\
+		--enable-xinerama		\
+		--enable-image-decoders=png,gif,jpeg,bmp
+MOZ_MK_OPTIONS+=	XP_UNIX=1		\
+			PERL=${PERL}
+#MOZ_EXPORT+=	CPPFLAGS=${CPPFLAGS}		\
+#		CFLAGS=$$CFLAGS			\
+#		LIBS=$$LIBS			\
+#		LDFLAGS=$$LDFLAGS		\
+#		CONFIG_SH=$$SH			\
+#		XP_UNIX=1			\
+#		PERL=$$PERL5
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS:=	-O2 -fno-strict-aliasing ${CFLAGS:N-O*}
+WITH_OPTIMIZE?=	-O2
+.else
+CFLAGS:=	${CFLAGS:N-O*:N-m*} -O
+WITH_OPTIMIZE?=	-O
+.endif
+
 .if defined(WITH_SMB)
 USE_GNOME+=	gnomevfs2
-CONFIGURE_ENV+=	WITH_SMB=yes
+MOZ_OPTIONS+=	--disable-gnomevfs
 .endif
 
 .if defined(WITH_DEBUG)
-CONFIGURE_ENV+=	WITH_DEBUG=yes
+MOZ_OPTIONS+=	--enable-debug				\
+		--disable-strip
 WITH_LOGGING=	yes
+.else
+MOZ_OPTIONS+=	--disable-debug				\
+		--enable-optimize=${WITH_OPTIMIZE}	\
+		--enable-strip
 .endif
 
 .if defined(WITH_LOGGING)
-CONFIGURE_ENV+=	WITH_LOGGING=yes
-.endif
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:=	-O2 -fno-strict-aliasing ${CFLAGS:N-O*}
+MOZ_OPTIONS+=	--enable-logging
 .else
-CFLAGS:=	${CFLAGS:N-O*:N-m*} -O
-CONFIGURE_ENV+=	WITH_OPTIMIZE=-O
+MOZ_OPTIONS+=	--disable-logging
 .endif
 
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
@@ -93,7 +176,7 @@ BROKEN=	"You must upgrade your freetype port to 1.3.1_2 or higher before \
 .endif
 
 # Makefile.common defines
-MOZCONFIG_SED?=	${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|g'	\
+MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 		-e 's|@CFLAGS@|${CFLAGS}|g'		\
 		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\
 		-e 's|@LIBS@|${LIBS}|g'			\
@@ -103,6 +186,7 @@ MOZCONFIG_SED?=	${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|g'	\
 		-e 's|@PERL@|${PERL5}|g'			\
 		-e 's|@KRB5_HOME@|${KRB5_HOME}|g'	\
 		-e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g'	\
+		-e 's|%%PREFIX%%|${PREFIX}|g'		\
 		-e 's|%%CFLAGS%%|${CFLAGS}|g'		\
 		-e 's|%%LDFLAGS%%|${LDFLAGS}|g'		\
 		-e 's|%%LIBS%%|${LIBS}|g'		\
@@ -112,8 +196,11 @@ MOZCONFIG_SED?=	${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|g'	\
 		-e 's|%%PERL%%|${PERL5}|g'		\
 		-e 's|%%KRB5_HOME%%|${KRB5_HOME}|g'	\
 		-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'
+MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
+
+post-patch: gecko-post-patch gecko-moz-pis-patch
 
-pre-configure:
+gecko-post-patch:
 .if exists(${.CURDIR}/pkg-install.in)
 	@${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL}
 .endif
@@ -121,19 +208,38 @@ pre-configure:
 	@${MOZCONFIG_SED} < ${.CURDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 .endif
 	@${RM} -f ${MOZCONFIG}
+.if !defined(NOMOZCONFIG)
 .if exists(${GENERIC_MOZCONFIG})
 	@${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG}
 .endif
 .if exists(${PORT_MOZCONFIG})
 	@${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG}
 .endif
+.for arg in ${MOZ_OPTIONS}
+	${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG}
+.endfor
+.for arg in ${MOZ_MK_OPTIONS}
+	${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG}
+.endfor
+.for var in ${MOZ_EXPORT}
+	${ECHO_CMD} "export ${var}" >> ${MOZCONFIG}
+.endfor
+.endif # .if !defined(NOMOZCONFIG)
 	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
 		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
 		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
 			${WRKSRC}/build/unix/mozilla-config.in
+	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+		${WRKSRC}/config/autoconf.mk.in
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g' \
-			${WRKSRC}/configure
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|/usr/X11R6|${X11BASE}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
@@ -143,6 +249,92 @@ pre-configure:
 		${FALSE}; \
 	fi
 
-post-build:
+# handles mozilla pis scripts.
+gecko-moz-pis-patch:
+.for moz in ${MOZ_PIS_SCRIPTS}
+	@${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz}
+.endfor
+
+post-build: gecko-post-build
+
+gecko-post-build:
 	@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \
 		${WRKSRC}/build/unix/*.pc
+
+pre-install: gecko-pre-install gecko-moz-pis-pre-install gecko-create-plist
+
+gecko-pre-install:
+	@${DO_NADA}	# Empty for now
+
+gecko-create-plist:
+.if !defined(NOGECKO_PLIST)
+	@${RM} -rf ${FAKEDIR} ${PLIST}
+	@${TOUCH} -f ${PLIST}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
+		${FAKEDIR}/bin/${MOZILLA}	\
+		${FAKEDIR}/bin/${MOZILLA}-config
+	${RM} -f ${FAKEDIR}/bin/*.bak
+# Create the plist
+	${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/${BROWSER_PLUGINS_DIR} 2>/dev/null || ${TRUE}" >> ${PLIST}
+	${MKDIR} ${FAKEDIR}/libdata
+	${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/
+	${RM} -f ${FAKEDIR}/lib/pkgconfig
+.for dir in ${MOZILLA_PLIST_DIRS}
+	@cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|${dir}/|' >> ${PLIST} && \
+		${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST}
+.endfor
+.for pcfile in ${PKGCONFIG_FILES}
+	${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST}
+	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
+		${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc
+.endfor
+	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
+	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
+.if ${MOZILLA_PLIST_DIRS:Mshare/idl}!="" && exists(${FAKEDIR}/share/idl)
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endif
+.endif # !defined(NOGECKO_PLIST)
+
+do-install: gecko-do-install
+
+gecko-do-install:
+.if !defined(NOGECKO_INSTALL)
+.for dir in ${MOZILLA_PLIST_DIRS}
+.if !exists(${PREFIX}/${dir})
+	${MKDIR} ${PREFIX}/${dir}
+	${CHMOD} 755 ${PREFIX}/${dir}
+.endif
+	cd ${FAKEDIR}/${dir} && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
+.endfor
+.for pcfile in ${PKGCONFIG_FILES}
+	${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
+		${PREFIX}/libdata/pkgconfig/${pcfile}.pc
+.endfor
+	${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR}
+	${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep
+.endif # !defined(NOGECKO_INSTALL)
+
+gecko-moz-pis-pre-install:
+.if defined(MOZ_PIS_SCRIPTS)
+	${MKDIR} ${FAKEDIR}/${MOZ_PIS_DIR}
+.for moz in ${MOZ_PIS_SCRIPTS}
+	${INSTALL_SCRIPT} ${WRKDIR}/${moz} ${FAKEDIR}/${MOZ_PIS_DIR}
+.endfor
+.endif
+
+post-install: gecko-post-install
+
+gecko-post-install:
+.if !defined(PAKCAGE_BUILDING)
+	@if [ -e ${PKGINSTALL} ] ; then \
+		${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \
+	fi
+.endif
+	@-update-desktop-database
+
diff --git a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
new file mode 100644
index 000000000..758c0146c
--- /dev/null
+++ b/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
@@ -0,0 +1,88 @@
+--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Wed Mar  2 12:36:59 2005
++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Wed Mar  2 12:36:37 2005
+@@ -56,6 +56,13 @@
+ #include "nsArray.h"
+ #include "nsDataHashtable.h"
+ 
++
++#ifdef HAVE_CPP_2BYTE_WCHAR_T
++  typedef nsDependentString nsLiteralString;
++#else
++  typedef NS_ConvertASCIItoUTF16 nsLiteralString;
++#endif
++
+ /**
+  * \addtogroup libart_renderer Libart Rendering Engine
+  * @{
+@@ -112,7 +119,7 @@
+   nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
+     
+ public:
+-  static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;  
++  static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;  
+ };
+ 
+ /** @} */
+@@ -120,7 +127,7 @@
+ //----------------------------------------------------------------------
+ // nsSVGLibartGlyphMetricsFT implementation:
+ 
+-nsDataHashtable<nsStringHashKey,nsDependentString*>
++nsDataHashtable<nsStringHashKey,nsLiteralString*>
+ nsSVGLibartGlyphMetricsFT::sFontAliases;
+ 
+ 
+@@ -155,15 +162,15 @@
+ 
+   static NS_NAMED_LITERAL_STRING(arial, "arial");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
+-                                              &arial);
++                                              (nsLiteralString *)&arial);
+ 
+   static NS_NAMED_LITERAL_STRING(courier, "courier new");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
+-                                              &courier);
++                                              (nsLiteralString *)&courier);
+ 
+   static NS_NAMED_LITERAL_STRING(times, "times new roman");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
+-                                              &times);
++                                              (nsLiteralString *)&times);
+ }
+ 
+ void NS_FreeSVGLibartGlyphMetricsFTGlobals()
+@@ -406,7 +413,7 @@
+   }
+   else {
+     // try alias if there is one:
+-    nsDependentString *alias = nsnull;
++    nsLiteralString *alias = nsnull;
+     nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
+                                                 &alias);
+     if (alias) {
+@@ -440,19 +447,19 @@
+     return;
+   }
+ 
+-  FTC_Image_Desc imageDesc;
+-  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++  FTC_ImageType imageDesc;
++  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+   float twipstopixel = GetTwipsToPixels();
+   float scale = GetPixelScale();
+-  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.image_type |= ftc_image_grays;
++  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->flags = 0;
+ 
+   // get the face
+   nsresult rv;
+   FTC_Manager mgr;
+   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+-  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+   NS_ASSERTION(mFace, "failed to get face/size");
+ }
+ 
diff --git a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
new file mode 100644
index 000000000..84392bd4a
--- /dev/null
+++ b/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
@@ -0,0 +1,50 @@
+$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $
+
+diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 10:36:16.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
+@@ -155,15 +155,15 @@
+ 
+   static NS_NAMED_LITERAL_STRING(arial, "arial");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
+-                                              &arial);
++                                              (nsDependentString *)&arial);
+ 
+   static NS_NAMED_LITERAL_STRING(courier, "courier new");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
+-                                              &courier);
++                                              (nsDependentString *)&courier);
+ 
+   static NS_NAMED_LITERAL_STRING(times, "times new roman");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
+-                                              &times);
++                                              (nsDependentString *)&times);
+ }
+ 
+ void NS_FreeSVGLibartGlyphMetricsFTGlobals()
+@@ -440,19 +440,19 @@
+     return;
+   }
+ 
+-  FTC_Image_Desc imageDesc;
+-  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++  FTC_ImageType imageDesc;
++  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+   float twipstopixel = GetTwipsToPixels();
+   float scale = GetPixelScale();
+-  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.image_type |= ftc_image_grays;
++  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->flags = 0;
+ 
+   // get the face
+   nsresult rv;
+   FTC_Manager mgr;
+   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+-  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+   NS_ASSERTION(mFace, "failed to get face/size");
+ }
+ 
diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in
index 40976ba26..9af187e48 100644
--- a/www/mozilla/files/mozconfig-generic.in
+++ b/www/mozilla/files/mozconfig-generic.in
@@ -1,65 +1,8 @@
-# $FreeBSD$
-#   $MCom: ports/www/mozilla/files/mozconfig-generic.in,v 1.2 2005/11/14 00:58:39 ahze Exp $
-######################################################################
-# standard opts from README
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-######################################################################
-# FreeBSD specific
+ac_add_options	--prefix=@FAKEDIR@
 export CPPFLAGS="@CPPFLAGS@"
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export LDFLAGS="@LDFLAGS@"
 export CONFIG_SH=/bin/sh
 export XP_UNIX=1
-mk_add_options XP_UNIX=1
 export PERL="@PERL@"
-mk_add_options PERL=$PERL
-# Configure options for installation
-ac_add_options --prefix=@FAKEDIR@
-ac_add_options --x-includes=@X11BASE@/include
-ac_add_options --x-libraries=@X11BASE@/lib
-######################################################################
-# Use ports for these libraries
-ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-zlib=/usr
-ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --with-gssapi=@KRB5_HOME@
-ac_add_options --with-system-nspr
-######################################################################
-# set compile/link features
-ac_add_options --with-pthreads
-######################################################################
-# disable unneeded/unavailable
-ac_add_options --disable-auto-deps
-ac_add_options --disable-bidi
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-jsd
-ac_add_options --disable-ldap
-ac_add_options --disable-pedantic
-ac_add_options --disable-profilesharing
-ac_add_options --disable-installer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
-ac_add_options --enable-image-decoders=png,gif,jpeg,bmp
-ac_add_options --enable-extensions="default"
-######################################################################
-if test -n "$WITH_DEBUG"; then
-    ac_add_options --enable-debug
-    ac_add_options --disable-strip
-else
-    ac_add_options --disable-debug
-    ac_add_options --enable-optimize=${WITH_OPTIMIZE}
-    ac_add_options --enable-strip
-fi
-if test -n "$WITH_LOGGING"; then
-    ac_add_options --enable-logging
-else
-    ac_add_options --disable-logging
-fi
-if test -z "$WITH_SMB"; then
-    ac_add_options --disable-gnomevfs
-fi
-######################################################################
diff --git a/www/mozilla/files/mozconfig.in b/www/mozilla/files/mozconfig.in
deleted file mode 100644
index 6a6f30d34..000000000
--- a/www/mozilla/files/mozconfig.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-#    $MCom: ports/www/mozilla/files/mozconfig.in,v 1.1 2005/11/13 19:07:58 ahze Exp $
-export MOZ_INTERNAL_LIBART_LGPL=1
-mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
-
-if test -z "$WITHOUT_MAILNEWS" ; then
-if test -z "$WITHOUT_LDAP" ; then
-	ac_add_options --enable-ldap
-else
-	ac_add_options --disable-ldap
-fi
-	ac_add_options --enable-mailnews
-else
-	ac_add_options --disable-mailnews
-fi # end WITHOUT_MAILNEWS
-
-if test -z "$WITH_JAVASCRIPT_DEBUGGER" ; then
-	ac_add_options --disable-jsd
-	ac_add_options --disable-dtd-debug
-else
-	ac_add_options --enable-jsd
-	ac_add_options --enable-dtd-debug
-fi # end WITH_JAVASCRIPT_DEBUGGER
diff --git a/www/mozilla/files/patch-config_autoconf.mk.in b/www/mozilla/files/patch-config_autoconf.mk.in
index 9c7c471be..c4fa0b516 100644
--- a/www/mozilla/files/patch-config_autoconf.mk.in
+++ b/www/mozilla/files/patch-config_autoconf.mk.in
@@ -5,7 +5,7 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/mozilla%%HEADERS_SUFX%%
++includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr
new file mode 100644
index 000000000..19e2703b4
--- /dev/null
+++ b/www/mozilla/files/patch-sysnspr
@@ -0,0 +1,21 @@
+--- directory/c-sdk/ldap/include/Makefile.in.orig	Sat Aug 20 02:15:05 2005
++++ directory/c-sdk/ldap/include/Makefile.in	Sat Aug 20 02:15:55 2005
+@@ -76,7 +76,6 @@
+ 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
+ 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR)
+ 	rm -rf $(NSPRINCDIR)/*
+-	cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR)
+ 
+ $(INCLUDEDIR):	FORCE
+ 	$(NSINSTALL) -D $(INCLUDEDIR)
+--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	Sat Aug 20 02:14:33 2005
++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Sat Aug 20 02:14:39 2005
+@@ -58,7 +58,7 @@
+ 
+ LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
+ INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
+-                   -I$(DIST)/include/nspr
++                   $(shell nspr-config --cflags)
+ DEFINES		+= $(DEFS)
+ 
+ PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 1a7bb6b4e..bf78ca70e 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Thierry Thomas <thierry@pompo.net>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/www/nvu/Makefile,v 1.1 2005/11/14 04:12:09 ahze Exp $
 #
 
 PORTNAME=	nvu
@@ -31,59 +31,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
 post-patch:
-# Remove so we can actaully find programs that are not in /usr/bin
 	@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
-# Stupid workaround..
-.for f in toolkit/components/Makefile.in toolkit/components/gnome/Makefile.in
-	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/${f}
-.endfor
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
-
-pre-install:
-	${RM} -rf ${PLIST} ${FAKEDIR}
-	${TOUCH} -f ${PLIST}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		 ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${ECHO_CMD} bin/nvu >> ${PLIST}
-	${ECHO_CMD} bin/nvu-config >> ${PLIST}
-	cd ${FAKEDIR}/lib/${NVU} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${NVU}/|' >> ${PLIST} \
-			&& ${FIND} -d * -type d | \
-			${SED} -e 's:^:@dirrm lib/${NVU}/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${NVU} >> ${PLIST}
-.for p in ${PKG_CONFIGS}
-	${ECHO_CMD} ${p:S|^|libdata/pkgconfig/|} >> ${PLIST}
-.endfor
-	cd ${FAKEDIR}/include/${NVU} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${NVU}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${NVU}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${NVU} >> ${PLIST}
-
-do-install:
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-		${FAKEDIR}/bin/* \
-		${FAKEDIR}/lib/pkgconfig/*
-	${RM} -f ${FAKEDIR}/bin/*.bak ${FAKEDIR}/lib/pkgconfig/*.bak
-	${MKDIR} ${PREFIX}/lib/${NVU}
-	${CHMOD} 755 ${PREFIX}/lib/${NVU}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/* ${PREFIX}/bin
-	if [ ! -d ${PREFIX}/libdata/pkgconfig ]; then \
-		${MKDIR} ${PREFIX}/libdata/pkgconfig ; \
-	fi
-.for i in ${PKG_CONFIGS}
-	${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/${i} ${PREFIX}/libdata/pkgconfig/
-.endfor
-	cd ${FAKEDIR}/lib/${NVU} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${NVU}
-	cd ${FAKEDIR}/include/${NVU} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${NVU}
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
+	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/www/nvu/files/patch-config_autoconf.mk.in b/www/nvu/files/patch-config_autoconf.mk.in
new file mode 100644
index 000000000..29fe7f8fb
--- /dev/null
+++ b/www/nvu/files/patch-config_autoconf.mk.in
@@ -0,0 +1,18 @@
+--- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
++++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
+@@ -50,13 +50,13 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%MOZILLA%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/%%MOZILLA%%
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 73def8140..ffc5ceaa2 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/seamonkey/Makefile,v 1.30 2005/11/18 09:28:46 ahze Exp $
+#    $MCom: ports/www/seamonkey/Makefile,v 1.31 2005/11/18 09:29:37 ahze Exp $
 #
 
 PORTNAME?=	seamonkey
@@ -18,22 +18,24 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-MOZ_VER=	1.5a
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	default
-SCRIPTS_DIR=	${FAKEDIR}/lib/${MOZILLA}
-MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
-MOZ_PIS_SCRIPTS=	S50cleanhome
+USE_X_PREFIX=	yes
+MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cairo"
 
 MOZ_EXTENSIONS=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
+MOZ_OPTIONS+=	--enable-application=suite	\
+		--enable-svg-renderer=cairo	\
+		--enable-system-cairo
+MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=suite
+
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
 	LDAP "Enable LDAP support for Mailnews" on \
@@ -42,18 +44,13 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../mozilla/Makefile.common"
 
 .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
 # Glitz support can only be enabled if cairo is built with glitz support
-CONFIGURE_ARGS+=--enable-glitz
+MOZ_OPTIONS+=	--enable-glitz
 LIB_DEPENDS+=	glitz.1:${PORTSDIR}/graphics/glitz
 .endif
 
-.if ${ARCH} == "ia64" || ${ARCH} == "alpha"
-#BROKEN=		Does not compile on ${ARCH}
-.endif
-
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500035
 IGNORE=		core dumps on ${ARCH} during post-build
 .endif
@@ -63,74 +60,53 @@ USE_GCC=	3.4+
 .endif
 
 .if defined(WITHOUT_MAILNEWS)
-CONFIGURE_ARGS+=	--disable-ldap --disable-mailnews
+MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
 .else
 # mail and news desired, but not LDAP
 .if defined(WITHOUT_LDAP)
-CONFIGURE_ARGS+=	--disable-ldap --enable-mailnews
+MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 .else
-CONFIGURE_ARGS+=	--enable-ldap --enable-mailnews
+MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .endif
 .endif
+.if 0	# TODO: Extensions are broken
 .if !defined(WITHOUT_CHATZILLA)
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 .endif
 CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
-
+.endif
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
-CONFIGURE_ARGS+=	--enable-jsd \
+MOZ_OPTIONS+=		--enable-jsd \
 			--enable-dtd-debug
 .else
-CONFIGURE_ARGS+=	--disable-jsd \
+MOZ_OPTIONS+=		--disable-jsd \
 			--disable-dtd-debug
 .endif
 
 .if defined(WITH_CALENDAR)
-CONFIGURE_ARGS+=	--enable-calendar
+MOZ_OPTIONS+=	--enable-calendar
 .endif
 
 .if defined(WITHOUT_COMPOSER)
-CONFIGURE_ARGS+=	--disable-composer
+MOZ_OPTIONS+=	--disable-composer
 .endif
 
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=	--enable-reorder
-.endif
+#.if ${ARCH} == "i386"
+#CONFIGURE_ARGS+=	--enable-reorder
+#.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		-e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \
-			${WRKSRC}/config/autoconf.mk.in
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-	@${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \
-		${WRKSRC}/modules/libpref/src/init/all.js
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
-	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
-		${FILESDIR}/seamonkey.sh >${WRKSRC}/${MOZILLA}
 
 pre-install:
-	${RM} -rf ${PLIST} ${FAKEDIR}
-	${TOUCH} -f ${PLIST}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
-	${MKDIR} ${SCRIPTS_DIR} ${MOZ_PIS_DIR}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/seamonkey \
-		${FAKEDIR}/bin/seamonkey-config
-	${ECHO_CMD} bin/${MOZILLA} >> ${PLIST}
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -139,62 +115,10 @@ pre-install:
 			fi; \
 		done; \
 	fi
-	${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} lib/${MOZILLA}/seamonkey >> ${PLIST}
-	${ECHO_CMD} lib/${MOZILLA}/seamonkey-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${FILESDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
-.if !defined(WITHOUT_MAILNEWS)
-	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
-.endif
 	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
-			&& ${FIND} -d * -type d | \
-			${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST}
-	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${MOZILLA}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${MOZILLA}" >> ${PLIST}
-		${ECHO_CMD} "@unexec rmdir %D/share/idl 2>/dev/null || true" >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${MOZILLA}
-	${CHMOD} 755 ${PREFIX}/lib/${MOZILLA}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/seamonkey ${PREFIX}/lib/${MOZILLA}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/seamonkey-config ${PREFIX}/lib/${MOZILLA}
-	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-			${WRKSRC}/build/unix/$${pcfile}.pc; \
-		${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \
-	done
-	${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin
-	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
-		${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \
-	fi
-	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \
-		${MKDIR} ${PREFIX}/lib/browser_plugins ; \
-	fi
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -204,18 +128,8 @@ do-install:
 			fi; \
 		done; \
 	fi
-	-${RM} -fr ${PREFIX}/include/${MOZILLA}
-	${MKDIR} ${PREFIX}/include/${MOZILLA}
-	${CHMOD} 755 ${PREFIX}/include/${MOZILLA}
-	cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA}
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/idl/${MOZILLA}
-	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA}
-
-post-install:
-	@-update-desktop-database
 
+.include "${.CURDIR}/../mozilla/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/seamonkey/files/mozconfig.in b/www/seamonkey/files/mozconfig.in
deleted file mode 100644
index b6c50de65..000000000
--- a/www/seamonkey/files/mozconfig.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# .mozconfig.in -*-shell-script-*-
-# $FreeBSD$
-#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $
-######################################################################
-ac_add_options --enable-application=suite
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-system-cairo
diff --git a/www/seamonkey/files/patch-config_autoconf.mk.in b/www/seamonkey/files/patch-config_autoconf.mk.in
index baf8588ee..c4fa0b516 100644
--- a/www/seamonkey/files/patch-config_autoconf.mk.in
+++ b/www/seamonkey/files/patch-config_autoconf.mk.in
@@ -5,7 +5,7 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/seamonkey%%HEADERS_SUFX%%
++includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
diff --git a/www/seamonkey/files/seamonkey.sh b/www/seamonkey/files/seamonkey.sh
deleted file mode 100644
index e23b900e6..000000000
--- a/www/seamonkey/files/seamonkey.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%"
-MOZILLA_EXEC="./seamonkey"
-MOZILLA_REMOTE_EXEC="${MOZILLA_EXEC} -remote"
-APPLICATION_ID="mozilla"
-
-LOCATION='new-tab'
-#MOZILLA_UILOCALE="en-US"
-#MOZILLA_UIREGION="US"
-#MOZILLA_DSP="auto"
-
-cd $MOZILLA_DIR                                     || exit 1
-
-# LANG, MOZILLA_UILOCALE, MOZILLA_UIREGION
-if [ -n "$LANG" -a ! -n "${MOZILLA_UILOCALE}" ]; then
-    _locale="${LANG%%.*}"
-    if [ "${_locale}" != "en_US" -a "${_locale}" != "C" ]; then
-	_region="${_locale##*_}"
-	_locale="${_locale%_*}"
-	[ -r chrome/${_locale}-${_region}.jar ] && \
-	    MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${_locale}-${_region}"
-    fi
-elif [ -n "${MOZILLA_UILOCALE}" ]; then
-    MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${MOZILLA_UILOCALE}"
-    if [ -n "${MOZILLA_UIREGION}" ]; then
-	MOZILLA_EXEC="${MOZILLA_EXEC} -UIRegion ${MOZILLA_UIREGION}"
-    fi
-fi
-
-# find a /dev/dsp handler
-case "${MOZILLA_DSP}" in
-#    [Ee][Ss][Dd]|esddsp) # Use the esd dsp wrapper
-#	MOZILLA_DSP="esddsp"
-#	;;
-    [Aa][Rr][Tt][Ss]|artsdsp) # Use the arts dsp wrapper
-	MOZILLA_DSP="artsdsp"
-	;;
-    [Nn][Oo][Nn][Ee]) # Direct dsp output
-	MOZILLA_DSP=""
-	;;
-    *) # Guest one (auto)
-	if [ -n "${KDE_FULL_SESSION}" ]; then
-		MOZILLA_DSP="artsdsp"
-#	elif [ -r ${HOME}/.esd_auth ]; then
-#		MOZILLA_DSP="esddsp"
-	else
-		MOZILLA_DSP=""
-	fi
-	;;
-esac
-
-if [ -n "${MOZILLA_DSP}" ] && type "${MOZILLA_DSP}" > /dev/null 2>&1; then
-	MOZILLA_EXEC="${MOZILLA_DSP} ${MOZILLA_EXEC}"
-fi
-
-case $1 in
-    -browser)
-    	REMOTE_COMMAND="xfeDoCommand (openBrowser)"
-	;;
-    -mail)
-    	REMOTE_COMMAND="xfeDoCommand (openInbox)"
-	;;
-    -compose)
-    	REMOTE_COMMAND="xfeDoCommand (composeMessage)"
-	;;
-    -*)
-    	exec ${MOZILLA_EXEC} "$@"
-	;;
-    *)
-	if [ -n "${LOCATION}" ]; then
-    		REMOTE_COMMAND="openURL($@,$LOCATION)"
-	else
-		REMOTE_COMMAND="openURL($@)"
-	fi
-	;;
-esac
-
-# process found
-${MOZILLA_REMOTE_EXEC} "ping()" >/dev/null 2>&1     &&
-${MOZILLA_REMOTE_EXEC} "${REMOTE_COMMAND}"          && exit 0
-
-# no existing process
-exec ${MOZILLA_EXEC} "$@"
-