- Remove www/seamonkey2 and www/seamonkey2-i18n: Upstream support dropped

  and multiple vulnerabilities.

48 files changed, 6 insertions, 4035 deletions

diff --git a/MOVED b/MOVED
index 2022821926ae..ca5bcbd22d5a 100644
--- a/MOVED
+++ b/MOVED
@@ -2823,3 +2823,5 @@ x11/kdebase4-workspace|x11/kde4-workspace|2011-10-16|Renamed upstream
 deskutils/lightning|www/seamonkey|2011-10-19|Superseded by LIGHTNING option in SeaMonkey
 deskutils/lightning-thunderbird|mail/thunderbird|2011-10-19|Superseded by LIGHTNING option in Thunderbird
 mail/enigmail-seamonkey2|mail/enigmail-seamonkey|2011-10-19|Depends on outdated and vulnerable SeaMonkey 2.0
+www/seamonkey2-i18n|www/seamonkey-i18n|2011-10-19|Depends on outdated and vulnerable SeaMonkey 2.0
+www/seamonkey2|www/seamonkey|2011-10-19|Upstream support dropped and multiple vulnerabilities
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 6b3ae12b0e58..d78e57e70111 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -192,7 +192,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #                         version is given by the maintainer via the port 
 #                         or by the user via defined variable try to find
 #                         the highest stable installed version.
-#                         Available values: yes 24+ 20+ 24 20
+#                         Available values: yes 24+ 24
 #                         NOTE:
 #                         default value 24 is used in case of USE_SEAMONKEY=yes
 #
@@ -296,12 +296,11 @@ _SEAMONKEY_BUILD_DEPENDS=	yes
 .endif
 
 _SEAMONKEY_DEFAULT_VERSION=	24
-_SEAMONKEY_VERSIONS=		24 20
-_SEAMONKEY_RANGE_VERSIONS=	24+ 20+
+_SEAMONKEY_VERSIONS=		24
+_SEAMONKEY_RANGE_VERSIONS=	24+
 
 # For specifying [24, 20, ..]+
-_SEAMONKEY_24P=	24 ${_SEAMONKEY_20P}
-_SEAMONKEY_20P=	20
+_SEAMONKEY_24P=	24
 
 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
 .if ${USE_SEAMONKEY} == "yes"
@@ -311,8 +310,6 @@ USE_SEAMONKEY=	${_SEAMONKEY_DEFAULT_VERSION}
 # Setting/finding SeaMonkey version we want.
 .if exists(${LOCALBASE}/bin/seamonkey)
 _SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
-.elif exists(${LOCALBASE}/bin/seamonkey2)
-_SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey2 --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed SeaMonkey version matches the wanted one
@@ -346,7 +343,6 @@ IGNORE=			cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C
 
 # Dependence lines for different SeaMonkey versions
 24_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
-20_DEPENDS=		${LOCALBASE}/lib/seamonkey2/seamonkey:${PORTSDIR}/www/seamonkey2
 
 # Add dependencies
 .if defined(USE_SEAMONKEY)
diff --git a/www/Makefile b/www/Makefile
index cbbe9ab5d11d..8e60ecf0f096 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1676,8 +1676,6 @@
     SUBDIR += script4rss
     SUBDIR += seamonkey
     SUBDIR += seamonkey-i18n
-    SUBDIR += seamonkey2
-    SUBDIR += seamonkey2-i18n
     SUBDIR += selenium
     SUBDIR += serendipity
     SUBDIR += serf
diff --git a/www/seamonkey2-i18n/Makefile b/www/seamonkey2-i18n/Makefile
deleted file mode 100644
index f2c95c71c48d..000000000000
--- a/www/seamonkey2-i18n/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# New ports collection makefile for:	firefox3-i18n
-# Date created:		28 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	seamonkey2-i18n
-PORTVERSION=	2.0.14
-PORTREVISION=	3
-CATEGORIES=	www
-MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
-PKGNAMEPREFIX=
-DISTFILES=	${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./}
-DIST_SUBDIR=	xpi/${DISTNAME}
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for SeaMonkey 2
-
-USE_SEAMONKEY=	20
-USE_XPI=	seamonkey2
-
-USE_SUBMAKE=	yes
-
-WDIR=	langpack2-*@seamonkey.mozilla.org
-
-XPI_DISTNAMES=	${SEAMONKEY_I18N_}
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-.include "${.CURDIR}/Makefile.option"
-.include <bsd.port.options.mk>
-.include "${.CURDIR}/Makefile.lang"
-
-SEAMONKEY_I18N_?=	${SEAMONKEY_I18N}
-
-.for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack2-${dist}@seamonkey.mozilla.org
-XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}=	chrome
-.endfor
-
-pre-everything::
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Please define SEAMONKEY_I18N_ALL to install all languages."
-	@${ECHO_CMD}
-	@${MKDIR} ${WRKSRC}
-
-do-extract:
-	@for lang in ${SEAMONKEY_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack2-$$lang@seamonkey.mozilla.org);\
-		then \
-			exit 1; \
-		fi \
-	done
-
-do-install:
-	@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
-	@${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/
-	@for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; }
-	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
-	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
-		${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
-	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
-
-	@${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
-
-post-patch:
-	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
-			-e 's/\(langpack\)/\12/'
-
-List-Langs:
-	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${PORTVERSION}/langpack"|\
-		${PERL} -ne 'if(/.*href="seamonkey-${PORTVERSION}.([a-zA-Z-]+).langpack.xpi"/){print "$$1\n"}' |\
-		${AWK} 'BEGIN{ORS=" "}{print $1}END{printf "\nNumber of languages: %d\n",NR}'
-
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-
-.include <bsd.port.mk>
diff --git a/www/seamonkey2-i18n/Makefile.lang b/www/seamonkey2-i18n/Makefile.lang
deleted file mode 100644
index de1fdfc74ee8..000000000000
--- a/www/seamonkey2-i18n/Makefile.lang
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile.lang for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
-# $FreeBSD$
-#
-# Currently, the following 19 languages are supported.
-#
-SEAMONKEY_I18N_ALL_=	be ca cs de es-AR es-ES fr gl hu it \
-			ka lt nb-NO nl pl pt-PT ru sk tr
-
-.if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum)
-SEAMONKEY_I18N=   ${SEAMONKEY_I18N_ALL_}
-.else
-.ifndef WITHOUT_LANG_BE
-SEAMONKEY_I18N+=  be
-.endif
-.ifndef WITHOUT_LANG_CA
-SEAMONKEY_I18N+=  ca
-.endif
-.ifndef WITHOUT_LANG_CS
-SEAMONKEY_I18N+=  cs
-.endif
-.ifndef WITHOUT_LANG_DE
-SEAMONKEY_I18N+=  de
-.endif
-.ifndef WITHOUT_LANG_SA
-SEAMONKEY_I18N+=  es-AR
-.endif
-.ifndef WITHOUT_LANG_ES
-SEAMONKEY_I18N+=  es-ES
-.endif
-.ifndef WITHOUT_LANG_FR
-SEAMONKEY_I18N+=  fr
-.endif
-.ifndef WITHOUT_LANG_GL
-SEAMONKEY_I18N+=  gl
-.endif
-.ifndef WITHOUT_LANG_HU
-SEAMONKEY_I18N+=  hu
-.endif
-.ifndef WITHOUT_LANG_IT
-SEAMONKEY_I18N+=  it
-.endif
-.ifndef WITHOUT_LANG_KA
-SEAMONKEY_I18N+=  ka
-.endif
-.ifndef WITHOUT_LANG_LT
-SEAMONKEY_I18N+=  lt
-.endif
-.ifndef WITHOUT_LANG_NB
-SEAMONKEY_I18N+=  nb-NO
-.endif
-.ifndef WITHOUT_LANG_NL
-SEAMONKEY_I18N+=  nl
-.endif
-.ifndef WITHOUT_LANG_PL
-SEAMONKEY_I18N+=  pl
-.endif
-.ifndef WITHOUT_LANG_PT
-SEAMONKEY_I18N+=  pt-PT
-.endif
-.ifndef WITHOUT_LANG_RU
-SEAMONKEY_I18N+=  ru
-.endif
-.ifndef WITHOUT_LANG_SK
-SEAMONKEY_I18N+=  sk
-.endif
-.ifndef WITHOUT_LANG_TR
-SEAMONKEY_I18N+=  tr
-.endif
-.endif
diff --git a/www/seamonkey2-i18n/Makefile.option b/www/seamonkey2-i18n/Makefile.option
deleted file mode 100644
index 1c7d12984372..000000000000
--- a/www/seamonkey2-i18n/Makefile.option
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile.option for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
-# $FreeBSD$
-#
-
-OPTIONS=		LANG_BE "Byelorussian"          off \
-				LANG_CA "Catalan"               off \
-				LANG_CS "Czech"                 off \
-				LANG_NL "Dutch"                 off \
-				LANG_GL "Galician"              off \
-				LANG_KA "Georgian"              off \
-				LANG_DE "German"                on \
-				LANG_FR "French"                on \
-				LANG_HU "Hungarian"             off \
-				LANG_IT "Italian"               on \
-				LANG_LT "Lithuanian"            off \
-				LANG_NB "Norwegian"             off \
-				LANG_PL "Polish"                off \
-				LANG_PT "Portuguese"            off \
-				LANG_RU "Russian"               on \
-				LANG_ES "Spanish"               on \
-				LANG_SA "Spanish (Argentina)"   off \
-				LANG_SK "Slovak"                off \
-				LANG_TR "Turkish"               off
diff --git a/www/seamonkey2-i18n/distinfo b/www/seamonkey2-i18n/distinfo
deleted file mode 100644
index c8ab6b45997c..000000000000
--- a/www/seamonkey2-i18n/distinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.be.langpack.xpi) = c803810ff7942252519cb89b25665416a11251281f435909626e5fb5a514f6a5
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.be.langpack.xpi) = 482603
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ca.langpack.xpi) = 1fa18a23049110de5d08fa58796dce6fb3d71d6ef4aa73dec480a3b09e73726e
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ca.langpack.xpi) = 488176
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.cs.langpack.xpi) = 46ca8e9fbb242e70c0ed0590999f7f69983d489fc85a298cdd596d65db2d3293
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.cs.langpack.xpi) = 522845
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.de.langpack.xpi) = 594641f82d42d24bc5c0670fcd9336f7c3154f9482cf9158948451f6e097ee81
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.de.langpack.xpi) = 542527
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.es-AR.langpack.xpi) = c1da6b7b2a5576cdb06da12974b7ad099e7ee01c6d0a63a169f65b1210b73f30
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.es-AR.langpack.xpi) = 489505
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.es-ES.langpack.xpi) = edba89b84668f479e8c119fb4aa8fd5b2392733b89df3403e3390f3c80a85a84
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.es-ES.langpack.xpi) = 509776
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.fr.langpack.xpi) = eb8e3c71cc78405ceca95dd54981037570f9c9c34db052c9ae8ff6347781e302
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.fr.langpack.xpi) = 579569
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.gl.langpack.xpi) = 4e62b9c8664ab5c439b8d976912218a11331bb806a893de7726e5943ac62ca7c
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.gl.langpack.xpi) = 495742
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.hu.langpack.xpi) = b11e85ae7cb8967ee8591c7085bb5cdee4ea4b68e3a0f5385f88ccd78a22da25
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.hu.langpack.xpi) = 521421
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.it.langpack.xpi) = c854ecca7f83a2fab1d11e933bb926409b1a64f2c478c3dd57993cb93d09b4c5
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.it.langpack.xpi) = 468253
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ka.langpack.xpi) = f2416d320a873e1d8388dcd2c6f83eb5a2546f3c776ccff72a724c8c4a40ff17
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ka.langpack.xpi) = 547342
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.lt.langpack.xpi) = e7c82212c0d8a9bb304973fdb0a299ba40fa30d3f179c54459490d33fe26c004
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.lt.langpack.xpi) = 522635
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.nb-NO.langpack.xpi) = 0855e4feada8908d1a0206361a9d135c9dadd7b3e65442614c6192c0ef4e1455
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.nb-NO.langpack.xpi) = 491213
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.nl.langpack.xpi) = 8ca6f8240f14b3a625a53135e8911a518a8eb6849e5924f9b250092066fd48e8
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.nl.langpack.xpi) = 499343
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.pl.langpack.xpi) = 6bc9e2814a814613ad50611a39e33d776c2d1babe58e96a8b55d82ea7f5d9ca8
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.pl.langpack.xpi) = 520072
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.pt-PT.langpack.xpi) = dbbd4d2ed93d21d3c029df9ae1fd8184938492317311073ad9d0453e70f9a2ac
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.pt-PT.langpack.xpi) = 490053
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ru.langpack.xpi) = 089b84d135229dbe7423014b5f71a904d45cf751e092e4d1fc8cdb3c2a67c14f
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.ru.langpack.xpi) = 560137
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.sk.langpack.xpi) = da9e20108845b8eceee04007c82775d5d50b0df7c541c82651d67f84143af14f
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.sk.langpack.xpi) = 524826
-SHA256 (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.tr.langpack.xpi) = f5f5a7bb30ac54edb3d1521d67928ffecfac106546ddf122bfebdba7f9287006
-SIZE (xpi/seamonkey2-i18n-2.0.14/seamonkey-2.0.14.tr.langpack.xpi) = 493838
diff --git a/www/seamonkey2-i18n/pkg-descr b/www/seamonkey2-i18n/pkg-descr
deleted file mode 100644
index 42e32d638856..000000000000
--- a/www/seamonkey2-i18n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Language packs for SeaMonkey 2
-
-WWW: http://www.seamonkey-project.org/releases/#langpacks
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
deleted file mode 100644
index beff894f3f9d..000000000000
--- a/www/seamonkey2/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-# New ports collection makefile for:	mozilla
-# Date created:		31 Mar 1998
-# Whom:			eivind/dima/jseger
-#
-# $FreeBSD$
-#
-
-PORTNAME=	seamonkey
-DISTVERSION=	2.0.14
-PORTREVISION=	1
-CATEGORIES?=	www ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
-DISTNAME=	seamonkey-${DISTVERSION}.source
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	The open source, standards compliant web browser
-
-DEPRECATED=	Upstream support dropped. Please consider using www/seamonkey instead.
-EXPIRATION_DATE=	2011-10-01
-FORBIDDEN=	several security vulnerabilities
-
-CONFLICTS_BUILD=	spidermonkey-1.[0-7]*
-LATEST_LINK=	seamonkey2
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GECKO=	gecko
-WANT_GNOME=	yes
-WANT_PERL=	yes
-HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-MAKE_JOBS_SAFE=	yes
-MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
-MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
-		ac_cv_func__Unwind_Backtrace=no
-CPPFLAGS+=	-I${LOCALBASE}/include/cairo
-USE_GCC=	4.2+
-
-MOZ_EXTENSIONS=	default
-MOZILLA_SUFX=	2
-MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
-MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
-		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg \
-		--enable-application=suite	\
-		--enable-svg-renderer=cairo	\
-		--enable-canvas
-USE_MOZILLA=	-png -dbm -jpeg -xft -cairo
-MOZ_TOOLKIT=	cairo-gtk2
-MOZILLA_PLIST_DIRS=	bin lib
-MOZ_PKGCONFIG_FILES=
-
-NOT_FOR_ARCHS=	ia64
-
-OPTIONS=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 \
-	DBUS "Enable D-BUS support" on \
-	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
-	SMB "Enable smb:// URI support using gnomevfs" off
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
-.endif
-
-.if ${ARCH} == powerpc64
-.if ${OSVERSION} < 900033
-BROKEN=		Needs binutils 2.17.50 to build
-.else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
-CFLAGS+=	-mminimal-toc
-.endif
-.endif
-
-MOZSRC:=	${WRKDIR}/comm-1.9.1/mozilla
-WRKSRC=		${WRKDIR}/comm-1.9.1
-
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=	libgnomeui
-MOZ_OPTIONS+=	--enable-gnomeui
-.else
-MOZ_OPTIONS+=	--disable-gnomeui
-.endif
-
-.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
-# Glitz support can only be enabled if cairo is built with glitz support
-MOZ_OPTIONS+=	--enable-glitz
-LIB_DEPENDS+=	glitz.1:${PORTSDIR}/graphics/glitz
-.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(WITH_JAVASCRIPT_DEBUGGER)
-MOZ_OPTIONS+=	--enable-jsd \
-		--enable-dtd-debug
-.else
-MOZ_OPTIONS+=	--disable-jsd \
-		--disable-dtd-debug
-.endif
-
-.if defined(WITHOUT_COMPOSER)
-MOZ_OPTIONS+=	--disable-composer
-.endif
-
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
-		${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-		${WRKSRC}/mozilla/storage/build/Makefile.in
-	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
-		${WRKSRC}/mozilla/modules/libpref/src/init/all.js
-	@${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \
-		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \
-		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/mozilla/js/src/configure \
-		${WRKSRC}/mozilla/configure \
-		${WRKSRC}/configure
-	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		< ${FILESDIR}/seamonkey.desktop.in > \
-		${WRKDIR}/${MOZILLA}.desktop
-
-pre-install:
-	${ECHO_CMD} share/applications/${MOZILLA}.desktop >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} 'share/pixmaps/${MOZILLA}.png' >> ${PLIST}
-
-do-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications
-	${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \
-		${PREFIX}/share/pixmaps/${MOZILLA}.png
-
-.include <bsd.port.post.mk>
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
deleted file mode 100644
index 1817b566914f..000000000000
--- a/www/seamonkey2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (seamonkey-2.0.14.source.tar.bz2) = 171101c471d5d1ec7563825c2e96cadaccdb85ed370999ac9c13d39abdc84020
-SIZE (seamonkey-2.0.14.source.tar.bz2) = 61744542
diff --git a/www/seamonkey2/files/extra-patch-security_manager_Makefile.in b/www/seamonkey2/files/extra-patch-security_manager_Makefile.in
deleted file mode 100644
index c936ae46850d..000000000000
--- a/www/seamonkey2/files/extra-patch-security_manager_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- security/manager/Makefile.in.orig.patched	Thu May 25 10:19:22 2006
-+++ security/manager/Makefile.in	Thu May 25 10:19:22 2006
-@@ -159,8 +159,6 @@
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
- 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
diff --git a/www/seamonkey2/files/libsydney_oss b/www/seamonkey2/files/libsydney_oss
deleted file mode 100644
index f3f0858e7b48..000000000000
--- a/www/seamonkey2/files/libsydney_oss
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-26 20:30:30.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-26 20:31:01.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+			sydney_audio_oss.c \
-+			$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
diff --git a/www/seamonkey2/files/moz_pis_S50cleanhome b/www/seamonkey2/files/moz_pis_S50cleanhome
deleted file mode 100644
index 3de5565e39f2..000000000000
--- a/www/seamonkey2/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to clean up users' Mozilla home directories to make upgrading
-# less painful.
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR}
-
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
-    sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
-    	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
-	| while read dir
-    do
-	[ ! -d "${dir}" ] && continue
-	# Debian does this for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# force a rebuild of compreg.dat and xpti.dat for new installations
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-		rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/www/seamonkey2/files/patch-bugzilla-522635 b/www/seamonkey2/files/patch-bugzilla-522635
deleted file mode 100644
index 689ee939baa0..000000000000
--- a/www/seamonkey2/files/patch-bugzilla-522635
+++ /dev/null
@@ -1,1445 +0,0 @@
-diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
-index 0df722e..39654b1 100644
---- mozilla/widget/src/gtk2/Makefile.in
-+++ mozilla/widget/src/gtk2/Makefile.in
-@@ -78,7 +78,6 @@ endif
- 
- CSRCS		= \
- 		mozcontainer.c \
--		mozdrawingarea.c \
- 		keysym2ucs.c \
- 		nsPrintdGTK.c \
- 		$(NULL)
-@@ -152,7 +151,6 @@ endif
- EXPORTS		= \
-                 nsGTKToolkit.h \
- 		nsIImageToPixbuf.h \
--		mozdrawingarea.h \
- 		mozcontainer.h \
- 		$(NULL)
- 
-diff --git a/widget/src/gtk2/mozcontainer.c b/widget/src/gtk2/mozcontainer.c
-index 71b425f..89731a3 100644
---- mozilla/widget/src/gtk2/mozcontainer.c
-+++ mozilla/widget/src/gtk2/mozcontainer.c
-@@ -294,8 +294,15 @@ moz_container_realize (GtkWidget *widget)
- 
-     /* create the shell window */
- 
--    attributes.event_mask = gtk_widget_get_events (widget);
--    attributes.event_mask |=  (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK);
-+    attributes.event_mask = (gtk_widget_get_events (widget) |
-+                             GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
-+                             GDK_VISIBILITY_NOTIFY_MASK |
-+                             GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-+                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-+#ifdef HAVE_GTK_MOTION_HINTS
-+                             GDK_POINTER_MOTION_HINT_MASK |
-+#endif
-+                             GDK_POINTER_MOTION_MASK);
-     attributes.x = widget->allocation.x;
-     attributes.y = widget->allocation.y;
-     attributes.width = widget->allocation.width;
-diff --git a/widget/src/gtk2/mozcontainer.h b/widget/src/gtk2/mozcontainer.h
-index 8f1d2f0..51850ea 100644
---- mozilla/widget/src/gtk2/mozcontainer.h
-+++ mozilla/widget/src/gtk2/mozcontainer.h
-@@ -40,6 +40,7 @@
- #define __MOZ_CONTAINER_H__
- 
- #include <gtk/gtkcontainer.h>
-+#include <gtk/gtkversion.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -83,6 +84,11 @@ extern "C" {
- #define IS_MOZ_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZ_CONTAINER_TYPE))
- #define MOZ_CONAINTER_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), MOZ_CONTAINER_TYPE, MozContainerClass))
- 
-+#if (GTK_CHECK_VERSION(2, 12, 0) || \
-+    (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_HILDON)))
-+#define HAVE_GTK_MOTION_HINTS
-+#endif
-+
- typedef struct _MozContainer      MozContainer;
- typedef struct _MozContainerClass MozContainerClass;
- 
-diff --git a/widget/src/gtk2/mozdrawingarea.c b/widget/src/gtk2/mozdrawingarea.c
-deleted file mode 100644
-index 5b7cf99..0000000
---- mozilla/widget/src/gtk2/mozdrawingarea.c
-+++ /dev/null
-@@ -1,241 +0,0 @@
--/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--/* vim:expandtab:shiftwidth=4:tabstop=4:
-- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * 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 Christopher Blizzard
-- * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-- * are Copyright (C) 2001 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 MPL, 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 MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include "mozdrawingarea.h"
--
--/* init methods */
--static void moz_drawingarea_class_init          (MozDrawingareaClass *klass);
--static void moz_drawingarea_init                (MozDrawingarea *drawingarea);
--
--/* static methods */
--static void moz_drawingarea_create_windows      (MozDrawingarea *drawingarea,
--                                                 GdkWindow *parent,
--                                                 GtkWidget *widget,
--                                                 GdkVisual *visual);
--
--static void moz_drawingarea_finalize            (GObject *object);
--
--static GObjectClass *parent_class = NULL;
--
--GtkType
--moz_drawingarea_get_type(void)
--{
--    static GtkType moz_drawingarea_type = 0;
--
--   if (!moz_drawingarea_type) {
--       static GTypeInfo moz_drawingarea_info = {
--           sizeof(MozDrawingareaClass), /* class size */
--           NULL, /* base_init */
--           NULL, /* base_finalize */
--           (GClassInitFunc) moz_drawingarea_class_init, /* class_init */
--           NULL, /* class_destroy */
--           NULL, /* class_data */
--           sizeof(MozDrawingarea), /* instance_size */
--           0, /* n_preallocs */
--           (GInstanceInitFunc) moz_drawingarea_init, /* instance_init */
--           NULL, /* value_table */
--       };
--       moz_drawingarea_type =
--           g_type_register_static (G_TYPE_OBJECT,
--                                   "MozDrawingarea",
--                                   &moz_drawingarea_info, 0);
--   }
--
--   return moz_drawingarea_type;
--}
--
--MozDrawingarea *
--moz_drawingarea_new (MozDrawingarea *parent, MozContainer *widget_parent,
--                     GdkVisual *visual)
--{
--    MozDrawingarea *drawingarea;
--
--    drawingarea = g_object_new(MOZ_DRAWINGAREA_TYPE, NULL);
--
--    if (!parent)
--        moz_drawingarea_create_windows(drawingarea,
--                                       GTK_WIDGET(widget_parent)->window,
--                                       GTK_WIDGET(widget_parent),
--                                       visual);
--    else
--        moz_drawingarea_create_windows(drawingarea,
--                                       parent->inner_window, 
--                                       GTK_WIDGET(widget_parent),
--                                       visual);
--
--    return drawingarea;
--}
--
--void
--moz_drawingarea_class_init (MozDrawingareaClass *klass)
--{
--    GObjectClass *object_class = G_OBJECT_CLASS (klass);
--
--    object_class->finalize = moz_drawingarea_finalize;
--
--    parent_class = g_type_class_peek_parent(klass);
--}
--
--void
--moz_drawingarea_init (MozDrawingarea *drawingarea)
--{
--
--}
--
--void
--moz_drawingarea_reparent (MozDrawingarea *drawingarea, GdkWindow *aNewParent)
--{
--    gdk_window_reparent(drawingarea->clip_window,
--                        aNewParent, 0, 0);
--}
--
--void
--moz_drawingarea_create_windows (MozDrawingarea *drawingarea, GdkWindow *parent,
--                                GtkWidget *widget, GdkVisual *visual)
--{
--    GdkWindowAttr attributes;
--    gint          attributes_mask = 0;
--
--    /* create the clipping window */
--    attributes.event_mask = 0;
--    attributes.x = 0;
--    attributes.y = 0;
--    attributes.width = 1;
--    attributes.height = 1;
--    attributes.wclass = GDK_INPUT_OUTPUT;
--    attributes.window_type = GDK_WINDOW_CHILD;
--    if (!visual) {
--        attributes.visual = gtk_widget_get_visual (widget);
--        attributes.colormap = gtk_widget_get_colormap (widget);
--    } else {
--        attributes.visual = visual;
--        attributes.colormap = gdk_colormap_new(visual, 0);
--    }
--
--    attributes_mask |= GDK_WA_VISUAL | GDK_WA_COLORMAP |
--        GDK_WA_X | GDK_WA_Y;
--
--    drawingarea->clip_window = gdk_window_new (parent, &attributes,
--                                               attributes_mask);
--    gdk_window_set_user_data(drawingarea->clip_window, widget);
--
--    /* set the default pixmap to None so that you don't end up with the
--       gtk default which is BlackPixel. */
--    gdk_window_set_back_pixmap(drawingarea->clip_window, NULL, FALSE);
--
--    attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
--                             GDK_VISIBILITY_NOTIFY_MASK |
--                             GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
--                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
--#ifdef HAVE_GTK_MOTION_HINTS
--                             GDK_POINTER_MOTION_HINT_MASK |
--#endif
--                             GDK_POINTER_MOTION_MASK);
--    /* create the inner window */
--    drawingarea->inner_window = gdk_window_new (drawingarea->clip_window,
--                                                &attributes, attributes_mask);
--    gdk_window_set_user_data(drawingarea->inner_window, widget);
--
--    /* set the default pixmap to None so that you don't end up with the
--       gtk default which is BlackPixel. */
--    gdk_window_set_back_pixmap(drawingarea->inner_window, NULL, FALSE);
--
--    if (visual) {
--        g_object_unref(attributes.colormap);
--    }
--}
--
--void
--moz_drawingarea_finalize (GObject *object)
--{
--    MozDrawingarea *drawingarea;
--    gpointer user_data;
--
--    g_return_if_fail(IS_MOZ_DRAWINGAREA(object));
--
--    drawingarea = MOZ_DRAWINGAREA(object);
--
--    gdk_window_destroy(drawingarea->inner_window);
--    gdk_window_destroy(drawingarea->clip_window);
--
--    (* parent_class->finalize) (object);
--}
--
--void
--moz_drawingarea_move (MozDrawingarea *drawingarea,
--                      gint x, gint y)
--{
--    gdk_window_move(drawingarea->clip_window, x, y);
--}
--
--void
--moz_drawingarea_resize (MozDrawingarea *drawingarea,
--                        gint width, gint height)
--{
--    gdk_window_resize(drawingarea->clip_window, width, height);
--    gdk_window_resize(drawingarea->inner_window, width, height);
--}
--
--void
--moz_drawingarea_move_resize (MozDrawingarea *drawingarea,
--                             gint x, gint y, gint width, gint height)
--{
--    gdk_window_resize(drawingarea->inner_window, width, height);
--    gdk_window_move_resize(drawingarea->clip_window, x, y, width, height);
--}
--
--void
--moz_drawingarea_set_visibility (MozDrawingarea *drawingarea,
--                                gboolean visibility)
--{
--    if (visibility) {
--        gdk_window_show_unraised(drawingarea->inner_window);
--        gdk_window_show_unraised(drawingarea->clip_window);
--    }
--    else    {
--        gdk_window_hide(drawingarea->clip_window);
--        gdk_window_hide(drawingarea->inner_window);
--    }
--}
--
--void
--moz_drawingarea_scroll (MozDrawingarea *drawingarea,
--                        gint x, gint y)
--{
--    gdk_window_scroll(drawingarea->inner_window, x, y);
--}
-diff --git a/widget/src/gtk2/mozdrawingarea.h b/widget/src/gtk2/mozdrawingarea.h
-deleted file mode 100644
-index bdcc6d3..0000000
---- mozilla/widget/src/gtk2/mozdrawingarea.h
-+++ /dev/null
-@@ -1,101 +0,0 @@
--/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--/* vim:expandtab:shiftwidth=4:tabstop=4:
-- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * 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 Christopher Blizzard
-- * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-- * are Copyright (C) 2001 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 MPL, 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 MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#ifndef __MOZ_DRAWINGAREA_H__
--#define __MOZ_DRAWINGAREA_H__
--
--#include <gdk/gdkwindow.h>
--#include <gtk/gtkversion.h>
--#include "mozcontainer.h"
--
--#ifdef __cplusplus
--extern "C" {
--#endif /* __cplusplus */
--
--#define MOZ_DRAWINGAREA_TYPE            (moz_drawingarea_get_type())
--#define MOZ_DRAWINGAREA(obj)            (GTK_CHECK_CAST((obj), MOZ_DRAWINGAREA_TYPE, MozDrawingarea))
--#define MOZ_DRAWINGAREA_CLASS(klass)    (GTK_CHECK_CLASS_CAST((klass), MOZ_DRAWINGAREA_TYPE, MozDrawingareaClass))
--#define IS_MOZ_DRAWINGAREA(obj)         (GTK_CHECK_TYPE((obj), MOZ_DRAWINGAREA_TYPE))
--#define IS_MOZ_DRAWINGAREA_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), MOZ_DRAWINGAREA_TYPE))
--#define MOZ_DRAWINGAREA_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS((obj), MOZ_DRAWINGAREA_TYPE, MozDrawingareaClass))
--
--#if (GTK_CHECK_VERSION(2, 12, 0) || \
--    (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_HILDON)))
--#define HAVE_GTK_MOTION_HINTS
--#endif
--
--typedef struct _MozDrawingarea      MozDrawingarea;
--typedef struct _MozDrawingareaClass MozDrawingareaClass;
--
--struct _MozDrawingarea
--{
--    GObject         parent_instance;
--    /* AFAIK this clip_window (and thus this whole class) exists solely to
--     * make gdk_window_scroll() smooth for nsIWidget::Scroll(). */
--    GdkWindow      *clip_window;
--    GdkWindow      *inner_window;
--};
--
--struct _MozDrawingareaClass
--{
--    GObjectClass parent_class;
--};
--
--GtkType         moz_drawingarea_get_type       (void);
--MozDrawingarea *moz_drawingarea_new            (MozDrawingarea *parent,
--                                                MozContainer *widget_parent,
--                                                GdkVisual *visual);
--void            moz_drawingarea_reparent       (MozDrawingarea *drawingarea,
--                                                GdkWindow *aNewParent);
--void            moz_drawingarea_move           (MozDrawingarea *drawingarea,
--                                                gint x, gint y);
--void            moz_drawingarea_resize         (MozDrawingarea *drawingarea,
--                                                gint width, gint height);
--void            moz_drawingarea_move_resize    (MozDrawingarea *drawingarea,
--                                                gint x, gint y,
--                                                gint width, gint height);
--void            moz_drawingarea_set_visibility (MozDrawingarea *drawingarea,
--                                                gboolean visibility);
--void            moz_drawingarea_scroll         (MozDrawingarea *drawingarea,
--                                                gint x, gint y);
--
--#ifdef __cplusplus
--}
--#endif /* __cplusplus */
--
--#endif /* __MOZ_DRAWINGAREA_H__ */
-diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
-index b9cca02..b00bcdf 100644
---- mozilla/widget/src/gtk2/nsWindow.cpp
-+++ mozilla/widget/src/gtk2/nsWindow.cpp
-@@ -368,7 +368,7 @@ nsWindow::nsWindow()
-     mPreferredWidth   = 0;
-     mPreferredHeight  = 0;
-     mContainer           = nsnull;
--    mDrawingarea         = nsnull;
-+    mGdkWindow           = nsnull;
-     mShell               = nsnull;
-     mWindowGroup         = nsnull;
-     mContainerGotFocus   = PR_FALSE;
-@@ -673,9 +673,7 @@ CheckDestroyInvisibleContainer()
- 
- // Change the containing GtkWidget on a sub-hierarchy of GdkWindows belonging
- // to aOldWidget and rooted at aWindow, and reparent any child GtkWidgets of
--// the GdkWindow hierarchy.  If aNewWidget is NULL, the reference to
--// aOldWidget is removed from its GdkWindows, and child GtkWidgets are
--// destroyed.
-+// the GdkWindow hierarchy to aNewWidget.
- static void
- SetWidgetForHierarchy(GdkWindow *aWindow,
-                       GtkWidget *aOldWidget,
-@@ -694,13 +692,7 @@ SetWidgetForHierarchy(GdkWindow *aWindow,
- 
-         // This window belongs to a child widget, which will no longer be a
-         // child of aOldWidget.
--        if (aNewWidget) {
--            gtk_widget_reparent(widget, aNewWidget);
--        } else {
--            // aNewWidget == NULL indicates that the window is about to be
--            // destroyed.
--            gtk_widget_destroy(widget);
--        }
-+        gtk_widget_reparent(widget, aNewWidget);
- 
-         return;
-     }
-@@ -714,6 +706,30 @@ SetWidgetForHierarchy(GdkWindow *aWindow,
-     gdk_window_set_user_data(aWindow, aNewWidget);
- }
- 
-+// Walk the list of child windows and call destroy on them.
-+void
-+nsWindow::DestroyChildWindows()
-+{
-+    if (!mGdkWindow)
-+        return;
-+
-+    while (GList *children = gdk_window_peek_children(mGdkWindow)) {
-+        GdkWindow *child = GDK_WINDOW(children->data);
-+        nsWindow *kid = get_window_for_gdk_window(child);
-+        if (kid) {
-+            kid->Destroy();
-+        } else {
-+            // This child is not an nsWindow.
-+            // Destroy the child GtkWidget.
-+            gpointer data;
-+            gdk_window_get_user_data(child, &data);
-+            if (GTK_IS_WIDGET(data)) {
-+                gtk_widget_destroy(static_cast<GtkWidget*>(data));
-+            }
-+        }
-+    }
-+}
-+
- NS_IMETHODIMP
- nsWindow::Destroy(void)
- {
-@@ -751,15 +767,6 @@ nsWindow::Destroy(void)
- 
-     NativeShow(PR_FALSE);
- 
--    // walk the list of children and call destroy on them.  Have to be
--    // careful, though -- calling destroy on a kid may actually remove
--    // it from our child list, losing its sibling links.
--    for (nsIWidget* kid = mFirstChild; kid; ) {
--        nsIWidget* next = kid->GetNextSibling();
--        kid->Destroy();
--        kid = next;
--    }
--
- #ifdef USE_XIM
-     IMEDestroyContext();
- #endif
-@@ -796,35 +803,26 @@ nsWindow::Destroy(void)
-         gtk_widget_destroy(mShell);
-         mShell = nsnull;
-         mContainer = nsnull;
-+        NS_ABORT_IF_FALSE(!mGdkWindow,
-+                          "mGdkWindow should be NULL when mContainer is destroyed");
-     }
-     else if (mContainer) {
-         gtk_widget_destroy(GTK_WIDGET(mContainer));
-         mContainer = nsnull;
-+        NS_ABORT_IF_FALSE(!mGdkWindow,
-+                          "mGdkWindow should be NULL when mContainer is destroyed");
-     }
--    else if (owningWidget) {
--        // Remove references from GdkWindows back to their container
--        // widget while the GdkWindow hierarchy is still available.
--        // (OnContainerUnrealize does this when the MozContainer widget is
--        // destroyed.)
--        SetWidgetForHierarchy(mDrawingarea->clip_window, owningWidget, NULL);
--    }
--
--    if (mDrawingarea) {
--        g_object_set_data(G_OBJECT(mDrawingarea->clip_window),
--                          "nsWindow", NULL);
--        g_object_set_data(G_OBJECT(mDrawingarea->inner_window),
--                          "nsWindow", NULL);
--
--        g_object_set_data(G_OBJECT(mDrawingarea->clip_window),
--                          "mozdrawingarea", NULL);
--        g_object_set_data(G_OBJECT(mDrawingarea->inner_window),
--                          "mozdrawingarea", NULL);
--
--        NS_ASSERTION(!get_gtk_widget_for_gdk_window(mDrawingarea->inner_window),
--                     "widget reference not removed");
-+    else if (mGdkWindow) {
-+        // Destroy child windows to ensure that their mThebesSurfaces are
-+        // released and to remove references from GdkWindows back to their
-+        // container widget.  (OnContainerUnrealize() does this when the
-+        // MozContainer widget is destroyed.)
-+        DestroyChildWindows();
- 
--        g_object_unref(mDrawingarea);
--        mDrawingarea = nsnull;
-+        gdk_window_set_user_data(mGdkWindow, NULL);
-+        g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", NULL);
-+        gdk_window_destroy(mGdkWindow);
-+        mGdkWindow = nsnull;
-     }
- 
-     if (gInvisibleContainer && owningWidget == gInvisibleContainer) {
-@@ -851,7 +849,7 @@ nsWindow::GetParent(void)
- NS_IMETHODIMP
- nsWindow::SetParent(nsIWidget *aNewParent)
- {
--    if (mContainer || !mDrawingarea || !mParent) {
-+    if (mContainer || !mGdkWindow || !mParent) {
-         NS_NOTREACHED("nsWindow::SetParent - reparenting a non-child window");
-         return NS_ERROR_NOT_IMPLEMENTED;
-     }
-@@ -866,12 +864,12 @@ nsWindow::SetParent(nsIWidget *aNewParent)
-     if (!oldContainer) {
-         // The GdkWindows have been destroyed so there is nothing else to
-         // reparent.
--        NS_ABORT_IF_FALSE(GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed,
-+        NS_ABORT_IF_FALSE(GDK_WINDOW_OBJECT(mGdkWindow)->destroyed,
-                           "live GdkWindow with no widget");
-         return NS_OK;
-     }
- 
--    NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed,
-+    NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(mGdkWindow)->destroyed,
-                       "destroyed GdkWindow with widget");
- 
-     GdkWindow* newParentWindow = NULL;
-@@ -901,11 +899,10 @@ nsWindow::SetParent(nsIWidget *aNewParent)
-         if (newContainer != oldContainer) {
-             NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(newParentWindow)->destroyed,
-                               "destroyed GdkWindow with widget");
--            SetWidgetForHierarchy(mDrawingarea->clip_window, oldContainer,
--                                  newContainer);
-+            SetWidgetForHierarchy(mGdkWindow, oldContainer, newContainer);
-         }
- 
--        moz_drawingarea_reparent(mDrawingarea, newParentWindow);
-+        gdk_window_reparent(mGdkWindow, newParentWindow, 0, 0);
-     }
- 
-     return NS_OK;
-@@ -1216,8 +1213,8 @@ nsWindow::Move(PRInt32 aX, PRInt32 aY)
-     if (mIsTopLevel) {
-         gtk_window_move(GTK_WINDOW(mShell), aX, aY);
-     }
--    else if (mDrawingarea) {
--        moz_drawingarea_move(mDrawingarea, aX, aY);
-+    else if (mGdkWindow) {
-+        gdk_window_move(mGdkWindow, aX, aY);
-     }
- 
-     return NS_OK;
-@@ -1244,19 +1241,19 @@ nsWindow::SetZIndex(PRInt32 aZIndex)
- 
-     NS_ASSERTION(!mContainer, "Expected Mozilla child widget");
- 
--    // We skip the nsWindows that don't have mDrawingareas.
-+    // We skip the nsWindows that don't have mGdkWindows.
-     // These are probably in the process of being destroyed.
- 
-     if (!GetNextSibling()) {
-         // We're to be on top.
--        if (mDrawingarea)
--            gdk_window_raise(mDrawingarea->clip_window);
-+        if (mGdkWindow)
-+            gdk_window_raise(mGdkWindow);
-     } else {
-         // All the siblings before us need to be below our widget. 
-         for (nsWindow* w = this; w;
-              w = static_cast<nsWindow*>(w->GetPrevSibling())) {
--            if (w->mDrawingarea)
--                gdk_window_lower(w->mDrawingarea->clip_window);
-+            if (w->mGdkWindow)
-+                gdk_window_lower(w->mGdkWindow);
-         }
-     }
-     return NS_OK;
-@@ -1500,7 +1497,7 @@ nsWindow::SetCursor(nsCursor aCursor)
- {
-     // if we're not the toplevel window pass up the cursor request to
-     // the toplevel window to handle it.
--    if (!mContainer && mDrawingarea) {
-+    if (!mContainer && mGdkWindow) {
-         nsWindow *window = GetContainerWindow();
-         if (!window)
-             return NS_ERROR_FAILURE;
-@@ -1583,7 +1580,7 @@ nsWindow::SetCursor(imgIContainer* aCursor,
- {
-     // if we're not the toplevel window pass up the cursor request to
-     // the toplevel window to handle it.
--    if (!mContainer && mDrawingarea) {
-+    if (!mContainer && mGdkWindow) {
-         nsWindow *window = GetContainerWindow();
-         if (!window)
-             return NS_ERROR_FAILURE;
-@@ -1710,10 +1707,10 @@ nsWindow::Validate()
- {
-     // Get the update for this window and, well, just drop it on the
-     // floor.
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
--    GdkRegion *region = gdk_window_get_update_area(mDrawingarea->inner_window);
-+    GdkRegion *region = gdk_window_get_update_area(mGdkWindow);
- 
-     if (region)
-         gdk_region_destroy(region);
-@@ -1724,6 +1721,9 @@ nsWindow::Validate()
- NS_IMETHODIMP
- nsWindow::Invalidate(PRBool aIsSynchronous)
- {
-+    if (!mGdkWindow)
-+        return NS_OK;
-+
-     GdkRectangle rect;
- 
-     rect.x = mBounds.x;
-@@ -1734,13 +1734,9 @@ nsWindow::Invalidate(PRBool aIsSynchronous)
-     LOGDRAW(("Invalidate (all) [%p]: %d %d %d %d\n", (void *)this,
-              rect.x, rect.y, rect.width, rect.height));
- 
--    if (!mDrawingarea)
--        return NS_OK;
--
--    gdk_window_invalidate_rect(mDrawingarea->inner_window,
--                               &rect, FALSE);
-+    gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE);
-     if (aIsSynchronous)
--        gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+        gdk_window_process_updates(mGdkWindow, FALSE);
- 
-     return NS_OK;
- }
-@@ -1749,6 +1745,9 @@ NS_IMETHODIMP
- nsWindow::Invalidate(const nsRect &aRect,
-                      PRBool        aIsSynchronous)
- {
-+    if (!mGdkWindow)
-+        return NS_OK;
-+
-     GdkRectangle rect;
- 
-     rect.x = aRect.x;
-@@ -1759,13 +1758,9 @@ nsWindow::Invalidate(const nsRect &aRect,
-     LOGDRAW(("Invalidate (rect) [%p]: %d %d %d %d (sync: %d)\n", (void *)this,
-              rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
- 
--    if (!mDrawingarea)
--        return NS_OK;
--
--    gdk_window_invalidate_rect(mDrawingarea->inner_window,
--                               &rect, FALSE);
-+    gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE);
-     if (aIsSynchronous)
--        gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+        gdk_window_process_updates(mGdkWindow, FALSE);
- 
-     return NS_OK;
- }
-@@ -1777,7 +1772,7 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
-     GdkRegion *region = nsnull;
-     aRegion->GetNativeRegion((void *&)region);
- 
--    if (region && mDrawingarea) {
-+    if (region && mGdkWindow) {
-         GdkRectangle rect;
-         gdk_region_get_clipbox(region, &rect);
- 
-@@ -1785,7 +1780,7 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
-                  (void *)this,
-                  rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
- 
--        gdk_window_invalidate_region(mDrawingarea->inner_window,
-+        gdk_window_invalidate_region(mGdkWindow,
-                                      region, FALSE);
-     }
-     else {
-@@ -1799,10 +1794,10 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
- NS_IMETHODIMP
- nsWindow::Update()
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
--    gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+    gdk_window_process_updates(mGdkWindow, FALSE);
-     return NS_OK;
- }
- 
-@@ -1817,7 +1812,7 @@ nsWindow::Scroll(PRInt32  aDx,
-                  PRInt32  aDy,
-                  nsRect  *aClipRect)
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
-     D_DEBUG_AT( ns_Window, "%s( %4d,%4d )\n", __FUNCTION__, aDx, aDy );
-@@ -1827,7 +1822,7 @@ nsWindow::Scroll(PRInt32  aDx,
-                      aClipRect->x, aClipRect->y, aClipRect->width, aClipRect->height );
-     }
- 
--    moz_drawingarea_scroll(mDrawingarea, aDx, aDy);
-+    gdk_window_scroll(mGdkWindow, aDx, aDy);
- 
-     // Update bounds on our child windows
-     for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-@@ -1847,10 +1842,10 @@ NS_IMETHODIMP
- nsWindow::ScrollWidgets(PRInt32 aDx,
-                         PRInt32 aDy)
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
--    moz_drawingarea_scroll(mDrawingarea, aDx, aDy);
-+    gdk_window_scroll(mGdkWindow, aDx, aDy);
-     return NS_OK;
- }
- 
-@@ -1868,10 +1863,10 @@ nsWindow::GetNativeData(PRUint32 aDataType)
-     switch (aDataType) {
-     case NS_NATIVE_WINDOW:
-     case NS_NATIVE_WIDGET: {
--        if (!mDrawingarea)
-+        if (!mGdkWindow)
-             return nsnull;
- 
--        return mDrawingarea->inner_window;
-+        return mGdkWindow;
-         break;
-     }
- 
-@@ -1991,8 +1986,8 @@ nsWindow::WidgetToScreen(const nsRect& aOldRect, nsRect& aNewRect)
-                                    &x, &y);
-         LOG(("WidgetToScreen (container) %d %d\n", x, y));
-     }
--    else if (mDrawingarea) {
--        gdk_window_get_origin(mDrawingarea->inner_window, &x, &y);
-+    else if (mGdkWindow) {
-+        gdk_window_get_origin(mGdkWindow, &x, &y);
-         LOG(("WidgetToScreen (drawing) %d %d\n", x, y));
-     }
- 
-@@ -2013,8 +2008,8 @@ nsWindow::ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect)
-         gdk_window_get_root_origin(GTK_WIDGET(mContainer)->window,
-                                    &x, &y);
-     }
--    else if (mDrawingarea) {
--        gdk_window_get_origin(mDrawingarea->inner_window, &x, &y);
-+    else if (mGdkWindow) {
-+        gdk_window_get_origin(mGdkWindow, &x, &y);
-     }
- 
-     aNewRect.x = aOldRect.x - x;
-@@ -2065,7 +2060,7 @@ nsWindow::CaptureMouse(PRBool aCapture)
- {
-     LOG(("CaptureMouse %p\n", (void *)this));
- 
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
-     GtkWidget *widget = GetMozContainerWidget();
-@@ -2089,7 +2084,7 @@ nsWindow::CaptureRollupEvents(nsIRollupListener *aListener,
-                               PRBool             aDoCapture,
-                               PRBool             aConsumeRollupEvent)
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NS_OK;
- 
-     GtkWidget *widget = GetMozContainerWidget();
-@@ -2271,11 +2266,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
-         return FALSE;
-     }
- 
--    if (!mDrawingarea)
--        return FALSE;
--
--    // handle exposes for the inner window only
--    if (aEvent->window != mDrawingarea->inner_window)
-+    if (!mGdkWindow)
-         return FALSE;
- 
-     static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
-@@ -2320,7 +2311,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
-     nsRefPtr<gfxContext> ctx = rc->ThebesContext();
- 
-     gfxPlatformGtk::GetPlatform()->SetGdkDrawable(ctx->OriginalSurface(),
--                                                  GDK_DRAWABLE(mDrawingarea->inner_window));
-+                                                  GDK_DRAWABLE(mGdkWindow));
- 
-     // clip to the update region
-     ctx->Save();
-@@ -2381,7 +2372,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
-         if (gForce24bpp) {
-             depth = 24; // 24 always
-         } else {
--            depth = gdk_drawable_get_depth(GDK_DRAWABLE(mDrawingarea->inner_window));
-+            depth = gdk_drawable_get_depth(GDK_DRAWABLE(mGdkWindow));
-         }
- 
-         if (!gUseBufferPixmap ||
-@@ -2390,7 +2381,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
-         {
-             // create a one-off always if we're not using the global pixmap
-             // if gUseBufferPixmap == TRUE, who's redrawing an area bigger than the screen?
--            bufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mDrawingarea->inner_window),
-+            bufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mGdkWindow),
-                                           boundsRect.width, boundsRect.height,
-                                           depth);
-             bufferPixmapSize.width = boundsRect.width;
-@@ -2405,7 +2396,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
-             gBufferPixmapSize.width = PR_MAX(gBufferPixmapSize.width, boundsRect.width);
-             gBufferPixmapSize.height = PR_MAX(gBufferPixmapSize.height, boundsRect.height);
- 
--            gBufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mDrawingarea->inner_window),
-+            gBufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mGdkWindow),
-                                            gBufferPixmapSize.width, gBufferPixmapSize.height,
-                                            depth);
- 
-@@ -2575,8 +2566,11 @@ nsWindow::OnContainerUnrealize(GtkWidget *aWidget)
-     NS_ASSERTION(mContainer == MOZ_CONTAINER(aWidget),
-                  "unexpected \"unrealize\" signal");
- 
--    if (mDrawingarea) {
--        SetWidgetForHierarchy(mDrawingarea->clip_window, aWidget, NULL);
-+    if (mGdkWindow) {
-+        DestroyChildWindows();
-+
-+        g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", NULL);
-+        mGdkWindow = NULL;
-     }
- }
- 
-@@ -2595,11 +2589,9 @@ nsWindow::OnSizeAllocate(GtkWidget *aWidget, GtkAllocation *aAllocation)
-     mBounds.width = rect.width;
-     mBounds.height = rect.height;
- 
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return;
- 
--    moz_drawingarea_resize (mDrawingarea, rect.width, rect.height);
--
-     if (mTransparencyBitmap) {
-       ApplyTransparencyBitmap();
-     }
-@@ -2668,7 +2660,7 @@ nsWindow::OnLeaveNotifyEvent(GtkWidget *aWidget, GdkEventCrossing *aEvent)
- 
-     event.time = aEvent->time;
- 
--    event.exit = is_top_level_mouse_exit(mDrawingarea->inner_window, aEvent)
-+    event.exit = is_top_level_mouse_exit(mGdkWindow, aEvent)
-         ? nsMouseEvent::eTopLevel : nsMouseEvent::eChild;
- 
-     LOG(("OnLeaveNotify: %p\n", (void *)this));
-@@ -2797,7 +2789,7 @@ nsWindow::OnMotionNotifyEvent(GtkWidget *aWidget, GdkEventMotion *aEvent)
-     }
-     else {
-         // XXX see OnScrollEvent()
--        if (aEvent->window == mDrawingarea->inner_window) {
-+        if (aEvent->window == mGdkWindow) {
-             event.refPoint.x = nscoord(aEvent->x);
-             event.refPoint.y = nscoord(aEvent->y);
-         } else {
-@@ -2828,7 +2820,7 @@ nsWindow::InitButtonEvent(nsMouseEvent &aEvent,
-                           GdkEventButton *aGdkEvent)
- {
-     // XXX see OnScrollEvent()
--    if (aGdkEvent->window == mDrawingarea->inner_window) {
-+    if (aGdkEvent->window == mGdkWindow) {
-         aEvent.refPoint.x = nscoord(aGdkEvent->x);
-         aEvent.refPoint.y = nscoord(aGdkEvent->y);
-     } else {
-@@ -3373,7 +3365,7 @@ nsWindow::OnScrollEvent(GtkWidget *aWidget, GdkEventScroll *aEvent)
-         break;
-     }
- 
--    if (aEvent->window == mDrawingarea->inner_window) {
-+    if (aEvent->window == mGdkWindow) {
-         // we are the window that the event happened on so no need for expensive ScreenToWidget
-         event.refPoint.x = nscoord(aEvent->x);
-         event.refPoint.y = nscoord(aEvent->y);
-@@ -3469,12 +3461,12 @@ nsWindow::ThemeChanged()
-     nsEventStatus status = nsEventStatus_eIgnore;
-     DispatchEvent(&event, status);
- 
--    if (!mDrawingarea || NS_UNLIKELY(mIsDestroyed))
-+    if (!mGdkWindow || NS_UNLIKELY(mIsDestroyed))
-         return;
- 
-     // Dispatch NS_THEMECHANGED to all child windows
-     GList *children =
--        gdk_window_peek_children(mDrawingarea->inner_window);
-+        gdk_window_peek_children(mGdkWindow);
-     while (children) {
-         GdkWindow *gdkWin = GDK_WINDOW(children->data);
- 
-@@ -3823,6 +3815,38 @@ GetBrandName(nsXPIDLString& brandName)
-         brandName.Assign(NS_LITERAL_STRING("Mozilla"));
- }
- 
-+static GdkWindow *
-+CreateGdkWindow(GdkWindow *parent, GtkWidget *widget)
-+{
-+    GdkWindowAttr attributes;
-+    gint          attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
-+
-+    attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
-+                             GDK_VISIBILITY_NOTIFY_MASK |
-+                             GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-+                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-+#ifdef HAVE_GTK_MOTION_HINTS
-+                             GDK_POINTER_MOTION_HINT_MASK |
-+#endif
-+                             GDK_POINTER_MOTION_MASK);
-+
-+    attributes.width = 1;
-+    attributes.height = 1;
-+    attributes.wclass = GDK_INPUT_OUTPUT;
-+    attributes.visual = gtk_widget_get_visual(widget);
-+    attributes.colormap = gtk_widget_get_colormap(widget);
-+    attributes.window_type = GDK_WINDOW_CHILD;
-+
-+    GdkWindow *window = gdk_window_new(parent, &attributes, attributes_mask);
-+    gdk_window_set_user_data(window, widget);
-+
-+    /* set the default pixmap to None so that you don't end up with the
-+       gtk default which is BlackPixel. */
-+    gdk_window_set_back_pixmap(window, NULL, FALSE);
-+
-+    return window;
-+}
-+
- nsresult
- nsWindow::NativeCreate(nsIWidget        *aParent,
-                        nsNativeWidget    aNativeParent,
-@@ -3866,8 +3890,7 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-     }
- 
-     // figure out our parent window
--    MozDrawingarea *parentArea = nsnull;
--    MozContainer   *parentMozContainer = nsnull;
-+    GtkWidget      *parentMozContainer = nsnull;
-     GtkContainer   *parentGtkContainer = nsnull;
-     GdkWindow      *parentGdkWindow = nsnull;
-     GtkWindow      *topLevelParent = nsnull;
-@@ -3880,28 +3903,10 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-         parentGtkContainer = GTK_CONTAINER(aNativeParent);
- 
-     if (parentGdkWindow) {
--        // find the mozarea on that window
--        gpointer user_data = nsnull;
--        user_data = g_object_get_data(G_OBJECT(parentGdkWindow),
--                                      "mozdrawingarea");
--        parentArea = MOZ_DRAWINGAREA(user_data);
--
--        NS_ASSERTION(parentArea, "no drawingarea for parent widget!\n");
--        if (!parentArea)
--            return NS_ERROR_FAILURE;
--
--        // get the user data for the widget - it should be a container
--        user_data = nsnull;
--        gdk_window_get_user_data(parentArea->inner_window, &user_data);
--        NS_ASSERTION(user_data, "no user data for parentArea\n");
--        if (!user_data)
--            return NS_ERROR_FAILURE;
-+        // get the widget for the window - it should be a moz container
-+        parentMozContainer = get_gtk_widget_for_gdk_window(parentGdkWindow);
- 
--        // Get the parent moz container
--        parentMozContainer = MOZ_CONTAINER(user_data);
--        NS_ASSERTION(parentMozContainer,
--                     "owning widget is not a mozcontainer!\n");
--        if (!parentMozContainer)
-+        if (!IS_MOZ_CONTAINER(parentMozContainer))
-             return NS_ERROR_FAILURE;
- 
-         // get the toplevel window just in case someone needs to use it
-@@ -3910,8 +3915,6 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-             GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(parentMozContainer)));
-     }
- 
--    GdkVisual* visual = nsnull;
--
-     // ok, create our windows
-     switch (mWindowType) {
-     case eWindowType_dialog:
-@@ -3939,11 +3942,11 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-                 GdkWindow* dialoglead = mShell->window;
-                 gdk_window_set_group(dialoglead, dialoglead);
-             }
--            if (parentArea) {
-+            if (parentGdkWindow) {
-                 nsWindow *parentnsWindow =
--                    get_window_for_gdk_window(parentArea->inner_window);
-+                    get_window_for_gdk_window(parentGdkWindow);
-                 NS_ASSERTION(parentnsWindow,
--                             "no nsWindow for parentArea!");
-+                             "no nsWindow for parentGdkWindow!");
-                 if (parentnsWindow && parentnsWindow->mWindowGroup) {
-                     gtk_window_group_add_window(parentnsWindow->mWindowGroup,
-                                                 GTK_WINDOW(mShell));
-@@ -4009,15 +4012,16 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-         }
- 
-         // create our container
--        mContainer = MOZ_CONTAINER(moz_container_new());
--        gtk_container_add(GTK_CONTAINER(mShell), GTK_WIDGET(mContainer));
--        gtk_widget_realize(GTK_WIDGET(mContainer));
-+        GtkWidget *container = moz_container_new();
-+        mContainer = MOZ_CONTAINER(container);
-+        gtk_container_add(GTK_CONTAINER(mShell), container);
-+        gtk_widget_realize(container);
- 
-         // make sure this is the focus widget in the container
--        gtk_window_set_focus(GTK_WINDOW(mShell), GTK_WIDGET(mContainer));
-+        gtk_window_set_focus(GTK_WINDOW(mShell), container);
- 
-         // and the drawing area
--        mDrawingarea = moz_drawingarea_new(nsnull, mContainer, visual);
-+        mGdkWindow = container->window;
- 
-         if (mWindowType == eWindowType_popup) {
-             // gdk does not automatically set the cursor for "temporary"
-@@ -4033,14 +4037,15 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-         break;
-     case eWindowType_child: {
-         if (parentMozContainer) {
--            mDrawingarea = moz_drawingarea_new(parentArea, parentMozContainer, visual);
-+            mGdkWindow = CreateGdkWindow(parentGdkWindow, parentMozContainer);
-         }
-         else if (parentGtkContainer) {
--            mContainer = MOZ_CONTAINER(moz_container_new());
--            gtk_container_add(parentGtkContainer, GTK_WIDGET(mContainer));
--            gtk_widget_realize(GTK_WIDGET(mContainer));
-+            GtkWidget *container = moz_container_new();
-+            mContainer = MOZ_CONTAINER(container);
-+            gtk_container_add(parentGtkContainer, container);
-+            gtk_widget_realize(container);
- 
--            mDrawingarea = moz_drawingarea_new(nsnull, mContainer, visual);
-+            mGdkWindow = container->window;
-         }
-         else {
-             NS_WARNING("Warning: tried to create a new child widget with no parent!");
-@@ -4061,17 +4066,8 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-         gtk_widget_set_double_buffered (GTK_WIDGET(mContainer),FALSE);
- #endif
- 
--    // label the drawing area with this object so we can find our way
--    // home
--    g_object_set_data(G_OBJECT(mDrawingarea->clip_window), "nsWindow",
--                      this);
--    g_object_set_data(G_OBJECT(mDrawingarea->inner_window), "nsWindow",
--                      this);
--
--    g_object_set_data(G_OBJECT(mDrawingarea->clip_window), "mozdrawingarea",
--                      mDrawingarea);
--    g_object_set_data(G_OBJECT(mDrawingarea->inner_window), "mozdrawingarea",
--                      mDrawingarea);
-+    // label the drawing window with this object so we can find our way home
-+    g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", this);
- 
-     if (mContainer)
-         g_object_set_data(G_OBJECT(mContainer), "nsWindow", this);
-@@ -4161,13 +4157,9 @@ nsWindow::NativeCreate(nsIWidget        *aParent,
-              (void *)GTK_WIDGET(mContainer)->window,
-              GDK_WINDOW_XWINDOW(GTK_WIDGET(mContainer)->window)));
-     }
--
--    if (mDrawingarea) {
--        LOG(("\tmDrawingarea %p %p %p %lx %lx\n", (void *)mDrawingarea,
--             (void *)mDrawingarea->clip_window,
--             (void *)mDrawingarea->inner_window,
--             GDK_WINDOW_XWINDOW(mDrawingarea->clip_window),
--             GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)));
-+    else if (mGdkWindow) {
-+        LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
-+             GDK_WINDOW_XWINDOW(mGdkWindow)));
-     }
- 
-     // resize so that everything is set to the right dimensions
-@@ -4325,16 +4317,16 @@ nsWindow::NativeResize(PRInt32 aWidth, PRInt32 aHeight, PRBool  aRepaint)
-         gtk_window_resize(GTK_WINDOW(mShell), aWidth, aHeight);
-     }
-     else if (mContainer) {
-+        GtkWidget *widget = GTK_WIDGET(mContainer);
-         GtkAllocation allocation;
--        allocation.x = 0;
--        allocation.y = 0;
-+        allocation.x = widget->allocation.x;
-+        allocation.y = widget->allocation.y;
-         allocation.width = aWidth;
-         allocation.height = aHeight;
--        gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
-+        gtk_widget_size_allocate(widget, &allocation);
-     }
--
--    if (mDrawingarea) {
--        moz_drawingarea_resize (mDrawingarea, aWidth, aHeight);
-+    else if (mGdkWindow) {
-+        gdk_window_resize(mGdkWindow, aWidth, aHeight);
-     }
- }
- 
-@@ -4360,19 +4352,18 @@ nsWindow::NativeResize(PRInt32 aX, PRInt32 aY,
-             gtk_window_move(GTK_WINDOW(mShell), aX, aY);
- 
-         gtk_window_resize(GTK_WINDOW(mShell), aWidth, aHeight);
--        moz_drawingarea_resize(mDrawingarea, aWidth, aHeight);
-+        gdk_window_resize(mGdkWindow, aWidth, aHeight);
-     }
-     else if (mContainer) {
-         GtkAllocation allocation;
--        allocation.x = 0;
--        allocation.y = 0;
-+        allocation.x = aX;
-+        allocation.y = aY;
-         allocation.width = aWidth;
-         allocation.height = aHeight;
-         gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
--        moz_drawingarea_move_resize(mDrawingarea, aX, aY, aWidth, aHeight);
-     }
--    else if (mDrawingarea) {
--        moz_drawingarea_move_resize(mDrawingarea, aX, aY, aWidth, aHeight);
-+    else if (mGdkWindow) {
-+        gdk_window_move_resize(mGdkWindow, aX, aY, aWidth, aHeight);
-     }
- }
- 
-@@ -4401,16 +4392,14 @@ nsWindow::NativeShow (PRBool  aAction)
-                 SetUserTimeAndStartupIDForActivatedWindow(mShell);
-             }
- 
--            moz_drawingarea_set_visibility(mDrawingarea, aAction);
-             gtk_widget_show(GTK_WIDGET(mContainer));
-             gtk_widget_show(mShell);
-         }
-         else if (mContainer) {
--            moz_drawingarea_set_visibility(mDrawingarea, TRUE);
-             gtk_widget_show(GTK_WIDGET(mContainer));
-         }
--        else if (mDrawingarea) {
--            moz_drawingarea_set_visibility(mDrawingarea, TRUE);
-+        else if (mGdkWindow) {
-+            gdk_window_show_unraised(mGdkWindow);
-         }
-     }
-     else {
-@@ -4420,10 +4409,9 @@ nsWindow::NativeShow (PRBool  aAction)
-         }
-         else if (mContainer) {
-             gtk_widget_hide(GTK_WIDGET(mContainer));
--            moz_drawingarea_set_visibility(mDrawingarea, FALSE);
-         }
--        if (mDrawingarea) {
--            moz_drawingarea_set_visibility(mDrawingarea, FALSE);
-+        else if (mGdkWindow) {
-+            gdk_window_hide(mGdkWindow);
-         }
-     }
- }
-@@ -4684,11 +4672,11 @@ nsWindow::GrabPointer(void)
-         return;
-     }
- 
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return;
- 
-     gint retval;
--    retval = gdk_pointer_grab(mDrawingarea->inner_window, TRUE,
-+    retval = gdk_pointer_grab(mGdkWindow, TRUE,
-                               (GdkEventMask)(GDK_BUTTON_PRESS_MASK |
-                                              GDK_BUTTON_RELEASE_MASK |
-                                              GDK_ENTER_NOTIFY_MASK |
-@@ -4730,8 +4718,8 @@ nsWindow::GrabKeyboard(void)
- 
-     if (mTransientParent)
-         grabWindow = GTK_WIDGET(mTransientParent)->window;
--    else if (mDrawingarea)
--        grabWindow = mDrawingarea->inner_window;
-+    else if (mGdkWindow)
-+        grabWindow = mGdkWindow;
-     else
-         return;
- 
-@@ -4777,11 +4765,11 @@ nsWindow::GetToplevelWidget(GtkWidget **aWidget)
- GtkWidget *
- nsWindow::GetMozContainerWidget()
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return NULL;
- 
-     GtkWidget *owningWidget =
--        get_gtk_widget_for_gdk_window(mDrawingarea->inner_window);
-+        get_gtk_widget_for_gdk_window(mGdkWindow);
-     return owningWidget;
- }
- 
-@@ -4821,10 +4809,10 @@ nsWindow::SetUrgencyHint(GtkWidget *top_window, PRBool state)
- void *
- nsWindow::SetupPluginPort(void)
- {
--    if (!mDrawingarea)
-+    if (!mGdkWindow)
-         return nsnull;
- 
--    if (GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed == TRUE)
-+    if (GDK_WINDOW_OBJECT(mGdkWindow)->destroyed == TRUE)
-         return nsnull;
- 
-     // we have to flush the X queue here so that any plugins that
-@@ -4832,22 +4820,19 @@ nsWindow::SetupPluginPort(void)
-     // this window in case it was just created
- #ifdef MOZ_X11
-     XWindowAttributes xattrs;
--    XGetWindowAttributes(GDK_DISPLAY (),
--                         GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+    XGetWindowAttributes(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(mGdkWindow),
-                          &xattrs);
-     XSelectInput (GDK_DISPLAY (),
--                  GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+                  GDK_WINDOW_XWINDOW(mGdkWindow),
-                   xattrs.your_event_mask |
-                   SubstructureNotifyMask);
- 
--    gdk_window_add_filter(mDrawingarea->inner_window,
--                          plugin_window_filter_func,
--                          this);
-+    gdk_window_add_filter(mGdkWindow, plugin_window_filter_func, this);
- 
-     XSync(GDK_DISPLAY(), False);
- #endif /* MOZ_X11 */
- 
--    return (void *)GDK_WINDOW_XWINDOW(mDrawingarea->inner_window);
-+    return (void *)GDK_WINDOW_XWINDOW(mGdkWindow);
- }
- 
- nsresult
-@@ -4907,14 +4892,13 @@ nsWindow::SetNonXEmbedPluginFocus()
-     Window curFocusWindow;
-     int focusState;
- 
--    XGetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+    XGetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
-                    &curFocusWindow,
-                    &focusState);
- 
-     LOGFOCUS(("\t curFocusWindow=%p\n", curFocusWindow));
- 
--    GdkWindow* toplevel = gdk_window_get_toplevel
--                                (mDrawingarea->inner_window);
-+    GdkWindow* toplevel = gdk_window_get_toplevel(mGdkWindow);
-     GdkWindow *gdkfocuswin = gdk_window_lookup(curFocusWindow);
- 
-     // lookup with the focus proxy window is supposed to get the
-@@ -4926,11 +4910,11 @@ nsWindow::SetNonXEmbedPluginFocus()
- 
-     // switch the focus from the focus proxy to the plugin window
-     mOldFocusWindow = curFocusWindow;
--    XRaiseWindow(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
--                 GDK_WINDOW_XWINDOW(mDrawingarea->inner_window));
-+    XRaiseWindow(GDK_WINDOW_XDISPLAY(mGdkWindow),
-+                 GDK_WINDOW_XWINDOW(mGdkWindow));
-     gdk_error_trap_push();
--    XSetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
--                   GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+    XSetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
-+                   GDK_WINDOW_XWINDOW(mGdkWindow),
-                    RevertToNone,
-                    CurrentTime);
-     gdk_flush();
-@@ -4939,8 +4923,7 @@ nsWindow::SetNonXEmbedPluginFocus()
-     gdk_window_add_filter(NULL, plugin_client_message_filter, this);
- 
-     LOGFOCUS(("nsWindow::SetNonXEmbedPluginFocus oldfocus=%p new=%p\n",
--                mOldFocusWindow,
--                GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)));
-+              mOldFocusWindow, GDK_WINDOW_XWINDOW(mGdkWindow)));
- }
- 
- void
-@@ -4957,7 +4940,7 @@ nsWindow::LoseNonXEmbedPluginFocus()
-     Window curFocusWindow;
-     int focusState;
- 
--    XGetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+    XGetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
-                    &curFocusWindow,
-                    &focusState);
- 
-@@ -4966,12 +4949,12 @@ nsWindow::LoseNonXEmbedPluginFocus()
-     // event filter that blocks the WM_TAKE_FOCUS is enough. WM and gtk2
-     // will take care of the focus later.
-     if (!curFocusWindow ||
--        curFocusWindow == GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)) {
-+        curFocusWindow == GDK_WINDOW_XWINDOW(mGdkWindow)) {
- 
-         gdk_error_trap_push();
--        XRaiseWindow(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+        XRaiseWindow(GDK_WINDOW_XDISPLAY(mGdkWindow),
-                      mOldFocusWindow);
--        XSetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+        XSetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
-                        mOldFocusWindow,
-                        RevertToParent,
-                        CurrentTime);
-@@ -6655,13 +6638,11 @@ nsWindow::IMESetCursorPosition(const nsTextEventReply& aReply)
- 
-     // Get the position of the refWindow in screen.
-     gint refX, refY;
--    gdk_window_get_origin(refWindow->mDrawingarea->inner_window,
--                          &refX, &refY);
-+    gdk_window_get_origin(refWindow->mGdkWindow, &refX, &refY);
- 
-     // Get the position of IM context owner window in screen.
-     gint ownerX, ownerY;
--    gdk_window_get_origin(ownerWindow->mDrawingarea->inner_window,
--                          &ownerX, &ownerY);
-+    gdk_window_get_origin(ownerWindow->mGdkWindow, &ownerX, &ownerY);
- 
-     // Compute the caret position in the IM owner window.
-     GdkRectangle area;
-@@ -6807,7 +6788,7 @@ nsWindow::GetToggledKeyState(PRUint32 aKeyCode, PRBool* aLEDState)
-     GdkModifierType modifiers = gdk_keyboard_get_modifiers();
-     PRUint32 capsLockMask, numLockMask, scrollLockMask;
-     PRBool foundMasks = gdk_keyboard_get_modmap_masks(
--                          GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+                          GDK_WINDOW_XDISPLAY(mGdkWindow),
-                           &capsLockMask, &numLockMask, &scrollLockMask);
-     if (!foundMasks)
-         return NS_ERROR_NOT_IMPLEMENTED;
-@@ -7138,10 +7119,12 @@ nsWindow::GetSurfaceForGdkDrawable(GdkDrawable* aDrawable,
- gfxASurface*
- nsWindow::GetThebesSurface()
- {
-+    if (!mGdkWindow)
-+        return nsnull;
-+
-     GdkDrawable* d;
-     gint x_offset, y_offset;
--    gdk_window_get_internal_paint_info(mDrawingarea->inner_window,
--                                       &d, &x_offset, &y_offset);
-+    gdk_window_get_internal_paint_info(mGdkWindow, &d, &x_offset, &y_offset);
- 
- #ifdef MOZ_X11
-     gint width, height;
-@@ -7217,7 +7200,7 @@ nsWindow::BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVert
-     }
- 
-     // get the gdk window for this widget
--    GdkWindow* gdk_window = mDrawingarea->inner_window;
-+    GdkWindow* gdk_window = mGdkWindow;
-     if (!GDK_IS_WINDOW(gdk_window)) {
-       return NS_ERROR_FAILURE;
-     }
-diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h
-index 23aa482..277c82c 100644
---- mozilla/widget/src/gtk2/nsWindow.h
-+++ mozilla/widget/src/gtk2/nsWindow.h
-@@ -43,7 +43,6 @@
- #include "nsAutoPtr.h"
- 
- #include "mozcontainer.h"
--#include "mozdrawingarea.h"
- #include "nsWeakReference.h"
- 
- #include "nsIDragService.h"
-@@ -480,6 +479,7 @@ protected:
-     PRUint32            mPreferredHeight;
- 
- private:
-+    void               DestroyChildWindows();
-     void               GetToplevelWidget(GtkWidget **aWidget);
-     GtkWidget         *GetMozContainerWidget();
-     nsWindow          *GetContainerWindow();
-@@ -492,7 +492,7 @@ private:
- 
-     GtkWidget          *mShell;
-     MozContainer       *mContainer;
--    MozDrawingarea     *mDrawingarea;
-+    GdkWindow          *mGdkWindow;
- 
-     GtkWindowGroup     *mWindowGroup;
- 
diff --git a/www/seamonkey2/files/patch-config-rules.mk b/www/seamonkey2/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/www/seamonkey2/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
- 
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/www/seamonkey2/files/patch-config_autoconf.mk.in b/www/seamonkey2/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 241bd93744d7..000000000000
--- a/www/seamonkey2/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig	2011-08-17 10:28:51.000000000 +0200
-+++ config/autoconf.mk.in	2011-08-17 10:29:26.000000000 +0200
-@@ -62,14 +62,14 @@
- 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)
-+idldir		= $(datadir)/idl/%%MOZILLA%%
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/%%MOZILLA%%
-+sdkdir		= $(libdir)/%%MOZILLA%%
- 
- MOZDEPTH	= $(DEPTH)/mozilla
- DIST		= $(MOZDEPTH)/dist
diff --git a/www/seamonkey2/files/patch-configure b/www/seamonkey2/files/patch-configure
deleted file mode 100644
index d482c0589516..000000000000
--- a/www/seamonkey2/files/patch-configure
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.orig	2009-10-08 04:03:59.000000000 +0200
-+++ configure	2009-10-10 19:56:41.000000000 +0200
-@@ -5794,7 +5794,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
-@@ -10890,7 +10890,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 10896 "configure"
- #include "confdefs.h"
-@@ -10921,7 +10921,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
-@@ -10931,7 +10931,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 10937 "configure"
- #include "confdefs.h"
-@@ -10962,7 +10962,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
diff --git a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index b71a03a4567b..000000000000
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
-+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
diff --git a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in
deleted file mode 100644
index cc1833b5be7d..000000000000
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
-+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-01 10:18:43.000000000 +0100
-@@ -147,6 +147,11 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
diff --git a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in
deleted file mode 100644
index 20780ba61b1a..000000000000
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig	2009-09-10 17:36:39.000000000 +0200
-+++ directory/c-sdk/ldap/libraries/libssldap/Makefile.in	2009-09-10 17:37:28.000000000 +0200
-@@ -42,7 +42,7 @@
- NSPR_LIBS   = @NSPR_LIBS@
- NSPR_CFLAGS = @NSPR_CFLAGS@
- NSS_LIBS   = @NSS_LIBS@
--NSS_CFLAGS = @NSS_CFLAGS@
-+NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss
- 
- include $(MOD_DEPTH)/config/autoconf.mk
- include $(topsrcdir)/build.mk
-@@ -180,6 +180,10 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+CUSTOM_LIBS=1
-+endif
-+
- ifndef CUSTOM_LIBS
- EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
- EXTRA_LIBS += $(NSSLINK) 
diff --git a/www/seamonkey2/files/patch-directory-xpcom-base-src-Makefile.in b/www/seamonkey2/files/patch-directory-xpcom-base-src-Makefile.in
deleted file mode 100644
index f56d7b17f104..000000000000
--- a/www/seamonkey2/files/patch-directory-xpcom-base-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- directory/xpcom/base/src/Makefile.in.orig	2009-11-22 03:44:31.000000000 +0100
-+++ directory/xpcom/base/src/Makefile.in	2009-11-26 13:06:53.000000000 +0100
-@@ -97,6 +97,10 @@
- 		$(NULL)
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/seamonkey2/files/patch-mozilla-build-autoconf-config.sub b/www/seamonkey2/files/patch-mozilla-build-autoconf-config.sub
deleted file mode 100644
index 12a704ade44b..000000000000
--- a/www/seamonkey2/files/patch-mozilla-build-autoconf-config.sub
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/build/autoconf/config.sub.orig	2010-01-05 12:26:13.000000000 +0100
-+++ mozilla/build/autoconf/config.sub	2010-01-05 12:26:46.000000000 +0100
-@@ -403,9 +403,6 @@
- 	amd64)
- 		basic_machine=x86_64-pc
- 		;;
--	amd64-*)
--		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
--		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
diff --git a/www/seamonkey2/files/patch-mozilla-build-unix-run-mozilla.sh b/www/seamonkey2/files/patch-mozilla-build-unix-run-mozilla.sh
deleted file mode 100644
index 153e210e66e9..000000000000
--- a/www/seamonkey2/files/patch-mozilla-build-unix-run-mozilla.sh
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/build/unix/run-mozilla.sh.orig	2010-09-30 21:59:05.000000000 +0200
-+++ mozilla/build/unix/run-mozilla.sh	2010-10-19 10:39:28.000000000 +0200
-@@ -310,7 +310,7 @@
- }
- if moz_should_set_ld_library_path
- then
--	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
-+	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- fi 
- 
- if [ -n "$LD_LIBRARYN32_PATH" ]
-@@ -391,6 +391,9 @@
- export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
- export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
- 
-+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey
-+export MOZ_PLUGIN_PATH
-+
- if [ $moz_debug -eq 1 ]
- then
- 	moz_debug_program ${1+"$@"}
diff --git a/www/seamonkey2/files/patch-mozilla-config-autoconf.mk.in b/www/seamonkey2/files/patch-mozilla-config-autoconf.mk.in
deleted file mode 100644
index 566b95240799..000000000000
--- a/www/seamonkey2/files/patch-mozilla-config-autoconf.mk.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/config/autoconf.mk.in.orig	2009-09-17 19:09:10.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2009-09-17 19:09:26.000000000 +0200
-@@ -275,7 +275,7 @@
- OS_CPPFLAGS	= @CPPFLAGS@
- OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
- OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
--OS_LDFLAGS	= @LDFLAGS@
-+OS_LDFLAGS	= @LDFLAGS@ -lc
- 
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
diff --git a/www/seamonkey2/files/patch-mozilla-config-mkdepend-Makefile.in b/www/seamonkey2/files/patch-mozilla-config-mkdepend-Makefile.in
deleted file mode 100644
index 64d685b847ed..000000000000
--- a/www/seamonkey2/files/patch-mozilla-config-mkdepend-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/config/mkdepend/Makefile.in.orig	2009-09-11 19:30:23.000000000 +0200
-+++ mozilla/config/mkdepend/Makefile.in	2009-09-11 19:29:53.000000000 +0200
-@@ -73,6 +73,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/seamonkey2/files/patch-mozilla-config-mkdepend-imakemdep.h b/www/seamonkey2/files/patch-mozilla-config-mkdepend-imakemdep.h
deleted file mode 100644
index 6df7089f91d3..000000000000
--- a/www/seamonkey2/files/patch-mozilla-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ mozilla/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/seamonkey2/files/patch-mozilla-configure b/www/seamonkey2/files/patch-mozilla-configure
deleted file mode 100644
index 3e8a62d65927..000000000000
--- a/www/seamonkey2/files/patch-mozilla-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/configure.orig	2010-01-08 09:53:05.000000000 +0100
-+++ mozilla/configure	2010-01-08 09:53:34.000000000 +0100
-@@ -5502,7 +5502,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
diff --git a/www/seamonkey2/files/patch-mozilla-content-xslt-public-txDouble.h b/www/seamonkey2/files/patch-mozilla-content-xslt-public-txDouble.h
deleted file mode 100644
index a23257af52ca..000000000000
--- a/www/seamonkey2/files/patch-mozilla-content-xslt-public-txDouble.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- mozilla/content/xslt/public/txDouble.h.orig	2009-08-25 01:35:47.000000000 +0200
-+++ mozilla/content/xslt/public/txDouble.h	2009-08-25 01:37:41.000000000 +0200
-@@ -43,11 +43,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
-+#endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
- #endif
-+static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- static fp_except_t oldmask = fpsetmask(~allmask);
- #endif
- 
diff --git a/www/seamonkey2/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp b/www/seamonkey2/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
deleted file mode 100644
index bbd6615f74bd..000000000000
--- a/www/seamonkey2/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- mozilla/embedding/base/nsEmbedAPI.cpp.orig	2007-10-09 20:00:30.000000000 -0400
-+++ mozilla/embedding/base/nsEmbedAPI.cpp	2007-10-09 20:01:45.000000000 -0400
-@@ -53,7 +53,12 @@ static PRBool             sRegistryIniti
- static PRUint32           sInitCounter = 0;
- 
- #define HACK_AROUND_THREADING_ISSUES
--//#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if __FreeBSD_version < 700042
-+#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#endif
-+#endif
- 
- #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
- // XXX hack class to clean up XPCOM when this module is unloaded
diff --git a/www/seamonkey2/files/patch-mozilla-js-src-Makefile.in b/www/seamonkey2/files/patch-mozilla-js-src-Makefile.in
deleted file mode 100644
index 125c74e7dfd1..000000000000
--- a/www/seamonkey2/files/patch-mozilla-js-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/js/src/Makefile.in.orig	2009-08-25 18:58:30.000000000 +0200
-+++ mozilla/js/src/Makefile.in	2009-08-25 18:58:47.000000000 +0200
-@@ -428,6 +428,7 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- EXTRA_LIBS	+= -pthread
-+LDFLAGS		+= -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
diff --git a/www/seamonkey2/files/patch-mozilla-js-src-build-autoconf-config.sub b/www/seamonkey2/files/patch-mozilla-js-src-build-autoconf-config.sub
deleted file mode 100644
index 2cb48a88c0e9..000000000000
--- a/www/seamonkey2/files/patch-mozilla-js-src-build-autoconf-config.sub
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/js/src/build/autoconf/config.sub.orig	2010-01-08 09:52:25.000000000 +0100
-+++ mozilla/js/src/build/autoconf/config.sub	2010-01-08 09:52:33.000000000 +0100
-@@ -403,9 +403,6 @@
- 	amd64)
- 		basic_machine=x86_64-pc
- 		;;
--	amd64-*)
--		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
--		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
diff --git a/www/seamonkey2/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/www/seamonkey2/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
deleted file mode 100644
index 2f5b09be6df7..000000000000
--- a/www/seamonkey2/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-09-14 13:17:15.000000000 +0200
-+++ mozilla/js/src/config/mkdepend/Makefile.in	2009-09-14 13:17:34.000000000 +0200
-@@ -72,7 +72,7 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/seamonkey2/files/patch-mozilla-js-src-configure b/www/seamonkey2/files/patch-mozilla-js-src-configure
deleted file mode 100644
index d5dec00651c8..000000000000
--- a/www/seamonkey2/files/patch-mozilla-js-src-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/js/src/configure.orig	2009-09-17 16:34:18.000000000 +0200
-+++ mozilla/js/src/configure	2009-09-17 16:34:46.000000000 +0200
-@@ -6916,10 +6916,6 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
-     ;;
--sparc*-*)
--    ENABLE_JIT=1
--    NANOJIT_ARCH=Sparc
--    ;;
- esac
- 
- # Check whether --enable-jit or --disable-jit was given.
diff --git a/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
deleted file mode 100644
index 726dc875e37f..000000000000
--- a/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2010-09-06 11:33:54.000000000 +0200
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2010-09-06 11:34:16.000000000 +0200
-@@ -59,7 +59,7 @@
- 
- #include <sys/types.h>
- 
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
diff --git a/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c b/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c
deleted file mode 100644
index e096cc70c2e8..000000000000
--- a/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig	2010-10-12 21:45:53.000000000 +0400
-+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c	2010-10-25 23:33:08.919096567 +0400
-@@ -258,6 +258,7 @@
- int
- sa_stream_destroy(sa_stream_t *s) {
-   int result = SA_SUCCESS;
-+  pthread_t thread_id;
- 
-   if (s == NULL) {
-     return SA_SUCCESS;
-@@ -265,8 +266,10 @@
- 
-   pthread_mutex_lock(&s->mutex);
- 
-+  thread_id = s->thread_id;
-+
-   /*
--   * This causes the thread sending data to ALSA to stop
-+   * This causes the thread sending data to OSS to stop
-    */
-   s->thread_id = 0;
- 
-@@ -281,6 +284,8 @@
- 
-   pthread_mutex_unlock(&s->mutex);
- 
-+  pthread_join(thread_id, NULL);
-+
-   /*
-    * Release resources.
-    */
-
-
diff --git a/www/seamonkey2/files/patch-mozilla-security-coreconf-FreeBSD.mk b/www/seamonkey2/files/patch-mozilla-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3015445bfc08..000000000000
--- a/www/seamonkey2/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,40 +0,0 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig	2010-03-16 09:57:06.000000000 +0000
-+++ mozilla/security/coreconf/FreeBSD.mk	2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
- ifeq ($(CPU_ARCH),pc98)
- CPU_ARCH		= x86
- endif
--ifeq ($(CPU_ARCH),amd64)
--CPU_ARCH		= x86_64
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+endif
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+endif
-+ifeq ($(OS_TEST),ia64) 
-+CPU_ARCH		= ia64
-+endif
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH		= powerpc
-+endif
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH		= sparc64
- endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -78,7 +90,7 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -87,4 +99,4 @@
- 
- G++INCLUDES		= -I/usr/include/g++
- 
--INCLUDES		+= -I/usr/X11R6/include
-+#INCLUDES		+= -I/usr/local/include
diff --git a/www/seamonkey2/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/www/seamonkey2/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
deleted file mode 100644
index 272a02bdb9e0..000000000000
--- a/www/seamonkey2/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
-+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
-@@ -110,6 +110,7 @@
- #include "nss.h"
- #include "pk11func.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "sechash.h"
diff --git a/www/seamonkey2/files/patch-mozilla-storage-build-Makefile.in b/www/seamonkey2/files/patch-mozilla-storage-build-Makefile.in
deleted file mode 100644
index 44ed0d3e7318..000000000000
--- a/www/seamonkey2/files/patch-mozilla-storage-build-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index 1997e6c2d19d..000000000000
--- a/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ mozilla/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/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 7dd5b80a1ced..000000000000
--- a/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-12-07 17:36:07.000000000 +0100
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2011-02-26 21:30:36.000000000 +0100
-@@ -73,6 +73,9 @@
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
- 
-@@ -96,7 +99,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+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
-@@ -115,6 +118,12 @@
- CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
- endif
- #
-+# FreeBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
-+endif
-+#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -165,9 +174,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
- #
-@@ -322,7 +337,7 @@
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS		:= $(CC) -c -x assembler-with-cpp
-@@ -331,7 +346,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS             := $(CC) -c -x assembler-with-cpp
-@@ -400,6 +415,15 @@
- 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_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
-+endif
-+endif
-+#
- # OpenBSD/SPARC
- #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/www/seamonkey2/files/patch-sysnss b/www/seamonkey2/files/patch-sysnss
deleted file mode 100644
index caaab4593f5c..000000000000
--- a/www/seamonkey2/files/patch-sysnss
+++ /dev/null
@@ -1,188 +0,0 @@
---- mozilla/security/manager/Makefile.in.orig	2009-10-08 04:03:28.000000000 +0200
-+++ mozilla/security/manager/Makefile.in	2009-10-11 00:38:00.000000000 +0200
-@@ -46,16 +46,8 @@
- MODULE = psm
- 
- ifndef MOZ_NATIVE_NSS
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
- 
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(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
--
- ifndef NSS_DISABLE_DBM
- NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
- NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
-@@ -249,11 +241,6 @@
- .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
- 	$(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 $@
- endif
- 
-@@ -274,76 +261,8 @@
- 
- libs::
- ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--ifndef NSS_DISABLE_DBM
--	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifdef ENABLE_TESTS
--	# Need certutil binary for mochitest certificates generation
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef SKIP_CHK
--ifndef ENABLE_TESTS # Just avoid secondary compile
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--	$(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
--ifndef NSS_DISABLE_DBM
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
--endif
--endif
--ifndef MOZ_NATIVE_NSS
--# NSS installs headers to dist/public and we want them in dist/include
--	$(NSINSTALL) -D $(DIST)/include/nss
--	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
--	  (cd $(DIST)/include/nss && tar -xf -)
--	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
--	  (cd $(DIST)/sdk/include && tar -xf -)
- endif
-+	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
- 	$(MAKE) -C locales $@
-@@ -356,47 +275,6 @@
- 
- install::
- ifndef MOZ_NATIVE_NSS
--	$(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)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -413,12 +291,6 @@
- 	$(MAKE) -C pki $@
- endif
- ifndef MOZ_NATIVE_NSS
--	$(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
- endif
- 
- echo-requires-recursive::
---- mozilla/security/manager/ssl/src/Makefile.in.orig	2009-08-26 19:05:39.000000000 +0200
-+++ mozilla/security/manager/ssl/src/Makefile.in	2009-08-26 19:06:17.000000000 +0200
-@@ -138,13 +138,14 @@
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/seamonkey2/files/patch-xptcall-alpha b/www/seamonkey2/files/patch-xptcall-alpha
deleted file mode 100644
index db5ef6438cdb..000000000000
--- a/www/seamonkey2/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ mozilla/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"
-+    );
-+
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ mozilla/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/seamonkey2/files/patch-xptcall-amd64 b/www/seamonkey2/files/patch-xptcall-amd64
deleted file mode 100644
index feb3452a20bc..000000000000
--- a/www/seamonkey2/files/patch-xptcall-amd64
+++ /dev/null
@@ -1,386 +0,0 @@
---- /dev/null	Wed Dec 31 16:00:00 1969
-+++ mozilla/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
-+++ mozilla/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/seamonkey2/files/patch-xptcall-ia64 b/www/seamonkey2/files/patch-xptcall-ia64
deleted file mode 100644
index d9f4f15525de..000000000000
--- a/www/seamonkey2/files/patch-xptcall-ia64
+++ /dev/null
@@ -1,38 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	2009-08-26 18:47:07.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	2009-08-26 18:49:39.000000000 +0200
-@@ -8,6 +8,7 @@
- // Section has executable code
-         .section .text, "ax","progbits"
- // procedure named 'NS_InvokeByIndex_P'
-+	.global XPTC_InvokeByIndex
-         .proc   NS_InvokeByIndex_P
- // manual bundling
-         .explicit
-@@ -24,7 +25,7 @@
- 
- // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
- //   PRUint32 paramCount, nsXPTCVariant* params);
--NS_InvokeByIndex_P::
-+NS_InvokeByIndex_P:
-         .prologue
-         .save ar.pfs, r37
- // allocate 4 input args, 6 local args, and 8 output args
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	2009-08-26 18:47:07.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	2009-08-26 18:47:34.000000000 +0200
-@@ -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:
- // 10 arguments, first 8 are the input arguments of previous
- // function call.  The 9th one is methodIndex and the 10th is the
- // pointer to the remaining input arguments.  The last two arguments
diff --git a/www/seamonkey2/files/patch-xptcall-sparc64 b/www/seamonkey2/files/patch-xptcall-sparc64
deleted file mode 100644
index bbf418dd3e2a..000000000000
--- a/www/seamonkey2/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ mozilla/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
-+++ mozilla/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
-+++ mozilla/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/seamonkey2/files/releng6_pulseaudio b/www/seamonkey2/files/releng6_pulseaudio
deleted file mode 100644
index 265c5c462242..000000000000
--- a/www/seamonkey2/files/releng6_pulseaudio
+++ /dev/null
@@ -1,55 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_pulseaudio.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig	2009-09-03 19:49:34.000000000 +0200
-+++ mozilla/toolkit/library/Makefile.in	2009-09-17 17:30:42.000000000 +0200
-@@ -228,12 +228,12 @@
- endif
- 
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
---- mozilla/layout/build/Makefile.in.orig	2009-09-17 23:07:56.000000000 +0200
-+++ mozilla/layout/build/Makefile.in	2009-09-17 23:15:53.000000000 +0200
-@@ -269,6 +269,10 @@
- endif
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_DSO_LDOPTS += -lpulse -lpthread
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2009-11-30 22:47:52.000000000 +0100
-+++ mozilla/xpcom/base/nsStackWalk.cpp	2009-11-30 22:48:09.000000000 +0100
-@@ -1115,6 +1115,7 @@
- #include "nscore.h"
- #include <stdio.h>
- #include "plstr.h"
-+#include <dlfcn.h>
- 
- // On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
- // if __USE_GNU is defined.  I suppose its some kind of standards
diff --git a/www/seamonkey2/files/seamonkey.desktop.in b/www/seamonkey2/files/seamonkey.desktop.in
deleted file mode 100644
index db8bb613e9c7..000000000000
--- a/www/seamonkey2/files/seamonkey.desktop.in
+++ /dev/null
@@ -1,169 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Seamonkey Web Browser
-Name[az]=Seamonkey Veb Səyyahı
-Name[bg]=Интернет браузър (Seamonkey)
-Name[bs]=Seamonkey web preglednik
-Name[ca]=Navegador web Seamonkey
-Name[cs]=Prohlížeč WWW Seamonkey
-Name[cy]=Y Porwr Gwe Seamonkey
-Name[da]=Seamonkey - internetbrowser
-Name[de]=Seamonkey Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Seamonkey
-Name[en_CA]=Seamonkey Web Browser
-Name[en_GB]=Seamonkey Web Browser
-Name[es]=Navegador Web Seamonkey
-Name[et]=Seamonkey veebibrauser
-Name[eu]=Seamonkey web arakatzailea
-Name[fa]=مرورگر وب Seamonkey
-Name[fi]=Seamonkey, WWW-selain
-Name[fr]=Navigateur Web Seamonkey
-Name[ga]=Brabhsálaí Lín Seamonkey
-Name[he]=דפדפן Seamonkey
-Name[hr]=Seamonkey Web preglednik
-Name[hu]=Seamonkey webböngésző
-Name[id]=Web Browser Seamonkey
-Name[it]=Browser web Seamonkey
-Name[ja]=Seamonkey ウェブ・ブラウザ
-Name[ko]=Seamonkey 웹 브라우저
-Name[li]=Seamonkey Web Browser
-Name[lt]=Seamonkey web naršyklė
-Name[mk]=Seamonkey Веб Прелистувач
-Name[mn]=Seamonkey веб хөтөч
-Name[ms]=Pelungsur Web Seamonkey
-Name[nb]=Seamonkey nettleser
-Name[nl]=Seamonkey webbrowser
-Name[nn]=Seamonkey nettlesar
-Name[no]=Seamonkey nettleser
-Name[pl]=Przeglądarka WWW Seamonkey
-Name[pt]=Navegador Web Seamonkey
-Name[pt_BR]=Navegador Web Seamonkey
-Name[ro]=Navigatorul Seamonkey
-Name[sl]=Spletni brskalnik Seamonkey
-Name[sq]=Seamonkey - Shfletuesi Web
-Name[sv]=Webbläsaren Seamonkey
-Name[tk]=Seamonkey Web Ahtarçisi
-Name[tr]=Seamonkey Web Tarayıcı
-Name[uk]=Переглядач web Seamonkey
-Name[vi]=Trình Duyệt Web Seamonkey
-Name[wa]=Betchteu waibe Seamonkey
-Name[zh_CN]=Seamonkey Web 浏览器
-Name[zh_TW]=Seamonkey 網頁瀏覽器
-GenericName=Seamonkey Web Browser
-GenericName[az]=Seamonkey Veb Səyyahı
-GenericName[bg]=Интернет браузър (Seamonkey)
-GenericName[bs]=Seamonkey web preglednik
-GenericName[ca]=Navegador web Seamonkey
-GenericName[cs]=Prohlížeč WWW Seamonkey
-GenericName[cy]=Y Porwr Gwe Seamonkey
-GenericName[da]=Seamonkey - internetbrowser
-GenericName[de]=Seamonkey Webbrowser
-GenericName[el]=Περιηγητής Διαδικτύου Seamonkey
-GenericName[en_CA]=Seamonkey Web Browser
-GenericName[en_GB]=Seamonkey Web Browser
-GenericName[es]=Navegador Web Seamonkey
-GenericName[et]=Seamonkey veebibrauser
-GenericName[eu]=Seamonkey web arakatzailea
-GenericName[fa]=مرورگر وب Seamonkey
-GenericName[fi]=Seamonkey, WWW-selain
-GenericName[fr]=Navigateur Web Seamonkey
-GenericName[ga]=Brabhsálaí Lín Seamonkey
-GenericName[he]=דפדפן Seamonkey
-GenericName[hr]=Seamonkey Web preglednik
-GenericName[hu]=Seamonkey webböngésző
-GenericName[id]=Web Browser Seamonkey
-GenericName[it]=Browser web Seamonkey
-GenericName[ja]=Seamonkey ウェブ・ブラウザ
-GenericName[ko]=Seamonkey 웹 브라우저
-GenericName[li]=Seamonkey Web Browser
-GenericName[lt]=Seamonkey web naršyklė
-GenericName[mk]=Seamonkey Веб Прелистувач
-GenericName[mn]=Seamonkey веб хөтөч
-GenericName[ms]=Pelungsur Web Seamonkey
-GenericName[nb]=Seamonkey nettleser
-GenericName[nl]=Seamonkey webbrowser
-GenericName[nn]=Seamonkey nettlesar
-GenericName[no]=Seamonkey nettleser
-GenericName[pl]=Przeglądarka WWW Seamonkey
-GenericName[pt]=Navegador Web Seamonkey
-GenericName[pt_BR]=Navegador Web Seamonkey
-GenericName[ro]=Navigatorul Seamonkey
-GenericName[sl]=Spletni brskalnik Seamonkey
-GenericName[sq]=Seamonkey - Shfletuesi Web
-GenericName[sv]=Webbläsaren Seamonkey
-GenericName[tk]=Seamonkey Web Ahtarçisi
-GenericName[tr]=Seamonkey Web Tarayıcı
-GenericName[uk]=Переглядач web Seamonkey
-GenericName[vi]=Trình Duyệt Web Seamonkey
-GenericName[wa]=Betchteu waibe Seamonkey
-GenericName[zh_CN]=Seamonkey Web 浏览器
-GenericName[zh_TW]=Seamonkey 網頁瀏覽器
-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]=ใช้งานเว็บบราวเซอร์ Seamonkey
-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=true
-Terminal=false
-Type=Application
-Icon=%%MOZILLA%%.png
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/seamonkey2/pkg-descr b/www/seamonkey2/pkg-descr
deleted file mode 100644
index 7ab49e67ae43..000000000000
--- a/www/seamonkey2/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the 2.0.x release of the Seamonkey open source web browser. It should 
-be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, 
-JavaScript, MathML, SSL encryption, SVG and RDF.  Also supports Java with
-the use of the FreeBSD native Java plug-in.
-
-WWW: http://www.mozilla.org/projects/seamonkey/