- Remove

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5245 df743ca5-7f9a-e211-a948-0013205c9059
author: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2005-11-30 05:46:12 +0800
committer: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2005-11-30 05:46:12 +0800
commit: dff320e95e1d0a6aed0ec85efb495575ec0614b4 (patch)
tree: e1eb7ef4390eb0a4109fc8c2bf1e21c1ab33c3f4
parent: c916094aec2d5c829e79b8ed901cacbe8e477c16 (diff)
download: marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.gz
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.bz2
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.lz
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.xz
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.zst
marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.zip
96 files changed, 0 insertions, 6243 deletions
diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile
deleted file mode 100644
index 8cfa12648..000000000
--- a/mail/thunderbird-devel/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# New ports collection makefile for:	mozilla-thunderbird
-# Date created:			4 September 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.15 2005/11/23 04:54:58 ahze Exp $
-#
-
-PORTNAME=	thunderbird
-DISTVERSION=	1.5rc1
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
-
-WANT_GNOME=	yes
-ALL_TARGET=	default
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
-MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
-MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-CONFLICTS=	thunderbird-1.0*
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE=	core dumps at runtime
-.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif # ${PERL_LEVEL} < 500600
-
-post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-pre-install:
-	${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-devel/distinfo b/mail/thunderbird-devel/distinfo
deleted file mode 100644
index 9f2805bbe..000000000
--- a/mail/thunderbird-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-1.5rc1-source.tar.bz2) = 0df70073cc6ac9f6772f82bc9e024543
-SHA256 (thunderbird-1.5rc1-source.tar.bz2) = 0f21ad373afeef3fff814b298c6b20c473f938f26b46380d8fcacc4c9c7a19df
-SIZE (thunderbird-1.5rc1-source.tar.bz2) = 35022501
diff --git a/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl b/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca..000000000
--- a/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/mail/thunderbird-devel/files/moz_pis_S50cleanhome b/mail/thunderbird-devel/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392..000000000
--- a/mail/thunderbird-devel/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# 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 polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-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
-	# at last, debian do this, we do for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/mail/thunderbird-devel/files/patch-Double.cpp b/mail/thunderbird-devel/files/patch-Double.cpp
deleted file mode 100644
index 5cd13e4ff..000000000
--- a/mail/thunderbird-devel/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
-+++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
-@@ -51,10 +51,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -75,22 +75,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d..000000000
--- a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh	Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e6644..000000000
--- a/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/mail/thunderbird-devel/files/patch-config-rules.mk b/mail/thunderbird-devel/files/patch-config-rules.mk
deleted file mode 100644
index ecc3c8194..000000000
--- a/mail/thunderbird-devel/files/patch-config-rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
-+++ config/rules.mk	Sun Feb  1 15:11:41 2004
-@@ -444,7 +444,11 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
- 
diff --git a/mail/thunderbird-devel/files/patch-config_autoconf.mk.in b/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fb..000000000
--- a/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74..000000000
--- a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b43..000000000
--- a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird-devel/files/patch-libm b/mail/thunderbird-devel/files/patch-libm
deleted file mode 100644
index 7de64b2a5..000000000
--- a/mail/thunderbird-devel/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
-+++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
- 
--FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK	= jsmathtemp.o
- JS_SAFE_ARENA	= 1
-@@ -320,7 +319,4 @@
- endif
- 	@$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
- 
---- js/Makefile.in	Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in	Thu Aug  4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd2..000000000
--- a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig	Mon Apr  4 15:08:49 2005
-+++ mail/app/mozilla.in	Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export	MRE_HOME
- 
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird-devel/files/patch-nopangoxft b/mail/thunderbird-devel/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c48..000000000
--- a/mail/thunderbird-devel/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3e0e14aca..000000000
--- a/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -71,7 +75,11 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/mail/thunderbird-devel/files/patch-sysnss b/mail/thunderbird-devel/files/patch-sysnss
deleted file mode 100644
index d854cabc0..000000000
--- a/mail/thunderbird-devel/files/patch-sysnss
+++ /dev/null
@@ -1,178 +0,0 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
---- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
-+++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
-@@ -37,16 +37,7 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_MODULES \
- 	$(NULL)
- 
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
-@@ -132,9 +123,4 @@
- .nss.cleaned: .nss.checkout
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- 
-@@ -153,43 +139,4 @@
- ifeq ($(OS_ARCH),WINNT)
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
- endif
- 	$(MAKE) -C boot $@
-@@ -200,18 +147,4 @@
- 
- install::
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -227,9 +160,4 @@
- endif
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
-                   $(NULL)
- 
---- config/config.mk	Tue Oct 12 00:11:11 2004
-+++ config/config.mk	Tue Aug  2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS	= \
- 	$(LIBS_DIR) \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- 	-lsmime3 \
- 	-lssl3 \
-@@ -189,11 +188,5 @@
- endif
- 
--NSS_DEP_LIBS	= \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
--	$(NULL)
-+NSS_DEP_LIBS	=
- 
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
-     const char *possible_ckbi_locations[] = {
-       NS_GRE_DIR,
-+      NS_UNIX_LIB_DIR,
-       NS_XPCOM_CURRENT_PROCESS_DIR
-     };
-@@ -419,5 +424,5 @@
-       }
- 
--      char *fullModuleName = nsnull;
-+      char *fullModuleName;
- #ifdef XP_MAC
-       nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
-       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+      if (fullModuleName == nsnull)
-+        continue;
-+      struct stat sb;
-+      if (stat(fullModuleName, &sb)) {
-+        if (errno != ENOENT)
-+          perror(fullModuleName);
-+        continue;
-+      }
-       /* If a module exists with the same name, delete it. */
-       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f53..000000000
--- a/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896..000000000
--- a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Mon May  3 13:05:12 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/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a..000000000
--- a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,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
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird-devel/files/patch-xptcall-alpha b/mail/thunderbird-devel/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e..000000000
--- a/mail/thunderbird-devel/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird-devel/files/patch-xptcall-sparc64 b/mail/thunderbird-devel/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71..000000000
--- a/mail/thunderbird-devel/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/mail/thunderbird-devel/files/thunderbird.desktop.in b/mail/thunderbird-devel/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f5..000000000
--- a/mail/thunderbird-devel/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird-devel/pkg-deinstall.in b/mail/thunderbird-devel/pkg-deinstall.in
deleted file mode 100644
index 838539839..000000000
--- a/mail/thunderbird-devel/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.8 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird-devel/pkg-descr b/mail/thunderbird-devel/pkg-descr
deleted file mode 100644
index 5a21b98b0..000000000
--- a/mail/thunderbird-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language.  See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.org/projects/thunderbird/
diff --git a/mail/thunderbird-devel/pkg-install.in b/mail/thunderbird-devel/pkg-install.in
deleted file mode 100644
index 588e64906..000000000
--- a/mail/thunderbird-devel/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom$
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
deleted file mode 100644
index 0a76c216a..000000000
--- a/mail/thunderbird/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# New ports collection makefile for:	mozilla-thunderbird
-# Date created:			4 September 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/mail/thunderbird/Makefile,v 1.12 2005/11/23 18:20:23 marcus Exp $
-#
-
-PORTNAME=	thunderbird
-PORTVERSION=	1.0.7
-PORTREVISION=	3
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
-
-WANT_GNOME=	yes
-ALL_TARGET=	default
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
-MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
-MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing \
-		--enable-official-branding
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-CONFLICTS=	thunerbird*-1.5*
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE=	core dumps at runtime
-.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif # ${PERL_LEVEL} < 500600
-
-post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-pre-install:
-	${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
deleted file mode 100644
index 13190306b..000000000
--- a/mail/thunderbird/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
-SHA256 (thunderbird-1.0.7-source.tar.bz2) = 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
-SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
diff --git a/mail/thunderbird/files/extra-patch-config_make-jars.pl b/mail/thunderbird/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca..000000000
--- a/mail/thunderbird/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/mail/thunderbird/files/moz_pis_S50cleanhome b/mail/thunderbird/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392..000000000
--- a/mail/thunderbird/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# 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 polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-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
-	# at last, debian do this, we do for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/mail/thunderbird/files/patch-Double.cpp b/mail/thunderbird/files/patch-Double.cpp
deleted file mode 100644
index 5cd13e4ff..000000000
--- a/mail/thunderbird/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
-+++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
-@@ -51,10 +51,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -75,22 +75,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird/files/patch-bugzilla149334 b/mail/thunderbird/files/patch-bugzilla149334
deleted file mode 100644
index fe1be5bc8..000000000
--- a/mail/thunderbird/files/patch-bugzilla149334
+++ /dev/null
@@ -1,342 +0,0 @@
-Index: gfx/idl/nsIFreeType2.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsIFreeType2.idl
---- gfx/idl/nsIFreeType2.idl	15 Apr 2004 23:30:02 -0000	1.10
-+++ gfx/idl/nsIFreeType2.idl	26 May 2004 10:00:54 -0000
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp	17 Apr 2004 21:52:29 -0000	1.25
-+++ gfx/src/freetype/nsFreeType.cpp	26 May 2004 10:00:54 -0000
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h	17 Apr 2004 21:52:29 -0000	1.17
-+++ gfx/src/freetype/nsFreeType.h	26 May 2004 10:00:54 -0000
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-Index: gfx/src/ps/nsFontMetricsPS.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
-retrieving revision 1.43
-diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
---- gfx/src/ps/nsFontMetricsPS.cpp	17 Apr 2004 21:52:31 -0000	1.43
-+++ gfx/src/ps/nsFontMetricsPS.cpp	26 May 2004 10:01:03 -0000
-@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
-Index: gfx/src/ps/nsFontMetricsPS.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFontMetricsPS.h
---- gfx/src/ps/nsFontMetricsPS.h	17 Apr 2004 21:52:31 -0000	1.25
-+++ gfx/src/ps/nsFontMetricsPS.h	26 May 2004 10:01:03 -0000
-@@ -319,7 +319,7 @@ protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- 
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -362,7 +362,7 @@ public:
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
- 
-Index: gfx/src/x11shared/nsFontFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
-retrieving revision 1.14
-diff -u -3 -p -r1.14 nsFontFreeType.cpp
---- gfx/src/x11shared/nsFontFreeType.cpp	17 Apr 2004 21:52:34 -0000	1.14
-+++ gfx/src/x11shared/nsFontFreeType.cpp	26 May 2004 10:01:03 -0000
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-Index: gfx/src/x11shared/nsFontFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h	17 Apr 2004 21:52:34 -0000	1.10
-+++ gfx/src/x11shared/nsFontFreeType.h	26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/mail/thunderbird/files/patch-bugzilla243151 b/mail/thunderbird/files/patch-bugzilla243151
deleted file mode 100644
index e1a2a77ac..000000000
--- a/mail/thunderbird/files/patch-bugzilla243151
+++ /dev/null
@@ -1,10 +0,0 @@
-Bogus assertion, see	https://bugzilla.mozilla.org/show_bug.cgi?id=243151
-
---- xpcom/threads/nsThread.cpp	Sun Oct  5 21:42:05 2003
-+++ xpcom/threads/nsThread.cpp	Mon Aug  8 00:33:45 2005
-@@ -374,5 +374,4 @@
-         status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit);
-         if (status != PR_SUCCESS) return NS_ERROR_FAILURE;
--        NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index");
-     }
- 
diff --git a/mail/thunderbird/files/patch-build_unix_mozilla-xpcom.pc.in b/mail/thunderbird/files/patch-build_unix_mozilla-xpcom.pc.in
deleted file mode 100644
index 4e982a544..000000000
--- a/mail/thunderbird/files/patch-build_unix_mozilla-xpcom.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- build/unix/mozilla-xpcom.pc.in.orig	Thu Jun 24 12:23:09 2004
-+++ build/unix/mozilla-xpcom.pc.in	Thu Jun 24 12:23:18 2004
-@@ -8,4 +8,4 @@
- Version: %MOZILLA_VERSION%
- Requires: mozilla-nspr = %MOZILLA_VERSION%
- Libs: -L${libdir} -lxpcom
--Cflags: -I${includedir}/xpcom -I${includedir}/string
-+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}
diff --git a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 37af6d18a..000000000
--- a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh	Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e6644..000000000
--- a/mail/thunderbird/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/mail/thunderbird/files/patch-config-rules.mk b/mail/thunderbird/files/patch-config-rules.mk
deleted file mode 100644
index ecc3c8194..000000000
--- a/mail/thunderbird/files/patch-config-rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
-+++ config/rules.mk	Sun Feb  1 15:11:41 2004
-@@ -444,7 +444,11 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
- 
diff --git a/mail/thunderbird/files/patch-config::mkdepend::Makefile.in b/mail/thunderbird/files/patch-config::mkdepend::Makefile.in
deleted file mode 100644
index bace012a2..000000000
--- a/mail/thunderbird/files/patch-config::mkdepend::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
- include $(topsrcdir)/config/rules.mk
- 
- HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= $(XCFLAGS)
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/mail/thunderbird/files/patch-config_autoconf.mk.in b/mail/thunderbird/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fb..000000000
--- a/mail/thunderbird/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird/files/patch-configure b/mail/thunderbird/files/patch-configure
deleted file mode 100644
index cdf04c84a..000000000
--- a/mail/thunderbird/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Wed Nov 23 13:17:02 2005
-+++ configure	Wed Nov 23 13:17:20 2005
-@@ -11417,12 +11417,12 @@
- 
-             echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
- echo "configure:11420: checking MOZ_GTK2_CFLAGS" >&5
--            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
-+            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
-             echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
- 
-             echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
- echo "configure:11425: checking MOZ_GTK2_LIBS" >&5
--            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
-+            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
-             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
-         else
-             MOZ_GTK2_CFLAGS=""
diff --git a/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74..000000000
--- a/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b43..000000000
--- a/mail/thunderbird/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird/files/patch-gfx-src-gtk-Makefile.in b/mail/thunderbird/files/patch-gfx-src-gtk-Makefile.in
deleted file mode 100644
index ff8b69984..000000000
--- a/mail/thunderbird/files/patch-gfx-src-gtk-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
-contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
-
-This causes an error, because libgfxshared_s is only under dist/lib.
-
-	-mi
-
---- gfx/src/gtk/Makefile.in	Mon Nov 10 07:24:51 2003
-+++ gfx/src/gtk/Makefile.in	Thu Jul 21 23:58:26 2005
-@@ -165,4 +165,5 @@
- ifdef MOZ_ENABLE_GTK2
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
-+		$(LIBS_DIR) \
- 		-lgkgfx \
- 		-lgfxshared_s \
diff --git a/mail/thunderbird/files/patch-jsosdep b/mail/thunderbird/files/patch-jsosdep
deleted file mode 100644
index 7f5484565..000000000
--- a/mail/thunderbird/files/patch-jsosdep
+++ /dev/null
@@ -1,9 +0,0 @@
---- js/src/jsosdep.h	Fri Nov 14 19:10:59 2003
-+++ js/src/jsosdep.h	Fri Aug  5 00:50:44 2005
-@@ -102,5 +102,5 @@
- #define JS_HAVE_LONG_LONG
- 
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__FreeBSD__)
- #define JS_HAVE_LONG_LONG
- 
diff --git a/mail/thunderbird/files/patch-libm b/mail/thunderbird/files/patch-libm
deleted file mode 100644
index 7de64b2a5..000000000
--- a/mail/thunderbird/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
-+++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
- 
--FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK	= jsmathtemp.o
- JS_SAFE_ARENA	= 1
-@@ -320,7 +319,4 @@
- endif
- 	@$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
- 
---- js/Makefile.in	Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in	Thu Aug  4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird/files/patch-mail_app_mozilla.in b/mail/thunderbird/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 24eeb12c3..000000000
--- a/mail/thunderbird/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,474 +0,0 @@
---- mail/app/mozilla.in.orig	Sun Jul 25 01:58:06 2004
-+++ mail/app/mozilla.in	Tue Mar 22 23:59:11 2005
-@@ -29,51 +29,82 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export	MRE_HOME
- 
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,162 +113,214 @@
- curdir=`dirname "$progname"`
- progbase=`basename "$progname"`
- run_moz="$curdir/run-mozilla.sh"
--if test -x "$run_moz"; then
--  dist_bin="$curdir"
--  found=1
-+if [ -x "$run_moz" ]; then
-+    dist_bin="$curdir"
-+    found=1
- else
--  here=`/bin/pwd`
--  while [ -h "$progname" ]; do
--    bn=`basename "$progname"`
--    cd `dirname "$progname"`
--    progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
--    if [ ! -x "$progname" ]; then
--      break
--    fi
--    curdir=`dirname "$progname"`
--    run_moz="$curdir/run-mozilla.sh"
--    if [ -x "$run_moz" ]; then
--      cd "$curdir"
--      dist_bin=`pwd`
--      found=1
--      break
--    fi
--  done
--  cd "$here"
-+    while [ -h "${progname}" ]; do
-+	bn=`basename "${progname}"`
-+	cd `dirname "${progname}"`
-+	progname=`ls -l "${bn}" | sed -e 's/^.* -> //'`
-+	if [ ! -x "$progname" ]; then
-+	    break
-+	fi
-+    	curdir=`dirname "${progname}"`
-+    	run_moz="${curdir}/run-mozilla.sh"
-+    	if [ -x "${run_moz}" ]; then
-+	    cd "$curdir"
-+	    dist_bin=`pwd`
-+	    run_moz="${dist_bin}/run-mozilla.sh"
-+	    found=1
-+	    break
-+	fi
-+    done
-+    cd "${here}"
- fi
- if [ $found = 0 ]; then
--  # Check default compile-time libdir
--  if [ -x "$moz_libdir/run-mozilla.sh" ]; then
--    dist_bin="$moz_libdir"
--  else 
--    echo "Cannot find mozilla runtime directory. Exiting."
--    exit 1
--  fi
--fi
--
--script_args=""
--debugging=0
--MOZILLA_BIN="${progbase}-bin"
--
--# The following is to check for a currently running instance.
--# This is taken almost verbatim from the Mozilla RPM package's launch script.
--MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
--check_running() {
--    "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
--    RETURN_VAL=$?
--    if [ $RETURN_VAL -eq 0 ]; then
--        echo 1
--        return 1
-+    # Check default compile-time libdir
-+    if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
-+	dist_bin="$moz_libdir"
-+	run_moz="${dist_bin}/run-mozilla.sh"
-     else
--        echo 0
--        return 0
-+	echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
-+	exit 1
-     fi
--}
-+fi
- 
-+MOZILLA_BIN="${progbase}-bin"
- if [ "$OSTYPE" = "beos" ]; then
--  mimeset -F "$MOZILLA_BIN"
-+    mimeset -F "$MOZILLA_BIN"
- fi
- 
--ALREADY_RUNNING=`check_running`
-+# test for binary apps in ${dist_bin}
-+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
-+    MOZILLA_BIN="${dist_bin}/${progbase}-bin"
-+else
-+    echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
-+    exit 1
-+fi
-+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
-+    MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
-+else
-+    MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
-+fi
- 
--################################################################ Parse Arguments
--# If there's a command line argument but it doesn't begin with a -
--# it's probably a url.  Try to send it to a running instance.
--_USE_EXIST=0
--_NEW_WINDOW=
--_optOne="$1"
--case "${_optOne}" in
--	-*) 
--		;;
-+# guest a default remote command
-+_remote_cmd="xfeDoCommand(openInbox)"
-+
-+# parse options
-+script_args=	# null
-+moreargs=	# null
-+target=		# null
-+ALREADY_RUNNING="test"
-+while [ $# -gt 0 ]
-+do
-+    if [ -n "${target}" ]; then
-+	# well, this can't be the target if not last
-+	moreargs="${moreargs} \"${target}\""
-+	target=	# null
-+    fi
-+    case "$1" in
-+	# preserve [pP] for profile
-+	--pure | -pure)
-+	    MOZILLA_BIN="${MOZILLA_BIN}.pure"
-+	    shift
-+	    ;;
-+	-g | --debug)
-+	    script_args="${script_args} -g"
-+	    debugging=1
-+	    shift
-+	    ;;
-+	-d | --debugger)
-+	    if [ -n "$2" ]; then
-+		script_args="${script_args} -d $2"
-+		shift 2
-+	    else
-+		"$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-[Uu][Ii][Ll]ocale)
-+	    if [ -n "$2" ]; then
-+		uilocale="$2"
-+		shift 2
-+	    else
-+		echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-[Uu][Ii][Rr]egion)
-+	    if [ -n "$2" ]; then
-+		uiregion="$2"
-+		shift 2
-+	    else
-+		echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2
-+		exit 1
-+	    fi
-+	    ;;
-+	-mail)
-+	    # mail is default for ithunderbird
-+	    shift
-+	    ;;
-+	-compose)
-+	    _remote_cmd="xfeDoCommand(composeMessage)"
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	-turbo | -nosplash | -quiet)
-+	    # use remote even with this
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
-+	-*)
-+	    # don't use remote with options
-+	    ALREADY_RUNNING=	# null
-+	    moreargs="${moreargs} $1"
-+	    shift
-+	    ;;
- 	*)
--		_USE_EXIST=1
--		;;
--esac
--
--_optOthers=
--_optLast=
--for i in "$@"; do 
--	_optLast="${i}"
--done #last arg
--
--for i in "$@"; do
--	[ $i = ${_optLast} ] && break
--	_optOthers="${_optOthers} ${i}"
--done #others arg
--
--#???: needs check if othersopt begin with -* ?
--if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
--	# Last argument seems to be a local file/directory
--	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
--	# If it is just "relatively" (./file) specified, make it absolutely
--	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
--elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
--	_NEW_WINDOW=1
--fi
--################################################################ Parse Arguments
--
--########################################################################### Main
--if [ $ALREADY_RUNNING -eq 1 ]; then
--	# There's an instance already running. Use it.
--	# Any command line args passed in?
--	if [ $# -gt 0 ]; then
--		# There were "some" command line args.
--		if [ ${_USE_EXIST} -eq 1 ]; then
--			# We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
--			_open_type="window"
--			#_open_type="tab"
--			_remote_cmd="openURL(${_optLast} , new-${_open_type})"
--			"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
--			unset _remote_cmd _open_type
--			exit $?
--		fi
-+	    target="$1"
-+	    shift
-+	    ;;
-+    esac
-+done
-+
-+# test for a running copy of firefox
-+# seems this is not needed
-+#if [-n "${ALREADY_RUNNING}" ]; then
-+#    if [ -n "${DISPLAY}" ]; then
-+#	if [ -n "${debugging}" ]; then
-+#	    echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()"
-+#	    ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes"
-+#	else
-+#	    ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 &&
-+#		ALREADY_RUNNING="yes"
-+#	fi
-+#    elif [ -n "${debugging}" ]; then
-+#	echo "$0: WARN, no DISPLAY environment" 1>&2
-+#    fi
-+#fi
-+
-+# process target
-+if [ -n "${target}" ]; then
-+    moreargs="${moreargs} \"${target}\""
-+    if [ -n "${ALREADY_RUNNING}" ]; then
-+	if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then
-+	    # not an URI, don't use xremote
-+	    ALREADY_RUNNING=        # null
-+	fi
-+    fi
-+fi
-+
-+# try remote protocol if running
-+if [ -n "${ALREADY_RUNNING}" ]; then
-+    if [ -n "${target}" ]; then
-+	if [ -n "${location}" ]; then
-+	    _remote_cmd="openURL(${target},${location})"
- 	else
--		# No command line args. Open new window/tab
--		#exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
--		"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
--		exit $?
-+	    _remote_cmd="openURL(${target})"
- 	fi
-+    fi
-+    # FIXME problems with freedesktop StartupNotify
-+    if [ -n "${debugging}" ]; then
-+	echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}"
-+	${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} &&
-+       	    exit 0
-+    else
-+	${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \
-+	   >/dev/null 2>&1 && exit 0
-+    fi
- fi
--# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
--########################################################################### Main
- 
--pass_arg_count=0
--while [ $# -gt $pass_arg_count ]
--do
--  case "$1" in
--    -p | --pure | -pure)
--      MOZILLA_BIN="${MOZILLA_BIN}.pure"
--      shift
--      ;;
--    -g | --debug)
--      script_args="$script_args -g"
--      debugging=1
--      shift
--      ;;
--    -d | --debugger)
--      script_args="$script_args -d $2"
--      shift 2
--      ;;
--    *)
--      # Move the unrecognized argument to the end of the list.
--      arg="$1"
--      shift
--      set -- "$@" "$arg"
--      pass_arg_count=`expr $pass_arg_count + 1`
--      ;;
--  esac
--done
-+# fallback to direct invocation
-+
-+# UILocale, UIRegion
-+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then
-+    uilocale="${MOZILLA_UILOCALE}"
-+fi
-+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
-+    uiregion="${MOZILLA_UIREGION}"
-+fi
-+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
-+    uilocale="en-US"
-+fi
-+if [ -n "${uilocale}" ]; then
-+    if [ -n "${uiregion}" ]; then
-+	moreargs="-UIRegion ${uiregion} ${moreargs}"
-+    fi
-+    moreargs="-UILocale ${uilocale} ${moreargs}"
-+fi
- 
--export MRE_HOME
-+# real invocation
-+eval "set -- ${moreargs}"
- 
- ## Start addon scripts
- moz_pis_startstop_scripts "start"
- 
--if [ $debugging = 1 ]
--then
--  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
-+if [ -n "${debugging}" ]; then
-+    echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
- exitcode=$?
- 
- ## Stop addon scripts
diff --git a/mail/thunderbird/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/mail/thunderbird/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
deleted file mode 100644
index 9e58b5186..000000000
--- a/mail/thunderbird/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- widget/src/gtk2/mozdrawingarea.c.orig	Tue Apr 30 12:29:00 2002
-+++ widget/src/gtk2/mozdrawingarea.c	Thu Aug 18 22:27:27 2005
-@@ -168,7 +168,9 @@
- 
-     drawingarea = MOZ_DRAWINGAREA(object);
- 
-+    gdk_window_set_user_data(drawingarea->inner_window, NULL);
-     gdk_window_destroy(drawingarea->inner_window);
-+    gdk_window_set_user_data(drawingarea->clip_window, NULL);
-     gdk_window_destroy(drawingarea->clip_window);
- 
-     (* parent_class->finalize) (object);
diff --git a/mail/thunderbird/files/patch-oji-threads b/mail/thunderbird/files/patch-oji-threads
deleted file mode 100644
index 5d4031c8e..000000000
--- a/mail/thunderbird/files/patch-oji-threads
+++ /dev/null
@@ -1,60 +0,0 @@
---- modules/oji/public/nsIThreadManager.h	Fri Sep 28 16:08:27 2001
-+++ modules/oji/public/nsIThreadManager.h	Sat Aug  6 03:27:26 2005
-@@ -113,5 +113,5 @@
- 	 */
- 	NS_IMETHOD
--	CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0;
-+	CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0;
- 	
- 	/**
-@@ -122,5 +122,5 @@
- 	 */
- 	NS_IMETHOD
--	PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0;
-+	PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0;
- };
- 
---- modules/oji/src/nsJVMManager.cpp	Mon Feb  9 17:48:48 2004
-+++ modules/oji/src/nsJVMManager.cpp	Sat Aug  6 03:29:19 2005
-@@ -268,9 +268,9 @@
- 
- NS_METHOD
--nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable)
-+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable)
- {
- 	PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable,
- 									PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
--	*outThreadID = NS_PTR_TO_INT32(thread);
-+	*outThreadID = (uintptr_t)(thread);
- 	return (thread != NULL ?  NS_OK : NS_ERROR_FAILURE);
- }
-@@ -308,5 +308,5 @@
- 
- NS_METHOD
--nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async)
-+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async)
- {
-     nsresult rv;
-@@ -873,5 +873,5 @@
- 
- 	do {
--		static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory());
-+		JSJ_RegisterLiveConnectFactory();
-         if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) {
-             JVM_InitLCGlue();
---- modules/oji/src/nsJVMManager.h	Sat Nov 29 13:56:08 2003
-+++ modules/oji/src/nsJVMManager.h	Sat Aug  6 03:30:01 2005
-@@ -122,5 +122,5 @@
- 	 */
- 	NS_IMETHOD
--	CreateThread(PRUint32* threadID, nsIRunnable* runnable);
-+	CreateThread(uintptr_t* threadID, nsIRunnable* runnable);
- 	
- 	/**
-@@ -131,5 +131,5 @@
- 	 */
- 	NS_IMETHOD
--	PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async);
-+	PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async);
- 
- 	/* from nsILiveConnectManager: */
diff --git a/mail/thunderbird/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3e0e14aca..000000000
--- a/mail/thunderbird/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -71,7 +75,11 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/mail/thunderbird/files/patch-sysnspr b/mail/thunderbird/files/patch-sysnspr
deleted file mode 100644
index 19e2703b4..000000000
--- a/mail/thunderbird/files/patch-sysnspr
+++ /dev/null
@@ -1,21 +0,0 @@
---- directory/c-sdk/ldap/include/Makefile.in.orig	Sat Aug 20 02:15:05 2005
-+++ directory/c-sdk/ldap/include/Makefile.in	Sat Aug 20 02:15:55 2005
-@@ -76,7 +76,6 @@
- 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
- 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR)
- 	rm -rf $(NSPRINCDIR)/*
--	cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR)
- 
- $(INCLUDEDIR):	FORCE
- 	$(NSINSTALL) -D $(INCLUDEDIR)
---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	Sat Aug 20 02:14:33 2005
-+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Sat Aug 20 02:14:39 2005
-@@ -58,7 +58,7 @@
- 
- LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
- INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
--                   -I$(DIST)/include/nspr
-+                   $(shell nspr-config --cflags)
- DEFINES		+= $(DEFS)
- 
- PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
diff --git a/mail/thunderbird/files/patch-sysnss b/mail/thunderbird/files/patch-sysnss
deleted file mode 100644
index d854cabc0..000000000
--- a/mail/thunderbird/files/patch-sysnss
+++ /dev/null
@@ -1,178 +0,0 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
---- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
-+++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
-@@ -37,16 +37,7 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_MODULES \
- 	$(NULL)
- 
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
-@@ -132,9 +123,4 @@
- .nss.cleaned: .nss.checkout
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- 
-@@ -153,43 +139,4 @@
- ifeq ($(OS_ARCH),WINNT)
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
- endif
- 	$(MAKE) -C boot $@
-@@ -200,18 +147,4 @@
- 
- install::
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -227,9 +160,4 @@
- endif
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
-                   $(NULL)
- 
---- config/config.mk	Tue Oct 12 00:11:11 2004
-+++ config/config.mk	Tue Aug  2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS	= \
- 	$(LIBS_DIR) \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- 	-lsmime3 \
- 	-lssl3 \
-@@ -189,11 +188,5 @@
- endif
- 
--NSS_DEP_LIBS	= \
--	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
--	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
--	$(NULL)
-+NSS_DEP_LIBS	=
- 
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
-     const char *possible_ckbi_locations[] = {
-       NS_GRE_DIR,
-+      NS_UNIX_LIB_DIR,
-       NS_XPCOM_CURRENT_PROCESS_DIR
-     };
-@@ -419,5 +424,5 @@
-       }
- 
--      char *fullModuleName = nsnull;
-+      char *fullModuleName;
- #ifdef XP_MAC
-       nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
-       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+      if (fullModuleName == nsnull)
-+        continue;
-+      struct stat sb;
-+      if (stat(fullModuleName, &sb)) {
-+        if (errno != ENOENT)
-+          perror(fullModuleName);
-+        continue;
-+      }
-       /* If a module exists with the same name, delete it. */
-       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/mail/thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f53..000000000
--- a/mail/thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896..000000000
--- a/mail/thunderbird/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Mon May  3 13:05:12 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/mail/thunderbird/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a..000000000
--- a/mail/thunderbird/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,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
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird/files/patch-xptcall-alpha b/mail/thunderbird/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e..000000000
--- a/mail/thunderbird/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird/files/patch-xptcall-ia64 b/mail/thunderbird/files/patch-xptcall-ia64
deleted file mode 100644
index 9cd07f7dd..000000000
--- a/mail/thunderbird/files/patch-xptcall-ia64
+++ /dev/null
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	Sun Jul 20 00:05:32 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	Sun Jul 20 00:06:37 2003
-@@ -8,6 +8,7 @@
- // Section has executable code
-         .section .text, "ax","progbits"
- // procedure named 'XPTC_InvokeByIndex'
-+	.global	XPTC_InvokeByIndex
-         .proc   XPTC_InvokeByIndex
- // manual bundling
-         .explicit
-@@ -24,7 +25,7 @@
- 
- // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
- //   PRUint32 paramCount, nsXPTCVariant* params);
--XPTC_InvokeByIndex::
-+XPTC_InvokeByIndex:
-         .prologue
-         .save ar.pfs, r37
- // allocate 4 input args, 6 local args, and 8 output args
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Sun Jul 20 00:02:02 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Sun Jul 20 00:02:40 2003
-@@ -6,6 +6,7 @@
- // Section has executable code
-         .section .text, "ax","progbits"
- // procedure named 'SharedStub'
-+	.global SharedStub
-         .proc   SharedStub
- // manual bundling
-         .explicit
-@@ -14,7 +15,7 @@
- //      .exclass  PrepareAndDispatch, @fullyvisible
-         .type   PrepareAndDispatch,@function
- 
--SharedStub::
-+SharedStub:
- // 9 arguments, first 8 are the input arguments of previous
- // function call.  The last one is methodIndex, and is passed in memory
-         .prologue
diff --git a/mail/thunderbird/files/patch-xptcall-sparc64 b/mail/thunderbird/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71..000000000
--- a/mail/thunderbird/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/mail/thunderbird/files/patch-xptcinvoke_x86_64_linux b/mail/thunderbird/files/patch-xptcinvoke_x86_64_linux
deleted file mode 100644
index 724e24089..000000000
--- a/mail/thunderbird/files/patch-xptcinvoke_x86_64_linux
+++ /dev/null
@@ -1,17 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp	Thu Apr 22 16:50:05 2004
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp	Fri Aug  5 02:16:00 2005
-@@ -82,11 +82,11 @@
-     PRUint64 value;
- 
--    for (uint32 i = 0; i < paramCount; i++, s++) {
-+    for (unsigned int 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_FLOAT:  
-+            case nsXPTType::T_DOUBLE: value = 0; /* initialize */   break;
-             case nsXPTType::T_I8:     value = s->val.i8;            break;
-             case nsXPTType::T_I16:    value = s->val.i16;           break;
diff --git a/mail/thunderbird/files/thunderbird.desktop.in b/mail/thunderbird/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f5..000000000
--- a/mail/thunderbird/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird/pkg-deinstall.in b/mail/thunderbird/pkg-deinstall.in
deleted file mode 100644
index dac65033b..000000000
--- a/mail/thunderbird/pkg-deinstall.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#    $MCom$
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-rm -rf ${MOZDIR}/extensions
-
-exit 0
diff --git a/mail/thunderbird/pkg-descr b/mail/thunderbird/pkg-descr
deleted file mode 100644
index 5a21b98b0..000000000
--- a/mail/thunderbird/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language.  See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.org/projects/thunderbird/
diff --git a/mail/thunderbird/pkg-install.in b/mail/thunderbird/pkg-install.in
deleted file mode 100644
index e4fea0df4..000000000
--- a/mail/thunderbird/pkg-install.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#    $MCom$
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-rm -rf ${MOZDIR}/extensions
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${REGCHROME} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
deleted file mode 100644
index 1d7ca3e9c..000000000
--- a/multimedia/vlc-devel/Makefile
+++ /dev/null
@@ -1,885 +0,0 @@
-# New ports collection makefile for:	vlc
-# Date created:		3rd August 2001
-# Whom:			Brian Somers <brian@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.1 2005/11/28 06:47:09 ahze Exp $
-#
-# NOTES about VLC Knobs:
-# Below you will see a number of knobs, if it starts with WITHOUT_ it is
-# enabled by default, if it starts with WITH_ it is disabled by default
-# and will be autodetected to enable
-#
-# If you define for example WITH_FAAD and WITHOUT_FAAD
-# the WITHOUT_ will always over ride the WITH_.
-#
-# Interface Knobs:
-#
-# WITH_CORBA
-#  Enable a Corba interface via orbit2
-#
-# WITH_NCURSES=yes
-#  Ncurses (console) interface
-#
-# WITH_SKINS
-#  This Interface supports a skinned gtk2.0 interface
-#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
-#
-# WITHOUT_WXGTK=yes
-#  WxWindows/Gtk 2.x Interface
-#  This is the default and most supported
-#  x11 interface
-#
-# WITH_WXGTK_VER=[2.4|2.6]
-#  Choose a WxGTK version you want to use.
-#  Defaults to 26
-#
-# Audio Knobs:
-#
-# WITH_ARTS=yes
-#  Arts Support
-#
-# WITH_DAAP=yes
-#  Enable libopendaap to connect to iTunes(R) music shares.
-#
-# WITHOUT_DTS=yes
-#  DTS decoder Support
-#  useful for many dvds
-#
-# WITH_ESOUND=yes
-#  Esound Support
-#
-# WITH_FAAC=yes
-#  Faac audio encoder (mp4/aac) Support
-#  ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
-#
-# WITH_FAAD=yes
-#  Faad audio decoder (mp4/aac) Support
-#
-# WITHOUT_FLAC=yes
-#  Flac Support
-#
-# WITHOUT_LAME=yes
-#  Mp3 encoder Support
-#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
-#
-# WITHOUT_A52=yes
-#  liba52 audio Support
-#
-# WITH_REALAUDIO
-#  Real audio(R) support
-#
-# WITH_SHOUT
-#  Libshout2 support
-#
-# WITH_TREMOR
-#  Interger-only Ogg Vorbis decoder
-#   !!experimental!!
-#
-# WITHOUT_MAD=yes
-#  Mad mp3 audio decoder Support
-#
-# WITHOUT_OGG=yes
-#  Ogg audio decoder Support
-#
-# WITH_SPEEX=yes
-#  Speex voice codec Support
-#
-# WITH_TWOLAME=yes
-#  Twolame Mpeg layer 2 audio Support
-#
-# WITHOUT_VORBIS=yes
-#  Vorbis Support
-#
-# Graphics Knobs:
-#
-# WITH_AALIB=yes
-#  Console Graphics Support
-#
-# WITH_CACA=yes
-#  Console Graphics Support (implies WITH_AALIB)
-#
-# WITH_DV=yes
-#  Digital video input
-#
-# WITH_FRIBIDI=yes
-#
-# WITH_GGI=yes
-#
-# WITH_SDL=yes
-#  SDL video output
-#
-# WITH_SVG=yes
-#
-# WITH_SVGALIB=yes
-#  SVGAlib video output
-#
-# WITH_XOSD=yes
-#
-# Multimedia Knobs:
-#
-# WITH_DIRAC
-#  Enable dirac general-purpose video codec
-#
-# WITH_X264
-#  Enable H.264/AVC Video Support
-#
-# WITHOUT_MATROSKA=yes
-#  Matroska Container Format Support
-#
-# WITHOUT_MPEG2=yes
-#  Mpeg-2 A/V Decoder Support
-#
-# WITH_THEORA=yes
-#  Video codec for OGG/Vorbis Support
-#
-# WITH_TRANSCODE=yes
-#  Disable transcode of multimedia via transcode (multimedia/transcode).
-#  This option allows you to convert a media file, dvd, A/V stream, etc
-#  in to another format. This also allows you to transcode multimedia
-#  on-the-fly and stream to a network and/or local playback.
-#
-# Streaming Knobs:
-#
-# WITHOUT_HTTPD=yes
-#  Web interface to control streaming media
-#
-# WITHOUT_LIVEMEDIA=yes
-#  Support for rstp/rtp/sdp protocols
-#  Only versions 2004.11.11 and higher are supported.
-#
-# WITHOUT_STREAM_PLUGINS=yes
-#  Disable build and install of Streaming plugins
-#
-# WITH_WIN32_CODECS=yes
-#  Support for win32 multimedia DLL's
-#
-# Other Knobs:
-#
-# WITH_AVAHI=yes
-#  Avahi (Rendezvous/Bonjour (R) ) networking
-#
-# WITH_DEBUG=yes
-#  Enable debuging support
-#
-# WITHOUT_CDROM=yes
-#  Disable cddb and vcd support
-#   and other cdrom support
-#
-# WITHOUT_CDPARANOIA=yes
-#  Disable Cdparanoia support
-#
-# WITHOUT_DVBPSI=yes
-#  TS MUX and DEMUX support
-#
-# WITHOUT_DVDNAV=yes
-#  Disable DVD (dvd menus) support
-#
-# WITH_DVDREAD=yes
-#  Enable Regular DVD support (non-menu)
-#
-# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
-# WITH_VLC_MOZILLA_PLUGIN= yes
-#  Enable A mozilla plugin for VLC
-#  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
-#  for more info on using this plugin.
-#   defaults to www/mozilla
-#
-#  NOTE: The www/mplayer-plugin is much more complete.
-#
-# WITH_OPENGL=yes
-#  Enable OpenGL visual plugin (not playback, play back is default with X11)
-#
-# WITH_SAMBA=yes
-#  Enable SAMBA Access module
-#
-# WITH_SSL=yes
-#  Enable TLS/SSL Support for web (httpd) interface
-#
-# WITHOUT_SLP=yes
-#  Disable SLP service discovery support
-#  * recommended if you want to stream media
-#
-# WITH_OPTIMIZED_CFLAGS=yes
-#  Compile with -O2 -ffast-math -fomit-frame-pointer
-#
-# WITH_DVD_DEVICE=/dev/somedevice
-#  default 5.x and above: /dev/acd0
-#  default 4.x and below: /dev/acd0c
-#  This option changes the default dvd device
-#
-# WITH_CDROM_DEVICE=/dev/somedevice
-#  default 5.x and above: /dev/acd0
-#  default 4.x and below: /dev/acd0c
-#  This option changes the default cdrom device
-#
-# WITHOUT_NLS=yes
-#  Disable Languarge Support
-#
-# WITHOUT_STREAM_PLUGINS=yes
-#  Disable ALL streaming plugins.
-#
-# WITH_VLC_DEFAULT_FONT=/path/to/font
-#  default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
-#  This option lets you change the default font for subtitles
-#
-# NOPORTDOCS=yes
-#  Do not install Vlc's Documents
-#
-
-PORTNAME=	vlc
-DISTVERSION=	0.8.5.20051128
-PORTREVISION=	0
-CATEGORIES=	multimedia audio ipv6 net www
-MASTER_SITES=	http://download2.videolan.org/pub/vlc/snapshots/ \
-		http://download.videolan.org/pub/vlc/snapshots/
-#		http://download2.videolan.org/pub/videolan/testing/${PORTNAME}-${DISTVERSION}/ \
-#		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
-#		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
-#		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
-#		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
-MASTER_SITE_SUBDIR=	ahze/:mozilla
-PKGNAMESUFFIX?=	-devel${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.5.//}
-
-MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	Multimedia streaming server and player for various audio/video formats
-
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
-LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-
-CONFLICTS=	vlc-*-0.8.4*
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.5.//}
-
-WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
-
-#USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GETOPT_LONG=yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gnometarget libxml2
-USE_REINPLACE=	yes
-WANT_SDL=	yes
-USE_ICONV=	yes
-USE_PERL5_BUILD=yes
-
-FAKEDIR=	${WRKDIR}/fake
-PLIST=		${WRKDIR}/plist
-
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
-
-CONFIGURE_ARGS+=	--enable-ffmpeg \
-			--with-ffmpeg=${LOCALBASE} \
-			--with-ffmpeg-zlib \
-			--disable-gnome \
-			--disable-gtk \
-			--without-libintl-prefix
-
-MAN1=		vlc.1 \
-		vlc-config.1
-
-.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
-WX_CONFIG=	wxgtk2-2.4-config
-WXGTK2_PORT=	wxgtk24
-.else
-WX_CONFIG=	wxgtk2-2.6-config
-WXGTK2_PORT=	wxgtk26
-CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BROKEN=	"Does not compile with perl ${PERL_VERSION}"
-.endif
-
-#.if ${ARCH}=="amd64"
-# Maybe this works now??
-#WITH_WXGTK_VER=	2.4
-#.endif
-
-# compatible knobs.
-.if defined(WITH_DEBUG)
-DEBUG=	yes
-.endif
-
-.if defined(WITH_LIBMPEG2)
-WITH_MPEG2=yes
-.endif
-
-.if defined(WITH_LIBCACA)
-WITH_CACA=yes
-.endif
-
-.if defined(WITH_LIBA52)
-WITH_A52=yes
-.endif
-
-.if defined(WITH_SMB)
-WITH_SAMBA=yes
-.endif
-
-.if defined(WITH_LIBMATROSKA)
-WITH_MATROSKA=yes
-.endif
-
-.if defined(WITH_LIBTREMOR)
-WITH_TREMOR=yes
-.endif
-# end compatible knobs
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-.endif
-
-.if defined(WITH_DVD_DEVICE)
-DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
-.else
-.if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/acd0c
-.else
-DEFAULT_DVD_DEVICE=/dev/acd0
-.endif
-.endif
-
-.if ${HAVE_GNOME:Mgnomevfs2} || defined(WITH_GNOMEVFS)
-USE_GNOME+=	gnomevfs2
-CONFIGURE_ARGS+=	--enable-gnomevfs
-.else
-CONFIGURE_ARGS+=	--disable-gnomevfs
-.endif
-
-.if defined(WITH_CDROM_DEVICE)
-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
-.else
-.if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
-DEFAULT_CDROM_DEVICE=/dev/acd0
-.endif
-.endif
-
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
-CONFIGURE_ARGS+=--enable-skins2
-WITH_WXGTK=	yes
-.else
-CONFIGURE_ARGS+=--disable-skins2
-.endif
-
-.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
-RUN_DEPENDS+=	${LOCALBASE}/lib/win32/wmv8ds32.ax:${PORTSDIR}/multimedia/win32-codecs
-CONFIGURE_ARGS+=--enable-loader
-.else
-CONFIGURE_ARGS+=--disable-loader
-.endif
-
-.if !defined(WITHOUT_WXGTK)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
-RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
-CONFIGURE_ARGS+=--enable-wxwidgets
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
-.else
-CONFIGURE_ARGS+=--disable-wxwidgets
-.endif
-
-.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
-LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--enable-arts
-.else
-CONFIGURE_ARGS+=	--disable-arts
-.endif
-
-.if (defined(WITH_AVAHI) || exists(${LOCALBASE}/lib/libavahi-client.a)) && !defi
-LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi
-CONFIGURE_ARGS+=	--enable-bonjour
-.else
-CONFIGUE_ARGS+=		--disable-bonjour
-.endif
-
-.if !defined(WITHOUT_CDROM)
-LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
-		cdio.6:${PORTSDIR}/sysutils/libcdio
-CONFIGURE_ARGS+=--enable-vcd \
-		--enable-libcddb \
-		--enable-libcdio \
-		--enable-cddax
-.else
-CONFIGURE_ARGS+=--disable-vcd \
-		--disable-libcddb \
-		--disable-libcdio \
-		--disable-cddax
-.endif
-
-.if !defined(WITHOUT_CDPARANOIA) && !defined(WITHOUT_CDROM)
-LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-CONFIGURE_ARGS+=--enable-cdda \
-		--enable-cddax
-.else
-CONFIGURE_ARGS+=--disable-cdda \
-		--disable-cddax
-.endif
-
-.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA)
-USE_GNOME+=	orbit2
-CONFIGURE_ARGS+=--enable-corba
-.else
-CONFIGURE_ARGS+=--disable-corba
-.endif
-
-.if !defined(WITHOUT_DVBPSI)
-LIB_DEPENDS+=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
-CONFIGURE_ARGS+=--enable-dvbpsi \
-		--with-dvbpsi=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-dvbpsi
-.endif
-
-.if !defined(WITHOUT_DVDNAV)
-LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
-CONFIGURE_ARGS+=--enable-dvdnav
-.else
-CONFIGURE_ARGS+=--disable-dvdnav
-.endif
-
-.if defined(WITH_DVDREAD) && !defined(WITHOUT_DVDREAD)
-LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
-CONFIGURE_ARGS+=--enable-dvdread
-.else
-CONFIGURE_ARGS+=--disable-dvdread
-.endif
-
-.if (defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
-ESOUND_SUFFIX=	-esound
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=--enable-esd
-.else
-CONFIGURE_ARGS+=--disable-esd
-.endif
-
-.if defined(WITH_FAAC) && !defined(WITHOUT_FAAC)
-CONFIGURE_ARGS+=--with-ffmpeg-faac
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-.endif
-
-.if (defined(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.a)) && !defined(WITHOUT_FAAD)
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-CONFIGURE_ARGS+=--enable-faad
-.else
-CONFIGURE_ARGS+=--disable-faad
-.endif
-
-.if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
-CONFIGURE_ARGS+=--enable-flac
-.else
-CONFLGIRE_ARGS+=--disable-flac
-.endif
-
-.if (defined(WITH_FRIBIDI) || exists(${LOCALBASE}/bin/fribidi-config)) && !defined(WITHOUT_FRIBIDI)
-LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+=--enable-fribidi
-.else
-CONFIGURE_ARGS+=--disable-fribidi
-.endif
-
-.if (defined(WITH_AALIB) || exists(${LOCALBASE}/lib/libaa.so.1)) && !defined(WITHOUT_AALIB)
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-CONFIGURE_ARGS+=--enable-aa
-.else
-CONFIGURE_ARGS+=--disable-aa
-.endif
-
-.if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC)
-LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+=--enable-dirac
-CPPFLAGS+=	-I${LOCALBASE}/include/dirac
-.else
-CONFIGURE_ARGS+=--disable-dirac
-.endif
-
-.if (defined(WITH_H264) || defined(WITH_X264) || exists(${LOCALBASE}/lib/libx264.a)) && !defined(WITHOUT_X264)
-CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
-.else
-CONFIGURE_ARGS+=--disable-x264
-.endif
-
-.if (defined(WITH_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
-.if !defined(WITHOUT_AALIB)
-WITH_AALIB=	yes
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-
-CONFIGURE_ARGS+=--enable-caca
-.endif
-.else
-CONFIGURE_ARGS+=--disable-caca
-.endif
-
-.if (defined(WITH_DAAP) || exists(${LOCALBASE}/lib/libopendaap.a)) && !defined(WITHOUT_DAAP)
-LIB_DEPENDS+=	opendaap.0:${PORTSDIR}/devel/libopendaap
-CONFIGURE_ARGS+=--enable-daap
-.else
-CONFIGURE_ARGS+=--disable-daap
-.endif
-
-.if !defined(WITHOUT_DTS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
-CONFIGURE_ARGS+=--enable-dts
-.else
-CONFIGURE_ARGS+=--disable-dts
-.endif
-
-.if (defined(WITH_DV) || exists(${LOCALBASE}/lib/libdv.a)) && !defined(WITHOUT_DV)
-LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+=--enable-dv
-.else
-CONFIGURE_ARGS+=--disable-dv
-.endif
-
-.if defined(WITHOUT_HTTPD)
-CONFIGURE_ARGS+=--disable-httpd
-.endif
-
-.if (defined(WITH_GGI) || exists(${LOCALBASE}/lib/libggi.a)) && !defined(WITHOUT_GGI)
-LIB_DEPENDS+=	ggi.2:${PORTSDIR}/graphics/libggi
-CONFIGURE_ARGS+=--enable-ggi
-.else
-CONFIGURE_ARGS+=--disable-ggi
-.endif
-
-# Do not use lame if PACKAGE_BUILDING is defined. since
-# lame can NOT be packaged.
-.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING)
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=--enable-mp3lame
-.else
-CONFIGURE_ARGS+=--disable-mp3lame
-.endif
-
-.if !defined(WITHOUT_MATROSKA)
-LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
-CONFIGURE_ARGS+=--enable-mkv
-.else
-CONFIGURE_ARGS+=--disable-mkv
-.endif
-
-.if !defined(WITHOUT_A52)
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-CONFIGURE_ARGS+=--enable-a52
-.else
-CONFIGURE_ARGS+=--disable-a52
-.endif
-
-.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
-USE_GECKO=	firefox mozilla seamonkey nvu
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
-		XPIDL="${XPIDL}" \
-		XPIDL_INCL="${XPIDL_INCL}"
-MOZILLA_SUFFIX=-mozilla
-CONFIGURE_ARGS+=--enable-mozilla
-.endif
-
-.if !defined(WITHOUT_MPEG2)
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-CONFIGURE_ARGS+=--enable-libmpeg2
-.else
-CONFIGURE_ARGS+=--disable-libmpeg2
-.endif
-
-.if defined(WITH_REALAUDIO)
-CONFIGURE_ARGS+=	--enable-real
-.endif
-
-.if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
-LIB_DEPENDS+=	shout.4:${PORTSDIR}/audio/libshout2
-CONFIGURE_AGRS+=	--enable-shout
-.endif
-
-.if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
-LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
-CONFIGURE_ARGS+=--enable-theora
-.else
-CONFIGURE_ARGS+=--disable-theora
-.endif
-
-.if !defined(WITHOUT_LIVEMEDIA)
-BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-CONFIGURE_ARGS+=--enable-livedotcom \
-		--with-livedotcom-tree=${LOCALBASE}/live
-.else
-CONFIGURE_ARGS+=--disable-livedotcom
-.endif
-
-.if !defined(WITHOUT_MAD)
-LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag \
-		mad.2:${PORTSDIR}/audio/libmad
-CONFIGURE_ARGS+=--enable-mad \
-		--with-mad=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-mad
-.endif
-
-.if !defined(WITHOUT_OGG)
-LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-CONFIGURE_ARGS+=--enable-ogg
-.else
-CONFIGURE_ARGS+=--disable-ogg
-WITHOUT_VORBIS=	yes
-.endif
-
-.if defined(WITH_NCURSES) && !defined(WITHOUT_NCURSES)
-CONFIGURE_ARGS+=--enable-ncurses
-.endif
-
-.if defined(WITH_OPENGL) && !defined(WITHOUT_OPENGL)
-USE_GL=	yes
-CONFIGURE_ARGS+=--enable-galaktos
-.else
-CONFIGURE_ARGS+=--disable-galaktos
-.endif
-
-.if (defined(WITH_SAMBA) || exists(${LOCALBASE}/lib/lib/libsmbclient.a)) && !defined(WITHOUT_SAMBA)
-LIB_DEPEND+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-CONFIGURE_ARGS+=--enable-smb
-.else
-CONFIGURE_ARGS+=--disable-smb
-.endif
-
-.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
-USE_SDL=	yes
-CONFIGURE_ARGS+=--enable-sdl
-.else
-CONFIGURE_ARGS+=--disable-sdl
-.endif
-
-.if defined(WITH_TRANSCODE) || exists(${LOCALBASE}/bin/transcode)
-RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
-.endif
-
-.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
-LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=--enable-gnutls
-.else
-CONFIGURE_ARGS+=--disable-gnutls
-.endif
-
-.if !defined(WITHOUT_SLP)
-LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
-.else
-CONFIGURE_ARGS+=--disable-slp
-.endif
-
-.if (defined(WITH_SPEEX) || exists(${LOCALBASE}/lib/libspeex.a)) && !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+=--enable-speex
-CPPFLAGS+=-I${LOCALBASE}/include/speex
-.else
-CONFIGURE_ARGS+=--disable-speex
-.endif
-
-.if defined(WITHOUT_STREAM_PLUGINS)
-CONFIGURE_ARGS+=--disable-sout
-.endif
-
-.if (defined(WITH_SVG) || ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)
-USE_GNOME+=	librsvg2
-CONFIGURE_ARGS+=--enable-svg
-.else
-CONFIGURE_AGRS+=--disable-svg
-.endif
-
-.if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB)
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
-CONFIGURE_ARGS+=--enable-svgalib
-.else
-CONFIGURE_ARGS+=--disable-svgalib
-.endif
-
-.if (defined(WITH_TREMOR) || exists(${LOCALBASE}/lib/libvorbisidec.a)) && !defined(WITHOUT_TREMOR)
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-.else
-CONFIGURE_ARGS+=--disable-tremor
-.endif
-
-.if (defined(WITH_TWOLAME) || exists(${LOCALBASE}/lib/libtwolame.a)) && !defined(WITHOUT_TWOLAME)
-LIB_DEPENDS+=		twolame.0:${PORTSDIR}/audio/twolame
-CONFIGURE_ARGS+=	--enable-twolame
-.else
-CONFIGURE_ARGS+=	--disable-twolame
-.endif
-
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-vorbis
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
-
-.if (defined(WITH_XOSD) || exists(${LOCALBASE}/lib/libxosd.a)) && !defined(WITHOUT_XOSD)
-LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
-CONFIGURE_ARGS+=--enable-xosd
-.else
-CONFIGURE_ARGS+=--disable-xosd
-.endif
-
-.if defined(DEBUG)
-CONFIGURE_AGRS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--enable-release
-.endif
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=	-O2 -ffast-math -fomit-frame-pointer
-CONFIGURE_ARGS+=--enable-release \
-		--enable-optimizations
-.else
-CONFIGURE_ARGS+=--enable-release
-.endif
-
-.if ${OSVERSION} < 500000
-CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order"
-	@${ECHO_MSG} "to learn how to tune VLC to your personal preferences!"
-	@${ECHO_MSG} ""
-
-post-patch:
-# Subtitle default font
-	@${REINPLACE_CMD} -e \
-	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
-		${WRKSRC}/modules/misc/freetype.c
-# mozilla plugin
-	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
-		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
-			${WRKSRC}/mozilla/Makefile.in
-# skins2 interface, no lrint on < 504000
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
-.endif
-# s/Linux/FreeBSD/
-	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
-		${WRKSRC}/po/*
-	@${RM} -f ${WRKSRC}/po/*.bak
-	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
-		${WRKSRC}/modules/audio_output/oss.c
-# pthreads/cflags
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
-		-e 's/-lc_r/${PTHREAD_LIBS}/' \
-		-e 's|-mcpu=pentiumpro||' \
-		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
-		${WRKSRC}/configure
-# cdrom/dvd support
-	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
-		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
-		${WRKSRC}/include/vlc_config.h
-.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
-	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
-		${WRKSRC}/loader/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
-		${WRKSRC}/loader/module.c
-.endif
-
-pre-install:
-	${RM} -rf ${PLIST} ${FAKEDIR}
-	${MKDIR} ${FAKEDIR}
-	${TOUCH} -f ${PLIST}
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
-.endif
-.if !defined(WITHOUT_WXGTK)
-	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
-.endif
-.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-.endif
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
-	cd ${FAKEDIR}/bin && ${FIND} -s * | \
-		${SED} -e 's|^|bin/|' >> ${PLIST}
-	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/|' >> ${PLIST}
-	cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
-		${SED} -e 's|^|lib/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
-.for dir in vlc
-	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
-		 && ${FIND} -d * -type d | \
-		 ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
-.else
-	${RM} -rf ${FAKEDIR}/share/doc
-.endif
-		${ECHO_MSG} "@dirrm share/vlc" >> ${PLIST}
-.if !defined(WITHOUT_NLS)
-	cd ${FAKEDIR}/share/locale &&  ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|share/locale/|' >> ${PLIST}
-.endif
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
-		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
-.endif
-.for locale in my ps tet tl
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
-.endfor
-
-do-install:
-	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-		${FAKEDIR}/bin/vlc-config
-	@${RM} -f ${FAKEDIR}/bin/*.bak
-	cd ${FAKEDIR}/bin && ${FIND} . | \
-		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
-	cd ${FAKEDIR}/include && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
-	cd ${FAKEDIR}/lib && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
-	cd ${FAKEDIR}/share && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-	@${MKDIR} ${PREFIX}/lib/browser_plugins
-	${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
-.endif
-	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
-.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
-	if [ ! -d ${PREFIX}/share/applications ]; then \
-		${MKDIR} ${PREFIX}/share/applications ; \
-	fi
-	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
-		${MKDIR} ${PREFIX}/share/pixmaps ; \
-	fi
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
-.endif
-.if !defined(WITHOUT_WXGTK)
-	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
deleted file mode 100644
index 194699a2f..000000000
--- a/multimedia/vlc-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (vlc-snapshot-20051128.tar.gz) = 684b60f212024ca1d9a0b0b2997bad41
-SHA256 (vlc-snapshot-20051128.tar.gz) = be94189011097265d0b98ba690dec50d5eb15e3c59a83d2fa36f78e3a881113b
-SIZE (vlc-snapshot-20051128.tar.gz) = 10598222
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
deleted file mode 100644
index 502fe4c96..000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- modules/codec/ffmpeg/ffmpeg.c.orig	Fri May 13 07:48:21 2005
-+++ modules/codec/ffmpeg/ffmpeg.c	Fri May 13 13:28:17 2005
-@@ -42,11 +42,9 @@
- 
- #include "ffmpeg.h"
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
- #   ifdef HAVE_POSTPROC_POSTPROCESS_H
--#       include <postproc/postprocess.h>
--#   else
--#       include <libpostproc/postprocess.h>
-+#       include <ffmpeg/postproc/postprocess.h>
- #   endif
- #endif
- 
-@@ -105,7 +103,7 @@
-         VLC_TRUE );
-         change_integer_range( 0, 2 );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
-     add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
-         LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
deleted file mode 100644
index 29b5eb319..000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/codec/ffmpeg/postprocess.c.orig	Fri May 13 07:48:21 2005
-+++ modules/codec/ffmpeg/postprocess.c	Sat May 14 00:11:53 2005
-@@ -35,13 +35,9 @@
- 
- #include "ffmpeg.h"
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
- 
--#ifdef HAVE_POSTPROC_POSTPROCESS_H
--#   include <postproc/postprocess.h>
--#else
--#   include <libpostproc/postprocess.h>
--#endif
-+#include <ffmpeg/postproc/postprocess.h>
- 
- #ifndef PP_CPU_CAPS_ALTIVEC
- #   define PP_CPU_CAPS_ALTIVEC 0
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
deleted file mode 100644
index 1ed5bda68..000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- modules/codec/ffmpeg/video.c.orig	Fri May 13 13:30:36 2005
-+++ modules/codec/ffmpeg/video.c	Fri May 13 13:32:42 2005
-@@ -202,7 +202,7 @@
- 
-     p_pic = p_dec->pf_vout_buffer_new( p_dec );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
-     {
-         E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
-@@ -301,7 +301,7 @@
-         p_sys->b_direct_rendering = 1;
-     }
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODE_BUILD > 4750
-     p_sys->p_pp = NULL;
-     p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
-     p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
-@@ -719,7 +719,7 @@
- 
-     if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     E_(ClosePostproc)( p_dec, p_sys->p_pp );
- #endif
- 
-@@ -741,7 +741,7 @@
-         uint8_t *p_dst, *p_src;
-         int i_src_stride, i_dst_stride;
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-         if( p_sys->p_pp && p_sys->b_pp )
-             E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
-         else
diff --git a/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c b/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c
deleted file mode 100644
index 3952ddff1..000000000
--- a/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/stream_out/switcher.c.orig	Wed Mar 23 03:57:15 2005
-+++ modules/stream_out/switcher.c	Wed Mar 23 03:57:50 2005
-@@ -44,7 +44,7 @@
- #ifdef HAVE_POSTPROC_POSTPROCESS_H
- #   include <postproc/postprocess.h>
- #else
--#   include <libpostproc/postprocess.h>
-+#   include <ffmpeg/postproc/postprocess.h>
- #endif
- 
- #define SOUT_CFG_PREFIX "sout-switcher-"
diff --git a/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h
deleted file mode 100644
index 4219d8b53..000000000
--- a/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/video_filter/swscale/common.h.orig	Fri May 13 03:23:24 2005
-+++ modules/video_filter/swscale/common.h	Fri May 13 03:37:24 2005
-@@ -36,7 +36,17 @@
- #define MANGLE(a) #a
- #endif
- 
--#ifdef ARCH_X86
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) bswap16(x)
-+#elif (defined(__FreeBSD__) && __FreeBSD_version <= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) be16toh(x)
-+#elif ARCH_X86
- static inline unsigned short ByteSwap16(unsigned short x)
- {
-   __asm("xchgb %b0,%h0" :
diff --git a/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c b/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
deleted file mode 100644
index 78799ac46..000000000
--- a/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/visualization/galaktos/PCM.c.orig	Fri Nov 26 08:21:47 2004
-+++ modules/visualization/galaktos/PCM.c	Fri Nov 26 08:22:06 2004
-@@ -79,7 +79,7 @@
- //Takes in a 2x512 array of PCM samples
- //and stores them
- 
--void addPCM(int16_t PCMdata[2][512])
-+void addPCM(short PCMdata[2][512])
- {
-   int i,j;
-   int samples=512;
diff --git a/multimedia/vlc-devel/files/svlc.desktop b/multimedia/vlc-devel/files/svlc.desktop
deleted file mode 100644
index e7ed9a3ee..000000000
--- a/multimedia/vlc-devel/files/svlc.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VideoLAN (skins) Media Player
-Comment=Video and Audio player and server
-Icon=gvlc.png
-Exec=vlc --intf skins2
-TryExec=svlc
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/multimedia/vlc-devel/files/wxvlc.desktop b/multimedia/vlc-devel/files/wxvlc.desktop
deleted file mode 100644
index c95dd3f62..000000000
--- a/multimedia/vlc-devel/files/wxvlc.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VideoLAN (wxgtk) Media Player
-Comment=Video and Audio player and server
-Icon=vlc.png
-Exec=vlc
-TryExec=wxvlc
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/multimedia/vlc-devel/pkg-descr b/multimedia/vlc-devel/pkg-descr
deleted file mode 100644
index 15b251466..000000000
--- a/multimedia/vlc-devel/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-vlc -- the VideoLAN Client
-
-VLC media player is a highly portable multimedia player for various
-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, and
-more) as well as DVD's, VCD's, and various streaming protocols. It
-can also be used as a server to stream in unicast or multicast in
-IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability 
-to transcode media on-the-fly for streaming or saving to disk.
-
-WWW: http://www.videolan.org/
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
deleted file mode 100644
index f0bc3fb65..000000000
--- a/www/galeon/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Ports collection Makefile for:	galeon
-# Date created:				1 August 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/www/galeon/Makefile,v 1.6 2005/11/26 05:11:24 ahze Exp $
-#
-
-PORTNAME=	galeon
-PORTVERSION=	2.0.0
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://osdn.dl.sourceforge.net/sourceforge/galeon/
-MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
-
-USE_GECKO=	firefox mozilla seamonkey
-WRKSRC=		${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \
-		gnomedesktop
-USE_AUTOTOOLS=	libtool:15
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--enable-nautilus-view=no \
-		--with-mozilla=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAN1=		galeon.1
-GCONF_SCHEMAS=	galeon.schemas
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-
-.if ${OSVERSION} > 500000
-# Galeon does not build correctly in -CURRENT if -Werror is passed
-# to the compiler.
-NO_WERROR=	yes
-.endif
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+=	--disable-werror
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|-lpthread|${PTHREAD_LIBS}|g'
-	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|g'
-	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
-		${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
-	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${X11BASE}/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \
-		${WRKSRC}/mozilla/mozilla-embed-shell.cpp
-
-.include <bsd.port.post.mk>
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
deleted file mode 100644
index f025626ea..000000000
--- a/www/galeon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (galeon-2.0.0.tar.bz2) = e1f1e46d40c9e2345c1ea5e9bc788244
-SHA256 (galeon-2.0.0.tar.bz2) = fa8c9706408c94f620cd93c462696467f73d59e21c87a4fa65afe39d2408d7a4
-SIZE (galeon-2.0.0.tar.bz2) = 2966515
diff --git a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
deleted file mode 100644
index 0400ebcf4..000000000
--- a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- bookmarks/bookmarks-import-druid-konqueror.c.orig	Tue Mar 30 16:33:05 2004
-+++ bookmarks/bookmarks-import-druid-konqueror.c	Mon May 31 23:35:26 2004
-@@ -20,6 +20,7 @@
- #include "config.h"
- #endif
- 
-+#include <sys/types.h>
- #include <glib/gi18n.h>
- #include "bookmarks-import-druid-konqueror.h"
- #include "gul-gobject-misc.h"
diff --git a/www/galeon/files/patch-src_Makefile.in b/www/galeon/files/patch-src_Makefile.in
deleted file mode 100644
index 3c75398d9..000000000
--- a/www/galeon/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Thu Dec 18 15:12:38 2003
-+++ src/Makefile.in	Thu Dec 18 15:13:13 2003
-@@ -206,6 +206,7 @@
- 	-I$(top_srcdir)/bookmarks \
- 	$(GALEON_DEPENDENCY_CFLAGS) \
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-DDATADIR=\""$(datadir)"\"
- 
- 
diff --git a/www/galeon/files/patch-src_galeon-main.c b/www/galeon/files/patch-src_galeon-main.c
deleted file mode 100644
index 777907e0e..000000000
--- a/www/galeon/files/patch-src_galeon-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/galeon-main.c.orig	Thu Sep 11 01:11:30 2003
-+++ src/galeon-main.c	Thu Sep 11 01:12:31 2003
-@@ -130,7 +130,7 @@
- #ifdef ENABLE_NLS
- 	/* Initialize the i18n stuff */
- 	setlocale(LC_ALL, "");
--	bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
-+	bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
- 	textdomain(GETTEXT_PACKAGE);
- #endif
- 	/* set the application name manually until gnome handles the
diff --git a/www/galeon/files/patch-ui_Makefile.in b/www/galeon/files/patch-ui_Makefile.in
deleted file mode 100644
index 9e87b8029..000000000
--- a/www/galeon/files/patch-ui_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ui/Makefile.in.orig	Fri Jan 23 01:48:25 2004
-+++ ui/Makefile.in	Fri Jan 23 01:48:55 2004
-@@ -265,8 +265,7 @@
- uidir = $(pkgdatadir)
- 
- uixmldir = $(datadir)/gnome-2.0/ui
--uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
--                 nautilus-galeon-view-ui.xml.in
-+uixml_in_files = galeon-bookmarks-editor-ui.xml.in
- 
- 
- uixml_DATA = $(uixml_in_files:.xml.in=.xml)
diff --git a/www/galeon/pkg-descr b/www/galeon/pkg-descr
deleted file mode 100644
index 9a4205386..000000000
--- a/www/galeon/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine).
-It's fast, it has a light interface, and it is fully standards-compliant.
-
-WWW: http://galeon.sourceforge.net/
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
deleted file mode 100644
index 1d66d0cd4..000000000
--- a/www/galeon/pkg-plist
+++ /dev/null
@@ -1,227 +0,0 @@
-bin/galeon
-bin/galeon-config-tool
-etc/sound/events/galeon.soundlist
-libdata/bonobo/servers/GNOME_Galeon_Automation.server
-libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/gnome/applications/galeon.desktop
-share/gnome/galeon/FAQ.html
-share/gnome/galeon/about_logo.png
-share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/bookmarks-editor-small.glade
-share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bug.png
-share/gnome/galeon/certificate-dialogs.glade
-share/gnome/galeon/debian.png
-share/gnome/galeon/default-bookmarks.xbel
-share/gnome/galeon/default-prefs.js
-share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/freshmeat.png
-share/gnome/galeon/galeon-bookmark-alias-mark.png
-share/gnome/galeon/galeon-default.png
-share/gnome/galeon/galeon-download.png
-share/gnome/galeon/galeon-egg-ui-toolbar.xml
-share/gnome/galeon/galeon-egg-ui.xml
-share/gnome/galeon/galeon-entry.png
-share/gnome/galeon/galeon-filter.png
-share/gnome/galeon/galeon-folder.png
-share/gnome/galeon/galeon-history.png
-share/gnome/galeon/galeon-insecure.png
-share/gnome/galeon/galeon-popup-blocked.png
-share/gnome/galeon/galeon-prefs-fonts.png
-share/gnome/galeon/galeon-prefs-general.png
-share/gnome/galeon/galeon-prefs-language.png
-share/gnome/galeon/galeon-prefs-mouse.png
-share/gnome/galeon/galeon-prefs-network.png
-share/gnome/galeon/galeon-prefs-privacy.png
-share/gnome/galeon/galeon-prefs-tabs.png
-share/gnome/galeon/galeon-prefs-web-content.png
-share/gnome/galeon/galeon-secure.png
-share/gnome/galeon/galeon-separator.png
-share/gnome/galeon/galeon-tab-loading.gif
-share/gnome/galeon/galeon.glade
-share/gnome/galeon/galeon.png
-share/gnome/galeon/gnu.png
-share/gnome/galeon/google.png
-share/gnome/galeon/google_groups.png
-share/gnome/galeon/google_images.png
-share/gnome/galeon/hand-open.png
-share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/logo.png
-share/gnome/galeon/myportal.css
-share/gnome/galeon/new_alias.xpm
-share/gnome/galeon/new_alias_small.xpm
-share/gnome/galeon/new_folder.xpm
-share/gnome/galeon/new_folder_small.xpm
-share/gnome/galeon/new_item.xpm
-share/gnome/galeon/new_item_small.xpm
-share/gnome/galeon/new_separator.xpm
-share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/prefs-dialog.glade
-share/gnome/galeon/print.glade
-share/gnome/galeon/rpm.png
-share/gnome/galeon/slack.png
-share/gnome/galeon/smart-bm-fold.png
-share/gnome/galeon/smart-bm-unfold.png
-share/gnome/galeon/stocks.png
-share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
-share/gnome/help/galeon/C/apx-authors.xml
-share/gnome/help/galeon/C/apx-bugs.xml
-share/gnome/help/galeon/C/apx-command-line.xml
-share/gnome/help/galeon/C/apx-compiling.xml
-share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/C/apx-mouse-gestures.xml
-share/gnome/help/galeon/C/apx-troubleshooting.xml
-share/gnome/help/galeon/C/bookmarks.xml
-share/gnome/help/galeon/C/browser-window.xml
-share/gnome/help/galeon/C/figures/bookmarks-editor.png
-share/gnome/help/galeon/C/figures/browser-window.png
-share/gnome/help/galeon/C/figures/find-dialog.png
-share/gnome/help/galeon/C/figures/gesture-back.png
-share/gnome/help/galeon/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon/C/figures/gesture-clone-window.png
-share/gnome/help/galeon/C/figures/gesture-close-2.png
-share/gnome/help/galeon/C/figures/gesture-close.png
-share/gnome/help/galeon/C/figures/gesture-contents.png
-share/gnome/help/galeon/C/figures/gesture-forward.png
-share/gnome/help/galeon/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon/C/figures/gesture-homepage.png
-share/gnome/help/galeon/C/figures/gesture-new-tab.png
-share/gnome/help/galeon/C/figures/gesture-new-window.png
-share/gnome/help/galeon/C/figures/gesture-next-link.png
-share/gnome/help/galeon/C/figures/gesture-next-tab.png
-share/gnome/help/galeon/C/figures/gesture-prev-link.png
-share/gnome/help/galeon/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/C/figures/gesture-reload.png
-share/gnome/help/galeon/C/figures/gesture-stop.png
-share/gnome/help/galeon/C/figures/gesture-up.png
-share/gnome/help/galeon/C/figures/gesture-view-source.png
-share/gnome/help/galeon/C/figures/othertools-history.png
-share/gnome/help/galeon/C/figures/othertools-pdm.png
-share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/C/figures/statusbar.png
-share/gnome/help/galeon/C/figures/tabbed-browsing.png
-share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/C/figures/toolbars-main.png
-share/gnome/help/galeon/C/galeon.xml
-share/gnome/help/galeon/C/getting-started.xml
-share/gnome/help/galeon/C/other-tools.xml
-share/gnome/help/galeon/C/plugins.xml
-share/gnome/help/galeon/C/preface.xml
-share/gnome/help/galeon/C/preferences.xml
-share/gnome/help/galeon/es/apx-authors.xml
-share/gnome/help/galeon/es/apx-bugs.xml
-share/gnome/help/galeon/es/apx-command-line.xml
-share/gnome/help/galeon/es/apx-compiling.xml
-share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/es/apx-mouse-gestures.xml
-share/gnome/help/galeon/es/apx-troubleshooting.xml
-share/gnome/help/galeon/es/bookmarks.xml
-share/gnome/help/galeon/es/browser-window.xml
-share/gnome/help/galeon/es/figures/bookmarks-editor.png
-share/gnome/help/galeon/es/figures/browser-window.png
-share/gnome/help/galeon/es/figures/find-dialog.png
-share/gnome/help/galeon/es/figures/gesture-back.png
-share/gnome/help/galeon/es/figures/gesture-clone-tab.png
-share/gnome/help/galeon/es/figures/gesture-clone-window.png
-share/gnome/help/galeon/es/figures/gesture-close-2.png
-share/gnome/help/galeon/es/figures/gesture-close.png
-share/gnome/help/galeon/es/figures/gesture-contents.png
-share/gnome/help/galeon/es/figures/gesture-forward.png
-share/gnome/help/galeon/es/figures/gesture-fullscreen.png
-share/gnome/help/galeon/es/figures/gesture-homepage.png
-share/gnome/help/galeon/es/figures/gesture-new-tab.png
-share/gnome/help/galeon/es/figures/gesture-new-window.png
-share/gnome/help/galeon/es/figures/gesture-next-link.png
-share/gnome/help/galeon/es/figures/gesture-next-tab.png
-share/gnome/help/galeon/es/figures/gesture-prev-link.png
-share/gnome/help/galeon/es/figures/gesture-prev-tab.png
-share/gnome/help/galeon/es/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/es/figures/gesture-reload.png
-share/gnome/help/galeon/es/figures/gesture-stop.png
-share/gnome/help/galeon/es/figures/gesture-up.png
-share/gnome/help/galeon/es/figures/gesture-view-source.png
-share/gnome/help/galeon/es/figures/othertools-history.png
-share/gnome/help/galeon/es/figures/othertools-pdm.png
-share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/es/figures/statusbar.png
-share/gnome/help/galeon/es/figures/tabbed-browsing.png
-share/gnome/help/galeon/es/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/es/figures/toolbars-main.png
-share/gnome/help/galeon/es/galeon.xml
-share/gnome/help/galeon/es/getting-started.xml
-share/gnome/help/galeon/es/other-tools.xml
-share/gnome/help/galeon/es/plugins.xml
-share/gnome/help/galeon/es/preface.xml
-share/gnome/help/galeon/es/preferences.xml
-share/gnome/omf/galeon/galeon-C.omf
-share/gnome/omf/galeon/galeon-es.omf
-share/gnome/pixmaps/galeon.png
-share/gnome/sounds/galeon/clicked.wav
-share/locale/am/LC_MESSAGES/galeon-2.0.mo
-share/locale/az/LC_MESSAGES/galeon-2.0.mo
-share/locale/be/LC_MESSAGES/galeon-2.0.mo
-share/locale/bg/LC_MESSAGES/galeon-2.0.mo
-share/locale/bs/LC_MESSAGES/galeon-2.0.mo
-share/locale/ca/LC_MESSAGES/galeon-2.0.mo
-share/locale/cs/LC_MESSAGES/galeon-2.0.mo
-share/locale/da/LC_MESSAGES/galeon-2.0.mo
-share/locale/de/LC_MESSAGES/galeon-2.0.mo
-share/locale/el/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_CA/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
-share/locale/es/LC_MESSAGES/galeon-2.0.mo
-share/locale/et/LC_MESSAGES/galeon-2.0.mo
-share/locale/eu/LC_MESSAGES/galeon-2.0.mo
-share/locale/fi/LC_MESSAGES/galeon-2.0.mo
-share/locale/fr/LC_MESSAGES/galeon-2.0.mo
-share/locale/ga/LC_MESSAGES/galeon-2.0.mo
-share/locale/gl/LC_MESSAGES/galeon-2.0.mo
-share/locale/hr/LC_MESSAGES/galeon-2.0.mo
-share/locale/hu/LC_MESSAGES/galeon-2.0.mo
-share/locale/it/LC_MESSAGES/galeon-2.0.mo
-share/locale/ja/LC_MESSAGES/galeon-2.0.mo
-share/locale/ko/LC_MESSAGES/galeon-2.0.mo
-share/locale/lt/LC_MESSAGES/galeon-2.0.mo
-share/locale/lv/LC_MESSAGES/galeon-2.0.mo
-share/locale/mk/LC_MESSAGES/galeon-2.0.mo
-share/locale/ml/LC_MESSAGES/galeon-2.0.mo
-share/locale/mn/LC_MESSAGES/galeon-2.0.mo
-share/locale/ms/LC_MESSAGES/galeon-2.0.mo
-share/locale/nb/LC_MESSAGES/galeon-2.0.mo
-share/locale/nl/LC_MESSAGES/galeon-2.0.mo
-share/locale/nn/LC_MESSAGES/galeon-2.0.mo
-share/locale/no/LC_MESSAGES/galeon-2.0.mo
-share/locale/pa/LC_MESSAGES/galeon-2.0.mo
-share/locale/pl/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
-share/locale/ro/LC_MESSAGES/galeon-2.0.mo
-share/locale/ru/LC_MESSAGES/galeon-2.0.mo
-share/locale/rw/LC_MESSAGES/galeon-2.0.mo
-share/locale/sk/LC_MESSAGES/galeon-2.0.mo
-share/locale/sl/LC_MESSAGES/galeon-2.0.mo
-share/locale/sq/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
-share/locale/sv/LC_MESSAGES/galeon-2.0.mo
-share/locale/ta/LC_MESSAGES/galeon-2.0.mo
-share/locale/tr/LC_MESSAGES/galeon-2.0.mo
-share/locale/uk/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/LC_MESSAGES/galeon-2.0.mo
-share/locale/wa/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
-@dirrm share/gnome/help/galeon/es/figures
-@dirrm share/gnome/help/galeon/es
-@dirrm share/gnome/help/galeon/C/figures
-@dirrm share/gnome/help/galeon/C
-@dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
deleted file mode 100644
index 7ab89243a..000000000
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	py-gnome-extras
-# Date created:				22 November 2005
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.25 2005/11/26 05:11:25 ahze Exp $
-#
-
-PORTNAME=	gnome
-PORTVERSION=	2.12.1
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-extras
-DISTNAME=	gnome-python-extras-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A set of Python bindings for GNOME 2
-
-LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
-		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
-		gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
-		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
-		gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
-
-USE_GECKO=	firefox mozilla seamonkey
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
-		gtksourceview libwnck nautiluscdburner pygnome2
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-EG_SRC_DIR=	${WRKSRC}/examples
-EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
-.if !defined(NOPORTDOCS)
-DOCSDIR=	${PREFIX}/share/doc/py-gnome-extras
-.else
-DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
-.endif
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-
-post-patch:
-	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
-	@${REINPLACE_CMD} -e 's|-DHAVE_GNOMEPRINT28||g' \
-		${WRKSRC}/configure
-
-.if !defined(NOPORTDOCS)
-post-install:
-	${MKDIR} ${EG_DST_DIR}
-	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
deleted file mode 100644
index d1cab3576..000000000
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 62a3d8bb5bd5c1696c7200c001ea34f2
-SHA256 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = d1f93adf096bd739cba988d9cdea8978faa97ac928bad26352e62830e8806ab5
-SIZE (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 476483
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in b/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in
deleted file mode 100644
index 89faafbdc..000000000
--- a/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jan 28 14:22:51 2005
-+++ Makefile.in	Fri Jan 28 14:23:04 2005
-@@ -43,7 +43,7 @@
- @BUILD_WNCK_TRUE@am__append_5 = wnck
- @BUILD_GTKMOZEMBED_TRUE@am__append_6 = gtkmozembed
- @BUILD_GTKSPELL_TRUE@am__append_7 = gtkspell
--@BUILD_GDL_TRUE@am__append_8 = gdl
-+@BUILD_GDL_TRUE@am__append_8 =
- @BUILD_TOTEM_PLPARSER_TRUE@am__append_9 = totem
- @BUILD_GTOP_TRUE@am__append_10 = gtop
- @BUILD_NAUTILUSBURN_TRUE@am__append_11 = nautilusburn
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-configure b/x11-toolkits/py-gnome-desktop/files/patch-configure
deleted file mode 100644
index 2151fdea2..000000000
--- a/x11-toolkits/py-gnome-desktop/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Nov 11 21:36:37 2005
-+++ configure	Fri Nov 11 21:36:55 2005
-@@ -21713,6 +21713,7 @@
- case $mozpackage in
-      firefox) mozpackage_required_version=1.0 ;;
-      mozilla) mozpackage_required_version=1.2b ;;
-+     seamonkey) mozpackage_required_version=1.2b ;;
-      *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&5
- echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&2;}
-    { (exit 1); exit 1; }; }
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gda_gda.override b/x11-toolkits/py-gnome-desktop/files/patch-gda_gda.override
deleted file mode 100644
index 1fa283a57..000000000
--- a/x11-toolkits/py-gnome-desktop/files/patch-gda_gda.override
+++ /dev/null
@@ -1,102 +0,0 @@
---- gda/gda.override.orig	Wed Apr 20 16:10:31 2005
-+++ gda/gda.override	Wed Apr 20 16:12:56 2005
-@@ -59,13 +59,14 @@ override gda_config_get_data_source_list
- static PyObject*
- _wrap_gda_config_get_data_source_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_data_source_list();
-+	list = gda_config_get_data_source_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_DATA_SOURCE_INFO, tmp->data, FALSE, FALSE);
-@@ -81,13 +82,14 @@ override gda_config_get_provider_list kw
- static PyObject*
- _wrap_gda_config_get_provider_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_provider_list();
-+	list = gda_config_get_provider_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_PROVIDER_INFO, tmp->data, FALSE, FALSE);
-@@ -174,20 +176,22 @@ static PyObject*
- _wrap_gda_config_list_keys (PyObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "path", NULL };
- 	gchar* path = "/";
-+	PyObject *plist;
-+	GList *tmp, *list;
- 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "|s:config_list_keys", kwlist, &path)) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_list_keys (path);
-+	list = gda_config_list_keys (path);
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyList_Append (plist, PyString_FromString (tmp->data));
-@@ -201,7 +205,8 @@ override gda_connection_execute_command 
- static PyObject*
- _wrap_gda_connection_execute_command (PyGObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "cmd", "params", NULL };
--	PyGObject *cmd, *params;
-+	PyGObject *cmd, *params, *plist;
-+	GList *tmp, *list;
- 
- /* TODO: 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "O!O!:GdaConnection.execute_command",
-@@ -211,14 +216,14 @@ _wrap_gda_connection_execute_command (Py
- 	}
- */
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
-+	list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
- 	      GDA_COMMAND (cmd->obj), GDA_PARAMETER_LIST (params->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
-@@ -235,13 +240,14 @@ override gda_connection_get_errors kwarg
- static PyObject*
- _wrap_gda_connection_get_errors (PyGObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
-+	list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pygobject_new (G_OBJECT (tmp->data));
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
deleted file mode 100644
index 05db58a4c..000000000
--- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtop/gtop.c.orig	Wed May 18 00:54:59 2005
-+++ gtop/gtop.c	Wed May 18 00:54:12 2005
-@@ -44,6 +44,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- 
-@@ -1316,8 +1317,8 @@ build_siglist(void)
- 
- 	for(i = 0; i < len; ++i)
- 	{
--		p = &glibtop_sys_siglist[i];
- 		PyObject* d;
-+		p = &glibtop_sys_siglist[i];
- 
- 		d = PyDict_New();
- 		my_dict_add_and_decref(d, "number", PyI_L(p->number));
diff --git a/x11-toolkits/py-gnome-desktop/pkg-descr b/x11-toolkits/py-gnome-desktop/pkg-descr
deleted file mode 100644
index 422d464c6..000000000
--- a/x11-toolkits/py-gnome-desktop/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Excerpt from the README:
-
- PyGNOME -- Python bindings for GNOME 2
- ======================================
- Author: James Henstridge <james@daa.com.au>
-
- This is a set of bindings for the GNOME 2 libraries for use with python.
-
-WWW: http://www.pygtk.org/
--- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
deleted file mode 100644
index 5254d0526..000000000
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ /dev/null
@@ -1,140 +0,0 @@
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
-libdata/pkgconfig/gnome-python-extras-2.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
-%%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
-%%PORTDOCS%%share/examples/py-gnome/applet/README
-%%PORTDOCS%%share/examples/py-gnome/applet/applet.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/populate-recent.py
-%%PORTDOCS%%share/examples/py-gnome/egg/trayicon.py
-%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_03.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_04.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_05.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_06.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_08.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_09.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.glade
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_11.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/sample-image.png
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
-%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
-%%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
-%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
-%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
-share/pygtk/2.0/defs/applet.defs
-share/pygtk/2.0/defs/art.defs
-share/pygtk/2.0/defs/gtkhtml2.defs
-share/pygtk/2.0/defs/gtkmozembed.defs
-share/pygtk/2.0/defs/gtksourceview.defs
-share/pygtk/2.0/defs/mediaprofiles.defs
-share/pygtk/2.0/defs/nautilus_burn.defs
-share/pygtk/2.0/defs/nb_drive_selection.defs
-share/pygtk/2.0/defs/print.defs
-share/pygtk/2.0/defs/printui.defs
-share/pygtk/2.0/defs/trayicon.defs
-share/pygtk/2.0/defs/wnck.defs
-%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
-%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
-%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
-%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
-%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
deleted file mode 100644
index 7ab89243a..000000000
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	py-gnome-extras
-# Date created:				22 November 2005
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.25 2005/11/26 05:11:25 ahze Exp $
-#
-
-PORTNAME=	gnome
-PORTVERSION=	2.12.1
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-extras
-DISTNAME=	gnome-python-extras-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A set of Python bindings for GNOME 2
-
-LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
-		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
-		gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
-		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
-		gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
-
-USE_GECKO=	firefox mozilla seamonkey
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
-		gtksourceview libwnck nautiluscdburner pygnome2
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-EG_SRC_DIR=	${WRKSRC}/examples
-EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
-.if !defined(NOPORTDOCS)
-DOCSDIR=	${PREFIX}/share/doc/py-gnome-extras
-.else
-DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
-.endif
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-
-post-patch:
-	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
-	@${REINPLACE_CMD} -e 's|-DHAVE_GNOMEPRINT28||g' \
-		${WRKSRC}/configure
-
-.if !defined(NOPORTDOCS)
-post-install:
-	${MKDIR} ${EG_DST_DIR}
-	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
deleted file mode 100644
index d1cab3576..000000000
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 62a3d8bb5bd5c1696c7200c001ea34f2
-SHA256 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = d1f93adf096bd739cba988d9cdea8978faa97ac928bad26352e62830e8806ab5
-SIZE (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 476483
diff --git a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in b/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
deleted file mode 100644
index 89faafbdc..000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jan 28 14:22:51 2005
-+++ Makefile.in	Fri Jan 28 14:23:04 2005
-@@ -43,7 +43,7 @@
- @BUILD_WNCK_TRUE@am__append_5 = wnck
- @BUILD_GTKMOZEMBED_TRUE@am__append_6 = gtkmozembed
- @BUILD_GTKSPELL_TRUE@am__append_7 = gtkspell
--@BUILD_GDL_TRUE@am__append_8 = gdl
-+@BUILD_GDL_TRUE@am__append_8 =
- @BUILD_TOTEM_PLPARSER_TRUE@am__append_9 = totem
- @BUILD_GTOP_TRUE@am__append_10 = gtop
- @BUILD_NAUTILUSBURN_TRUE@am__append_11 = nautilusburn
diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure
deleted file mode 100644
index 2151fdea2..000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Nov 11 21:36:37 2005
-+++ configure	Fri Nov 11 21:36:55 2005
-@@ -21713,6 +21713,7 @@
- case $mozpackage in
-      firefox) mozpackage_required_version=1.0 ;;
-      mozilla) mozpackage_required_version=1.2b ;;
-+     seamonkey) mozpackage_required_version=1.2b ;;
-      *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&5
- echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&2;}
-    { (exit 1); exit 1; }; }
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override b/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
deleted file mode 100644
index 1fa283a57..000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
+++ /dev/null
@@ -1,102 +0,0 @@
---- gda/gda.override.orig	Wed Apr 20 16:10:31 2005
-+++ gda/gda.override	Wed Apr 20 16:12:56 2005
-@@ -59,13 +59,14 @@ override gda_config_get_data_source_list
- static PyObject*
- _wrap_gda_config_get_data_source_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_data_source_list();
-+	list = gda_config_get_data_source_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_DATA_SOURCE_INFO, tmp->data, FALSE, FALSE);
-@@ -81,13 +82,14 @@ override gda_config_get_provider_list kw
- static PyObject*
- _wrap_gda_config_get_provider_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_provider_list();
-+	list = gda_config_get_provider_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_PROVIDER_INFO, tmp->data, FALSE, FALSE);
-@@ -174,20 +176,22 @@ static PyObject*
- _wrap_gda_config_list_keys (PyObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "path", NULL };
- 	gchar* path = "/";
-+	PyObject *plist;
-+	GList *tmp, *list;
- 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "|s:config_list_keys", kwlist, &path)) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_list_keys (path);
-+	list = gda_config_list_keys (path);
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyList_Append (plist, PyString_FromString (tmp->data));
-@@ -201,7 +205,8 @@ override gda_connection_execute_command 
- static PyObject*
- _wrap_gda_connection_execute_command (PyGObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "cmd", "params", NULL };
--	PyGObject *cmd, *params;
-+	PyGObject *cmd, *params, *plist;
-+	GList *tmp, *list;
- 
- /* TODO: 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "O!O!:GdaConnection.execute_command",
-@@ -211,14 +216,14 @@ _wrap_gda_connection_execute_command (Py
- 	}
- */
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
-+	list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
- 	      GDA_COMMAND (cmd->obj), GDA_PARAMETER_LIST (params->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
-@@ -235,13 +240,14 @@ override gda_connection_get_errors kwarg
- static PyObject*
- _wrap_gda_connection_get_errors (PyGObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
-+	list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pygobject_new (G_OBJECT (tmp->data));
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
deleted file mode 100644
index 05db58a4c..000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtop/gtop.c.orig	Wed May 18 00:54:59 2005
-+++ gtop/gtop.c	Wed May 18 00:54:12 2005
-@@ -44,6 +44,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- 
-@@ -1316,8 +1317,8 @@ build_siglist(void)
- 
- 	for(i = 0; i < len; ++i)
- 	{
--		p = &glibtop_sys_siglist[i];
- 		PyObject* d;
-+		p = &glibtop_sys_siglist[i];
- 
- 		d = PyDict_New();
- 		my_dict_add_and_decref(d, "number", PyI_L(p->number));
diff --git a/x11-toolkits/py-gnome-extras/pkg-descr b/x11-toolkits/py-gnome-extras/pkg-descr
deleted file mode 100644
index 422d464c6..000000000
--- a/x11-toolkits/py-gnome-extras/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Excerpt from the README:
-
- PyGNOME -- Python bindings for GNOME 2
- ======================================
- Author: James Henstridge <james@daa.com.au>
-
- This is a set of bindings for the GNOME 2 libraries for use with python.
-
-WWW: http://www.pygtk.org/
--- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
deleted file mode 100644
index 5254d0526..000000000
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ /dev/null
@@ -1,140 +0,0 @@
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
-libdata/pkgconfig/gnome-python-extras-2.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
-%%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
-%%PORTDOCS%%share/examples/py-gnome/applet/README
-%%PORTDOCS%%share/examples/py-gnome/applet/applet.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
-%%PORTDOCS%%share/examples/py-gnome/egg/recent/populate-recent.py
-%%PORTDOCS%%share/examples/py-gnome/egg/trayicon.py
-%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_03.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_04.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_05.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_06.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_08.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_09.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.glade
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_11.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/sample-image.png
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
-%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
-%%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
-%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
-%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
-share/pygtk/2.0/defs/applet.defs
-share/pygtk/2.0/defs/art.defs
-share/pygtk/2.0/defs/gtkhtml2.defs
-share/pygtk/2.0/defs/gtkmozembed.defs
-share/pygtk/2.0/defs/gtksourceview.defs
-share/pygtk/2.0/defs/mediaprofiles.defs
-share/pygtk/2.0/defs/nautilus_burn.defs
-share/pygtk/2.0/defs/nb_drive_selection.defs
-share/pygtk/2.0/defs/print.defs
-share/pygtk/2.0/defs/printui.defs
-share/pygtk/2.0/defs/trayicon.defs
-share/pygtk/2.0/defs/wnck.defs
-%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
-%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
-%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
-%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
-%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
author	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2005-11-30 05:46:12 +0800
committer	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2005-11-30 05:46:12 +0800
commit	dff320e95e1d0a6aed0ec85efb495575ec0614b4 (patch)
tree	e1eb7ef4390eb0a4109fc8c2bf1e21c1ab33c3f4
parent	c916094aec2d5c829e79b8ed901cacbe8e477c16 (diff)
download	marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.gz marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.bz2 marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.lz marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.xz marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.tar.zst marcuscom-ports-dff320e95e1d0a6aed0ec85efb495575ec0614b4.zip