- Update firefox to 1.5

- Add Makefile.common
  o A new build/install system for gecko ports, Makefile.common
    includes many generic routines and common tasks.
  o Fix ld-run-path in all gecko's by using -Wl,-rpath,${moz_libdir}
    thus removing the need to have a startup script for ports that
    depend on gecko. [2]
  o Use system libm, nss, nspr in all gecko ports

- Add bsd.gecko.mk
  o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...]
    with a more robust way of detecting a gecko a end user wishs to
    use.
  o bsd.gecko.mk abstracts the selection of gecko-based backends. It
    allows users and porters to support any available gecko backend
    without needing to build many conditional tests. ${USE_GECKO} is the
    list of backends that your port can handle, and ${GECKO} is set by
    bsd.gecko.mk to be the chosen backend. Users set ${WITH_GECKO} to the
    list of gecko backends they want on their system.

  Port Makefile example:

  USE_GECKO=firefox mozilla seamonkey thunderbird
  .include <bsd.port.pre.mk>
  .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"

  End user example:
  WITH_GECKO=seamonkey firefox

  We highly recommend moving away from using WITH_MOZILLA and switching to
  USE/WITH_GECKO.

PR:		89052 [2]
Submitted by:	vs [2]
Obtained from:	www/firefox
Thanks to:	adamw, marcus, and mezz for ideas, bug squashing, and more
		sajd from irc.freenode.org/#FreeBSD-Gnome for
		 pointing out many bugs

21 files changed, 817 insertions, 489 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 1e97fdab459d..8d71725431ac 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,288 +3,119 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile,v 1.23 2005/10/27 00:08:39 marcus Exp $
+#    $MCom: ports/www/mozilla/Makefile,v 1.31 2005/11/24 01:43:42 ahze Exp $
 #
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.12
-PORTREVISION?=	1
+PORTREVISION?=	3
 PORTEPOCH=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/source \
 			ahze/:local
-DISTFILES=	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \
+		libart_lgpl-1${EXTRACT_SUFX}:local
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-MOZILLA?=	mozilla
-MOZ_SUFX?=
-LATEST_LINK=	${MOZILLA}
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
-			--exclude */macbuild/*\
-			--exclude */package/* \
-			--exclude .cvsignore \
-			--exclude makefile.win \
-			--exclude MANIFEST
-USE_GNOME=	gtk20 libidl desktopfileutils
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_PERL5=	yes
-USE_ICONV=	yes
-USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 ALL_TARGET=	default
-FAKEDIR=	${WRKDIR}/fake
-MOZ_PIS_DIR=	${FAKEDIR}/lib/${MOZILLA}/init.d
-MOZ_PIS_SCRIPTS=	# No default
-CONFIGURE_ARGS=					\
-		--disable-auto-deps		\
-		--enable-chrome-format=jar	\
-		--disable-cpp-exceptions	\
-		--disable-cpp-rtti		\
-		--enable-crypto			\
-		--disable-gtktest		\
-		--disable-freetypetest		\
-		--disable-installer		\
-		--disable-glibtest		\
-		--enable-double-buffer		\
-		--enable-mathml			\
-		--disable-md			\
-		--disable-pedantic		\
-		--disable-bidi			\
-		--disable-plaintext-editor-only	\
-		--enable-svg			\
-		--disable-tests			\
-		--disable-xterm-updates		\
-		--enable-xinerama		\
-		--with-system-zlib		\
-		--with-system-jpeg=${LOCALBASE}	\
-		--with-system-png=${LOCALBASE}	\
-		--with-gssapi=/usr		\
-		--prefix=${FAKEDIR}		\
-		--with-pthreads			\
-		--enable-default-toolkit=gtk2
 
-PLIST=		${WRKDIR}/pkg-plist
-MOZ_EXTENSIONS=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-FREETYPE_LIB=	libfreetype.so.9
-PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
-		mozilla-nspr mozilla-nss mozilla-plugin
 
-# JPI stuff.  List paths to Java Plug-ins here in the order to try.
-JPI_LIST?=\
-	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
-	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
+MOZ_EXTENSIONS=	default
+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=XFT "Enable Xft font anti-aliasing" on \
-	CALENDAR "Enable the Calendar module" off \
+OPTIONS=CALENDAR "Enable the Calendar module" off \
 	MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
-	DEBUG "Enable debugging (i.e. gdb) support" off \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
 	XMLTERM "Enable the XMLTerm module" on \
 	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
-	OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \
-	SMB "Enable smb:// URI support via gnomevfs" off
-#	CAIRO_RENDER "Enable SVG rendering with Cairo" off
+	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
-#.if !defined(WITH_CAIRO_RENDER)
-DISTFILES+=	libart_lgpl-1${EXTRACT_SUFX}:local
-#.endif
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE=	core dumps on ${ARCH} during post-build
-.endif
-
-.if exists(${LOCALBASE}/include/freetype/freetype.h)
-BROKEN=	"You must upgrade your freetype port to 1.3.1_2 or higher before \
-	installing Mozilla.  If you have 1.3.1_2 installed, please remove \
-	${LOCALBASE}/include/freetype, then build Mozilla"
-.endif
-
-.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
-	defined(WITHOUT_COMPOSER))
-BROKEN=	"Calendar requires Composer and Mailnews support."
-.endif
-
-#.if defined(WITH_CAIRO_RENDER)
-#LIB_DEPENDS+=		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
-#BUILD_DEPENDS+=		${LOCALBASE}/include/cairo/cairo-xlib.h:${PORTSDIR}/graphics/cairo
-
-#CONFIGURE_ARGS+=	--enable-svg-renderer-cairo \
-#			--disable-svg-renderer-libart
-#CONFIGURE_ENV+=		MOZ_SVG_RENDERER_CAIRO=1
-#.else
-CONFIGURE_ARGS+=	--enable-svg-renderer-libart \
-			--disable-svg-renderer-cairo
-CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
-MAKE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
+# libart patches
 .if ${OSVERSION} < 500035
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
 .endif
-#.endif
 
-.if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-CONFIGURE_ARGS+=--enable-xft
-.if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
-BROKEN=		"Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
-		illegibly. Please remove the mozilla-fonts package."
-.endif
-.else
-CONFIGURE_ARGS+=--disable-xft
-.endif
+LATEST_LINK=	${MOZILLA}
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--enable-debug \
-		--disable-strip
-.else
-CONFIGURE_ARGS+=--disable-debug \
-		--enable-strip
+.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
+IGNORE=	core dumps on ${ARCH} during post-build
 .endif
 
-# LDAP is only used by mail and news so disable both together
+.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
+	defined(WITHOUT_COMPOSER))
+BROKEN=	"Calendar requires Composer and Mailnews support."
+.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 !defined(WITHOUT_CHATZILLA)
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 .endif
-.if !defined(WITHOUT_XMLTERM)
+
+.if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER)
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
 .endif
-CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
 
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
-CONFIGURE_ARGS+=	--enable-jsd \
-			--enable-dtd-debug
+MOZ_OPTIONS+=	--enable-jsd \
+		--enable-dtd-debug
 .else
-CONFIGURE_ARGS+=	--disable-jsd \
-			--disable-dtd-debug
+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
-.endif
-
-#.if ${ARCH} == "i386"
-#CONFIGURE_ARGS+=	--enable-reorder
-#.endif
-
-.if defined(WITH_SMB)
-USE_GNOME+=	gnomevfs2
-.else
-CONFIGURE_ARGS+=--disable-gnomevfs
-.endif
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=		-O2
-CONFIGURE_ARGS+=	--enable-optimize=-O2
+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 \
-		${WRKSRC}/nsprpub/configure
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/nsprpub/configure \
-		${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
-	@for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
-			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
-			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
-	done
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g' \
-		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
-		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 	@${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-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
 
 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 \
@@ -293,56 +124,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 \
@@ -352,29 +140,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
new file mode 100644
index 000000000000..ecbfe0ec8def
--- /dev/null
+++ b/www/mozilla/Makefile.common
@@ -0,0 +1,357 @@
+# 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.17 2005/11/29 08:40:08 ahze 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
+# MOZ_EXTENSIONS	Override "default" extensions
+# MOZ_GRAPHICS		Override "default" graphics decoders
+# MOZ_PROTOCOLS		Override "default" protocols
+#
+# PORT_MOZCONFIG	Defaults to ${FILESDIR}/mozconfig.in, but can
+#			be set to a generic mozconfig included with
+#			the port
+
+BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		nspr4:${PORTSDIR}/devel/nspr \
+		nss3:${PORTSDIR}/security/nss \
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
+
+OPTIONS+=	DEBUG "Build a debugging image" off \
+		LOGGING "Enable additional log messages" off \
+		OPTIMIZED_CFLAGS "Enable some additional optimizations" off
+
+MAINTAINER?=	gnome@FreeBSD.org
+
+MOZILLA?=	${PORTNAME}
+MOZILLA_VER?=	${PORTVERSION}
+MOZ_RPATH?=	${MOZILLA}
+USE_GNOME+=	gtk20 libidl desktopfileutils
+USE_ICONV=	yes
+USE_PERL5_BUILD=yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+
+WRKSRC?=	${WRKDIR}/mozilla
+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
+
+EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude */CVS/*	\
+			--exclude */macbuild/*			\
+			--exclude */package/*			\
+			--exclude .cvsignore			\
+			--exclude makefile.win			\
+			--exclude MANIFEST			\
+			--exclude */nsprpub/*			\
+			--exclude mozilla/modules/libimg/png	\
+			--exclude mozilla/jpeg			\
+			--exclude mozilla/dbm			\
+			--exclude mozilla/js/src/fdlibm		\
+			--exclude mozilla/security/nss		\
+			--exclude mozilla/gc/boehm		\
+			--exclude mozilla/gfx/cairo
+
+JPI_LIST?=\
+	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
+	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
+
+PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
+			${MOZILLA}-xpcom ${MOZILLA}-plugin
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
+LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
+
+# 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
+.if !defined(MOZ_EXTENSIONS)
+MOZ_OPTIONS+=	--enable-extensions=default
+.else
+MOZ_OPTIONS+=	--enable-extensions=${MOZ_EXTENSIONS}
+.endif
+.if !defined(MOZ_GRAPHICS)
+MOZ_OPTIONS+=	--enable-image-decoders=default
+.else
+MOZ_OPTIONS+=	--enable-image-decoders=${MOZ_GRAPHICS}
+.endif
+.if !defined(MOZ_PROTOCOLS)
+MOZ_OPTIONS+=	--enable-necko-protocols=default
+.else
+MOZ_OPTIONS+=	--enable-necko-protocols=${MOZ_PROTOCOLS}
+.endif
+# 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
+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
+MOZ_OPTIONS+=	--disable-gnomevfs
+.endif
+
+.if defined(WITH_DEBUG)
+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)
+MOZ_OPTIONS+=	--enable-logging
+.else
+MOZ_OPTIONS+=	--disable-logging
+.endif
+
+.if exists(${LOCALBASE}/include/freetype/freetype.h)
+BROKEN=	"You must upgrade your freetype port to 1.3.1_2 or higher before \
+	installing ${PORTNAME}.  If you have 1.3.1_2 installed, please remove \
+	${LOCALBASE}/include/freetype, then build ${PORTNAME}"
+.endif
+
+# Makefile.common defines
+MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
+		-e 's|@CFLAGS@|${CFLAGS}|g'		\
+		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\
+		-e 's|@LIBS@|${LIBS}|g'			\
+		-e 's|@X11BASE@|${X11BASE}|g'		\
+		-e 's|@LOCALBASE@|${LOCALBASE}|g'	\
+		-e 's|@FAKEDIR@|${FAKEDIR}|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'		\
+		-e 's|%%X11BASE%%|${X11BASE}|g'		\
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g'	\
+		-e 's|%%FAKEDIR%%|${FAKEDIR}|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
+
+gecko-post-patch:
+.if exists(${.CURDIR}/pkg-install.in)
+	@${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL}
+.endif
+.if exists(${.CURDIR}/pkg-deinstall.in)
+	@${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 [ -e ${PORT_MOZCONFIG} ] ; then \
+		${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \
+	fi
+.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|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
+		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+	@${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 ; \
+		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' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
+	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
+		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
+		${FALSE}; \
+	fi
+
+# 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' \
+		-e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \
+		${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}!=""
+	${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/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk
new file mode 100644
index 000000000000..8a31aebc541a
--- /dev/null
+++ b/www/mozilla/bsd.gecko.mk
@@ -0,0 +1,152 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD$
+#    $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.9 2005/11/29 20:30:06 adamw Exp $
+#
+# 4 column tabs prevent hair loss and tooth decay!
+
+# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users
+# and porters to support any available gecko backend without needing to build
+# many conditional tests. ${USE_GECKO} is the list of backends that your port
+# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend.
+# Users set ${WITH_GECKO} to the list of gecko backends they want on their system.
+
+.if defined(USE_GECKO)
+#.if defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include)
+
+# Please make sure all changes to this file are passed through the maintainer.
+# Do not commit them yourself (unless of course you're the Port's Wraith ;).
+Gecko_Include_MAINTAINER=		gnome@FreeBSD.org
+Gecko_Pre_Include=			bsd.gecko.mk
+
+
+# Users should use the following syntax:
+#
+# WITH_GECKO= mozilla firefox seamonkey
+#  Use mozilla whenever a port supports it, falling back on firefox and
+#  then seamonkey.
+# WITH_GECKO= firefox
+#  Sets your preferred backend. With this example, firefox will always
+#  be chosen, unless the port doesn't support a firefox backend. In that
+#  case, you get whatever the porter chose as the default. Better to use
+#  the first example.
+#
+#
+# Ports shoud use the following:
+#
+# USE_GECKO= mozilla firefox seamonkey
+#  The list of gecko backends that the port supports. Unless the user
+#  overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
+#  will be the default. In the above example, www/mozilla will be used
+#  as a gecko backend unless WITH_GECKO=firefox or WITH_GECKO=seamonkey
+#  is defined by the user.
+#
+#  Your port should check the ${GECKO} variable to see which backend
+#  has been chosen.
+#
+#  Example: 
+#  USE_GECKO= mozilla firefox seamonkey
+#  post-patch:
+#  .if ${GECKO}=="seamonkey"
+#	@${REINPALCE_CMD} -e 's|mozilla-|seamonkey-|' \
+#		${WRKSRC}/configure
+#  .endif
+
+
+_GECKO_ALL=	firefox mozilla nvu seamonkey sunbird thunderbird
+
+_NEW_GCC_GECKO=	firefox seamonkey sunbird
+
+sunbird_PORTSDIR=	deskutils
+
+thunderbird_PORTSDIR=	mail
+
+.for gecko in ${_GECKO_ALL}
+${gecko}_PORTSDIR?=	www
+${gecko}_DEPENDS?=	${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko}
+${gecko}_PLIST?=	${X11BASE}/lib/${gecko}/libgtkembedmoz.so
+.endfor
+
+# Figure out which mozilla to use
+# Weed out bad options in USE_GECKO
+.for badgecko in ${USE_GECKO}
+. if ${_GECKO_ALL:M${badgecko}}!=""
+GOOD_USE_GECKO+=	${badgecko}
+. endif
+.endfor
+
+.undef GECKO_FALLTHROUGH
+.undef _FOUND_WITH_GECKO
+# Figure out which gecko to use and weed out the bad ones
+.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO)
+. for badgecko in ${WITH_GECKO}
+.  if ${GOOD_USE_GECKO:M${badgecko}}!=""
+GOOD_WITH_GECKO+=	${badgecko}
+.  endif
+. endfor
+. if defined(GOOD_WITH_GECKO)
+.  for gecko in ${GOOD_WITH_GECKO}
+.   if !defined(GECKO_FALLTHROUGH)
+GECKO=	${gecko}
+GECKO_FALLTHROUGH=	${TRUE}
+_FOUND_WITH_GECKO=	${TRUE}
+.   endif
+.  endfor
+. endif
+.endif
+
+.if !defined(GECKO) && defined(GOOD_USE_GECKO)
+. for gecko in ${GOOD_USE_GECKO}
+.  if !defined(GECKO_FALLTRHOUGH)
+GECKO=	${gecko}
+GECKO_FALLTRHOUGH=	${TRUE}
+.  endif
+. endfor
+.endif
+
+# Use new gcc on new geckos
+.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!=""
+. if ${_NEW_GCC_GECKO:M${GECKO}}!=""
+USE_GCC?=	3.4+
+. endif
+.endif
+
+# Generic defines
+BROWSER_LINUX_PLUGINS_DIR?=	${X11BASE}/lib/browser_linux_plugins
+BROWSER_PLUGINS_DIR?=		${X11BASE}/lib/browser_plugins
+
+GECKO_CONFIG?=			${X11BASE}/bin/${GECKO}-config
+XPIDL?=				${X11BASE}/lib/${GECKO}/xpidl
+XPIDL_INCL?=			`${GECKO_CONFIG} --idlflags`
+
+.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!=""
+BUILD_DEPENDS+=	${${GECKO}_PLIST}:${${GECKO}_DEPENDS}
+RUN_DEPENDS+=	${${GECKO}_PLIST}:${${GECKO}_DEPENDS}
+.else
+BROKEN="Incorrect use of USE_GECKO"
+.endif
+
+pre-everything:: _gecko-pre-everything
+
+_gecko-pre-everything::
+	@${ECHO_CMD} ""
+.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO)
+	@${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you"
+	@${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}."
+	@${ECHO_CMD} " \"${GECKO}\" will be used"
+	@${ECHO_CMD} " for gecko support, but you can change that by using one of"
+	@${ECHO_CMD} " the following values:"
+.else
+	@${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can"
+	@${ECHO_CMD} " change that by defining WITH_GECKO to the following values:"
+.endif
+	@${ECHO_CMD} ""
+.for gecko in ${GOOD_USE_GECKO}
+	@${ECHO_CMD} "   ${gecko} "
+.endfor
+	@${ECHO_CMD} ""
+
+#.endif # end it all
+.endif
+# HERE THERE BE TACOS
diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in
new file mode 100644
index 000000000000..9af187e48d2f
--- /dev/null
+++ b/www/mozilla/files/mozconfig-generic.in
@@ -0,0 +1,8 @@
+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
+export PERL="@PERL@"
diff --git a/www/mozilla/files/patch-config_autoconf.mk.in b/www/mozilla/files/patch-config_autoconf.mk.in
index 9c7c471bec3c..c4fa0b516d1d 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-gfx-src-gtk-Makefile.in b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in
new file mode 100644
index 000000000000..ff8b699841a3
--- /dev/null
+++ b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in
@@ -0,0 +1,15 @@
+When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
+contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
+
+This causes an error, because libgfxshared_s is only under dist/lib.
+
+	-mi
+
+--- gfx/src/gtk/Makefile.in	Mon Nov 10 07:24:51 2003
++++ gfx/src/gtk/Makefile.in	Thu Jul 21 23:58:26 2005
+@@ -165,4 +165,5 @@
+ ifdef MOZ_ENABLE_GTK2
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
++		$(LIBS_DIR) \
+ 		-lgkgfx \
+ 		-lgfxshared_s \
diff --git a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp b/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp
deleted file mode 100644
index bb55059a04e0..000000000000
--- a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp.orig	Thu Mar 10 12:22:22 2005
-+++ layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp	Thu Mar 10 12:22:59 2005
-@@ -50,6 +50,7 @@
- #include "nsRenderingContextGTK.h"
- #include <gdk/gdkx.h>
- #include <cairo.h>
-+#include <cairo-xlib.h>
- 
- /**
-  * \addtogroup cairo_renderer Cairo Rendering Engine
diff --git a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp b/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp
deleted file mode 100644
index 9e5f793f1706..000000000000
--- a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp.orig	Thu Mar 10 12:24:44 2005
-+++ layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp	Thu Mar 10 12:25:25 2005
-@@ -51,6 +51,7 @@
- #include "nsSVGTypeCIDs.h"
- #include "nsIComponentManager.h"
- #include <cairo.h>
-+#include <stdlib.h>
- 
- /**
-  * \addtogroup gdiplus_renderer Cairo Rendering Engine
diff --git a/www/mozilla/files/patch-libm b/www/mozilla/files/patch-libm
new file mode 100644
index 000000000000..7de64b2a5068
--- /dev/null
+++ b/www/mozilla/files/patch-libm
@@ -0,0 +1,25 @@
+--- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
++++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
+@@ -148,5 +148,4 @@
+ endif
+ 
+-FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
+ JSMATH_PRELINK	= jsmathtemp.o
+ JS_SAFE_ARENA	= 1
+@@ -320,7 +319,4 @@
+ endif
+ 	@$(RM) -f $(JSMATH_PRELINK)
+-else
+-# Create dependency so we build fdlibm
+-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
+ endif
+ 
+--- js/Makefile.in	Sun Mar 23 14:36:00 2003
++++ js/Makefile.in	Thu Aug  4 23:08:06 2005
+@@ -46,5 +46,5 @@
+ #
+ 
+-DIRS		= src/fdlibm src
++DIRS		= src
+ 
+ include $(topsrcdir)/config/rules.mk
diff --git a/www/mozilla/files/patch-nsprpub-pr-include-md-_pth.h b/www/mozilla/files/patch-nsprpub-pr-include-md-_pth.h
deleted file mode 100644
index 1f8159c70b1f..000000000000
--- a/www/mozilla/files/patch-nsprpub-pr-include-md-_pth.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Jul 26 07:23:42 2004
-+++ nsprpub/pr/include/md/_pth.h	Mon Jul 26 07:18:37 2004
-@@ -90,7 +90,7 @@
- #define _PT_PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init
- #define _PT_PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy
- #define _PT_PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))
--#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))
- #if defined(DARWIN)
- #define _PT_PTHREAD_CONDATTR_INIT(x)      0
- #else
diff --git a/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c b/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c
deleted file mode 100644
index f9949d6d9c96..000000000000
--- a/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- nsprpub/pr/src/io/prprf.c.orig	Mon Mar  8 22:18:19 2004
-+++ nsprpub/pr/src/io/prprf.c	Fri Mar 19 15:26:55 2004
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__x86_64__))
-+#if defined(__amd64__)
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__x86_64__))
- #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
- #elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
deleted file mode 100644
index b66fea57cd33..000000000000
--- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
+++ /dev/null
@@ -1,124 +0,0 @@
---- nsprpub/pr/include/md/_freebsd.cfg.orig	Sat Nov 15 15:36:12 2003
-+++ nsprpub/pr/include/md/_freebsd.cfg	Sun Feb  1 13:36:44 2004
-@@ -91,7 +91,7 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__alpha)
-+#elif defined(__alpha__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -138,8 +138,7 @@
- #define PR_ALIGN_OF_DOUBLE  8
- #define PR_ALIGN_OF_POINTER 8
- 
--#elif defined(__sparc__)
--
-+#elif defined(__sparc64__)
- #undef IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
- #define	HAVE_LONG_LONG
-@@ -185,6 +184,102 @@
- #define PR_ALIGN_OF_DOUBLE  8
- #define PR_ALIGN_OF_POINTER 8
- 
-+#elif defined(__ia64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
- #else
- 
- #error "Unknown CPU architecture"
diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h
deleted file mode 100644
index fca34102ffb0..000000000000
--- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- nsprpub/pr/include/md/_freebsd.h.orig	Sat Nov 15 18:36:13 2003
-+++ nsprpub/pr/include/md/_freebsd.h	Sun Dec 14 11:40:08 2003
-@@ -50,6 +50,10 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
-+#elif defined(__ia64__)
-+#define _PR_SI_ARCHITECTURE "ia64"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #else
- #error "Unknown CPU architecture"
- #endif
diff --git a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c
deleted file mode 100644
index 08346f235416..000000000000
--- a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 17:59:47 2003
-+++ nsprpub/pr/src/pthreads/ptio.c	Fri Aug 29 15:39:46 2003
-@@ -189,7 +189,7 @@
- #endif
- #endif
- 
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
- static PRBool _pr_ipv6_v6only_on_by_default;
- /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- #ifndef IPV6_V6ONLY
-@@ -1154,7 +1154,7 @@
-     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
- 
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
-     /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
-      * is turned on by default, contrary to what RFC 3493, Section
-      * 5.3 says.  So we have to turn it off.  Find out whether we
-@@ -3462,7 +3462,7 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
-         if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
-         {
-             int on = 0;
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 6b72f3f007ae..d1cb9f9f7ece 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Tue Apr 20 21:39:17 2004
-+++ configure	Thu Apr 29 14:01:52 2004
-@@ -9362,7 +9362,7 @@
+--- configure.orig	Tue Oct 12 00:13:29 2004
++++ configure	Wed Nov 23 01:48:55 2005
+@@ -9368,7 +9368,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9368 "configure"
+ #line 9374 "configure"
  #include "confdefs.h"
-@@ -9393,7 +9393,7 @@
+@@ -9399,7 +9399,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -9403,7 +9403,7 @@
+@@ -9409,7 +9409,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9409 "configure"
+ #line 9415 "configure"
  #include "confdefs.h"
-@@ -9434,7 +9434,7 @@
+@@ -9440,7 +9440,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,7 +36,22 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12298,9 +12298,9 @@
+@@ -11401,12 +11401,12 @@
+ 
+             echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
+ echo "configure:11404: checking MOZ_GTK2_CFLAGS" >&5
+-            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
++            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
+             echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
+ echo "configure:11409: checking MOZ_GTK2_LIBS" >&5
+-            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
++            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
+             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
+         else
+             MOZ_GTK2_CFLAGS=""
+@@ -12344,9 +12344,9 @@
  
  
  
diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr
new file mode 100644
index 000000000000..19e2703b4b38
--- /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/mozilla/files/patch-sysnss b/www/mozilla/files/patch-sysnss
new file mode 100644
index 000000000000..d854cabc053a
--- /dev/null
+++ b/www/mozilla/files/patch-sysnss
@@ -0,0 +1,178 @@
+--- Makefile.in	Tue Sep 14 16:59:40 2004
++++ Makefile.in	Tue Aug  2 08:26:55 2005
+@@ -102,6 +102,4 @@
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+-
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+--- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
++++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
+@@ -37,16 +37,7 @@
+ 	SOFTOKEN3_LIB \
+ 	SOFTOKEN3_CHK \
+-	LOADABLE_ROOT_MODULE \
+ 	HAVE_FREEBL_MODULES \
+ 	$(NULL)
+ 
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
+-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
+-SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
+-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
+-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-
+ ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+ ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+@@ -132,9 +123,4 @@
+ .nss.cleaned: .nss.checkout
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+ 	touch $@
+ 
+@@ -153,43 +139,4 @@
+ ifeq ($(OS_ARCH),WINNT)
+ 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-endif
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+-ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
+-endif
+-ifndef DISABLE_DIST_GRE
+-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
+-ifdef HAVE_FREEBL_MODULES
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
+-endif
+-endif
+-ifndef _SKIP_OLD_GRE_INSTALL
+-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_MODULES
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+-endif
+ endif
+ 	$(MAKE) -C boot $@
+@@ -200,18 +147,4 @@
+ 
+ install::
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-endif
+ 	$(MAKE) -C boot $@
+ 	$(MAKE) -C ssl $@
+@@ -227,9 +160,4 @@
+ endif
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+ 
+ echo-requires-recursive::
+--- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
++++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
+@@ -117,5 +117,5 @@
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += -I$(DIST)/public/nss \
++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
+                   $(NULL)
+ 
+--- config/config.mk	Tue Oct 12 00:11:11 2004
++++ config/config.mk	Tue Aug  2 09:19:18 2005
+@@ -170,5 +170,4 @@
+ NSS_LIBS	= \
+ 	$(LIBS_DIR) \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ 	-lsmime3 \
+ 	-lssl3 \
+@@ -189,11 +188,5 @@
+ endif
+ 
+-NSS_DEP_LIBS	= \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+-	$(NULL)
++NSS_DEP_LIBS	=
+ 
+ MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+--- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
++++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
+@@ -88,4 +88,8 @@
+ }
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <errno.h>
++
+ #ifdef PR_LOGGING
+ PRLogModuleInfo* gPIPNSSLog = nsnull;
+@@ -406,4 +410,5 @@
+     const char *possible_ckbi_locations[] = {
+       NS_GRE_DIR,
++      NS_UNIX_LIB_DIR,
+       NS_XPCOM_CURRENT_PROCESS_DIR
+     };
+@@ -419,5 +424,5 @@
+       }
+ 
+-      char *fullModuleName = nsnull;
++      char *fullModuleName;
+ #ifdef XP_MAC
+       nsCAutoString nativePath;
+@@ -431,4 +436,12 @@
+       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
+ #endif
++      if (fullModuleName == nsnull)
++        continue;
++      struct stat sb;
++      if (stat(fullModuleName, &sb)) {
++        if (errno != ENOENT)
++          perror(fullModuleName);
++        continue;
++      }
+       /* If a module exists with the same name, delete it. */
+       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
index dbdc47b6f8e4..dbdc47b6f8e4 100644
--- a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
+++ b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
index b9457eff010c..7d0d70f5da02 100644
--- a/www/mozilla/pkg-deinstall.in
+++ b/www/mozilla/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.7 2005/07/13 08:45:47 ahze Exp $
+#    $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.9 2005/11/13 19:07:58 ahze Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr
index d91ac6c1d832..37a7a64039b1 100644
--- a/www/mozilla/pkg-descr
+++ b/www/mozilla/pkg-descr
@@ -7,7 +7,4 @@ This is the latest release of the Mozilla browser.  It contains all the
 bugfixes and security enhancements from the mozilla port as well as
 new new features.
 
-This version has been built with GTK+-2 bindings for use with applications
-such as Galeon 2.
-
 WWW: http://www.mozilla.org/
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index 2b196acaf42c..057d80bf594b 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/pkg-install.in,v 1.7 2005/07/13 08:45:47 ahze Exp $
+#    $MCom: ports/www/mozilla/pkg-install.in,v 1.9 2005/11/13 19:07:58 ahze Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)