diff -ruN --exclude=CVS ports.orig/deskutils/sunbird/Makefile ports/deskutils/sunbird/Makefile
--- ports.orig/deskutils/sunbird/Makefile	Fri Nov 18 03:46:49 2005
+++ ports/deskutils/sunbird/Makefile	Sun Nov 20 00:20:57 2005
@@ -35,22 +35,11 @@
 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|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
 		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 
 post-patch:
-	@${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/ ; \
@@ -59,57 +48,14 @@
 .endfor
 
 pre-install:
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/sunbird \
-		${FAKEDIR}/bin/sunbird-config
-	${ECHO_CMD} bin/sunbird >> ${PLIST}
-	${ECHO_CMD} bin/sunbird-config >> ${PLIST}
-	cd ${FAKEDIR}/lib/${SUNBIRD} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${SUNBIRD}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${SUNBIRD}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${SUNBIRD} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${SUNBIRD} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${SUNBIRD}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${SUNBIRD}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${SUNBIRD} >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${SUNBIRD}
-	${CHMOD} 755 ${PREFIX}/lib/${SUNBIRD}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/sunbird ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/sunbird-config ${PREFIX}/bin
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${SUNBIRD}
-	${MKDIR} ${PREFIX}/include/${SUNBIRD}
-	${CHMOD} 755 ${PREFIX}/include/${SUNBIRD}
-	cd ${FAKEDIR}/include/${SUNBIRD} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${SUNBIRD}
-	cd ${FAKEDIR}/lib/${SUNBIRD} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${SUNBIRD}
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
 	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS ports.orig/deskutils/sunbird/files/patch-config_autoconf.mk.in ports/deskutils/sunbird/files/patch-config_autoconf.mk.in
--- ports.orig/deskutils/sunbird/files/patch-config_autoconf.mk.in	Thu Apr 28 22:14:31 2005
+++ ports/deskutils/sunbird/files/patch-config_autoconf.mk.in	Sun Nov 20 01:22:19 2005
@@ -5,14 +5,14 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)
++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)/$(MOZ_APP_NAME)
++mozappdir	= $(libdir)/%%MOZILLA%%
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
diff -ruN --exclude=CVS ports.orig/deskutils/sunbird/pkg-deinstall.in ports/deskutils/sunbird/pkg-deinstall.in
--- ports.orig/deskutils/sunbird/pkg-deinstall.in	Tue Jun 28 01:39:59 2005
+++ ports/deskutils/sunbird/pkg-deinstall.in	Sun Nov 20 00:48:51 2005
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/pkg-deinstall.in,v 1.3 2005/06/28 05:39:59 adamw Exp $
+#    $MCom$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,14 +16,11 @@
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
+rm -rf ${MOZDIR}/extensions
+rm -rf ${MOZDIR}/updates
 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
-rm -f ${MOZDIR}/extensions.ini
 
 exit 0
diff -ruN --exclude=CVS ports.orig/deskutils/sunbird/pkg-install.in ports/deskutils/sunbird/pkg-install.in
--- ports.orig/deskutils/sunbird/pkg-install.in	Sun Nov 13 23:12:06 2005
+++ ports/deskutils/sunbird/pkg-install.in	Wed Dec 31 19:00:00 1969
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/pkg-install.in,v 1.5 2005/11/14 04:12:06 ahze Exp $
-#
-# 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
-SUNBIRD=${MOZDIR}/sunbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${SUNBIRD} -register > /dev/null 2>&1
-
-touch -f ${MOZDIR}/chrome/user-skins.rdf ${MOZDIR}/chrome/user-locales.rdf
-
-exit 0
diff -ruN --exclude=CVS ports.orig/mail/thunderbird/Makefile ports/mail/thunderbird/Makefile
--- ports.orig/mail/thunderbird/Makefile	Sun Nov 13 23:12:06 2005
+++ ports/mail/thunderbird/Makefile	Sun Nov 20 00:20:50 2005
@@ -28,9 +28,7 @@
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-SCRIPTS_DIR=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}
-MOZ_PIS_SCRIPTS=S50cleanhome
-MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
+MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
 CONFLICTS=	thunderbird-1.5*
 
@@ -45,28 +43,11 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif # ${PERL_LEVEL} < 500600
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
 
 post-patch:
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${PORTNAME}|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
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
 		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@@ -79,74 +60,11 @@
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
 
 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}
 	${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \
-		${FAKEDIR}/bin/${PORTNAME} \
-		${FAKEDIR}/bin/${PORTNAME}-config
-	${ECHO_CMD} bin/${PORTNAME} >> ${PLIST}
-	${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
 	@${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \
-			s|${FAKEDIR}|${PREFIX}|g ; \
-			s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/lib/${PORTNAME}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${PORTNAME}
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME}
-	${MKDIR} ${PREFIX}/share/idl/${PORTNAME}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME}
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
diff -ruN --exclude=CVS ports.orig/mail/thunderbird/files/patch-build_unix_run-mozilla.sh ports/mail/thunderbird/files/patch-build_unix_run-mozilla.sh
--- ports.orig/mail/thunderbird/files/patch-build_unix_run-mozilla.sh	Sun Nov 13 23:12:07 2005
+++ ports/mail/thunderbird/files/patch-build_unix_run-mozilla.sh	Sun Nov 20 00:37:15 2005
@@ -5,7 +5,7 @@
  ##
  ## 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"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
diff -ruN --exclude=CVS ports.orig/mail/thunderbird/files/patch-config_autoconf.mk.in ports/mail/thunderbird/files/patch-config_autoconf.mk.in
--- ports.orig/mail/thunderbird/files/patch-config_autoconf.mk.in	Wed Dec 31 19:00:00 1969
+++ ports/mail/thunderbird/files/patch-config_autoconf.mk.in	Sun Nov 20 01:16:18 2005
@@ -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 -ruN --exclude=CVS ports.orig/mail/thunderbird-devel/Makefile ports/mail/thunderbird-devel/Makefile
--- ports.orig/mail/thunderbird-devel/Makefile	Fri Nov 18 05:05:25 2005
+++ ports/mail/thunderbird-devel/Makefile	Sun Nov 20 01:47:25 2005
@@ -28,9 +28,7 @@
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-SCRIPTS_DIR=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}
-MOZ_PIS_SCRIPTS=S50cleanhome
-MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
+MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
 CONFLICTS=	thunderbird-1.0*
 
@@ -45,28 +43,11 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif # ${PERL_LEVEL} < 500600
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
 
 post-patch:
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${PORTNAME}|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
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
 		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@@ -79,74 +60,10 @@
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
 
 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}
 	${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \
-		${FAKEDIR}/bin/${PORTNAME} \
-		${FAKEDIR}/bin/${PORTNAME}-config
-	${ECHO_CMD} bin/${PORTNAME} >> ${PLIST}
-	${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
-	@${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \
-			s|${FAKEDIR}|${PREFIX}|g ; \
-			s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/lib/${PORTNAME}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${PORTNAME}
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME}
-	${MKDIR} ${PREFIX}/share/idl/${PORTNAME}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME}
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
diff -ruN --exclude=CVS ports.orig/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh ports/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh
--- ports.orig/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh	Fri Nov 18 05:05:25 2005
+++ ports/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh	Sun Nov 20 00:36:46 2005
@@ -5,7 +5,7 @@
  ##
  ## 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"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_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"}
diff -ruN --exclude=CVS ports.orig/mail/thunderbird-devel/files/patch-config_autoconf.mk.in ports/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
--- ports.orig/mail/thunderbird-devel/files/patch-config_autoconf.mk.in	Wed Dec 31 19:00:00 1969
+++ ports/mail/thunderbird-devel/files/patch-config_autoconf.mk.in	Sun Nov 20 01:14:13 2005
@@ -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 -ruN --exclude=CVS ports.orig/www/firefox/Makefile ports/www/firefox/Makefile
--- ports.orig/www/firefox/Makefile	Sat Nov 19 02:34:00 2005
+++ ports/www/firefox/Makefile	Sun Nov 20 00:21:49 2005
@@ -13,40 +13,26 @@
 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
-
-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
+FIREFOX_ICON=		${MOZILLA}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
+
+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 @@
 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 @@
 .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 @@
 			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 -ruN --exclude=CVS ports.orig/www/firefox/files/patch-config_autoconf.mk.in ports/www/firefox/files/patch-config_autoconf.mk.in
--- ports.orig/www/firefox/files/patch-config_autoconf.mk.in	Thu Nov 10 19:15:48 2005
+++ ports/www/firefox/files/patch-config_autoconf.mk.in	Sat Nov 19 17:29:51 2005
@@ -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 -ruN --exclude=CVS ports.orig/www/firefox/pkg-deinstall.in ports/www/firefox/pkg-deinstall.in
--- ports.orig/www/firefox/pkg-deinstall.in	Thu Nov 10 19:15:47 2005
+++ ports/www/firefox/pkg-deinstall.in	Sun Nov 20 00:00:49 2005
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/pkg-deinstall.in,v 1.7 2005/11/11 00:15:47 ahze Exp $
+#    $MCom$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,14 +16,8 @@
 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 -ruN --exclude=CVS ports.orig/www/firefox/pkg-install.in ports/www/firefox/pkg-install.in
--- ports.orig/www/firefox/pkg-install.in	Thu Nov 10 19:15:47 2005
+++ ports/www/firefox/pkg-install.in	Wed Dec 31 19:00:00 1969
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/www/firefox/pkg-install.in,v 1.7 2005/11/11 00:15:47 ahze Exp $
-#
-# 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 -ruN --exclude=CVS ports.orig/www/mozilla/Makefile ports/www/mozilla/Makefile
--- ports.orig/www/mozilla/Makefile	Mon Nov 14 15:03:15 2005
+++ ports/www/mozilla/Makefile	Sun Nov 20 00:22:37 2005
@@ -29,8 +29,6 @@
 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
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
@@ -89,60 +87,23 @@
 .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 +112,13 @@
 			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 +128,11 @@
 			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 <bsd.port.post.mk>
diff -ruN --exclude=CVS ports.orig/www/mozilla/Makefile.common ports/www/mozilla/Makefile.common
--- ports.orig/www/mozilla/Makefile.common	Thu Nov 17 13:18:08 2005
+++ ports/www/mozilla/Makefile.common	Sun Nov 20 01:20:53 2005
@@ -28,12 +28,16 @@
 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
@@ -113,7 +117,9 @@
 		-e 's|%%KRB5_HOME%%|${KRB5_HOME}|g'	\
 		-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'
 
-pre-configure:
+post-patch: gecko-post-patch gecko-moz-pis-patch
+
+gecko-post-patch:
 .if exists(${.CURDIR}/pkg-install.in)
 	@${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL}
 .endif
@@ -131,9 +137,16 @@
 		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
+	@${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 +156,93 @@
 		${FALSE}; \
 	fi
 
-post-build:
+# handles mozilla pis scripts.
+gecko-moz-pis-patch:
+.if defined(MOZ_PIS_SCRIPTS)
+.for moz in ${MOZ_PIS_SCRIPTS}
+	@${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz}
+.endfor
+.endif
+
+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 -ruN --exclude=CVS ports.orig/www/mozilla/files/patch-config_autoconf.mk.in ports/www/mozilla/files/patch-config_autoconf.mk.in
--- ports.orig/www/mozilla/files/patch-config_autoconf.mk.in	Sun Nov 13 14:07:59 2005
+++ ports/www/mozilla/files/patch-config_autoconf.mk.in	Sat Nov 19 17:30:53 2005
@@ -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 -ruN --exclude=CVS ports.orig/www/nvu/Makefile ports/www/nvu/Makefile
--- ports.orig/www/nvu/Makefile	Sun Nov 13 23:12:09 2005
+++ ports/www/nvu/Makefile	Sun Nov 20 00:58:03 2005
@@ -31,59 +31,8 @@
 .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 -ruN --exclude=CVS ports.orig/www/nvu/files/patch-config_autoconf.mk.in ports/www/nvu/files/patch-config_autoconf.mk.in
--- ports.orig/www/nvu/files/patch-config_autoconf.mk.in	Wed Dec 31 19:00:00 1969
+++ ports/www/nvu/files/patch-config_autoconf.mk.in	Sun Nov 20 01:17:57 2005
@@ -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 -ruN --exclude=CVS ports.orig/www/seamonkey/Makefile ports/www/seamonkey/Makefile
--- ports.orig/www/seamonkey/Makefile	Fri Nov 18 04:29:37 2005
+++ ports/www/seamonkey/Makefile	Sun Nov 20 00:40:38 2005
@@ -18,16 +18,13 @@
 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"
 
@@ -50,10 +47,6 @@
 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
@@ -98,39 +91,17 @@
 .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 +110,10 @@
 			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 +123,7 @@
 			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 <bsd.port.post.mk>
diff -ruN --exclude=CVS ports.orig/www/seamonkey/files/patch-config_autoconf.mk.in ports/www/seamonkey/files/patch-config_autoconf.mk.in
--- ports.orig/www/seamonkey/files/patch-config_autoconf.mk.in	Thu Nov 10 23:11:03 2005
+++ ports/www/seamonkey/files/patch-config_autoconf.mk.in	Sat Nov 19 17:30:38 2005
@@ -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 -ruN --exclude=CVS ports.orig/www/seamonkey/files/seamonkey.sh ports/www/seamonkey/files/seamonkey.sh
--- ports.orig/www/seamonkey/files/seamonkey.sh	Thu Nov 10 23:11:03 2005
+++ ports/www/seamonkey/files/seamonkey.sh	Wed Dec 31 19:00:00 1969
@@ -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} "$@"
-