Remove these ports now that they have been committed to FreeBSD.

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

69 files changed, 0 insertions, 5455 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
deleted file mode 100644
index c0832b18e..000000000
--- a/www/epiphany-extensions/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# Ports collection Makefile for:	epiphany-extensions
-# Date created:				30 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.87 2007/03/11 20:02:57 mezz Exp $
-#
-
-PORTNAME=	epiphany
-PORTVERSION=	2.18.0
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-PKGNAMESUFFIX=	-extensions
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A set of add-ons for the Epiphany web browser
-
-BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
-RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GECKO=	firefox mozilla seamonkey firefox15<->firefox
-USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget
-INSTALLS_OMF=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--with-mozilla=${GECKO}
-
-GCONF_SCHEMAS=	smart-bookmarks.schemas
-
-EPHY_EXTENSIONS=all
-EPHY_VERSION=	2.18
-
-PLIST_SUB=	VERSION="2.18" EPHY_VERSION=${EPHY_VERSION}
-
-OPTIONS=	OPENSP "Enable OpenSP SGML support" off \
-		ADBLOCK "Enable the adblock extension" on
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-
-.if defined(WITH_OPENSP)
-CONFIGURE_ARGS+=	--enable-opensp=yes
-.else
-CONFIGURE_ARGS+=	--disable-opensp
-.endif
-
-.if !defined(WITHOUT_ADBLOCK)
-EPHY_EXTENSIONS:=	${EPHY_EXTENSIONS},adblock
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-PLIST_SUB+=		ADBLOCK=""
-.else
-PLIST_SUB+=		ADBLOCK="@comment "
-.endif
-
-.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
-USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-PLIST_SUB+=	PYTHON=""
-.else
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
-
-pre-everything::
-	@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
-	@${ECHO_MSG} "	WITH_OPENSP=yes		Enable support for OpenSP SGML validation"
-	@${ECHO_MSG} ""
-
-.include <bsd.port.post.mk>
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
deleted file mode 100644
index 624d53ca0..000000000
--- a/www/epiphany-extensions/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = c0a6218b6a8506f204891a0769ac9553
-SHA256 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 38c58fb43b6fcfecd80f8d36aa1a0ff1163c050195dda1ed074f5f605b007ff9
-SIZE (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 892671
diff --git a/www/epiphany-extensions/pkg-descr b/www/epiphany-extensions/pkg-descr
deleted file mode 100644
index 06c245526..000000000
--- a/www/epiphany-extensions/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Epiphany-extensions is a set of plugins for the Epiphany web browser that
-extend its base functionality.  Currently, the following extensions are
-supported:
-
-* Mouse gestures
-* Pop-up blocker
-* Tabs menu
-
-WWW: http://www.gnome.org/projects/epiphany/extensions
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
deleted file mode 100644
index adaa34bef..000000000
--- a/www/epiphany-extensions/pkg-plist
+++ /dev/null
@@ -1,200 +0,0 @@
-lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyo
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
-lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo
-lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
-lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
-lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
-lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
-lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
-lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
-lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la
-lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
-lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la
-lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
-lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la
-lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
-lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la
-lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
-lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la
-lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.la
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.so
-lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la
-lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
-lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la
-lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
-share/gnome/epiphany-extensions/ephy-gestures.xml
-share/gnome/epiphany-extensions/glade/action-properties.glade
-share/gnome/epiphany-extensions/glade/actions-editor.glade
-%%ADBLOCK%%share/gnome/epiphany-extensions/glade/adblock.glade
-share/gnome/epiphany-extensions/glade/error-viewer.glade
-share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
-share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
-share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
-share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/C/legal.xml
-share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
-share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
-share/gnome/omf/epiphany-extensions/epiphany-extensions-sv.omf
-share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/rw/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/tr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/vi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-@dirrm share/gnome/omf/epiphany-extensions
-@dirrm share/gnome/help/epiphany-extensions/sv/figures
-@dirrm share/gnome/help/epiphany-extensions/sv
-@dirrm share/gnome/help/epiphany-extensions/C/figures
-@dirrm share/gnome/help/epiphany-extensions/C
-@dirrm share/gnome/help/epiphany-extensions
-@dirrm share/gnome/epiphany-extensions/xml
-@dirrm share/gnome/epiphany-extensions/glade
-@dirrm share/gnome/epiphany-extensions
-@dirrmtry lib/epiphany/%%VERSION%%/extensions
-@dirrmtry lib/epiphany/%%VERSION%%/plugins
-@dirrmtry lib/epiphany/%%VERSION%%
-@dirrmtry lib/epiphany
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
deleted file mode 100644
index 47000a5b3..000000000
--- a/www/epiphany/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Ports collection Makefile for:	epiphany
-# Date created:				24 April 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.140 2007/02/27 19:58:08 mezz Exp $
-#
-
-PORTNAME=	epiphany
-PORTVERSION=	2.18.0
-CATEGORIES=	www gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An extremely lightweight and simple web browser for GNOME 2
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-
-USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_PYTHON=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GECKO=	firefox seamonkey firefox15<->firefox xulrunner
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-mozilla=${GECKO} --mandir=${PREFIX}/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas \
-		epiphany-fonts.schemas epiphany-pango.schemas
-
-PLIST_SUB+=	EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \
-		EPHY_PREFIX="${PREFIX}"
-
-MAN1=		epiphany.1
-
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-
-NO_WERROR=	yes
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+=	--enable-compile-warnings=no
-.endif
-
-.if ${HAVE_GNOME:Mpygnome2}!=""
-USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=	pygnome2
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|-lpthread|${PTHREAD_LIBS}|g'
-	@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
-		${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
-	@${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
-		${WRKSRC}/src/Makefile.in
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
-		${PREFIX}/etc/gconf/schemas
-	@-update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
deleted file mode 100644
index 609b848b3..000000000
--- a/www/epiphany/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/epiphany-2.18.0.tar.bz2) = 3ac47fcf7e9875885c3f4d53dac24b7c
-SHA256 (gnome2/epiphany-2.18.0.tar.bz2) = 92c8f698a101ff2fdd9a83b96a5a37376be839df9d918c084c6551a7db587fd5
-SIZE (gnome2/epiphany-2.18.0.tar.bz2) = 4658364
diff --git a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
deleted file mode 100644
index 146b9e594..000000000
--- a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/bookmarks/ephy-bookmarks.c.orig	Sat Apr 15 04:11:39 2006
-+++ src/bookmarks/ephy-bookmarks.c	Sat Apr 15 04:13:43 2006
-@@ -92,7 +92,10 @@ static const EphyBookmarksBookmarkInfo d
- 	 * For instance in .nl these should be
- 	 * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
- 	 */
--	{ N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
-+	{ N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") },
-+	{ N_("The FreeBSD Project"), N_("http://www.freebsd.org/") },
-+	{ N_("Daemon News"), N_("http://daemonnews.org/") },
-+	{ N_("BSD News"), N_("http://bsdnews.com/") }
- };
- 
- static const char *default_topics [] =
diff --git a/www/epiphany/pkg-descr b/www/epiphany/pkg-descr
deleted file mode 100644
index 51066f8d5..000000000
--- a/www/epiphany/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Epiphany is a web browser designed to be as lightweight and fast as
-possible, at the expense of many of the features found in other
-browsers.
-
-WWW: http://www.gnome.org/projects/epiphany/
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
deleted file mode 100644
index 00f0b4d79..000000000
--- a/www/epiphany/pkg-plist
+++ /dev/null
@@ -1,400 +0,0 @@
-bin/epiphany
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-single.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-loader.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node-db.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-notebook.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
-lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
-lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
-libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
-share/aclocal/epiphany.m4
-share/dbus-1/services/org.gnome.Epiphany.service
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
-%%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
-%%DOCSDIR%%/EphyWindow.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/epiphany.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/applications/bme.desktop
-share/gnome/applications/epiphany.desktop
-share/gnome/epiphany/about.ini
-share/gnome/epiphany/chrome/branding/brand.dtd
-share/gnome/epiphany/chrome/branding/brand.properties
-share/gnome/epiphany/chrome/epiphany.manifest
-share/gnome/epiphany/chrome/global/about.xhtml
-share/gnome/epiphany/default-prefs.js
-share/gnome/epiphany/ephy-xml2ini.xsl
-share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
-share/gnome/epiphany/epiphany-bookmarks-html.xsl
-share/gnome/epiphany/epiphany-bookmarksbar.xml
-share/gnome/epiphany/epiphany-fs-toolbar.xml
-share/gnome/epiphany/epiphany-history-window-ui.xml
-share/gnome/epiphany/epiphany-toolbar.xml
-share/gnome/epiphany/epiphany-ui.xml
-share/gnome/epiphany/epiphany.xhtml
-share/gnome/epiphany/glade/certificate-dialogs.glade
-share/gnome/epiphany/glade/epiphany.glade
-share/gnome/epiphany/glade/form-signing-dialog.glade
-share/gnome/epiphany/glade/prefs-dialog.glade
-share/gnome/epiphany/glade/print.glade
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/download.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/download.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/download.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/download.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg
-share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
-share/gnome/epiphany/mime-types-permissions.xml
-share/gnome/help/epiphany/C/epiphany.xml
-share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-screenshot.png
-share/gnome/help/epiphany/C/legal.xml
-share/gnome/help/epiphany/bg/epiphany.xml
-share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
-share/gnome/help/epiphany/el/epiphany.xml
-share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-screenshot.png
-share/gnome/help/epiphany/en_GB/epiphany.xml
-share/gnome/help/epiphany/en_GB/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-screenshot.png
-share/gnome/help/epiphany/es/epiphany.xml
-share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-screenshot.png
-share/gnome/help/epiphany/eu/epiphany.xml
-share/gnome/help/epiphany/eu/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fi/epiphany.xml
-share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fr/epiphany.xml
-share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-screenshot.png
-share/gnome/help/epiphany/it/epiphany.xml
-share/gnome/help/epiphany/it/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ja/epiphany.xml
-share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
-share/gnome/help/epiphany/nl/epiphany.xml
-share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ru/epiphany.xml
-share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-screenshot.png
-share/gnome/help/epiphany/sv/epiphany.xml
-share/gnome/help/epiphany/sv/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-screenshot.png
-share/gnome/help/epiphany/uk/epiphany.xml
-share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/omf/epiphany/epiphany-C.omf
-share/gnome/omf/epiphany/epiphany-bg.omf
-share/gnome/omf/epiphany/epiphany-el.omf
-share/gnome/omf/epiphany/epiphany-en_GB.omf
-share/gnome/omf/epiphany/epiphany-es.omf
-share/gnome/omf/epiphany/epiphany-eu.omf
-share/gnome/omf/epiphany/epiphany-fi.omf
-share/gnome/omf/epiphany/epiphany-fr.omf
-share/gnome/omf/epiphany/epiphany-it.omf
-share/gnome/omf/epiphany/epiphany-ja.omf
-share/gnome/omf/epiphany/epiphany-nl.omf
-share/gnome/omf/epiphany/epiphany-ru.omf
-share/gnome/omf/epiphany/epiphany-sv.omf
-share/gnome/omf/epiphany/epiphany-uk.omf
-share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
-share/locale/am/LC_MESSAGES/epiphany.mo
-share/locale/ar/LC_MESSAGES/epiphany.mo
-share/locale/az/LC_MESSAGES/epiphany.mo
-share/locale/be/LC_MESSAGES/epiphany.mo
-share/locale/bg/LC_MESSAGES/epiphany.mo
-share/locale/bn/LC_MESSAGES/epiphany.mo
-share/locale/bn_IN/LC_MESSAGES/epiphany.mo
-share/locale/bs/LC_MESSAGES/epiphany.mo
-share/locale/ca/LC_MESSAGES/epiphany.mo
-share/locale/cs/LC_MESSAGES/epiphany.mo
-share/locale/cy/LC_MESSAGES/epiphany.mo
-share/locale/da/LC_MESSAGES/epiphany.mo
-share/locale/de/LC_MESSAGES/epiphany.mo
-share/locale/dz/LC_MESSAGES/epiphany.mo
-share/locale/el/LC_MESSAGES/epiphany.mo
-share/locale/en_CA/LC_MESSAGES/epiphany.mo
-share/locale/en_GB/LC_MESSAGES/epiphany.mo
-share/locale/es/LC_MESSAGES/epiphany.mo
-share/locale/et/LC_MESSAGES/epiphany.mo
-share/locale/eu/LC_MESSAGES/epiphany.mo
-share/locale/fa/LC_MESSAGES/epiphany.mo
-share/locale/fi/LC_MESSAGES/epiphany.mo
-share/locale/fr/LC_MESSAGES/epiphany.mo
-share/locale/ga/LC_MESSAGES/epiphany.mo
-share/locale/gl/LC_MESSAGES/epiphany.mo
-share/locale/gu/LC_MESSAGES/epiphany.mo
-share/locale/he/LC_MESSAGES/epiphany.mo
-share/locale/hi/LC_MESSAGES/epiphany.mo
-share/locale/hr/LC_MESSAGES/epiphany.mo
-share/locale/hu/LC_MESSAGES/epiphany.mo
-share/locale/id/LC_MESSAGES/epiphany.mo
-share/locale/is/LC_MESSAGES/epiphany.mo
-share/locale/it/LC_MESSAGES/epiphany.mo
-share/locale/ja/LC_MESSAGES/epiphany.mo
-share/locale/ka/LC_MESSAGES/epiphany.mo
-share/locale/ko/LC_MESSAGES/epiphany.mo
-share/locale/ku/LC_MESSAGES/epiphany.mo
-share/locale/li/LC_MESSAGES/epiphany.mo
-share/locale/lt/LC_MESSAGES/epiphany.mo
-share/locale/lv/LC_MESSAGES/epiphany.mo
-share/locale/mg/LC_MESSAGES/epiphany.mo
-share/locale/mi/LC_MESSAGES/epiphany.mo
-share/locale/mk/LC_MESSAGES/epiphany.mo
-share/locale/ml/LC_MESSAGES/epiphany.mo
-share/locale/mn/LC_MESSAGES/epiphany.mo
-share/locale/mr/LC_MESSAGES/epiphany.mo
-share/locale/ms/LC_MESSAGES/epiphany.mo
-share/locale/nb/LC_MESSAGES/epiphany.mo
-share/locale/ne/LC_MESSAGES/epiphany.mo
-share/locale/nl/LC_MESSAGES/epiphany.mo
-share/locale/nn/LC_MESSAGES/epiphany.mo
-share/locale/or/LC_MESSAGES/epiphany.mo
-share/locale/pa/LC_MESSAGES/epiphany.mo
-share/locale/pl/LC_MESSAGES/epiphany.mo
-share/locale/pt/LC_MESSAGES/epiphany.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany.mo
-share/locale/ro/LC_MESSAGES/epiphany.mo
-share/locale/ru/LC_MESSAGES/epiphany.mo
-share/locale/rw/LC_MESSAGES/epiphany.mo
-share/locale/sk/LC_MESSAGES/epiphany.mo
-share/locale/sl/LC_MESSAGES/epiphany.mo
-share/locale/sq/LC_MESSAGES/epiphany.mo
-share/locale/sr/LC_MESSAGES/epiphany.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
-share/locale/sv/LC_MESSAGES/epiphany.mo
-share/locale/ta/LC_MESSAGES/epiphany.mo
-share/locale/te/LC_MESSAGES/epiphany.mo
-share/locale/th/LC_MESSAGES/epiphany.mo
-share/locale/tk/LC_MESSAGES/epiphany.mo
-share/locale/tr/LC_MESSAGES/epiphany.mo
-share/locale/uk/LC_MESSAGES/epiphany.mo
-share/locale/vi/LC_MESSAGES/epiphany.mo
-share/locale/wa/LC_MESSAGES/epiphany.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany.mo
-share/locale/zh_HK/LC_MESSAGES/epiphany.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
-@dirrm share/gnome/omf/epiphany
-@dirrm share/gnome/help/epiphany/uk/figures
-@dirrm share/gnome/help/epiphany/uk
-@dirrm share/gnome/help/epiphany/sv/figures
-@dirrm share/gnome/help/epiphany/sv
-@dirrm share/gnome/help/epiphany/ru/figures
-@dirrm share/gnome/help/epiphany/ru
-@dirrm share/gnome/help/epiphany/nl/figures
-@dirrm share/gnome/help/epiphany/nl
-@dirrm share/gnome/help/epiphany/ja/figures
-@dirrm share/gnome/help/epiphany/ja
-@dirrm share/gnome/help/epiphany/it/figures
-@dirrm share/gnome/help/epiphany/it
-@dirrm share/gnome/help/epiphany/fr/figures
-@dirrm share/gnome/help/epiphany/fr
-@dirrm share/gnome/help/epiphany/fi/figures
-@dirrm share/gnome/help/epiphany/fi
-@dirrm share/gnome/help/epiphany/eu/figures
-@dirrm share/gnome/help/epiphany/eu
-@dirrm share/gnome/help/epiphany/es/figures
-@dirrm share/gnome/help/epiphany/es
-@dirrm share/gnome/help/epiphany/en_GB/figures
-@dirrm share/gnome/help/epiphany/en_GB
-@dirrm share/gnome/help/epiphany/el/figures
-@dirrm share/gnome/help/epiphany/el
-@dirrm share/gnome/help/epiphany/bg/figures
-@dirrm share/gnome/help/epiphany/bg
-@dirrm share/gnome/help/epiphany/C/figures
-@dirrm share/gnome/help/epiphany/C
-@dirrm share/gnome/help/epiphany
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/status
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions
-@dirrm share/gnome/epiphany/icons/hicolor/scalable
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/status
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions
-@dirrm share/gnome/epiphany/icons/hicolor/32x32
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/status
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions
-@dirrm share/gnome/epiphany/icons/hicolor/24x24
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/status
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions
-@dirrm share/gnome/epiphany/icons/hicolor/22x22
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/status
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions
-@dirrm share/gnome/epiphany/icons/hicolor/16x16
-@dirrm share/gnome/epiphany/icons/hicolor
-@dirrm share/gnome/epiphany/icons
-@dirrm share/gnome/epiphany/glade
-@dirrm share/gnome/epiphany/chrome/global
-@dirrm share/gnome/epiphany/chrome/branding
-@dirrm share/gnome/epiphany/chrome
-@dirrm share/gnome/epiphany/art
-@dirrm share/gnome/epiphany
-@dirrm %%DOCSDIR%%
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-@dirrmtry lib/epiphany
-@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
-@dirrm include/epiphany/%%EPHY_VERSION%%
-@dirrm include/epiphany
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
deleted file mode 100644
index 5c237b4ce..000000000
--- a/www/erwn/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	erwin
-# Date created:			31 July 1999
-# Whom:				Jim Mock <jimFreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	erwn
-PORTVERSION=	0.8
-PORTREVISION=	2
-CATEGORIES=	www editors
-MASTER_SITES=	http://lisas.de/erwin/
-DISTNAME=	erwin-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple GTK+-2 HTML editor
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gtkhtml3 gtksourceview
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=		erwin.1
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.14|g" \
-		${WRKSRC}/configure
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/erwn/distinfo b/www/erwn/distinfo
deleted file mode 100644
index 57c76fba4..000000000
--- a/www/erwn/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (erwin-0.8.tar.gz) = 2387dfbb12b499672148e3a8cc4f5929
-SHA256 (erwin-0.8.tar.gz) = f9abd203472481c590b445363f501d49c42497fe9c950049632981b799638f13
-SIZE (erwin-0.8.tar.gz) = 199002
diff --git a/www/erwn/files/patch-src::erwindialogs.c b/www/erwn/files/patch-src::erwindialogs.c
deleted file mode 100644
index b637ec848..000000000
--- a/www/erwn/files/patch-src::erwindialogs.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/erwindialogs.c.orig	Thu Jan 20 05:59:44 2005
-+++ src/erwindialogs.c	Thu Mar 31 18:52:42 2005
-@@ -125,9 +125,9 @@
- {
- 	GtkWidget *dialog;
- 	GtkFileFilter *filter_all = gtk_file_filter_new();
-+	GtkFileFilter *filter_html = gtk_file_filter_new();
- 	gtk_file_filter_add_pattern(filter_all, "*");
- 	gtk_file_filter_set_name(filter_all, "All Files");
--	GtkFileFilter *filter_html = gtk_file_filter_new();
- 	gtk_file_filter_add_pattern(filter_html, "*html");
- 	gtk_file_filter_set_name(filter_html, "HTML Files");
- 
diff --git a/www/erwn/pkg-descr b/www/erwn/pkg-descr
deleted file mode 100644
index b370a210e..000000000
--- a/www/erwn/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-erwin is a simple GTK+-2 based HTML editor. Its features
-include:
-
-  - preview rendered html page
-  - support for html tags
-  - intelligent tag closer
-  - drag'n'drop support
-  - source highlighting
-
-WWW:	http://lisas.de/erwin/index.php3
diff --git a/www/erwn/pkg-plist b/www/erwn/pkg-plist
deleted file mode 100644
index d97e67ffb..000000000
--- a/www/erwn/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/erwin
-share/gnome/erwin/bold.svg
-share/gnome/erwin/bold1.svg
-share/gnome/erwin/erwin-highlighting.xml
-share/gnome/erwin/h1.svg
-share/gnome/erwin/h11.svg
-share/gnome/erwin/h2.svg
-share/gnome/erwin/h22.svg
-share/gnome/erwin/h3.svg
-share/gnome/erwin/h33.svg
-share/gnome/erwin/small.svg
-share/gnome/pixmaps/erwin.xpm
-@dirrm share/gnome/erwin
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
deleted file mode 100644
index 25de86d76..000000000
--- a/www/evolution-webcal/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	evolution-webcal
-# Date created:				Mon Apr 26 18:08:00 CEST 2004
-# Whom:					Koop Mast <kwm@rainbow-runner.nl>
-#
-# $FreeBSD$
-#   $MCom: ports/www/evolution-webcal/Makefile,v 1.45 2007/02/28 00:24:20 mezz Exp $
-#
-
-PORTNAME=	webcal
-PORTVERSION=	2.10.0
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-PKGNAMEPREFIX=	evolution-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Webcal(endar) handler for gnome
-
-USE_XLIB=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_PERL=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	evolution-webcal.schemas
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \
-		${WRKSRC}/po/Makefile.in.in
-
-.include <bsd.port.mk>
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
deleted file mode 100644
index 1e808f3dd..000000000
--- a/www/evolution-webcal/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (evolution-webcal-2.10.0.tar.bz2) = a29004e6e1ad977845ed7c68963c8925
-SHA256 (evolution-webcal-2.10.0.tar.bz2) = 4017850f067d1b08f7b76b94988978f8f63ecfc8d201c910ea5d6119097add15
-SIZE (evolution-webcal-2.10.0.tar.bz2) = 163306
diff --git a/www/evolution-webcal/pkg-descr b/www/evolution-webcal/pkg-descr
deleted file mode 100644
index ab2f04e9d..000000000
--- a/www/evolution-webcal/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Evolution Webcal installs a GNOME URL Handler for "webcal:".
-This will pop up a subscription dialog when you point your web browser at it.
-The calendars will automaticaly appear in Evolution 1.5.x if it is running,
-or will show up the next time you start Evolution.
-
-It also works for non-GNOME applications. These applications need to set
-there URL handler to be "gnome-open".
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
deleted file mode 100644
index 19e0896fa..000000000
--- a/www/evolution-webcal/pkg-plist
+++ /dev/null
@@ -1,122 +0,0 @@
-libexec/evolution-webcal
-share/locale/ar/LC_MESSAGES/evolution-webcal.mo
-share/locale/as/LC_MESSAGES/evolution-webcal.mo
-share/locale/az/LC_MESSAGES/evolution-webcal.mo
-share/locale/bg/LC_MESSAGES/evolution-webcal.mo
-share/locale/bn/LC_MESSAGES/evolution-webcal.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo
-share/locale/bs/LC_MESSAGES/evolution-webcal.mo
-share/locale/ca/LC_MESSAGES/evolution-webcal.mo
-share/locale/cs/LC_MESSAGES/evolution-webcal.mo
-share/locale/cy/LC_MESSAGES/evolution-webcal.mo
-share/locale/da/LC_MESSAGES/evolution-webcal.mo
-share/locale/de/LC_MESSAGES/evolution-webcal.mo
-share/locale/dz/LC_MESSAGES/evolution-webcal.mo
-share/locale/el/LC_MESSAGES/evolution-webcal.mo
-share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo
-share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo
-share/locale/es/LC_MESSAGES/evolution-webcal.mo
-share/locale/et/LC_MESSAGES/evolution-webcal.mo
-share/locale/eu/LC_MESSAGES/evolution-webcal.mo
-share/locale/fa/LC_MESSAGES/evolution-webcal.mo
-share/locale/fi/LC_MESSAGES/evolution-webcal.mo
-share/locale/fr/LC_MESSAGES/evolution-webcal.mo
-share/locale/gl/LC_MESSAGES/evolution-webcal.mo
-share/locale/gu/LC_MESSAGES/evolution-webcal.mo
-share/locale/hi/LC_MESSAGES/evolution-webcal.mo
-share/locale/hu/LC_MESSAGES/evolution-webcal.mo
-share/locale/id/LC_MESSAGES/evolution-webcal.mo
-share/locale/it/LC_MESSAGES/evolution-webcal.mo
-share/locale/ja/LC_MESSAGES/evolution-webcal.mo
-share/locale/ka/LC_MESSAGES/evolution-webcal.mo
-share/locale/ko/LC_MESSAGES/evolution-webcal.mo
-share/locale/ku/LC_MESSAGES/evolution-webcal.mo
-share/locale/ky/LC_MESSAGES/evolution-webcal.mo
-share/locale/lt/LC_MESSAGES/evolution-webcal.mo
-share/locale/lv/LC_MESSAGES/evolution-webcal.mo
-share/locale/mk/LC_MESSAGES/evolution-webcal.mo
-share/locale/ml/LC_MESSAGES/evolution-webcal.mo
-share/locale/mr/LC_MESSAGES/evolution-webcal.mo
-share/locale/ms/LC_MESSAGES/evolution-webcal.mo
-share/locale/nb/LC_MESSAGES/evolution-webcal.mo
-share/locale/ne/LC_MESSAGES/evolution-webcal.mo
-share/locale/nl/LC_MESSAGES/evolution-webcal.mo
-share/locale/or/LC_MESSAGES/evolution-webcal.mo
-share/locale/pa/LC_MESSAGES/evolution-webcal.mo
-share/locale/pl/LC_MESSAGES/evolution-webcal.mo
-share/locale/pt/LC_MESSAGES/evolution-webcal.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo
-share/locale/ro/LC_MESSAGES/evolution-webcal.mo
-share/locale/ru/LC_MESSAGES/evolution-webcal.mo
-share/locale/rw/LC_MESSAGES/evolution-webcal.mo
-share/locale/sk/LC_MESSAGES/evolution-webcal.mo
-share/locale/sl/LC_MESSAGES/evolution-webcal.mo
-share/locale/sq/LC_MESSAGES/evolution-webcal.mo
-share/locale/sr/LC_MESSAGES/evolution-webcal.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
-share/locale/sv/LC_MESSAGES/evolution-webcal.mo
-share/locale/ta/LC_MESSAGES/evolution-webcal.mo
-share/locale/te/LC_MESSAGES/evolution-webcal.mo
-share/locale/th/LC_MESSAGES/evolution-webcal.mo
-share/locale/tr/LC_MESSAGES/evolution-webcal.mo
-share/locale/ug/LC_MESSAGES/evolution-webcal.mo
-share/locale/uk/LC_MESSAGES/evolution-webcal.mo
-share/locale/vi/LC_MESSAGES/evolution-webcal.mo
-share/locale/xh/LC_MESSAGES/evolution-webcal.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-webcal.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
deleted file mode 100644
index 9718c36dc..000000000
--- a/www/gtkhtml3/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	gtkhtml3
-# Date created:				12 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.97 2007/02/27 04:38:51 marcus Exp $
-#
-
-PORTNAME=	gtkhtml3
-PORTVERSION=	3.14.0
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Lightweight HTML rendering/printing/editing engine
-
-LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui ltverhack
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-PLIST_SUB=	VERSION="3.14"
-
-.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
deleted file mode 100644
index 5c08be207..000000000
--- a/www/gtkhtml3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b
-SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7
-SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035..000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr
deleted file mode 100644
index 38451dc01..000000000
--- a/www/gtkhtml3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GtkHTML is a lightweight HTML rendering, printing, and editing engine.
-
-WWW: http://www.ximian.com/
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
deleted file mode 100644
index 1a964af4b..000000000
--- a/www/gtkhtml3/pkg-plist
+++ /dev/null
@@ -1,171 +0,0 @@
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.a
-lib/libgtkhtml-%%VERSION%%.la
-lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.19
-libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
-libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
-share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
-@dirrm lib/gtkhtml
-@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
-@dirrm include/libgtkhtml-%%VERSION%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
deleted file mode 100644
index 9718c36dc..000000000
--- a/www/gtkhtml38/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	gtkhtml3
-# Date created:				12 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.97 2007/02/27 04:38:51 marcus Exp $
-#
-
-PORTNAME=	gtkhtml3
-PORTVERSION=	3.14.0
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Lightweight HTML rendering/printing/editing engine
-
-LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui ltverhack
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-PLIST_SUB=	VERSION="3.14"
-
-.include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
deleted file mode 100644
index 5c08be207..000000000
--- a/www/gtkhtml38/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b
-SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7
-SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035..000000000
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml38/pkg-descr b/www/gtkhtml38/pkg-descr
deleted file mode 100644
index 38451dc01..000000000
--- a/www/gtkhtml38/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GtkHTML is a lightweight HTML rendering, printing, and editing engine.
-
-WWW: http://www.ximian.com/
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
deleted file mode 100644
index 1a964af4b..000000000
--- a/www/gtkhtml38/pkg-plist
+++ /dev/null
@@ -1,171 +0,0 @@
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.a
-lib/libgtkhtml-%%VERSION%%.la
-lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.19
-libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
-libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
-share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
-@dirrm lib/gtkhtml
-@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
-@dirrm include/libgtkhtml-%%VERSION%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
deleted file mode 100644
index f4481bda7..000000000
--- a/www/mozilla/Makefile
+++ /dev/null
@@ -1,161 +0,0 @@
-# New ports collection makefile for:	mozilla
-# Date created:		31 Mar 1998
-# Whom:			eivind/dima/jseger
-#
-# $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile,v 1.42 2006/12/09 15:32:06 ahze Exp $
-
-PORTNAME=	mozilla
-PORTVERSION=	1.7.13
-PORTREVISION?=	1
-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} \
-		libart_lgpl-1${EXTRACT_SUFX}:local
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The open source, standards compliant web browser
-
-DEPRECATED=	The mozilla team has shifted the development branch of mozilla to \
-		seamonkey, this port is outdated and has many vulnerabilities. \
-		Please consider using www/seamonkey or www/firefox instead.
-
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-USE_GMAKE=	yes
-USE_BZIP2=	yes
-WANT_GNOME=	yes
-HAS_CONFIGURE=	yes
-MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-ALL_TARGET=	default
-
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-
-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
-
-NOT_FOR_ARCHS=	ia64
-
-OPTIONS=CALENDAR "Enable the Calendar module" off \
-	MAILNEWS "Enable Mail and News modules" on \
-	COMPOSER "Enable the HTML Composer module" on \
-	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 \
-	SMB "Enable smb:// URI support using gnomevfs" off
-
-.if !defined(WITHOUT_MAILNEWS)
-GECKO_PLIST_PRE_FILES=	lib/${MOZILLA}/defaults/isp/US/movemail.rdf \
-			lib/${MOZILLA}/defaults/isp/movemail.rdf
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/defaults/isp/US/ \
-			lib/${MOZILLA}/defaults/isp
-.endif
-
-.include <bsd.port.pre.mk>
-
-# libart patches
-.if ${OSVERSION} < 500035
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
-.endif
-
-LATEST_LINK=	${MOZILLA}
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE=	core dumps on ${ARCH} during post-build
-.endif
-
-.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
-	defined(WITHOUT_COMPOSER))
-BROKEN=	Calendar requires Composer and Mailnews support.
-.endif
-.if defined(WITHOUT_MAILNEWS)
-MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
-.else
-# mail and news desired, but not LDAP
-.if defined(WITHOUT_LDAP)
-MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
-.else
-MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
-.endif
-.endif
-
-.if !defined(WITHOUT_CHATZILLA)
-MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
-.endif
-
-.if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER)
-MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
-.endif
-
-.if defined(WITH_JAVASCRIPT_DEBUGGER)
-MOZ_OPTIONS+=	--enable-jsd \
-		--enable-dtd-debug
-.else
-MOZ_OPTIONS+=	--disable-jsd \
-		--disable-dtd-debug
-.endif
-
-.if defined(WITH_CALENDAR)
-MOZ_OPTIONS+=	--enable-calendar
-.endif
-
-.if defined(WITHOUT_COMPOSER)
-MOZ_OPTIONS+=	--disable-composer
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
-		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
-	@${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
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		< ${FILESDIR}/mozilla.desktop.in > \
-		${WRKDIR}/mozilla.desktop
-
-pre-install:
-	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
-		for jpi in ${JPI_LIST}; do \
-			if [ -f $${jpi} ]; then \
-				${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \
-				break; \
-			fi; \
-		done; \
-	fi
-.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}
-
-do-install:
-	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
-		for jpi in ${JPI_LIST}; do \
-			if [ -f $${jpi} ]; then \
-		    		${LN} -sf $${jpi} \
-			    		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
-				break; \
-			fi; \
-		done; \
-	fi
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \
-		${PREFIX}/share/applications
-
-post-install:
-	@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
-
-.include "${.CURDIR}/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
deleted file mode 100644
index 7af21f896..000000000
--- a/www/mozilla/Makefile.common
+++ /dev/null
@@ -1,427 +0,0 @@
-# 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.44 2007/02/04 22:41:19 marcus Exp $
-
-# This file contains some reusable components for mozilla ports. It's of
-# use primarily to apps from the mozilla project itself (such as Firefox,
-# Thunderbird, etc.), and probably won't be of use for gecko-based ports
-# like epiphany, galeon, etc. The reusable components for gecko-based ports
-# lives in www/mozilla/bsd.gecko.mk.
-#
-#
-# Ports can use the following:
-#
-# GECKO_PLIST_PRE_FILES  List of files to add to the beginning of plist
-# GECKO_PLIST_PRE_DIRS
-#
-# MOZILLA_PLIST_DIRS	List of directories to descend into when
-#			installing and creating the plist
-# MOZ_PIS_SCRIPTS	List of scripts residing in ${FILESDIR} to
-#			be filtered through MOZCONFIG_SED and installed
-#			along with our Pluggable Init Scripts (PIS)
-# MOZ_SED_ARGS		sed(1) commands through which MOZ_PIS_SCRIPTS
-#			are filtered. There is a default set defined here,
-#			so you probably want to add to MOZ_SED_ARGS rather
-#			than clobber it
-#
-# MOZ_OPTIONS		configure arguments (added to .mozconfig). If
-#			NOMOZCONFIG is defined, you probably want to set
-#			CONFIGURE_ARGS+=${MOZ_OPTIONS}
-# MOZ_MK_OPTIONS	make(1) arguments (added to .mozconfig). If
-#			NOMOZCONFIG is defined, you probably want to set
-#			MAKE_ARGS+=${MOZ_MK_OPTIONS}
-# MOZ_EXPORT		environment variables for the build process
-#			(added to .mozconfig). If NOMOZCONFIG is defined,
-#			you probably want to set MAKE_ENV+=${MOZ_EXPORT}
-# MOZ_EXTENSIONS	A list of extensions to build
-# MOZ_GRAPHICS		A list of image decoders to build
-# MOZ_PROTOCOLS		A list of protocols to build (http, ftp, etc.)
-#
-# PORT_MOZCONFIG	Defaults to ${FILESDIR}/mozconfig.in, but can
-#			be set to a generic mozconfig included with
-#			the port
-#
-# NOGECKO_INSTALL	Don't install the built gecko (most likely
-#			for testing)
-# NOGECKO_PLIST		Don't create a dynamically-generated playlist
-# NOMOZCONFIG		Don't drop a customized .mozconfig into the
-#			build directory. Options will have to be
-#			specified in CONFIGURE_ARGS instead
-
-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
-
-MAINTAINER?=	gnome@FreeBSD.org
-
-MOZILLA?=	${PORTNAME}
-MOZILLA_VER?=	${PORTVERSION}
-MOZILLA_BIN?=	${PORTNAME}-bin
-MOZ_RPATH?=	${MOZILLA}
-USE_GNOME+=	gtk20 libidl desktopfileutils
-USE_ICONV=	yes
-USE_PERL5_BUILD=yes
-USE_XLIB=	yes
-
-MOZILLA_SUFX?=	none
-WRKSRC?=	${WRKDIR}/mozilla
-FAKEDIR?=	${WRKDIR}/fake
-PLIST?=		${WRKDIR}/plist
-MASTER_DIR?=	${.CURDIR}/../../www/mozilla
-
-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
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-PKGINSTALL?=	${WRKDIR}/pkg-install
-PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
-MASTER_MOZDIR?=	${PORTSDIR}/www/mozilla
-PKGINSTALL_INC?=	${MASTER_MOZDIR}/pkg-install.in
-PKGDEINSTALL_INC?=	${MASTER_MOZDIR}/pkg-deinstall.in
-
-EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude */CVS/*	\
-			--exclude */macbuild/*			\
-			--exclude */package/*			\
-			--exclude mozilla/modules/libimg/png	\
-			--exclude mozilla/jpeg			\
-			--exclude mozilla/dbm			\
-			--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
-
-MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
-			${MOZILLA}-xpcom ${MOZILLA}-plugin
-
-CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
-LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
-
-_USE_GECKO_OPTIONS_ALL=	java debug logging optimized_cflags
-
-.if !defined(USE_GECKO_OPTIONS)
-USE_GECKO_OPTIONS=	debug logging optimized_cflags
-.endif
-
-debug_OPTION=	"Build a debugging image" off
-java_OPTION=	"Enable JAVA xpcom" off
-logging_OPTION=	"Enable additional log messages" off
-optimized_cflags_OPTION=	"Enable some additional optimizations" off
-
-.for option in ${USE_GECKO_OPTIONS:L}
-.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!=""
-OPTIONS+=	${option:U} ${${option}_OPTION}
-_${option}=	${TRUE}
-.endif
-.endfor
-
-# Standard options from README
-MOZ_TOOLKIT?=	gtk2
-MOZ_OPTIONS+=	--enable-crypto 	\
-		--disable-tests 	\
-		--enable-default-toolkit=${MOZ_TOOLKIT} \
-		--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}
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:=	${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
-WITH_OPTIMIZE?=	-O2
-.else
-CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
-WITH_OPTIMIZE?=
-.endif
-
-.if defined(WITH_SMB)
-USE_GNOME+=	gnomevfs2
-MOZ_OPTIONS+=	--enable-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_JAVA) && defined(_WITH_JAVA)
-USE_JAVA=	yes
-JAVA_VERSION+=	1.4+
-JAVA_OS+=	native
-CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
-MOZ_OPTIONS+=	--enable-javaxpcom
-.endif
-
-.if defined(WITH_LOGGING)
-MOZ_OPTIONS+=	--enable-logging
-.else
-MOZ_OPTIONS+=	--disable-logging
-.endif
-
-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|%%MOZILLA%%|${MOZILLA}|g'		\
-		-e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|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(${PKGINSTALL_INC})
-	@${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL}
-.endif
-.if exists(${PKGDEINSTALL_INC})
-	@${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${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 ; \
-		s|echo aout|echo elf|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
-	@if [ -d ${WRKSRC}/directory/c-sdk ]; then \
-		${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-			${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-			${WRKSRC}/directory/c-sdk/configure ; \
-	fi
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|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}/*/*/*/nsDeviceContextSpecG.cpp
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
-		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.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-configure: gecko-post-configure
-
-gecko-post-configure:
-	@${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h
-
-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-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
-
-.if !target(port-pre-install)
-port-pre-install:
-		@${DO_NADA}
-.endif
-
-gecko-pre-install:
-.if !defined(NOGECKO_PLIST)
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@${TOUCH} -f ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
-.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
-	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}
-	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config
-.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
-	${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \
-	${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc
-.endfor
-	@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
-		s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
-		${FAKEDIR}/bin/${MOZILLA} \
-		${FAKEDIR}/bin/${MOZILLA}-config
-.endif
-	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/${MOZILLA}	\
-		${FAKEDIR}/bin/${MOZILLA}-config
-	${RM} -f ${FAKEDIR}/bin/*.bak
-.endif
-
-gecko-create-plist:
-.if !defined(NOGECKO_PLIST)
-# Create the plist
-.for f in ${GECKO_PLIST_PRE_FILES}
-	${ECHO_CMD} ${f} >> ${PLIST}
-.endfor
-.for f in ${GECKO_PLIST_PRE_DIRS}
-	${ECHO_CMD} "@dirrm ${f}" >> ${PLIST}
-.endfor
-	${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 ${MOZ_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}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST}
-.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 ${MOZ_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(PACKAGE_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
deleted file mode 100644
index d6923aa36..000000000
--- a/www/mozilla/bsd.gecko.mk
+++ /dev/null
@@ -1,171 +0,0 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD$
-#    $MCom: ports-stable/www/mozilla/bsd.gecko.mk,v 1.3 2006/10/24 17:48:39 ahze 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 should 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.
-#
-# USE_GECKO= firefox-devel<->firefox
-#  This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure 
-#  if ${GECKO}=="firefox-devel"
-#
-#  Example:
-#  USE_GECKO= mozilla firefox seamonkey
-#  .include <bsd.port.pre.mk>
-#  .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-#  post-patch:
-#	@${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
-#		${WRKSRC}/configure
-#
-#  If you want your port to check the ${GECKO} variable to see which backend
-#  has been chosen.
-#
-#  Example:
-#  USE_GECKO= mozilla firefox seamonkey
-#  .include <bsd.port.pre.mk>
-#  .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-#  post-patch:
-#  .if ${GECKO}=="seamonkey"
-#	@${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \
-#		${WRKSRC}/configure
-#  .endif
-
-.if ${OSVERSION} >= 500000
-.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64"
-_GECKO_ALL=	firefox nvu seamonkey thunderbird xulrunner flock firefox15
-.endif
-.endif
-_GECKO_ALL+=	mozilla
-
-thunderbird_PORTSDIR=	mail
-
-.for gecko in ${_GECKO_ALL}
-${gecko}_PORTSDIR?=	www
-${gecko}_DEPENDS?=	${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko}
-${gecko}_PLIST?=	${LOCALBASE}/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:C/^([^<->]+).*/\1/}}!=""
-GOOD_USE_GECKO+=	${badgecko:C/^([^<->]+).*/\1/}
-. endif
-. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}"
-${badgecko:C/^([^<->]+).*/\1/}_HACK=	s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g
-. 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
-
-# Generic defines
-BROWSER_LINUX_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_linux_plugins
-BROWSER_PLUGINS_DIR?=		${LOCALBASE}/lib/browser_plugins
-
-GECKO_CONFIG?=			${LOCALBASE}/bin/${GECKO}-config
-XPIDL?=				${LOCALBASE}/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
-IGNORE=	Unable to find a supported gecko, please check 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} ""
-	@${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} ""
-
-post-patch: gecko-post-patch
-
-gecko-post-patch:
-.if defined(${GECKO}_HACK)
-	${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \
-		${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK}
-.endif
-
-#.endif # end it all
-.endif
-# HERE THERE BE TACOS
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
deleted file mode 100644
index 82439353f..000000000
--- a/www/mozilla/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (mozilla-1.7.13-source.tar.bz2) = eb0683207f7668319c65e403d04bfc41
-SHA256 (mozilla-1.7.13-source.tar.bz2) = 015018ffa88843563c8acbbcad16ffdc22a1e2d1a9e5a28972164ab86273b01e
-SIZE (mozilla-1.7.13-source.tar.bz2) = 30525187
-MD5 (libart_lgpl-1.tar.bz2) = c6dba83a091336ef8abdb7c85694f16e
-SHA256 (libart_lgpl-1.tar.bz2) = cd964fb67183c048f2c245ee26beeade29f3109e947c6d8a8993374c8f8392df
-SIZE (libart_lgpl-1.tar.bz2) = 102977
diff --git a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
deleted file mode 100644
index 758c0146c..000000000
--- a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Wed Mar  2 12:36:59 2005
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Wed Mar  2 12:36:37 2005
-@@ -56,6 +56,13 @@
- #include "nsArray.h"
- #include "nsDataHashtable.h"
- 
-+
-+#ifdef HAVE_CPP_2BYTE_WCHAR_T
-+  typedef nsDependentString nsLiteralString;
-+#else
-+  typedef NS_ConvertASCIItoUTF16 nsLiteralString;
-+#endif
-+
- /**
-  * \addtogroup libart_renderer Libart Rendering Engine
-  * @{
-@@ -112,7 +119,7 @@
-   nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
-     
- public:
--  static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;  
-+  static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;  
- };
- 
- /** @} */
-@@ -120,7 +127,7 @@
- //----------------------------------------------------------------------
- // nsSVGLibartGlyphMetricsFT implementation:
- 
--nsDataHashtable<nsStringHashKey,nsDependentString*>
-+nsDataHashtable<nsStringHashKey,nsLiteralString*>
- nsSVGLibartGlyphMetricsFT::sFontAliases;
- 
- 
-@@ -155,15 +162,15 @@
- 
-   static NS_NAMED_LITERAL_STRING(arial, "arial");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
--                                              &arial);
-+                                              (nsLiteralString *)&arial);
- 
-   static NS_NAMED_LITERAL_STRING(courier, "courier new");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
--                                              &courier);
-+                                              (nsLiteralString *)&courier);
- 
-   static NS_NAMED_LITERAL_STRING(times, "times new roman");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
--                                              &times);
-+                                              (nsLiteralString *)&times);
- }
- 
- void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -406,7 +413,7 @@
-   }
-   else {
-     // try alias if there is one:
--    nsDependentString *alias = nsnull;
-+    nsLiteralString *alias = nsnull;
-     nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
-                                                 &alias);
-     if (alias) {
-@@ -440,19 +447,19 @@
-     return;
-   }
- 
--  FTC_Image_Desc imageDesc;
--  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+  FTC_ImageType imageDesc;
-+  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
-   float twipstopixel = GetTwipsToPixels();
-   float scale = GetPixelScale();
--  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.image_type |= ftc_image_grays;
-+  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->flags = 0;
- 
-   // get the face
-   nsresult rv;
-   FTC_Manager mgr;
-   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
--  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
-   NS_ASSERTION(mFace, "failed to get face/size");
- }
- 
diff --git a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
deleted file mode 100644
index 84392bd4a..000000000
--- a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $
-
-diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 10:36:16.000000000 +0900
-+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
-@@ -155,15 +155,15 @@
- 
-   static NS_NAMED_LITERAL_STRING(arial, "arial");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
--                                              &arial);
-+                                              (nsDependentString *)&arial);
- 
-   static NS_NAMED_LITERAL_STRING(courier, "courier new");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
--                                              &courier);
-+                                              (nsDependentString *)&courier);
- 
-   static NS_NAMED_LITERAL_STRING(times, "times new roman");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
--                                              &times);
-+                                              (nsDependentString *)&times);
- }
- 
- void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -440,19 +440,19 @@
-     return;
-   }
- 
--  FTC_Image_Desc imageDesc;
--  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+  FTC_ImageType imageDesc;
-+  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
-   float twipstopixel = GetTwipsToPixels();
-   float scale = GetPixelScale();
--  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.image_type |= ftc_image_grays;
-+  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->flags = 0;
- 
-   // get the face
-   nsresult rv;
-   FTC_Manager mgr;
-   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
--  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
-   NS_ASSERTION(mFace, "failed to get face/size");
- }
- 
diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in
deleted file mode 100644
index 9af187e48..000000000
--- a/www/mozilla/files/mozconfig-generic.in
+++ /dev/null
@@ -1,8 +0,0 @@
-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/mozilla.desktop.in b/www/mozilla/files/mozilla.desktop.in
deleted file mode 100644
index 191765663..000000000
--- a/www/mozilla/files/mozilla.desktop.in
+++ /dev/null
@@ -1,169 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla Web Browser
-Name[az]=Mozilla Veb Səyyahı
-Name[bg]=Интернет браузър (Mozilla)
-Name[bs]=Mozilla web preglednik
-Name[ca]=Navegador web Mozilla
-Name[cs]=Prohlížeč WWW Mozilla
-Name[cy]=Y Porwr Gwe Mozilla
-Name[da]=Mozilla - internetbrowser
-Name[de]=Mozilla Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Mozilla
-Name[en_CA]=Mozilla Web Browser
-Name[en_GB]=Mozilla Web Browser
-Name[es]=Navegador Web Mozilla
-Name[et]=Mozilla veebibrauser
-Name[eu]=Mozilla web arakatzailea
-Name[fa]=مرورگر وب Mozilla
-Name[fi]=Mozilla, WWW-selain
-Name[fr]=Navigateur Web Mozilla
-Name[ga]=Brabhsálaí Lín Mozilla
-Name[he]=דפדפן Mozilla
-Name[hr]=Mozilla Web preglednik
-Name[hu]=Mozilla webböngésző
-Name[id]=Web Browser Mozilla
-Name[it]=Browser web Mozilla
-Name[ja]=Mozilla ウェブ・ブラウザ
-Name[ko]=Mozilla 웹 브라우저
-Name[li]=Mozilla Web Browser
-Name[lt]=Mozilla web naršyklė
-Name[mk]=Mozilla Веб Прелистувач
-Name[mn]=Mozilla веб хөтөч
-Name[ms]=Pelungsur Web Mozilla
-Name[nb]=Mozilla nettleser
-Name[nl]=Mozilla webbrowser
-Name[nn]=Mozilla nettlesar
-Name[no]=Mozilla nettleser
-Name[pl]=Przeglądarka WWW Mozilla
-Name[pt]=Navegador Web Mozilla
-Name[pt_BR]=Navegador Web Mozilla
-Name[ro]=Navigatorul Mozilla
-Name[sl]=Spletni brskalnik Mozilla
-Name[sq]=Mozilla - Shfletuesi Web
-Name[sv]=Webbläsaren Mozilla
-Name[tk]=Mozilla Web Ahtarçisi
-Name[tr]=Mozilla Web Tarayıcı
-Name[uk]=Переглядач web Mozilla
-Name[vi]=Trình Duyệt Web Mozilla
-Name[wa]=Betchteu waibe mozilla
-Name[zh_CN]=Mozilla Web 浏览器
-Name[zh_TW]=Mozilla 網頁瀏覽器
-GenericName=Mozilla Web Browser
-GenericName[az]=Mozilla Veb Səyyahı
-GenericName[bg]=Интернет браузър (Mozilla)
-GenericName[bs]=Mozilla web preglednik
-GenericName[ca]=Navegador web Mozilla
-GenericName[cs]=Prohlížeč WWW Mozilla
-GenericName[cy]=Y Porwr Gwe Mozilla
-GenericName[da]=Mozilla - internetbrowser
-GenericName[de]=Mozilla Webbrowser
-GenericName[el]=Περιηγητής Διαδικτύου Mozilla
-GenericName[en_CA]=Mozilla Web Browser
-GenericName[en_GB]=Mozilla Web Browser
-GenericName[es]=Navegador Web Mozilla
-GenericName[et]=Mozilla veebibrauser
-GenericName[eu]=Mozilla web arakatzailea
-GenericName[fa]=مرورگر وب Mozilla
-GenericName[fi]=Mozilla, WWW-selain
-GenericName[fr]=Navigateur Web Mozilla
-GenericName[ga]=Brabhsálaí Lín Mozilla
-GenericName[he]=דפדפן Mozilla
-GenericName[hr]=Mozilla Web preglednik
-GenericName[hu]=Mozilla webböngésző
-GenericName[id]=Web Browser Mozilla
-GenericName[it]=Browser web Mozilla
-GenericName[ja]=Mozilla ウェブ・ブラウザ
-GenericName[ko]=Mozilla 웹 브라우저
-GenericName[li]=Mozilla Web Browser
-GenericName[lt]=Mozilla web naršyklė
-GenericName[mk]=Mozilla Веб Прелистувач
-GenericName[mn]=Mozilla веб хөтөч
-GenericName[ms]=Pelungsur Web Mozilla
-GenericName[nb]=Mozilla nettleser
-GenericName[nl]=Mozilla webbrowser
-GenericName[nn]=Mozilla nettlesar
-GenericName[no]=Mozilla nettleser
-GenericName[pl]=Przeglądarka WWW Mozilla
-GenericName[pt]=Navegador Web Mozilla
-GenericName[pt_BR]=Navegador Web Mozilla
-GenericName[ro]=Navigatorul Mozilla
-GenericName[sl]=Spletni brskalnik Mozilla
-GenericName[sq]=Mozilla - Shfletuesi Web
-GenericName[sv]=Webbläsaren Mozilla
-GenericName[tk]=Mozilla Web Ahtarçisi
-GenericName[tr]=Mozilla Web Tarayıcı
-GenericName[uk]=Переглядач web Mozilla
-GenericName[vi]=Trình Duyệt Web Mozilla
-GenericName[wa]=Betchteu waibe mozilla
-GenericName[zh_CN]=Mozilla Web 浏览器
-GenericName[zh_TW]=Mozilla 網頁瀏覽器
-Comment=Browse the web
-Comment[ar]=تصفح الانترنت
-Comment[az]=Vebi gəzin
-Comment[be]=Вандраваць па павуціньню
-Comment[bg]=Сърфиране в интернет
-Comment[bn]=ওয়েব ব্রাউজ করুন
-Comment[bs]=Pregledaj na internetu
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížet WWW
-Comment[cy]=Pori'r we
-Comment[da]=Benyt internettet
-Comment[de]=Im Web surfen
-Comment[el]=Περιήγηση στον παγκόσμιο ιστό
-Comment[en_CA]=Browse the web
-Comment[en_GB]=Browse the web
-Comment[es]=Navegar por la web
-Comment[et]=Sirvi veebi
-Comment[eu]=Arakatu web-a
-Comment[fa]=مرور وب
-Comment[fi]=Selaa WWW:tä
-Comment[fr]=Naviguer sur Internet
-Comment[ga]=Brabhsáil an Líon
-Comment[gu]=વેબમાં શોધો
-Comment[he]=גלוש ברשת
-Comment[hi]=वेब ब्राउज़ करें
-Comment[hr]=Pregledaj Web
-Comment[hu]=A világháló böngészése
-Comment[id]=Jelajah web
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[li]=Blajere op internet
-Comment[lt]=Naršyti internete
-Comment[mk]=Прелистувајте го вебот
-Comment[ml]=വലക്കെട്ട് തിരയുക
-Comment[mn]=Веб броузе хийх
-Comment[ms]=Layari web
-Comment[nb]=Surf på nettet
-Comment[nl]=Websurfen
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegar na web
-Comment[pt_BR]=Navegar na web
-Comment[ro]=Navigare Internet
-Comment[ru]=Программа для просмотра веб-страниц
-Comment[sk]=Prehliadať internet
-Comment[sl]=Brskaj po spletu
-Comment[sq]=Eksploro web-in
-Comment[sr]=Прегледај веб
-Comment[sr@Latn]=Pregledaj veb
-Comment[sv]=Surfa på nätet
-Comment[ta]=வலையில் உலாவு
-Comment[th]=ใช้งานเว็บบราวเซอร์ Mozilla
-Comment[tk]=Webi Ahtar
-Comment[tr]=Web'e Gözat
-Comment[uk]=Програма перегляду web-сторінок
-Comment[vi]=Duyệt web
-Comment[wa]=Naivyî avå les waibes
-Comment[zh_CN]=浏览 Web
-Comment[zh_TW]=瀏覽網頁
-Exec=mozilla %U
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/mozilla/files/patch-Double.cpp b/www/mozilla/files/patch-Double.cpp
deleted file mode 100644
index 5cd13e4ff..000000000
--- a/www/mozilla/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
-+++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
-@@ -51,10 +51,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -75,22 +75,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in
deleted file mode 100644
index 5480cb799..000000000
--- a/www/mozilla/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Fri Aug 29 20:20:58 2003
-+++ Makefile.in	Sat Oct 18 15:34:15 2003
-@@ -67,8 +67,7 @@
- 	$(tier_2_dirs) \
- 	$(tier_9_dirs) \
- 	$(tier_40_dirs) \
--	$(tier_50_dirs) \
--	$(NULL)
-+	$(tier_50_dirs)
- 
- ifdef GC_LEAK_DETECTOR
- DIRS += gc/boehm
-@@ -87,7 +86,8 @@
- DIRS += $(tier_98_dirs)
- endif
- 
--DIRS	+= $(tier_99_dirs)
-+DIRS	+= $(tier_99_dirs) \
-+		$(NULL)
- 
- #
- # tier 0 - base build config dirs
diff --git a/www/mozilla/files/patch-bugzilla149334 b/www/mozilla/files/patch-bugzilla149334
deleted file mode 100644
index fe1be5bc8..000000000
--- a/www/mozilla/files/patch-bugzilla149334
+++ /dev/null
@@ -1,342 +0,0 @@
-Index: gfx/idl/nsIFreeType2.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsIFreeType2.idl
---- gfx/idl/nsIFreeType2.idl	15 Apr 2004 23:30:02 -0000	1.10
-+++ gfx/idl/nsIFreeType2.idl	26 May 2004 10:00:54 -0000
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp	17 Apr 2004 21:52:29 -0000	1.25
-+++ gfx/src/freetype/nsFreeType.cpp	26 May 2004 10:00:54 -0000
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h	17 Apr 2004 21:52:29 -0000	1.17
-+++ gfx/src/freetype/nsFreeType.h	26 May 2004 10:00:54 -0000
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-Index: gfx/src/ps/nsFontMetricsPS.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
-retrieving revision 1.43
-diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
---- gfx/src/ps/nsFontMetricsPS.cpp	17 Apr 2004 21:52:31 -0000	1.43
-+++ gfx/src/ps/nsFontMetricsPS.cpp	26 May 2004 10:01:03 -0000
-@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
-Index: gfx/src/ps/nsFontMetricsPS.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFontMetricsPS.h
---- gfx/src/ps/nsFontMetricsPS.h	17 Apr 2004 21:52:31 -0000	1.25
-+++ gfx/src/ps/nsFontMetricsPS.h	26 May 2004 10:01:03 -0000
-@@ -319,7 +319,7 @@ protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- 
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -362,7 +362,7 @@ public:
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
- 
-Index: gfx/src/x11shared/nsFontFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
-retrieving revision 1.14
-diff -u -3 -p -r1.14 nsFontFreeType.cpp
---- gfx/src/x11shared/nsFontFreeType.cpp	17 Apr 2004 21:52:34 -0000	1.14
-+++ gfx/src/x11shared/nsFontFreeType.cpp	26 May 2004 10:01:03 -0000
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-Index: gfx/src/x11shared/nsFontFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h	17 Apr 2004 21:52:34 -0000	1.10
-+++ gfx/src/x11shared/nsFontFreeType.h	26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/www/mozilla/files/patch-build_unix_run-mozilla.sh b/www/mozilla/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 87114cc7b..000000000
--- a/www/mozilla/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 12:27:28 2003
-+++ build/unix/run-mozilla.sh	Wed Feb 11 14:24:17 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%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"}
-@@ -442,6 +442,9 @@
- #
- export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
- export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
-+
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins
-+export MOZ_PLUGIN_PATH
- 
- if [ $moz_debug -eq 1 ]
- then
diff --git a/www/mozilla/files/patch-config-mkdepend-imakemdep.h b/www/mozilla/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e6644..000000000
--- a/www/mozilla/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/www/mozilla/files/patch-config::mkdepend::Makefile.in b/www/mozilla/files/patch-config::mkdepend::Makefile.in
deleted file mode 100644
index bace012a2..000000000
--- a/www/mozilla/files/patch-config::mkdepend::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
- include $(topsrcdir)/config/rules.mk
- 
- HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= $(XCFLAGS)
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/mozilla/files/patch-config::rules.mk b/www/mozilla/files/patch-config::rules.mk
deleted file mode 100644
index 16cb6ae11..000000000
--- a/www/mozilla/files/patch-config::rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	Sun May 18 16:10:18 2003
-+++ config/rules.mk	Sun Jul 20 18:07:26 2003
-@@ -448,7 +448,11 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
- 
diff --git a/www/mozilla/files/patch-config_autoconf.mk.in b/www/mozilla/files/patch-config_autoconf.mk.in
deleted file mode 100644
index c4fa0b516..000000000
--- a/www/mozilla/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Mon Mar 15 22:56:25 2004
-+++ config/autoconf.mk.in	Fri Mar 19 15:17:50 2004
-@@ -31,13 +31,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/www/mozilla/files/patch-extensions_p3p_Makefile.in b/www/mozilla/files/patch-extensions_p3p_Makefile.in
deleted file mode 100644
index efade70e9..000000000
--- a/www/mozilla/files/patch-extensions_p3p_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- extensions/p3p/Makefile.in.orig	Sun Jul  9 14:10:16 2006
-+++ extensions/p3p/Makefile.in	Sun Jul  9 14:20:10 2006
-@@ -62,23 +62,23 @@
- p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in
- 	@$(RM) -f $@
- 	$(PP) -DNAMESPACE=http://www.w3.org/2000/10/18/P3Pv1 \
--	-DHAS_TMPL_RETENTION\
-+	-DHAS_TMPL_RETENTION \
- 	$< > $@
- 
- p3p200012.xsl: resources/content/p3p.xsl.in Makefile.in
- 	@$(RM) -f $@
- 	$(PP) -DNAMESPACE=http://www.w3.org/2000/12/P3Pv1 \
--	-DHAS_CALL_OURS\
-+	-DHAS_CALL_OURS \
- 	$< > $@
- 
- p3p200109.xsl: resources/content/p3p.xsl.in Makefile.in
- 	@$(RM) -f $@
- 	$(PP) -DNAMESPACE=http://www.w3.org/2001/09/P3Pv1 \
--	-DHAS_CALL_OURS\
-+	-DHAS_CALL_OURS \
- 	$< > $@
- 
- p3p200201.xsl: resources/content/p3p.xsl.in Makefile.in
- 	@$(RM) -f $@
- 	$(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \
--	-DHAS_CALL_OURS -DHAS_PURPOSE_SRC\
-+	-DHAS_CALL_OURS -DHAS_PURPOSE_SRC \
- 	$< > $@
diff --git a/www/mozilla/files/patch-gcc4 b/www/mozilla/files/patch-gcc4
deleted file mode 100644
index 855a756a6..000000000
--- a/www/mozilla/files/patch-gcc4
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.24
-diff -u -r1.24 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp	7 Feb 2004 15:22:30 -0000	1.24
-+++ gfx/src/freetype/nsFreeType.cpp	4 Mar 2005 19:59:53 -0000
-@@ -96,7 +96,7 @@
- // Define the FreeType2 functions we resolve at run time.
- // see the comment near nsFreeType2::DoneFace() for more info
- //
--#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
-+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
- FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
-   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
-Index: widget/src/gtk2/nsDragService.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
-retrieving revision 1.5
-diff -u -r1.5 nsDragService.cpp
---- widget/src/gtk2/nsDragService.cpp	30 Oct 2003 01:48:41 -0000	1.5
-+++ widget/src/gtk2/nsDragService.cpp	4 Mar 2005 20:00:01 -0000
-@@ -838,7 +838,7 @@
-             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-         listTarget->target = g_strdup(gMimeListType);
-         listTarget->flags = 0;
--        listTarget->info = (guint)listAtom;
-+        listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
-         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                ("automatically adding target %s with id %ld\n",
-                listTarget->target, listAtom));
-@@ -877,7 +877,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             listTarget->target = g_strdup(gTextUriListType);
-                             listTarget->flags = 0;
--                            listTarget->info = (guint)listAtom;
-+                            listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", listTarget->target, listAtom));
-@@ -914,7 +914,7 @@
-                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                         target->target = g_strdup(flavorStr);
-                         target->flags = 0;
--                        target->info = (guint)atom;
-+                        target->info = (guint)NS_PTR_TO_INT32(atom);
-                         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                ("adding target %s with id %ld\n",
-                                target->target, atom));
-@@ -931,7 +931,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             plainTarget->target = g_strdup(kTextMime);
-                             plainTarget->flags = 0;
--                            plainTarget->info = (guint)plainAtom;
-+                            plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", plainTarget->target, plainAtom));
-@@ -948,7 +948,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             urlTarget->target = g_strdup(gMozUrlType);
-                             urlTarget->flags = 0;
--                            urlTarget->info = (guint)urlAtom;
-+                            urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", urlTarget->target, urlAtom));
---- mailnews/mime/src/mimeeobj.h.orig	Sat Dec 16 14:01:13 2006
-+++ mailnews/mime/src/mimeeobj.h	Sat Dec 16 14:01:28 2006
-@@ -54,7 +54,7 @@ struct MimeExternalObjectClass {
-   MimeLeafClass leaf;
- };
- 
--extern MimeExternalObjectClass mimeExternalObjectClass;
-+extern "C" MimeExternalObjectClass mimeExternalObjectClass;
- 
- struct MimeExternalObject {
-   MimeLeaf leaf;
diff --git a/www/mozilla/files/patch-gfx-src-gtk-Makefile.in b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in
deleted file mode 100644
index ff8b69984..000000000
--- a/www/mozilla/files/patch-gfx-src-gtk-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-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-gfx_src_ps_nsType1.cpp b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp
deleted file mode 100644
index 29752f34a..000000000
--- a/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
---- gfx/src/ps/nsType1.cpp.orig	Wed Dec 11 01:24:47 2002
-+++ gfx/src/ps/nsType1.cpp	Sun Sep 10 09:52:45 2006
-@@ -81,8 +81,8 @@
-   int            wmode;
- } FT2PT1_info;
- 
--static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, 
--                   FT_Vector *aEndPt, void *aClosure);
-+static int cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, 
-+                   const FT_Vector *aEndPt, void *aClosure);
- static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd);
- static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue);
- 
-@@ -173,7 +173,7 @@
- }
- 
- static PRBool
--sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti)
-+sideWidthAndBearing(const FT_Vector *aEndPt, FT2PT1_info *aFti)
- {
-   int aw = 0;
-   int ah = 0;
-@@ -216,7 +216,7 @@
- }
- 
- static int
--moveto(FT_Vector *aEndPt, void *aClosure)
-+moveto(const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
-   FT_UShort upm = fti->face->units_per_EM;
-@@ -253,7 +253,7 @@
- }
- 
- static int
--lineto(FT_Vector *aEndPt, void *aClosure)
-+lineto(const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
-   FT_UShort upm = fti->face->units_per_EM;
-@@ -279,7 +279,7 @@
- }
- 
- static int
--conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure)
-+conicto(const FT_Vector *aControlPt, const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
-   FT_UShort upm = ftinfo->face->units_per_EM;
-@@ -311,7 +311,7 @@
- }
- 
- static int
--cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt,
-+cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, const FT_Vector *aEndPt,
-         void *aClosure)
- {
-   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
diff --git a/www/mozilla/files/patch-libm b/www/mozilla/files/patch-libm
deleted file mode 100644
index 7de64b2a5..000000000
--- a/www/mozilla/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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-qt b/www/mozilla/files/patch-qt
deleted file mode 100644
index d1cb9f9f7..000000000
--- a/www/mozilla/files/patch-qt
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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 9374 "configure"
- #include "confdefs.h"
-@@ -9399,7 +9399,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -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 9415 "configure"
- #include "confdefs.h"
-@@ -9440,7 +9440,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -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 @@
- 
- 
- 
--MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
-+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
- 
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks"
- 
- # Check whether --enable-extensions or --disable-extensions was given.
- if test "${enable_extensions+set}" = set; then
diff --git a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
deleted file mode 100644
index 5c76b5af5..000000000
--- a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
+++ /dev/null
@@ -1,37 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Thu Jul  8 12:56:24 2004
-@@ -35,16 +35,18 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
--DEFAULT_COMPILER	= gcc
--CC			= gcc
--CCC			= g++
-+CCC			= ${CXX}
- RANLIB			= ranlib
- 
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -71,7 +73,11 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr
deleted file mode 100644
index 19e2703b4..000000000
--- a/www/mozilla/files/patch-sysnspr
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index d854cabc0..000000000
--- a/www/mozilla/files/patch-sysnss
+++ /dev/null
@@ -1,178 +0,0 @@
---- 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-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f53..000000000
--- a/www/mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/www/mozilla/files/patch-widget_src_gtk2_nsDragService.cpp b/www/mozilla/files/patch-widget_src_gtk2_nsDragService.cpp
deleted file mode 100644
index df9abaef6..000000000
--- a/www/mozilla/files/patch-widget_src_gtk2_nsDragService.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- widget/src/gtk2/nsDragService.cpp.nograb	2007-01-16 21:26:49.000000000 -0500
-+++ widget/src/gtk2/nsDragService.cpp	2007-01-16 21:27:04.000000000 -0500
-@@ -799,7 +799,6 @@
- void
- nsDragService::GetTargetDragData(GdkAtom aFlavor)
- {
--    gtk_grab_add(mHiddenWidget);
-     PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor));
-     PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n",
-                                    mTargetWidget, mTargetDragContext));
-@@ -817,7 +816,6 @@
-         gtk_main_iteration();
-     }
-     PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n"));
--    gtk_grab_remove(mHiddenWidget);
- }
- 
- void
diff --git a/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc
deleted file mode 100644
index ebe5474ca..000000000
--- a/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
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
deleted file mode 100644
index dbdc47b6f..000000000
--- a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 14:31:25 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -59,8 +62,8 @@
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
- endif
- endif
--# IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+# IA64 Linux & FreeBSD
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in b/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in
deleted file mode 100644
index 768eaf648..000000000
--- a/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in
+++ /dev/null
@@ -1,436 +0,0 @@
---- xpfe/bootstrap/mozilla.in.orig	Fri Feb 20 19:13:46 2004
-+++ xpfe/bootstrap/mozilla.in	Tue Mar 22 22:40:43 2005
-@@ -29,141 +29,324 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+		    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+		    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
- #uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
- 
--# honor MOZILLA_FIVE_HOME if it's there
--if [ -n "$MOZILLA_FIVE_HOME" ] ; then
--  dist_bin="$MOZILLA_FIVE_HOME"
--else
--  # Use run-mozilla.sh in the current dir if it exists
--  # If not, then start resolving symlinks until we find run-mozilla.sh
--  found=0
--  progname=$0
--  curdir=`dirname "$progname"`
--  run_moz="$curdir/run-mozilla.sh"
--  if test -x "$run_moz"; then
--    dist_bin=$curdir
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+use_openFile="yes"	# use openFile() for file/dir
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export MRE_HOME
-+
-+# Use run-mozilla.sh in the current dir if it exists
-+# If not, then start resolving symlinks until we find run-mozilla.sh
-+found=0
-+progname="$0"
-+curdir=`dirname "$progname"`
-+progbase=`basename "$progname"`
-+run_moz="$curdir/run-mozilla.sh"
-+# mozilla must obey MOZILLA_FIVE_HOME
-+if [ -n "$MOZILLA_FIVE_HOME" -a -d "$MOZILLA_FIVE_HOME" -a \
-+	-x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then
-+    curdir="$MOZILLA_FIVE_HOME"
-+    run_moz="$curdir/run-mozilla.sh"
-+    dist_bin="$curdir"
-     found=1
--  else
--    here=`/bin/pwd`
--    while [ -h "$progname" ]; do
--      bn=`basename "$progname"`
--      cd `dirname "$progname"`
--      progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' `
--      if [ ! -x "$progname" ]; then
--        break
--      fi
--      curdir=`dirname "$progname"`
--      run_moz="$curdir/run-mozilla.sh"
--      if [ -x "$run_moz" ]; then
--        cd "$curdir"
--        dist_bin=`pwd`
--        found=1
--        break
--      fi
-+elif [ -x "$run_moz" ]; then
-+    dist_bin="$curdir"
-+    found=1
-+else
-+    while [ -h "${progname}" ]; do
-+	bn=`basename "${progname}"`
-+	cd `dirname "${progname}"`
-+	progname=`ls -l "${bn}" | sed -e 's/^.* -> //'`
-+	if [ ! -x "$progname" ]; then
-+	    break
-+	fi
-+	curdir=`dirname "${progname}"`
-+	run_moz="${curdir}/run-mozilla.sh"
-+	if [ -x "${run_moz}" ]; then
-+	    cd "$curdir"
-+	    dist_bin=`pwd`
-+	    run_moz="${dist_bin}/run-mozilla.sh"
-+	    found=1
-+	    break
-+	fi
-     done
--    cd "$here"
--  fi
--  if [ $found = 0 ]; then
-+    cd "${here}"
-+fi
-+if [ $found = 0 ]; then
-     # Check default compile-time libdir
--    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
--      dist_bin=$moz_libdir
--    else 
--      echo "Cannot find mozilla runtime directory. Exiting."
--      exit 1
--    fi
--  fi
-+    if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
-+	dist_bin="$moz_libdir"
-+	run_moz="${dist_bin}/run-mozilla.sh"
-+    else
-+	echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
-+	exit 1
-+    fi
- fi
- 
--script_args=""
--debugging=0
--MOZILLA_BIN="%MOZILLA-BIN%"
--
-+MOZILLA_BIN="${progbase}-bin"
- if [ "$OSTYPE" = "beos" ]; then
--  mimeset -F $MOZILLA_BIN
-+    mimeset -F "$MOZILLA_BIN"
- fi
- 
-+# test for binary apps in ${dist_bin}
-+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
-+    MOZILLA_BIN="${dist_bin}/${progbase}-bin"
-+else
-+    echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
-+    exit 1
-+fi
-+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
-+    MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
-+else
-+    MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
-+fi
-+
-+# guest a default remote command
-+_remote_cmd="xfeDoCommand(openBrowser)"
-+
-+# parse options
-+script_args=	# null
-+moreargs=	# null
-+target=		# null
-+ALREADY_RUNNING="test"
- pass_arg_count=0
- while [ $# -gt $pass_arg_count ]
- do
--  case "$1" in
--    -p | -pure)
--      MOZILLA_BIN="%MOZILLA-BIN%.pure"
--      shift
--      ;;
--    -g | --debug)
--      script_args="$script_args -g"
--      debugging=1
--      shift
--      ;;
--    -d | --debugger)
--      script_args="$script_args -d $2"
--      shift 2
--      ;;
--    *)
--      # Move the unrecognized argument to the end of the list.
--      arg="$1"
--      shift
--      set -- "$@" "$arg"
--      pass_arg_count=`expr $pass_arg_count + 1`
--      ;;
--  esac
-+    if [ -n "${target}" ]; then
-+	# well, this can't be the target if not last
-+	moreargs="${moreargs} \"${target}\""
-+	target=	# null
-+    fi
-+    case "$1" in
-+	# preserve [pP] for profile
-+	--pure | -pure)
-+	    MOZILLA_BIN="${MOZILLA_BIN}.pure"
-+	    shift
-+	    ;;
-+	-g | --debug)
-+	    script_args="${script_args} -g"
-+	    debugging=1
-+	    shift
-+	    ;;
-+	-d | --debugger)
-+	    if [ -n "$2" ]; then
-+		script_args="${script_args} -d $2"
-+		shift 2
-+	    else
-+		"$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-[Uu][Ii][Ll]ocale)
-+	    if [ -n "$2" ]; then
-+		uilocale="$2"
-+		shift 2
-+	    else
-+		echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-[Uu][Ii][Rr]egion)
-+	    if [ -n "$2" ]; then
-+		uiregion="$2"
-+		shift 2
-+	    else
-+		echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-browser)
-+	    # browser is default for mozilla
-+	    shift
-+	    ;;
-+	-mail)
-+	    _remote_cmd="xfeDoCommand(openInbox)"
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	-compose)
-+	    _remote_cmd="xfeDoCommand(composeMessage)"
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	-turbo | -nosplash | -quiet)
-+	    # use remote even with this
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	-*)
-+	    # don't use remote with options
-+	    ALREADY_RUNNING=	# null
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	*)
-+	    target="$1"
-+	    shift
-+	    ;;
-+    esac
- done
- 
--export MRE_HOME
-+# test for a running copy of firefox
-+# seems this is not needed
-+#if [-n "${ALREADY_RUNNING}" ]; then
-+#    if [ -n "${DISPLAY}" ]; then
-+#	if [ -n "${debugging}" ]; then
-+#	    echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()"
-+#	    ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes"
-+#	else
-+#	    ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 &&
-+#		ALREADY_RUNNING="yes"
-+#	fi
-+#    elif [ -n "${debugging}" ]; then
-+#	echo "$0: WARN, no DISPLAY environment" 1>&2
-+#    fi
-+#fi
-+
-+# process target
-+if [ -n "${target}" ]; then
-+    moreargs="${moreargs} \"${target}\""
-+    if [ -n "${ALREADY_RUNNING}" ]; then
-+	if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then
-+	    if [ `expr "${target}" : '/.*'` -eq 0 ]; then
-+		target="${here}/${target}"
-+	    fi
-+	    if [ -r "${target}" -o -d "${target}" ]; then
-+		[ -n "${use_openFile}" ] || target="file://${target}"
-+	    else
-+		echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2
-+		ALREADY_RUNNING=	# null
-+	    fi
-+	else
-+	    # an former URI, don't use openFile
-+	    use_openFile=	# null
-+	fi
-+    fi
-+fi
-+
-+# try remote protocol if running
-+if [ -n "${ALREADY_RUNNING}" ]; then
-+    if [ -n "${target}" ]; then
-+	if [ -n "${use_openFile}" ]; then
-+	    _remote_cmd="openFile(${target})"
-+	elif [ -n "${location}" ]; then
-+	    _remote_cmd="openURL(${target},${location})"
-+	else
-+	    _remote_cmd="openURL(${target})"
-+	fi
-+    fi
-+    # FIXME problems with freedesktop StartupNotify
-+    if [ -n "${debugging}" ]; then
-+	echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}"
-+	${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} &&
-+       	    exit 0
-+    else
-+	${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \
-+	    >/dev/null 2>&1 && exit 0
-+    fi
-+fi
-+
-+# fallback to direct invocation
-+
-+# UILocale, UIRegion
-+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then
-+    uilocale="${MOZILLA_UILOCALE}"
-+fi
-+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
-+    uiregion="${MOZILLA_UIREGION}"
-+fi
-+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
-+    uilocale="en-US"
-+fi
-+if [ -n "${uilocale}" ]; then
-+    if [ -n "${uiregion}" ]; then
-+	moreargs="-UIRegion ${uiregion} ${moreargs}"
-+    fi
-+    moreargs="-UILocale ${uilocale} ${moreargs}"
-+fi
-+
-+# real invocation
-+eval "set -- ${moreargs}"
- 
- ## Start addon scripts
- moz_pis_startstop_scripts "start"
- 
--if [ $debugging = 1 ]
--then
--  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
-+if [ -n "${debugging}" ]; then
-+    echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
- exitcode=$?
- 
- ## Stop addon scripts
diff --git a/www/mozilla/files/patch-xptcall-alpha b/www/mozilla/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e..000000000
--- a/www/mozilla/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/www/mozilla/files/patch-xptcall-amd64 b/www/mozilla/files/patch-xptcall-amd64
deleted file mode 100644
index 3227cad02..000000000
--- a/www/mozilla/files/patch-xptcall-amd64
+++ /dev/null
@@ -1,386 +0,0 @@
---- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
---- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+    if (! iface_info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/www/mozilla/files/patch-xptcall-ia64 b/www/mozilla/files/patch-xptcall-ia64
deleted file mode 100644
index 9cd07f7dd..000000000
--- a/www/mozilla/files/patch-xptcall-ia64
+++ /dev/null
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	Sun Jul 20 00:05:32 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	Sun Jul 20 00:06:37 2003
-@@ -8,6 +8,7 @@
- // Section has executable code
-         .section .text, "ax","progbits"
- // procedure named 'XPTC_InvokeByIndex'
-+	.global	XPTC_InvokeByIndex
-         .proc   XPTC_InvokeByIndex
- // manual bundling
-         .explicit
-@@ -24,7 +25,7 @@
- 
- // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
- //   PRUint32 paramCount, nsXPTCVariant* params);
--XPTC_InvokeByIndex::
-+XPTC_InvokeByIndex:
-         .prologue
-         .save ar.pfs, r37
- // allocate 4 input args, 6 local args, and 8 output args
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Sun Jul 20 00:02:02 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Sun Jul 20 00:02:40 2003
-@@ -6,6 +6,7 @@
- // Section has executable code
-         .section .text, "ax","progbits"
- // procedure named 'SharedStub'
-+	.global SharedStub
-         .proc   SharedStub
- // manual bundling
-         .explicit
-@@ -14,7 +15,7 @@
- //      .exclass  PrepareAndDispatch, @fullyvisible
-         .type   PrepareAndDispatch,@function
- 
--SharedStub::
-+SharedStub:
- // 9 arguments, first 8 are the input arguments of previous
- // function call.  The last one is methodIndex, and is passed in memory
-         .prologue
diff --git a/www/mozilla/files/patch-xptcall-sparc64 b/www/mozilla/files/patch-xptcall-sparc64
deleted file mode 100755
index 9599a8a71..000000000
--- a/www/mozilla/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
deleted file mode 100644
index 535f0f50a..000000000
--- a/www/mozilla/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-#    $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.9 2006/10/18 17:29:07 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
-rm -rf ${MOZDIR}/updates
-find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1
-find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1
-
-exit 0
diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr
deleted file mode 100644
index 37a7a6403..000000000
--- a/www/mozilla/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is the current release of the Mozilla open source web browser. It should 
-be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, 
-JavaScript, MathML, SVG and RDF.  This version also supports SSL encryption, 
-and Java with the use of the FreeBSD native Java plug-in.
-
-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.
-
-WWW: http://www.mozilla.org/
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
deleted file mode 100644
index f3d6e6f1a..000000000
--- a/www/mozilla/pkg-install.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-#    $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.9 2006/10/18 17:29:07 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-MOZBIN=${MOZDIR}/%%MOZILLA_BIN%%
-REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-
-cd ${MOZDIR} || exit 1
-if [ -f ${REGXPCOM} ]; then
-	./run-mozilla.sh ${REGXPCOM} || true
-fi
-if [ -f ${REGCHROME} ]; then
-	./run-mozilla.sh ${REGCHROME} || true
-fi
-if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then
-	./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1
-fi
-if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
-    mkdir -p %%PREFIX%%/lib/browser_plugins
-fi
-cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/plugins/ > /dev/null 2>&1
-cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1
-
-exit 0
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
deleted file mode 100644
index ebc4bf3bf..000000000
--- a/www/peacock/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	peacock
-# Date created:				21st April 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	peacock
-PORTVERSION=	1.9.1
-PORTREVISION=	8
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	pav@FreeBSD.org
-COMMENT=	A GUI-based HTML Editor for GTK+/GNOME
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui gtksourceview gtkhtml3
-GNU_CONFIGURE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
-	    	${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/www/peacock/distinfo b/www/peacock/distinfo
deleted file mode 100644
index a058127a1..000000000
--- a/www/peacock/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (peacock-1.9.1.tar.gz) = 85283f1c5f6e271ed7f977b18d7504b0
-SHA256 (peacock-1.9.1.tar.gz) = 2e7045cd0b0cba4b2ffe8e056e9a213c4bab63bc946398bbd79e31d44f3fe81a
-SIZE (peacock-1.9.1.tar.gz) = 146327
diff --git a/www/peacock/pkg-descr b/www/peacock/pkg-descr
deleted file mode 100644
index 2d1aad772..000000000
--- a/www/peacock/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Peacock is a GUI-based HTML Editor for GNOME 2. It is a WYSIWYG HTML
-editor, using GtkHTML control known from Evolution.  It supports most
-of HTML 4.0 standards, templates for documents, styles and images.
-
-WWW: http://peacock.sourceforge.net/
diff --git a/www/peacock/pkg-plist b/www/peacock/pkg-plist
deleted file mode 100644
index cf58da995..000000000
--- a/www/peacock/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/peacock-2
-share/gnome/peacock-2/glade/dialogs.glade
-share/gnome/peacock-2/pixmaps/peacock-logo.png
-share/gnome/peacock-2/ui/peacock-ui.xml
-@dirrm share/gnome/peacock-2/ui
-@dirrm share/gnome/peacock-2/pixmaps
-@dirrm share/gnome/peacock-2/glade
-@dirrm share/gnome/peacock-2