Clean out MarcusCom after the big import into ports.

Next stop, GNOME 2.17. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
author: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> 2006-10-14 18:33:48 +0800
committer: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> 2006-10-14 18:33:48 +0800
commit: 1b3327761c8bcb98d89b529daeae9600844b4361 (patch)
tree: 0be1cd4eb5fec6661da4798906b0d9bd522e794f /mail
parent: a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff)
download: marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip
102 files changed, 0 insertions, 6011 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
deleted file mode 100644
index f59c15fca..000000000
--- a/mail/balsa/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# New ports collection makefile for:	balsa
-# Date created:				02 December 1998
-# Whom:					Glenn Johnson <gljohns@bellsouth.net>
-#
-# $FreeBSD$
-#   $MCom$
-#
-
-PORTNAME=	balsa
-PORTVERSION=	2.3.13
-PORTREVISION=	1
-CATEGORIES=	mail gnome
-MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
-DISTNAME=	balsa-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A mail reader for the GNOME 2 desktop
-
-LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
-		pcre.0:${PORTSDIR}/devel/pcre \
-		esmtp.6:${PORTSDIR}/mail/libesmtp \
-		gmime-2.0.4:${PORTSDIR}/mail/gmime2
-
-USE_GMAKE=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_PERL5=	yes
-USE_OPENSSL=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui \
-		gtkhtml3
-USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libltdl:15
-USE_GCC=	3.4+
-GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-CONFIGURE_ARGS=	--enable-threads \
-		--enable-gtkhtml \
-		--disable-more-warnings \
-		--with-ssl \
-		--enable-gtkhtml=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
-
-MAN1=		balsa.1
-
-OPTIONS=	LDAP "Enable LDAP support" on \
-		GTKSPELL "Spell checking support" on \
-		GPG "Enable GnuPG support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GPG)
-LIB_DEPENDS+=		gpgme.15:${PORTSDIR}/security/gpgme
-CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}/bin/gpgme-config
-.endif
-
-.if !defined(WITHOUT_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.endif
-
-.if !defined(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=--with-gtkspell
-.endif
-
-.if ${PREFIX}==${LOCALBASE}
-PLIST_SUB+=	GTKICON="@comment "
-.else
-PLIST_SUB+=	GTKICON=""
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \
-		${WRKSRC}/libbalsa/mailbox_imap.c
-# PREFIX safeness
-	@${REINPLACE_CMD} -E \
-		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
-		${PREFIX}/share/gnome/balsa/hicolor
-
-.include <bsd.port.post.mk>
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
deleted file mode 100644
index 0a415a6d6..000000000
--- a/mail/balsa/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (balsa-2.3.13.tar.bz2) = a1c7fe3454243f1719a19fcdb0905948
-SHA256 (balsa-2.3.13.tar.bz2) = e11b26389e57705b226abcc87a94a6ddbc17a729e861fdf3dd0d842871c927ab
-SIZE (balsa-2.3.13.tar.bz2) = 2504314
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
deleted file mode 100644
index 730ae6d7e..000000000
--- a/mail/balsa/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	Sat Mar 19 14:39:26 2005
-+++ configure	Sat Mar 19 14:40:24 2005
-@@ -21821,7 +21821,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap -llber -lresolv $LIBS"
-+LIBS="-lldap -llber $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21885,7 +21885,7 @@
- #define ENABLE_LDAP 1
- _ACEOF
- 
--              LIBS="-lldap -llber -lresolv $LIBS"
-+              LIBS="-lldap -llber $LIBS"
- else
-   { { echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
- echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
-@@ -22664,13 +22664,13 @@
- else
- 
- 
--echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
--echo $ECHO_N "checking for new_pspell_manager in -lpspell... $ECHO_C" >&6
--if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
-+echo "$as_me:$LINENO: checking for new_aspell_speller in -lpspell" >&5
-+echo $ECHO_N "checking for new_aspell_speller in -lpspell... $ECHO_C" >&6
-+if test "${ac_cv_lib_pspell_new_aspell_speller+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
-+LIBS="-lpspell -lstdc++ $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22684,11 +22684,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char new_pspell_manager ();
-+char new_aspell_speller ();
- int
- main ()
- {
--new_pspell_manager ();
-+new_aspell_speller ();
-   ;
-   return 0;
- }
diff --git a/mail/balsa/files/patch-doc_omf.make b/mail/balsa/files/patch-doc_omf.make
deleted file mode 100644
index dcc67260e..000000000
--- a/mail/balsa/files/patch-doc_omf.make
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/omf.make.orig	Mon Sep 16 02:46:07 2002
-+++ doc/omf.make	Mon Sep 16 02:46:37 2002
-@@ -27,7 +27,7 @@
- #
- 
- omf_dest_dir=$(datadir)/omf/@PACKAGE@
--scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+scrollkeeper_localstate_dir = /var/db/scrollkeeper
- 
- omf: omf_timestamp
- 
diff --git a/mail/balsa/files/patch-doc_xmldocs.make b/mail/balsa/files/patch-doc_xmldocs.make
deleted file mode 100644
index 9379b0d60..000000000
--- a/mail/balsa/files/patch-doc_xmldocs.make
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/xmldocs.make.orig	Wed Sep 18 07:12:20 2002
-+++ doc/xmldocs.make	Tue Oct 29 12:20:37 2002
-@@ -36,7 +36,7 @@
- # ************* Begin of section some packagers may need to modify  **************
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- # **************  You should not have to edit below this line  *******************
- xml_files = $(entities) $(docname).xml
diff --git a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c
deleted file mode 100644
index a7206c822..000000000
--- a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libbalsa/imap/imap-handle.c.orig	Sun May  1 17:37:58 2005
-+++ libbalsa/imap/imap-handle.c	Tue May  3 01:39:13 2005
-@@ -23,6 +23,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <glib.h>
- #include <glib-object.h>
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.c b/mail/balsa/files/patch-libbalsa_mailbox_local.c
deleted file mode 100644
index 90d988400..000000000
--- a/mail/balsa/files/patch-libbalsa_mailbox_local.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- libbalsa/mailbox_local.c.orig	Thu Dec 29 01:47:25 2005
-+++ libbalsa/mailbox_local.c	Thu Dec 29 01:48:23 2005
-@@ -375,7 +375,7 @@ typedef struct {
- #else                           /* GLIB_CHECK_VERSION(2, 8, 0) */
-     int fd;
- #endif                          /* GLIB_CHECK_VERSION(2, 8, 0) */
--    guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno);
-+    guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno);
-     LibBalsaMailboxLocal *local;
- } LibBalsaMailboxLocalSaveTreeInfo;
- 
-@@ -399,9 +399,9 @@ lbm_local_save_tree_item(guint msgno, gu
-     if (msgno == 0) {
-         info.msgno = msgno;
-         info.value.total = a;
--    } else if (save_info->fileno) {
--        info.msgno = save_info->fileno(save_info->local, msgno);
--        info.value.parent = save_info->fileno(save_info->local, a);
-+    } else if (save_info->sti_fileno) {
-+        info.msgno = save_info->sti_fileno(save_info->local, msgno);
-+        info.value.parent = save_info->sti_fileno(save_info->local, a);
-     } else {
-         info.msgno = msgno;
-         info.value.parent = a;
-@@ -466,7 +466,7 @@ lbm_local_save_tree(LibBalsaMailboxLocal
-         return;
-     }
- 
--    save_info.fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->fileno;
-+    save_info.sti_fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->sti_fileno;
-     save_info.local = local;
- #if GLIB_CHECK_VERSION(2, 8, 0)
-     save_info.array =
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.h b/mail/balsa/files/patch-libbalsa_mailbox_local.h
deleted file mode 100644
index 985646513..000000000
--- a/mail/balsa/files/patch-libbalsa_mailbox_local.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbalsa/mailbox_local.h.orig	Thu Dec 29 01:49:05 2005
-+++ libbalsa/mailbox_local.h	Thu Dec 29 01:49:13 2005
-@@ -66,7 +66,7 @@ struct _LibBalsaMailboxLocalClass {
-     gint (*check_files)(const gchar * path, gboolean create);
-     void (*set_path)(LibBalsaMailboxLocal * local, const gchar * path);
-     void (*remove_files)(LibBalsaMailboxLocal * local);
--    guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno);
-+    guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno);
- };
- 
- GObject *libbalsa_mailbox_local_new(const gchar * path, gboolean create);
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
deleted file mode 100644
index ee8d9dcb9..000000000
--- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- libbalsa/mailbox_maildir.c.orig	Tue Dec 27 04:44:40 2005
-+++ libbalsa/mailbox_maildir.c	Thu Dec 29 01:52:57 2005
-@@ -25,6 +25,8 @@
- #define _XOPEN_SOURCE          500
- #define _XOPEN_SOURCE_EXTENDED 1
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -50,7 +52,7 @@ struct message_info {
-     /* The message's order when parsing; needed for saving the message
-      * tree in a form that will match the msgnos when the mailbox is
-      * reopened. */
--    guint fileno;
-+    guint mi_fileno;
- };
- #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
- #define FLAGS_REALLY_DIFFER(orig_flags, flags) \
-@@ -194,7 +196,7 @@ libbalsa_mailbox_maildir_class_init(LibB
-     libbalsa_mailbox_local_class->set_path     = lbm_maildir_set_path;
-     libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files;
-     libbalsa_mailbox_local_class->load_message = lbm_maildir_load_message;
--    libbalsa_mailbox_local_class->fileno       = lbm_maildir_fileno;
-+    libbalsa_mailbox_local_class->sti_fileno       = lbm_maildir_fileno;
- }
- 
- static void
-@@ -408,7 +410,7 @@ static LibBalsaMessageFlag parse_filenam
- }
- 
- static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir,
--                              const gchar *subdir, guint * fileno)
-+                              const gchar *subdir, guint * md_fileno)
- {
-     gchar *path;
-     GDir *dir;
-@@ -463,12 +465,12 @@ static void lbm_maildir_parse(LibBalsaMa
- 	    msg_info->key=key;
- 	    msg_info->filename=g_strdup(filename);
- 	    msg_info->flags = msg_info->orig_flags = flags;
--	    msg_info->fileno = 0;
-+	    msg_info->mi_fileno = 0;
- 	}
- 	msg_info->subdir = subdir;
--        if (!msg_info->fileno)
-+        if (!msg_info->mi_fileno)
-             /* First time we saw this key. */
--	    msg_info->fileno = ++*fileno;
-+	    msg_info->mi_fileno = ++*md_fileno;
-     }
-     g_dir_close(dir);
- }
-@@ -476,16 +478,16 @@ static void lbm_maildir_parse(LibBalsaMa
- static void
- lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir)
- {
--    guint msgno, fileno = 0;
-+    guint msgno, md_fileno = 0;
- 
-     for (msgno = mdir->msgno_2_msg_info->len; msgno > 0; --msgno) {
-         struct message_info *msg_info =
-             message_info_from_msgno(mdir, msgno);
--        msg_info->fileno = 0;
-+        msg_info->mi_fileno = 0;
-     }
- 
--    lbm_maildir_parse(mdir, "cur", &fileno);
--    lbm_maildir_parse(mdir, "new", &fileno);
-+    lbm_maildir_parse(mdir, "cur", &md_fileno);
-+    lbm_maildir_parse(mdir, "new", &md_fileno);
- }
- 
- static gboolean
-@@ -927,7 +929,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal 
-     msg_info =
-         message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno);
- 
--    return msg_info->fileno;
-+    return msg_info->mi_fileno;
- }
- 
- /* Called with mailbox locked. */
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
deleted file mode 100644
index 2511938ff..000000000
--- a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- libbalsa/mailbox_mbox.c.orig	Tue Dec 27 14:54:34 2005
-+++ libbalsa/mailbox_mbox.c	Thu Dec 29 01:44:01 2005
-@@ -26,6 +26,7 @@
- 
- #include <gmime/gmime-stream-fs.h>
- 
-+#include <sys/stat.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-@@ -214,7 +215,7 @@ lbm_mbox_check_files(const gchar * path,
-     } else if (create) {
-         gint fd;
- 
--        if ((fd = creat(path, S_IRUSR | S_IWUSR)) == -1) {
-+	if ((fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1) {
-             g_warning("An error:\n%s\n occurred while trying to "
-                       "create the mailbox \"%s\"\n",
-                       strerror(errno), path);
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mh.c b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
deleted file mode 100644
index ecce74d29..000000000
--- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c
+++ /dev/null
@@ -1,250 +0,0 @@
---- libbalsa/mailbox_mh.c.orig	Tue Dec 27 04:44:41 2005
-+++ libbalsa/mailbox_mh.c	Thu Dec 29 01:55:40 2005
-@@ -27,6 +27,8 @@
- /* to compile this on BSD/Darwin */
- #undef _POSIX_SOURCE
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -46,7 +48,7 @@ struct message_info {
-     LibBalsaMessageFlag flags;
-     LibBalsaMessageFlag orig_flags;
-     LibBalsaMessage *message;
--    gint fileno;
-+    gint mi_fileno;
- };
- 
- static LibBalsaMailboxLocalClass *parent_class = NULL;
-@@ -278,7 +280,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
- 
- #define MH_BASENAME(msgno) \
-     g_strdup_printf((msgno->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
--		    ",%d" : "%d", msg_info->fileno)
-+		    ",%d" : "%d", msg_info->mi_fileno)
- 
- static GMimeStream *
- libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
-@@ -338,7 +340,7 @@ static gint
- lbm_mh_compare_fileno(const struct message_info ** a,
- 		      const struct message_info ** b)
- {
--    return (*a)->fileno - (*b)->fileno;
-+    return (*a)->mi_fileno - (*b)->mi_fileno;
- }
- 
- #define INVALID_FLAG ((unsigned) -1)
-@@ -357,7 +359,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
- 
-     while ((filename = g_dir_read_name(dir)) != NULL) {
- 	LibBalsaMessageFlag delete_flag = 0;
--	guint fileno;
-+	guint mh_fileno;
- 
- 	if (filename[0] == ',') {
- 	    filename++;
-@@ -366,24 +368,24 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
- 	if (lbm_mh_check_filename(filename) == FALSE)
- 	    continue;
- 
--	if (sscanf(filename, "%d", &fileno) != 1)
-+	if (sscanf(filename, "%d", &mh_fileno) != 1)
-             break;     /* FIXME report error? */
--	if (fileno > mh->last_fileno)
--	    mh->last_fileno = fileno;
-+	if (mh_fileno > mh->last_fileno)
-+	    mh->last_fileno = mh_fileno;
- 
- 	if (add_msg_info && mh->messages_info) {
- 	    struct message_info *msg_info =
- 		g_hash_table_lookup(mh->messages_info,
--				    GINT_TO_POINTER(fileno));
-+				    GINT_TO_POINTER(mh_fileno));
- 	    if (!msg_info) {
- 		msg_info = g_new0(struct message_info, 1);
- 		msg_info->flags = INVALID_FLAG;
- 		g_hash_table_insert(mh->messages_info,
--				    GINT_TO_POINTER(fileno), msg_info);
-+				    GINT_TO_POINTER(mh_fileno), msg_info);
- 		g_ptr_array_add(mh->msgno_2_msg_info, msg_info);
-                 /* dummy entry in mindex for now */
-                 g_ptr_array_add(LIBBALSA_MAILBOX(mh)->mindex, NULL);
--		msg_info->fileno = fileno;
-+		msg_info->mi_fileno = mh_fileno;
- 	    }
- 	    msg_info->orig_flags = delete_flag;
- 	}
-@@ -401,17 +403,17 @@ static const gchar *LibBalsaMailboxMhRep
- static const gchar *LibBalsaMailboxMhRecent = "recent:";
- 
- static void
--lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint fileno, LibBalsaMessageFlag flag)
-+lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint mh_fileno, LibBalsaMessageFlag flag)
- {
-     struct message_info *msg_info;
- 
--    if (!fileno)
-+    if (!mh_fileno)
- 	return;
- 
--    msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(fileno));
-+    msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(mh_fileno));
- 
-     if (!msg_info) {
--	g_print("MH sequence info for nonexistent message %d\n", fileno);
-+	g_print("MH sequence info for nonexistent message %d\n", mh_fileno);
- 	return;
-     }
- 
-@@ -440,7 +442,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
- 
-     for (seq = sequences; *seq; seq++) {
- 	guint end = 0;
--	guint fileno;
-+	guint mh_fileno;
- 
- 	if (!**seq)
- 	    continue;
-@@ -451,11 +453,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
- 	    if (sscanf(line, "%d", &end) != 1)
-                 break; /* FIXME report error? */
- 	}
--	if (sscanf(*seq, "%d", &fileno) != 1)
-+	if (sscanf(*seq, "%d", &mh_fileno) != 1)
-             break;     /* FIXME report error? */
- 	do
--	    lbm_mh_set_flag(mh, fileno, flag);
--	while (++fileno <= end);
-+	    lbm_mh_set_flag(mh, mh_fileno, flag);
-+	while (++mh_fileno <= end);
-     }
- 
-     g_strfreev(sequences);
-@@ -587,7 +589,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
- 	    sequences = g_strsplit(p, " ", 0);
- 	    for (seq = sequences; *seq; seq++) {
- 		guint end = 0;
--		guint fileno;
-+		guint mh_fileno;
- 
- 		if (!**seq)
- 		    continue;
-@@ -598,15 +600,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
- 		    if (sscanf(p, "%d", &end) != 1)
-                         break; /* FIXME report error? */
- 		}
--		if (sscanf(*seq, "%d", &fileno) != 1)
-+		if (sscanf(*seq, "%d", &mh_fileno) != 1)
-                     break; /* FIXME report error? */
- 		do {
--		    p = g_strdup_printf("%s/%d", path, fileno);
-+		    p = g_strdup_printf("%s/%d", path, mh_fileno);
- 		    if (access(p, F_OK) == 0)
- 			retval = TRUE;
- 		    g_free(p);
- 		    /* One undeleted unread message is enough. */
--		} while (!retval && ++fileno <= end);
-+		} while (!retval && ++mh_fileno <= end);
- 	    }
- 	    g_strfreev(sequences);
- 	    break;
-@@ -693,7 +695,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
- 	else {
- 	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
- 	    g_hash_table_remove(mh->messages_info, 
--		    		GINT_TO_POINTER(msg_info->fileno));
-+		    		GINT_TO_POINTER(msg_info->mi_fileno));
- 	    libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
- 	    if (renumber > msgno)
- 		/* First message that needs renumbering. */
-@@ -773,11 +775,11 @@ lbm_mh_flag_line(struct message_info *ms
-     if (!(msg_info->flags & flag))
- 	return;
- 
--    if (li->last < msg_info->fileno - 1) {
-+    if (li->last < msg_info->mi_fileno - 1) {
- 	lbm_mh_print_line(li);
--	li->first = msg_info->fileno;
-+	li->first = msg_info->mi_fileno;
-     }
--    li->last = msg_info->fileno;
-+    li->last = msg_info->mi_fileno;
- }
- 
- static gboolean
-@@ -858,7 +860,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
- 	    /* free old information */
- 	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
- 	    g_hash_table_remove(mh->messages_info, 
--		    		GINT_TO_POINTER(msg_info->fileno));
-+		    		GINT_TO_POINTER(msg_info->mi_fileno));
- 	    libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
- 	} else {
- 	    lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen);
-@@ -1092,7 +1094,7 @@ libbalsa_mailbox_mh_fetch_message_struct
-  * we'll just add new lines and let the next sync merge them with any
-  * existing lines. */
- static void
--lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint fileno,
-+lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint mh_fileno,
- 			LibBalsaMessageFlag flags)
- {
-     FILE *fp;
-@@ -1103,13 +1105,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
- 	return;
- 
-     if (flags & LIBBALSA_MESSAGE_FLAG_NEW)
--	fprintf(fp, "unseen: %d\n", fileno);
-+	fprintf(fp, "unseen: %d\n", mh_fileno);
-     if (flags & LIBBALSA_MESSAGE_FLAG_FLAGGED)
--	fprintf(fp, "flagged: %d\n", fileno);
-+	fprintf(fp, "flagged: %d\n", mh_fileno);
-     if (flags & LIBBALSA_MESSAGE_FLAG_REPLIED)
--	fprintf(fp, "replied: %d\n", fileno);
-+	fprintf(fp, "replied: %d\n", mh_fileno);
-     if (flags & LIBBALSA_MESSAGE_FLAG_RECENT)
--	fprintf(fp, "recent: %d\n", fileno);
-+	fprintf(fp, "recent: %d\n", mh_fileno);
-     fclose(fp);
- }
- 
-@@ -1126,7 +1128,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
-     int fd;
-     GMimeStream *out_stream;
-     GMimeFilter *crlffilter;
--    int fileno;
-+    int mh_fileno;
-     int retries;
-     GMimeStream *in_stream;
- 
-@@ -1169,14 +1171,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
-     libbalsa_mime_stream_shared_unlock(stream);
-     g_object_unref(in_stream);
- 
--    fileno = mh->last_fileno; 
-+    mh_fileno = mh->last_fileno; 
-     retries = 10;
-     do {
- 	/* rename tempfile to message-number-name */
- 	char *new_filename;
- 	gint rename_status;
- 
--	new_filename = g_strdup_printf("%s/%d", path, ++fileno);
-+	new_filename = g_strdup_printf("%s/%d", path, ++mh_fileno);
- 	rename_status = libbalsa_safe_rename(tmp, new_filename);
- 	g_free(new_filename);
- 	if (rename_status != -1)
-@@ -1199,9 +1201,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa
-                     "Too high activity?");
- 	return FALSE;
-     }
--    mh->last_fileno = fileno;
-+    mh->last_fileno = mh_fileno;
- 
--    lbm_mh_update_sequences(mh, fileno,
-+    lbm_mh_update_sequences(mh, mh_fileno,
-                             flags | LIBBALSA_MESSAGE_FLAG_RECENT);
- 
-     return TRUE;
diff --git a/mail/balsa/files/patch-libbalsa_misc.c b/mail/balsa/files/patch-libbalsa_misc.c
deleted file mode 100644
index 22af56e0e..000000000
--- a/mail/balsa/files/patch-libbalsa_misc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libbalsa/misc.c.orig	Fri Feb 18 18:05:54 2005
-+++ libbalsa/misc.c	Sat Mar 19 14:44:04 2005
-@@ -23,7 +23,9 @@
- #include "config.h"
- 
- #define _SVID_SOURCE           1
-+#ifndef __FreeBSD__
- #define _XOPEN_SOURCE          500
-+#endif
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
diff --git a/mail/balsa/files/patch-src_main.c b/mail/balsa/files/patch-src_main.c
deleted file mode 100644
index 044e51dd9..000000000
--- a/mail/balsa/files/patch-src_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	Sun Jan 18 06:39:47 2004
-+++ src/main.c	Sun Jan 18 21:38:15 2004
-@@ -233,7 +233,7 @@
-     gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                        GNOME_PARAM_POPT_TABLE, options,
-                        GNOME_PARAM_APP_PREFIX, BALSA_STD_PREFIX,
--                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share",
-+                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share/gnome",
- 		       GNOME_PARAM_HUMAN_READABLE_NAME, _("The Balsa E-Mail Client"),
-                        NULL);
- 
diff --git a/mail/balsa/files/patch-src_threads.h b/mail/balsa/files/patch-src_threads.h
deleted file mode 100644
index 62c60b878..000000000
--- a/mail/balsa/files/patch-src_threads.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/threads.h.orig	Tue Dec 31 14:06:47 2002
-+++ src/threads.h	Tue Dec 31 14:07:32 2002
-@@ -21,6 +21,9 @@
- 
- #ifndef __THREADS_H__
- #define __THREADS_H__
-+
-+#include <pthread.h>
-+
- /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
- extern pthread_mutex_t mailbox_lock;
- 
diff --git a/mail/balsa/pkg-descr b/mail/balsa/pkg-descr
deleted file mode 100644
index 06d18a364..000000000
--- a/mail/balsa/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-A mail reader for GNOME 2. It supports local mail, pop3, and IMAP. It can
-view mail files in mbox, maildir, and mh format.
-
-The pop3 support is not complete. All mail retrieved will be left on the
-server, and hence retrieved again if not deleted through some other pop3
-client. Using fetchmail would be recommended to retrieve pop3 mail.
-
-Balsa is probably not fully usable as one's primary mail client at this
-time.  However, it is under active development and fits with other gnome
-applications.
-
-WWW: http://balsa.gnome.org/
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
deleted file mode 100644
index 86029ee2a..000000000
--- a/mail/balsa/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-bin/balsa
-bin/balsa-ab
-etc/sound/events/balsa.soundlist
-libdata/bonobo/servers/GNOME_Balsa.server
-share/gnome/applications/balsa.desktop
-share/gnome/balsa/hicolor/16x16/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-good.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
-share/gnome/balsa/hicolor/22x22
-share/gnome/balsa/hicolor/24x24/apps/balsa-crypt-check.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypt.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-marked-new.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-preview.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-sign.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-good.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-trash-empty.png
-share/gnome/balsa/hicolor/icon-theme.cache
-share/gnome/balsa/pixmaps/attachment.png
-share/gnome/balsa/pixmaps/balsa-logo.png
-share/gnome/balsa/pixmaps/balsa-top.png
-share/gnome/balsa/pixmaps/balsa-watermark.png
-share/gnome/balsa/pixmaps/balsa_icon.png
-share/gnome/balsa/pixmaps/balsa_logo.png
-share/gnome/help/balsa/C/balsa.xml
-share/gnome/help/balsa/C/fdl-appendix.xml
-share/gnome/help/balsa/C/figures/address-book-ldap.png
-share/gnome/help/balsa/C/figures/address-book-modify.png
-share/gnome/help/balsa/C/figures/address-book-start.png
-share/gnome/help/balsa/C/figures/address-book-vcard.png
-share/gnome/help/balsa/C/figures/address-book.png
-share/gnome/help/balsa/C/figures/balsa_logo.png
-share/gnome/help/balsa/C/figures/druid-start.png
-share/gnome/help/balsa/C/figures/example-alias.png
-share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/C/figures/main-window-toolbar.png
-share/gnome/help/balsa/C/figures/main-window.png
-share/gnome/help/balsa/C/figures/message-window.png
-share/gnome/help/balsa/C/figures/msg-part-select.png
-share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/figures/newmsg-window.png
-share/gnome/help/balsa/C/figures/preferences-window.png
-share/gnome/help/balsa/C/figures/spell-check.png
-share/gnome/idl/Balsa.idl
-share/gnome/omf/balsa/balsa-C.omf
-share/gnome/pixmaps/gnome-balsa2.png
-share/gnome/sounds/balsa/newmail.wav
-share/gnome/sounds/balsa/startup.wav
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-disposition-notification.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-external-body.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-alternative.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-encrypted.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-signed.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart.png
-share/locale/am/LC_MESSAGES/balsa.mo
-share/locale/az/LC_MESSAGES/balsa.mo
-share/locale/bg/LC_MESSAGES/balsa.mo
-share/locale/ca/LC_MESSAGES/balsa.mo
-share/locale/cs/LC_MESSAGES/balsa.mo
-share/locale/da/LC_MESSAGES/balsa.mo
-share/locale/de/LC_MESSAGES/balsa.mo
-share/locale/el/LC_MESSAGES/balsa.mo
-share/locale/en_CA/LC_MESSAGES/balsa.mo
-share/locale/en_GB/LC_MESSAGES/balsa.mo
-share/locale/es/LC_MESSAGES/balsa.mo
-share/locale/et/LC_MESSAGES/balsa.mo
-share/locale/fi/LC_MESSAGES/balsa.mo
-share/locale/fr/LC_MESSAGES/balsa.mo
-share/locale/ga/LC_MESSAGES/balsa.mo
-share/locale/he/LC_MESSAGES/balsa.mo
-share/locale/hi/LC_MESSAGES/balsa.mo
-share/locale/hr/LC_MESSAGES/balsa.mo
-share/locale/hu/LC_MESSAGES/balsa.mo
-share/locale/id/LC_MESSAGES/balsa.mo
-share/locale/it/LC_MESSAGES/balsa.mo
-share/locale/ja/LC_MESSAGES/balsa.mo
-share/locale/ko/LC_MESSAGES/balsa.mo
-share/locale/lt/LC_MESSAGES/balsa.mo
-share/locale/lv/LC_MESSAGES/balsa.mo
-share/locale/ml/LC_MESSAGES/balsa.mo
-share/locale/ms/LC_MESSAGES/balsa.mo
-share/locale/nb/LC_MESSAGES/balsa.mo
-share/locale/ne/LC_MESSAGES/balsa.mo
-share/locale/nl/LC_MESSAGES/balsa.mo
-share/locale/nn/LC_MESSAGES/balsa.mo
-share/locale/pa/LC_MESSAGES/balsa.mo
-share/locale/pl/LC_MESSAGES/balsa.mo
-share/locale/pt/LC_MESSAGES/balsa.mo
-share/locale/pt_BR/LC_MESSAGES/balsa.mo
-share/locale/ro/LC_MESSAGES/balsa.mo
-share/locale/ru/LC_MESSAGES/balsa.mo
-share/locale/rw/LC_MESSAGES/balsa.mo
-share/locale/sk/LC_MESSAGES/balsa.mo
-share/locale/sl/LC_MESSAGES/balsa.mo
-share/locale/sq/LC_MESSAGES/balsa.mo
-share/locale/sr/LC_MESSAGES/balsa.mo
-share/locale/sr@Latn/LC_MESSAGES/balsa.mo
-share/locale/sv/LC_MESSAGES/balsa.mo
-share/locale/tr/LC_MESSAGES/balsa.mo
-share/locale/uk/LC_MESSAGES/balsa.mo
-share/locale/vi/LC_MESSAGES/balsa.mo
-share/locale/wa/LC_MESSAGES/balsa.mo
-share/locale/zh_CN/LC_MESSAGES/balsa.mo
-share/locale/zh_HK/LC_MESSAGES/balsa.mo
-share/locale/zh_TW/LC_MESSAGES/balsa.mo
-@dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/omf/balsa
-%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
-@dirrm share/gnome/help/balsa/C/figures
-@dirrm share/gnome/help/balsa/C
-@dirrm share/gnome/help/balsa
-@dirrm share/gnome/balsa/pixmaps
-@dirrm share/gnome/balsa/hicolor/24x24/apps
-@dirrm share/gnome/balsa/hicolor/24x24
-@dirrm share/gnome/balsa/hicolor/16x16/apps
-@dirrm share/gnome/balsa/hicolor/16x16
-@dirrm share/gnome/balsa/hicolor
-@dirrm share/gnome/balsa
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
deleted file mode 100644
index e969f21e7..000000000
--- a/mail/contact-lookup-applet/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	contact lookup applet
-# Date created:				22 January 2004
-# Whom:					kwm@rainbow-runner.nl
-#
-# $FreeBSD$
-#    $MCom$
-
-PORTNAME=	contact
-PORTVERSION=	0.14
-PORTREVISION=	1
-CATEGORIES=	mail gnome
-MASTER_SITES=	http://www.burtonini.com/computing/
-PKGNAMESUFFIX=	-lookup-applet
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gnome panel applet for easy Evolution contact book access
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehier gnomeprefix gnomehack gnomepanel \
-		evolutiondataserver gal2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|mkdir}"|mkdir} -p"|g' \
-		${WRKSRC}/install-sh
-
-.include <bsd.port.mk>
diff --git a/mail/contact-lookup-applet/distinfo b/mail/contact-lookup-applet/distinfo
deleted file mode 100644
index 71e0cdc5b..000000000
--- a/mail/contact-lookup-applet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (contact-lookup-applet-0.14.tar.gz) = 53b7d3a55ce7f50dae06f2c896cb1677
-SHA256 (contact-lookup-applet-0.14.tar.gz) = 2f5dfbe6f71b47698ec031f11ba2c21d53bcc148595f4fc8aa3278944931cb11
-SIZE (contact-lookup-applet-0.14.tar.gz) = 421627
diff --git a/mail/contact-lookup-applet/files/patch-src_contact-dialog.c b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
deleted file mode 100644
index 52ab8653e..000000000
--- a/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/contact-dialog.c.orig	Sat Sep 30 19:56:51 2006
-+++ src/contact-dialog.c	Sat Sep 30 19:57:14 2006
-@@ -260,7 +260,7 @@
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--      if (!gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL)) {
-+      if (!gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL)) {
-         gtk_widget_hide (photo_frame);
-       } else if( (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL ) {
-         GdkPixbuf *tmp;
diff --git a/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
deleted file mode 100644
index 2ce6c8e62..000000000
--- a/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/e-contact-entry.c.orig	Sat Sep 30 19:54:33 2006
-+++ src/e-contact-entry.c	Sat Sep 30 19:56:09 2006
-@@ -261,8 +261,8 @@
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
--			      photo->length, NULL))
-+      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
-+			      photo->data.inlined.length, NULL))
-         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 
-       if (pixbuf) {
diff --git a/mail/contact-lookup-applet/pkg-descr b/mail/contact-lookup-applet/pkg-descr
deleted file mode 100644
index 71e405abb..000000000
--- a/mail/contact-lookup-applet/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Contact Lookup Applet is a gnome panel tool to look up people using the
-Evolution data server backend.
-
-WWW: http://www.burtonini.com/
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
deleted file mode 100644
index 7c6a8865f..000000000
--- a/mail/contact-lookup-applet/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-libdata/bonobo/servers/GNOME_ContactLookupApplet.server
-libexec/contact-lookup-applet
-share/gnome/lookup-applet/GNOME_ContactLookupApplet.xml
-share/gnome/lookup-applet/contact-lookup-applet.glade
-share/locale/bg/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/ca/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/cs/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/de/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/el/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/en_CA/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/es/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/eu/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/fr/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/hu/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/it/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/ja/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/lt/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/nb/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/ne/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/pa/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/pl/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/pt_BR/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/rw/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/sk/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/sq/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/sr/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/sr@Latn/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/sv/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/uk/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
-share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
-@dirrm share/gnome/lookup-applet
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
deleted file mode 100644
index aed7a9ef1..000000000
--- a/mail/enigmail-thunderbird/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:	enigmail
-# Date created:			20 January 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	enigmail
-PORTVERSION=	0.94.1
-PORTREVISION=	1
-CATEGORIES=	mail security
-MASTER_SITES=	http://www.mozilla-enigmail.org/downloads/src/
-PKGNAMEPREFIX?=	thunderbird-
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	A GnuPG extension for the Thunderbird mail client
-
-EXTRACT_DEPENDS=${GECKO_WRKSRC}/configure:${PORTSDIR}/${GECKO_PORTDIR}:patch
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		nspr4:${PORTSDIR}/devel/nspr \
-		nss3:${PORTSDIR}/security/nss \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS=	${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
-		gpg:${PORTSDIR}/security/gnupg
-
-GECKO=		${PKGNAMEPREFIX:S/-//}
-.if ${GECKO} == "thunderbird"
-GECKO_PORTDIR=	mail/${GECKO}
-.else
-GECKO_PORTDIR=	www/${GECKO}
-.endif
-GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
-WRKSRC=		${WRKDIR}/mozilla
-
-USE_GMAKE=	yes
-USE_GCC=	3.4+
-USE_GNOME=	gtk20 libidl desktopfileutils
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-CFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
-
-XPI_FILE=	${DISTNAME}-${GECKO}-freebsd-${ARCH}.xpi
-PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
-PLIST_DIRS=	%%DATADIR%%
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@${CP} -R ${GECKO_WRKSRC} ${WRKSRC}
-	@for f in ${EXTRACT_ONLY}; do \
-		cd ${WRKSRC}/mailnews/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \
-	done
-
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export)
-	@(cd ${WRKSRC}/modules/libreg; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom/string; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom/obsolete; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
-	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} xpi);
-
-do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH}.xpi ${DATADIR}/${XPI_FILE}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/enigmail-thunderbird/distinfo b/mail/enigmail-thunderbird/distinfo
deleted file mode 100644
index 7316cbd8f..000000000
--- a/mail/enigmail-thunderbird/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (enigmail-0.94.1.tar.gz) = b255e7a77ecea435934bfa1872e99f6a
-SHA256 (enigmail-0.94.1.tar.gz) = 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1
-SIZE (enigmail-0.94.1.tar.gz) = 513084
diff --git a/mail/enigmail-thunderbird/pkg-descr b/mail/enigmail-thunderbird/pkg-descr
deleted file mode 100644
index d3a91c99f..000000000
--- a/mail/enigmail-thunderbird/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Enigmail is an extension to the Thunderbird / Seamonkey mail client
-which allows users to access the authentication and encryption features
-provided by the popular GnuPG software.
-
-Enigmail can encrypt/sign mail when sending, and also decrypt/authenticate
-received mail. It can also import/export public keys. Enigmail supports
-both the inline PGP format, and the PGP/MIME format (RFC 3156), which can
-be used to encrypt attachments.
-
-WWW: http://enigmail.mozdev.org/
-
-- Alex Dupre
-ale@FreeBSD.org
diff --git a/mail/enigmail-thunderbird/pkg-message b/mail/enigmail-thunderbird/pkg-message
deleted file mode 100644
index 8ec572dc6..000000000
--- a/mail/enigmail-thunderbird/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-*****************************************************************************
-In order to activate the Enigmail extension, every user should install the 
-XPI file into his own profile via the menu:
-
-Tools -> Extensions -> Install
-
-*****************************************************************************
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
deleted file mode 100644
index ecd516765..000000000
--- a/mail/enigmail/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# New ports collection makefile for:	enigmail
-# Date created:			20 January 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	enigmail
-PORTVERSION?=	0.93.0
-PORTREVISION?=	2
-CATEGORIES=	mail security
-MASTER_SITES=	\
-		http://mozdev.secsup.org/enigmail/src/ \
-		http://downloads.us-east3.mozdev.org/enigmail/src/ \
-		http://mozdev.oregonstate.edu/enigmail/src/ \
-		http://mozdev.sweetooth.org/enigmail/src/ \
-		http://ftp.heanet.ie/pub/mozdev/enigmail/src/ \
-		http://mirror.meisterwerk.net/rmozdev/enigmail/src/
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		ipc-${IPCVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	A GnuPG extension for the Mozilla mail client
-
-EXTRACT_DEPENDS?=	${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla/Makefile:${PORTSDIR}/${LOCAL_SRCDIR}:configure \
-		zip:${PORTSDIR}/archivers/zip \
-		gmake:${PORTSDIR}/devel/gmake \
-		intltool-extract:${PORTSDIR}/textproc/intltool
-BUILD_DEPENDS?=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS?=	nspr4:${PORTSDIR}/devel/nspr
-RUN_DEPENDS?=	mozilla:${PORTSDIR}/${LOCAL_SRCDIR}
-
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-
-IPCVERSION?=	1.1.3
-
-USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
-
-WRKSRC=		${WRKDIR}/mozilla
-LOCAL_SRCDIR?=	www/mozilla
-LOCAL_SUBDIR?=	lib/mozilla
-LOCAL_PREFIX=	${PREFIX}/${LOCAL_SUBDIR}
-
-COMPONENTS=	ipc.xpt enigmime.xpt libenigmime.so enigmail.xpt enigmail.js enigprefs-service.js
-CHROME=		enigmime.jar enigmail.jar enigmail-skin.jar enigmail-skin-tbird.jar
-PREF=		enigmail.js
-
-PLIST_SUB=	LOCAL_SUBDIR=${LOCAL_SUBDIR}
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@${CP} -R ${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla ${WRKSRC}
-	@for f in ${EXTRACT_ONLY}; do \
-		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \
-	done
-
-pre-patch:
-	@${REINPLACE_CMD} -e "s|${LOCAL_SRCDIR}|mail/enigmail${PKGNAMESUFFIX}|g" \
-		`${FIND} ${WRKSRC} -name autoconf.mk`
-
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export)
-	@(cd ${WRKSRC}/modules/libreg; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom/string; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/xpcom/obsolete; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/extensions/ipc; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
-	@(cd ${WRKSRC}/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
-
-do-install:
-	@for f in ${COMPONENTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$f ${LOCAL_PREFIX}/components; \
-	done
-	@for f in ${CHROME}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$f ${LOCAL_PREFIX}/chrome; \
-	done
-	@for f in ${PREF}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/defaults/pref/$$f ${LOCAL_PREFIX}/defaults/pref; \
-	done
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
deleted file mode 100644
index 94c71ae32..000000000
--- a/mail/enigmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (enigmail-0.93.0.tar.gz) = cb7126705924cb7f0de205b4ff4e28b4
-SHA256 (enigmail-0.93.0.tar.gz) = 9b3883ee7f44dd4056c7243fe5c8f6fe05cccd76c661e8bf820641d2e891a376
-SIZE (enigmail-0.93.0.tar.gz) = 404411
-MD5 (ipc-1.1.3.tar.gz) = 64ba4c6e3b52568468c4f6680ec7e679
-SHA256 (ipc-1.1.3.tar.gz) = 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725
-SIZE (ipc-1.1.3.tar.gz) = 102593
diff --git a/mail/enigmail/pkg-deinstall b/mail/enigmail/pkg-deinstall
deleted file mode 100644
index 21a24bd8e..000000000
--- a/mail/enigmail/pkg-deinstall
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if test "$2" = "POST-DEINSTALL"; then
-FILE=${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt
-cp ${FILE} ${FILE}.orig
-cat ${FILE}.orig | grep -v enigmime | grep -v enigmail > ${FILE}
-rm ${FILE}.orig
-fi
diff --git a/mail/enigmail/pkg-descr b/mail/enigmail/pkg-descr
deleted file mode 100644
index eaeab702b..000000000
--- a/mail/enigmail/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Enigmail is an extension to the mail client of Mozilla / Thunderbird
-which allows users to access the authentication and encryption features
-provided by the popular GnuPG software.
-
-Enigmail can encrypt/sign mail when sending, and also decrypt/authenticate
-received mail. It can also import/export public keys. Enigmail supports
-both the inline PGP format, and the PGP/MIME format (RFC 3156), which can
-be used to encrypt attachments.
-
-WWW: http://enigmail.mozdev.org/
-
-- Alex Dupre
-ale@FreeBSD.org
diff --git a/mail/enigmail/pkg-install b/mail/enigmail/pkg-install
deleted file mode 100644
index 5a7d83391..000000000
--- a/mail/enigmail/pkg-install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if test "$2" = "POST-INSTALL"; then
-cat << EOF >> ${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt
-skin,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
-locale,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
-content,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
-skin,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
-locale,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
-content,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
-skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/modern/enigmail/
-skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/classic/enigmail/
-locale,install,url,jar:resource:/chrome/enigmail.jar!/locale/en-US/enigmail/
-EOF
-fi
diff --git a/mail/enigmail/pkg-message b/mail/enigmail/pkg-message
deleted file mode 100644
index e20b967ea..000000000
--- a/mail/enigmail/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-*****************************************************************************
-You have to manually delete the components database (compreg.dat), located in
-your profile directory in order to use enigmail.
-
-If you upgraded Mozilla/Thunderbird from a previous release you have to
-remove also the XUL.mfasl file and the content of the chrome subdirectory.
-*****************************************************************************
diff --git a/mail/enigmail/pkg-plist b/mail/enigmail/pkg-plist
deleted file mode 100644
index c1f4a711b..000000000
--- a/mail/enigmail/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%LOCAL_SUBDIR%%/components/ipc.xpt
-%%LOCAL_SUBDIR%%/components/enigmime.xpt
-%%LOCAL_SUBDIR%%/components/libenigmime.so
-%%LOCAL_SUBDIR%%/components/enigmail.xpt
-%%LOCAL_SUBDIR%%/components/enigmail.js
-%%LOCAL_SUBDIR%%/components/enigprefs-service.js
-%%LOCAL_SUBDIR%%/chrome/enigmail.jar
-%%LOCAL_SUBDIR%%/chrome/enigmail-skin.jar
-%%LOCAL_SUBDIR%%/chrome/enigmail-skin-tbird.jar
-%%LOCAL_SUBDIR%%/chrome/enigmime.jar
-%%LOCAL_SUBDIR%%/defaults/pref/enigmail.js
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
deleted file mode 100644
index 767439ed5..000000000
--- a/mail/evolution-exchange/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:	evolution-exchange
-# Date created:				28 April, 2005
-# Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
-#
-# $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.69 2006/09/04 19:08:06 ahze Exp $
-#
-
-PORTNAME=	evolution-exchange
-PORTVERSION=	2.8.1
-CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
-
-BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
-		--with-static-ldap=no \
-		--disable-compile-warnings
-
-EVO_VERSION=	2.8
-PLIST_SUB=	VERSION="2.8" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
-		OLDDOCSDIR="share/doc/ximian-connector"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-.else
-LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
-.endif
-.endif
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
deleted file mode 100644
index 10db56d5e..000000000
--- a/mail/evolution-exchange/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/evolution-exchange-2.8.1.tar.bz2) = f4dfdfed72eb705adefbaff0b575fb10
-SHA256 (gnome2/evolution-exchange-2.8.1.tar.bz2) = f891a7a0c3aae94942a70f646ba3f6386d55e7234b67bae62b2f03a4c0df06e0
-SIZE (gnome2/evolution-exchange-2.8.1.tar.bz2) = 1029601
diff --git a/mail/evolution-exchange/pkg-descr b/mail/evolution-exchange/pkg-descr
deleted file mode 100644
index 03dc3b673..000000000
--- a/mail/evolution-exchange/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Evolution-exchange is a plugin for Evolution that adds Exchange client
-capabilities to Evolution.
-
-With Evolution-Exchange installed, Evolution functions as an
-Exchange client, enabling users to become full participants in company-wide
-group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD
-users can access public folders, Global Address Lists, email, calendar,
-task lists, and group scheduling information.
-
-- Alex Kiesel
-kiesel@schlund.de
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
deleted file mode 100644
index d378103d0..000000000
--- a/mail/evolution-exchange/pkg-plist
+++ /dev/null
@@ -1,192 +0,0 @@
-bin/exchange-connector-setup-%%VERSION%%
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.a
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.la
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
-libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
-libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
-%%OLDDOCSDIR%%/E2kContext.html
-%%OLDDOCSDIR%%/E2kGlobalCatalog.html
-%%OLDDOCSDIR%%/E2kSecurityDescriptor.html
-%%OLDDOCSDIR%%/ch01.html
-%%OLDDOCSDIR%%/ch02.html
-%%OLDDOCSDIR%%/ch03.html
-%%OLDDOCSDIR%%/ch04.html
-%%OLDDOCSDIR%%/ch05.html
-%%OLDDOCSDIR%%/ch06.html
-%%OLDDOCSDIR%%/home.png
-%%OLDDOCSDIR%%/index.html
-%%OLDDOCSDIR%%/index.sgml
-%%OLDDOCSDIR%%/left.png
-%%OLDDOCSDIR%%/right.png
-%%OLDDOCSDIR%%/style.css
-%%OLDDOCSDIR%%/up.png
-%%OLDDOCSDIR%%/ximian-connector-E2kAutoconfig.html
-%%OLDDOCSDIR%%/ximian-connector-E2kContext-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kOperation-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kOperation.html
-%%OLDDOCSDIR%%/ximian-connector-E2kProperties.html
-%%OLDDOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
-%%OLDDOCSDIR%%/ximian-connector-E2kResult-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kSid.html
-%%OLDDOCSDIR%%/ximian-connector-E2kUserDialog.html
-%%OLDDOCSDIR%%/ximian-connector-MAPI.html
-%%OLDDOCSDIR%%/ximian-connector-autoconfig.html
-%%OLDDOCSDIR%%/ximian-connector-bug-private.html
-%%OLDDOCSDIR%%/ximian-connector-bug-xml.html
-%%OLDDOCSDIR%%/ximian-connector-calendar.html
-%%OLDDOCSDIR%%/ximian-connector-delegation.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-action.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-encoding-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-freebusy.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-http-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-kerberos.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-restriction.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-result.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-rule.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-uri.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-xml-utils.html
-%%OLDDOCSDIR%%/ximian-connector-favorites.html
-%%OLDDOCSDIR%%/ximian-connector-fba.html
-%%OLDDOCSDIR%%/ximian-connector-freebusy.html
-%%OLDDOCSDIR%%/ximian-connector-mail-threading.html
-%%OLDDOCSDIR%%/ximian-connector-mail.html
-%%OLDDOCSDIR%%/ximian-connector-ntlm.html
-%%OLDDOCSDIR%%/ximian-connector-oof.html
-%%OLDDOCSDIR%%/ximian-connector-other-users.html
-%%OLDDOCSDIR%%/ximian-connector-permissions.html
-%%OLDDOCSDIR%%/ximian-connector-test-utils.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm-des.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm-md4.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm.html
-%%OLDDOCSDIR%%/ximian-connector.devhelp
-%%OLDDOCSDIR%%/ximian-connector.devhelp2
-%%OLDDOCSDIR%%/ximian-connnector-booking.html
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-change-password.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-delegates.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-folder-tree.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-oof.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-passwd-expiry.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-permissions-dialog.glade
-share/gnome/evolution-exchange/%%VERSION%%/images/connector-mini.png
-share/gnome/evolution-exchange/%%VERSION%%/images/connector.png
-share/gnome/evolution-exchange/%%VERSION%%/images/exchange-delegates-48.png
-share/gnome/evolution-exchange/%%VERSION%%/images/exchange-oof-48.png
-share/gnome/evolution-exchange/%%VERSION%%/ui/ximian-connector.xml
-share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
-@dirrm share/gnome/evolution-exchange/%%VERSION%%
-@dirrm share/gnome/evolution-exchange
-@dirrm %%OLDDOCSDIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
deleted file mode 100644
index 5527f6f5d..000000000
--- a/mail/evolution-sharp/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:		evolution-sharp
-# Date created:					20041012
-# Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
-# $FreeBSD$
-#   $Id: Makefile,v 1.1 2006-10-08 17:10:51 mezz Exp $
-#
-
-PORTNAME=	evolution-sharp
-PORTVERSION=	0.11.1
-PORTREVISION=	1
-CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
-
-MAINTAINER=	bsd-sharp-list@forge.novell.com
-COMMENT=	Mono bindings for evolution
-
-BUILD_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
-		evolution:${PORTSDIR}/mail/evolution
-RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
-		evolution:${PORTSDIR}/mail/evolution
-
-USE_GNOME=	gnomehack evolutiondataserver
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-
-post-patch:
-	@${REINPLACE_CMD}  's|eshellver="2.6"|eshellver="2.8"|g ; \
-		s|evolution-shell-2.6|evolution-shell-2.8|g' \
-			${WRKSRC}/configure
-	@${REINPLACE_CMD} 's|.@EBOOK_SOVERSION@||g ; \
-		s|.@ECAL_SOVERSION@||g ; \
-		s|.@EDS_SOVERSION@||g' \
-		${WRKSRC}/evolution/evolution-sharp.dll.config.in
-
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.mk>
diff --git a/mail/evolution-sharp/distinfo b/mail/evolution-sharp/distinfo
deleted file mode 100644
index 5f5431d28..000000000
--- a/mail/evolution-sharp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (evolution-sharp-0.11.1.tar.bz2) = d1bf31c7c9dda9ba012e169981626cce
-SHA256 (evolution-sharp-0.11.1.tar.bz2) = ad519f0f3b02f2bba671d95c77bf8862a1b283cf4bafda252e031d147b153cf1
-SIZE (evolution-sharp-0.11.1.tar.bz2) = 305490
diff --git a/mail/evolution-sharp/files/patch-evolution::Makefile.in b/mail/evolution-sharp/files/patch-evolution::Makefile.in
deleted file mode 100644
index 8142f4ec7..000000000
--- a/mail/evolution-sharp/files/patch-evolution::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- evolution/Makefile.in.orig	Thu Mar  3 00:28:29 2005
-+++ evolution/Makefile.in	Thu Mar  3 00:44:28 2005
-@@ -364,14 +364,14 @@
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then									\
--	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
--	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;		\
-+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";		\
-+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1;		\
- 	fi
- 
- uninstall-local:
- 	@if test -n '$(TARGET)'; then									\
--	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
--	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
-+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";		\
-+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1;	\
- 	fi
- 
- evolution-sharp.pub: $(top_srcdir)/evolution-sharp.pub
diff --git a/mail/evolution-sharp/files/patch-evolution_src_GLibUtil.cs b/mail/evolution-sharp/files/patch-evolution_src_GLibUtil.cs
deleted file mode 100644
index b39595d3e..000000000
--- a/mail/evolution-sharp/files/patch-evolution_src_GLibUtil.cs
+++ /dev/null
@@ -1,20 +0,0 @@
---- evolution/src/GLibUtil.cs.orig	Mon Sep 12 16:49:54 2005
-+++ evolution/src/GLibUtil.cs	Mon Oct  3 23:49:21 2005
-@@ -10,7 +10,7 @@
- 			return ((int)time.Subtract (local_epoch).TotalSeconds);
- 		}
- 	
--		[DllImport("libglib-2.0.so.0")]
-+		[DllImport("libglib-2.0.so")]
- 		public static extern int g_slist_length (IntPtr slist);
- 		
-                 [DllImport("glibsharpglue")]
-@@ -19,7 +19,7 @@
- 		[DllImport("glibsharpglue")]
- 		public static extern  IntPtr gtksharp_slist_get_next (IntPtr slist);
-  
--		[DllImport("libglib-2.0.so.0")]
-+		[DllImport("libglib-2.0.so")]
- 		public static extern void g_slist_free (IntPtr slist);
- 
- 		public static string[] GLibSListToStringArray (IntPtr slist, bool free_list_mem)
diff --git a/mail/evolution-sharp/pkg-descr b/mail/evolution-sharp/pkg-descr
deleted file mode 100644
index c9c5ef4d4..000000000
--- a/mail/evolution-sharp/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Evolution# is a .NET language binding for various Ximian Evolution (tm)
-libraries.
-
-WWW: http://www.gnome.org
diff --git a/mail/evolution-sharp/pkg-plist b/mail/evolution-sharp/pkg-plist
deleted file mode 100644
index 43616eb66..000000000
--- a/mail/evolution-sharp/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/libevolutionglue.a
-lib/libevolutionglue.la
-lib/libevolutionglue.so
-lib/mono/evolution-sharp/evolution-sharp.dll
-lib/mono/gac/evolution-sharp/2.0.0.0__457eed85bd9370df/evolution-sharp.dll
-lib/mono/gac/evolution-sharp/2.0.0.0__457eed85bd9370df/evolution-sharp.dll.config
-lib/mono/gac/evolution-sharp/2.0.0.0__457eed85bd9370df/evolution-sharp.dll.mdb
-libdata/pkgconfig/evolution-sharp.pc
-share/gapi-2.0/evolution-api.xml
-@dirrm lib/mono/gac/evolution-sharp/2.0.0.0__457eed85bd9370df
-@dirrm lib/mono/gac/evolution-sharp
-@dirrm lib/mono/evolution-sharp
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
deleted file mode 100644
index 214162559..000000000
--- a/mail/evolution/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# New ports collection makefile for:	evolution
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.118 2006/10/03 01:57:47 ahze Exp $
-#
-
-PORTNAME=	evolution
-PORTVERSION=	2.8.1
-PORTREVISION=	1
-CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An integrated mail, calendar and address book distributed suite
-
-LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_BISON=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
-		gtkhtml3 desktopfileutils
-GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
-CONFIGURE_ARGS=	--enable-nss=yes \
-		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib \
-		--with-nspr-includes=${LOCALBASE}/include/nspr \
-		--with-nspr-libs=${LOCALBASE}/lib \
-		--enable-mono=no \
-		--with-sub-version=" FreeBSD GNOME Team Port"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
-		apps_evolution_calendar-${EVO_VERSION}.schemas \
-		apps-evolution-mail-prompts-checkdefault-${EVO_VERSION}.schemas \
-		apps_evolution_shell-${EVO_VERSION}.schemas \
-		evolution-mail-${EVO_VERSION}.schemas
-
-EVO_VERSION=	2.8
-PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.8
-
-OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
-		LDAP "Enable LDAP support" on \
-		SPAMASSASSIN "Enable SpamAssassin spam filtering" off
-
-.include <bsd.port.pre.mk>
-
-USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
-
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-WITH_GSTREAMER=	yes
-WITH_DBUS=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libdbus-glib-1.so)
-WITH_DBUS=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libgstreamer-0.8.so)
-WITH_GSTREAMER=	yes
-.endif
-
-.if defined(WITH_PILOT)
-LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
-CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
-			--enable-pilot-conduits=yes
-PLIST_SUB+=	PILOT:=""
-.else
-PLIST_SUB+=	PILOT:="@comment "
-.endif
-
-.if !defined(WITHOUT_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-openldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-openldap=no
-.endif
-
-.if defined(WITH_SPAMASSASSIN)
-RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-.endif
-
-.if defined(WITH_GSTREAMER)
-LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
-PLIST_SUB+=	GSTREAMER=""
-.else
-PLIST_SUB+=	GSTREAMER="@comment "
-.endif
-
-.if defined(WITH_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-PLIST_SUB+=	DBUS=""
-.else
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-.else
-LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
-.endif
-.endif
-
-post-install: install-ldconfig-file
-	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
-		${PREFIX}/bin/evolution
-	-@update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
deleted file mode 100644
index 079c04195..000000000
--- a/mail/evolution/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/evolution-2.8.1.tar.bz2) = 6a08d1121bc126c4ed7035ab94a09871
-SHA256 (gnome2/evolution-2.8.1.tar.bz2) = 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b
-SIZE (gnome2/evolution-2.8.1.tar.bz2) = 12873039
diff --git a/mail/evolution/files/patch-90_build_with_new_pisock b/mail/evolution/files/patch-90_build_with_new_pisock
deleted file mode 100644
index ffa26563c..000000000
--- a/mail/evolution/files/patch-90_build_with_new_pisock
+++ /dev/null
@@ -1,907 +0,0 @@
-diff -Nur evolution-2.8.0/addressbook/conduit/address-conduit.c evolution-2.8.0.new/addressbook/conduit/address-conduit.c
---- addressbook/conduit/address-conduit.c.orig	2005-12-06 09:43:37.000000000 +0100
-+++ addressbook/conduit/address-conduit.c	2006-09-20 18:47:49.000000000 +0200
-@@ -462,6 +462,7 @@
- {
- 	static char buff[ 4096 ];
- 	struct Address addr;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -469,7 +470,10 @@
- 	}
- 
- 	memset (&addr, 0, sizeof (struct Address));
--	unpack_Address (&addr, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Address(&addr, &piBuf, address_v1);
- 
- 	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
- 		    addr.entry[entryLastname] ?
-@@ -786,12 +790,23 @@
- 	}
- }
- 
-+/* convert a local EAddrLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution address record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EAddrLocalRecord *local,
--			      EAddrConduitContext *ctxt)
-+			      EAddrConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 	
- 	g_assert (local->addr != NULL );
- 	
-@@ -802,10 +817,25 @@
- 	p.attr = local->local.attr;
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
-+	
-+	memset(record, 0, maxRecordLen);
- 
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Address (local->addr, p.record, 0xffff);
-+	{
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Address(local->addr, &piBuf, address_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -834,16 +864,26 @@
- 	 */
- 	if (local->local.ID != 0) {
- 		struct Address addr;
--		char record[0xffff];
-+		pi_buffer_t *piBuf;
- 		int cat = 0;
-+		int dlpReadRetval = 0;
-+
- 		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_ecard: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+		                                  ctxt->dbi->db_handle,
-+		                                  local->local.ID, piBuf,
-+		                                  NULL, NULL, &cat);
-+
-+
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 			memset (&addr, 0, sizeof (struct Address));
--			unpack_Address (&addr, record, 0xffff);
-+			unpack_Address(&addr, piBuf, address_v1);
- 			for (i = 0; i < 5; i++) {
- 				if (addr.entry[entryPhone1 + i])
- 					local->addr->entry[entryPhone1 + i] = 
-@@ -858,6 +898,8 @@
- 			}
- 			free_Address (&addr);
- 		}
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 
- 	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-@@ -1022,7 +1064,13 @@
- 
- 	g_return_val_if_fail(remote!=NULL,NULL);
- 	memset (&address, 0, sizeof (struct Address));
--	unpack_Address (&address, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Address(&address, &piBuf, address_v1);
-+	}
- 
- 	if (in_contact == NULL)
- 		contact = e_contact_new ();
-@@ -1212,7 +1260,7 @@
- 	EBookQuery *query;
-     	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename;
- 	char *change_id;
- 	char *auth;
-@@ -1302,9 +1350,14 @@
-   	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-   	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Address application block"));
-@@ -1313,8 +1366,8 @@
- 					   _("Could not read pilot's Address application block"));
- 		return -1;
- 	}
--	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AddressAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 
-   	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1494,6 +1547,7 @@
- {
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1501,7 +1555,7 @@
- 	g_return_val_if_fail (local != NULL, -1);
- 	g_return_val_if_fail (remote != NULL, -1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1693,9 +1747,11 @@
- 	 GnomePilotRecord *remote,
- 	 EAddrConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+	
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 	
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 	
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/calendar/calendar-conduit.c evolution-2.8.0.new/calendar/conduits/calendar/calendar-conduit.c
---- calendar/conduits/calendar/calendar-conduit.c.orig	2005-12-23 05:39:34.000000000 +0100
-+++ calendar/conduits/calendar/calendar-conduit.c	2006-09-20 18:48:56.000000000 +0200
-@@ -413,6 +413,7 @@
- {
- 	static char buff[ 4096 ];
- 	struct Appointment appt;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -420,7 +421,10 @@
- 	}
- 
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Appointment(&appt, &piBuf, datebook_v1);
- 
- 	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
- 		    mktime (&appt.begin),
-@@ -813,12 +817,23 @@
- 	return TRUE;
- }
- 
-+/* convert a local ECalLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution Calendar record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (ECalLocalRecord *local,
--			      ECalConduitContext *ctxt)
-+			      ECalConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->appt != NULL );
-@@ -829,9 +844,25 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-+	{
-+
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Appointment(local->appt, &piBuf, datebook_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -867,22 +898,31 @@
-          * we don't overwrite them 
- 	 */
- 	if (local->local.ID != 0) {
--		struct Appointment appt;		
--		char record[0xffff];
-+		struct Appointment appt;
-+		pi_buffer_t *piBuf;
- 		int cat = 0;
-+		int dlpReadRetval = 0;
- 		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-+						    ctxt->dbi->db_handle,
-+						    local->local.ID, piBuf,
-+						    NULL, NULL, &cat);
-+		
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 			memset (&appt, 0, sizeof (struct Appointment));
--			unpack_Appointment (&appt, record, 0xffff);
-+			unpack_Appointment (&appt, piBuf, datebook_v1);
- 			local->appt->alarm = appt.alarm;
- 			local->appt->advance = appt.advance;
- 			local->appt->advanceUnits = appt.advanceUnits;
- 			free_Appointment (&appt);
- 		}
-+		pi_buffer_free(piBuf);
- 	}
- 
- 	/* STOP: don't replace these with g_strdup, since free_Appointment
-@@ -1144,7 +1184,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Appointment(&appt, &piBuf, datebook_v1);
-+	}
- 
- 	if (in_comp == NULL) {
- 		comp = e_cal_component_new ();
-@@ -1409,7 +1455,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *removed = NULL, *added = NULL, *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1521,9 +1567,14 @@
- 	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- 	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock(dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Calendar application block"));
-@@ -1532,8 +1583,8 @@
- 					   _("Could not read pilot's Calendar application block"));
- 		return -1;
- 	}
--	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AppointmentAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 
- 	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1715,6 +1766,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1722,7 +1774,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1883,9 +1935,11 @@
- 	 GnomePilotRecord *remote,
- 	 ECalConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+	
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/memo/memo-conduit.c evolution-2.8.0.new/calendar/conduits/memo/memo-conduit.c
---- calendar/conduits/memo/memo-conduit.c.orig	2005-10-19 13:39:35.000000000 +0200
-+++ calendar/conduits/memo/memo-conduit.c	2006-09-20 18:49:46.000000000 +0200
-@@ -331,6 +331,7 @@
- {
- 	static char buff[ 64 ];
- 	struct Memo memo;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -338,7 +339,10 @@
- 	}
- 
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Memo(&memo, &piBuf, memo_v1);
- 
- 	g_snprintf (buff, 64, "['%s']",
- 		    memo.text ?
-@@ -446,12 +450,24 @@
- 	}
- }
- 
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EMemoLocalRecord *local,
--			      EMemoConduitContext *ctxt)
-+			      EMemoConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->memo != NULL );
-@@ -464,9 +480,25 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Memo (local->memo, p.record, 0xffff);
-+	{
-+
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Memo(local->memo, &piBuf, memo_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -483,53 +515,39 @@
- {
- 	int i, j;
- 	int retval = 0; /* 0 is the Unfiled category */
--	LOG(fprintf(stderr, "add_category_if_possible: called\n"));
-+	LOG(g_message("add_category_if_possible\n"));
- 	
- 	for(i=0; i<16; i++){
- 		/* if strlen is 0, then the category is empty
- 		   the PalmOS doesn't let 0-length strings for
- 		   categories */
--		LOG(fprintf(stderr, "add_category_if_possible: calling strlen, i==%d\n", i));
- 		if(strlen(category->name[i]) == 0){
- 			int cat_to_add_len;
--			LOG(fprintf(stderr, "add_category_if_possible: strlen == 0\n"));
- 			
- 			cat_to_add_len = strlen(cat_to_add);
--			LOG(fprintf(stderr, "add_category_if_possible: cat_to_add_len: %d\n",
--					cat_to_add_len));
- 			retval = i;
- 			
- 			/* only 15 characters for category, 16th is
- 			 * '\0' can't do direct mem transfer due to
- 			 * declaration type
- 			 */
--			LOG(fprintf(stderr, "add_category_if_possible: copying first 15 of category\n"));
- 			for(j=0; j<cat_to_add_len; j++){
- 				category->name[i][j] = cat_to_add[j];
- 			}
--			LOG(fprintf(stderr,
--				"add_category_if_possible: setting from %d to i==15 to \\0\n",
--				cat_to_add_len));
- 
- 			for(j=cat_to_add_len; j<16; j++)
- 				category->name[i][j] = '\0';
- 			
--			LOG(fprintf(stderr, "add_category_if_possible: setting ID[%d] to %d\n",
--				category->ID[i], lastDesktopUniqueID));
- 			category->ID[i] = lastDesktopUniqueID;
- 			lastDesktopUniqueID++;
--			
--			LOG(fprintf(stderr, "add_category_if_possible: setting renamed[%d] to TRUE\n", i));
- 			category->renamed[i] = TRUE;
- 			
--			LOG(g_message("*** adding category '%s', ID %d ***",
--				category->name[i], category->ID[i]));
- 			break;
- 		}
- 	}
- 	
- 	if(retval == 0){
--		LOG(g_message("*** not adding category - category list already full ***"));
-+		LOG(g_warning( _("*** not adding category - category list already full ***") ));
- 	}
- 	
- 	return retval;
-@@ -554,31 +572,35 @@
- 	local->comp = comp;
- 	g_object_ref (comp);
- 
--	LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_uid\n"));
- 	e_cal_component_get_uid (local->comp, &uid);
--	LOG(fprintf(stderr, "local_record_from_comp: got UID - %s, calling e_pilot_map_lookup_pid\n", uid));
- 	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
--	LOG(fprintf(stderr, "local_record_from_comp: local->local.ID == %lu\n", local->local.ID));
- 
- 	compute_status (ctxt, local, uid);
--	
--	LOG(fprintf(stderr, "local_record_from_comp: local->local.attr: %d\n", local->local.attr));
- 
- 	local->memo = g_new0 (struct Memo,1);
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
- 		int cat = 0;
-+		int dlpReadRetval = 0;
-+		pi_buffer_t *piBuf;
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
- 		
--		LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+						   ctxt->dbi->db_handle,
-+						   local->local.ID, piBuf,
-+						   NULL, NULL, &cat);
-+
-+		
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 		}
--		LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 	
- 	/*
-@@ -589,34 +611,23 @@
- 		int cat = -1;
- 		int i;
- 		
--		LOG(fprintf(stderr, "local_record_from_comp: trying to set category"));
--		LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_categories_list\n"));
--		
- 		e_cal_component_get_categories_list(comp, &categ_list_head);
--		LOG(fprintf(stderr, "local_record_from_comp: got list, setting categ_list_cur to head\n"));
- 		
- 		categ_list_cur = categ_list_head;
- 		while (categ_list_cur && cat == -1)
- 		{	
--			LOG(fprintf(stderr, "local_record_from_comp: iterating, data == %s",
--				(char *)categ_list_cur->data));
- 			for(i=0; i<16; i++){
--				LOG(fprintf(stderr, "local_record_from_comp: i == %d\n", i));
- 				if(strcmp((char *)categ_list_cur->data,
- 					  ctxt->ai.category.name[i]) == 0){
- 					cat = i;
--					LOG(fprintf(stderr, "local_record_from_comp: found category, name: %s\n",
--							ctxt->ai.category.name[i]));
- 					break;
- 				}
- 			}
- 			
--			LOG(fprintf(stderr, "local_record_from_comp: calling g_slist_next\n"));
- 			categ_list_cur = g_slist_next(categ_list_cur);
- 		}
- 		
- 		if(cat != -1){
--			LOG(fprintf(stderr, "local_record_from_comp: setting category\n"));
- 			local->local.category = cat;
- 		}
- 		else if(categ_list_head != NULL){
-@@ -708,7 +719,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Memo(&memo, &piBuf, memo_v1);
-+	}
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -836,7 +853,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -929,9 +946,14 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 		num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Memo application block"));
-@@ -940,8 +962,9 @@
- 					   _("Could not read pilot's Memo application block"));
- 		return -1;
- 	}
--	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	
-+	unpack_MemoAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 	
- 	lastDesktopUniqueID = 128;
- 
-@@ -963,6 +986,9 @@
- 	unsigned char *buf;
- 	int dlpRetVal, len;
- 
-+	/* Write AppBlock to PDA - updates categories */
-+	/* NOTE: not changed for pilot-link 0.12 because the two
-+	 * functions below didn't change */
- 	buf = (unsigned char*)g_malloc (0xffff);
- 	
- 	len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1156,6 +1182,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1163,7 +1190,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1319,9 +1346,10 @@
- 	 GnomePilotRecord *remote,
- 	 EMemoConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/todo/todo-conduit.c evolution-2.8.0.new/calendar/conduits/todo/todo-conduit.c
---- calendar/conduits/todo/todo-conduit.c.orig	2006-05-13 09:56:49.000000000 +0200
-+++ calendar/conduits/todo/todo-conduit.c	2006-09-20 18:50:31.000000000 +0200
-@@ -409,7 +409,13 @@
- 	}
- 
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_ToDo(&todo, &piBuf, todo_v1);
-+	}
- 
- 	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
- 		    todo.indefinite,
-@@ -589,12 +595,24 @@
- 	}
- }
- 
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EToDoLocalRecord *local,
--			      EToDoConduitContext *ctxt)
-+			      EToDoConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->todo != NULL );
-@@ -607,9 +625,24 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-+	{
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_ToDo(local->todo, &piBuf, todo_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -696,15 +729,23 @@
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
- 		int cat = 0;
--		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		int dlpReadRetval = 0;
-+		pi_buffer_t *piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+						   ctxt->dbi->db_handle,
-+						   local->local.ID, piBuf,
-+						   NULL, NULL, &cat);
-+
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 		}
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 	
- 	/*
-@@ -864,7 +905,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_ToDo(&todo, &piBuf, todo_v1);
-+	}
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -1014,7 +1061,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1104,9 +1151,14 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 			num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's ToDo application block"));
-@@ -1115,8 +1167,9 @@
- 					   _("Could not read pilot's ToDo application block"));
- 		return -1;
- 	}
--	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+
-+	unpack_ToDoAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 	
- 	lastDesktopUniqueID = 128;
- 
-@@ -1138,6 +1191,9 @@
- 	unsigned char *buf;
- 	int dlpRetVal, len;
- 
-+	/* Write AppBlock to PDA - updates categories */
-+	/* NOTE: not changed for pilot-link 0.12 because the two
-+	 * functions below didn't change */
- 	buf = (unsigned char*)g_malloc (0xffff);
- 	
- 	len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1320,6 +1376,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1327,7 +1384,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1484,9 +1541,11 @@
- 	 GnomePilotRecord *remote,
- 	 EToDoConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
deleted file mode 100644
index c852e6179..000000000
--- a/mail/evolution/files/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig	Tue Nov 15 17:58:33 2005
-+++ configure	Tue Nov 15 18:02:37 2005
-@@ -23732,6 +23732,15 @@
-     SOFTOKN3_LIB=''
-     HAL_REQUIREMENT=''
-     ;;
-+*freebsd*) os_win32=no
-+    NO_UNDEFINED=''
-+    SOCKET_LIBS=''
-+    SOEXT='.so'
-+    SA_JUNK_PLUGIN=sa-junk-plugin
-+    DL_LIB=''
-+    SOFTOKN3_LIB='-lsoftokn3'
-+    HAL_REQUIREMENT='hal'
-+    ;;
- *)  os_win32=no
-     NO_UNDEFINED=''
-     SOEXT='.so'
-@@ -26280,6 +26289,7 @@
- 		#include <sys/socket.h>
- 		#include <netinet/in.h>
- 		#include <netdb.h>
-+		#include <stdio.h>
- 
- 
- int
-@@ -27980,7 +27990,7 @@
- 	LDFLAGS_save="$LDFLAGS"
- 
- 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
- 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
- if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -33143,7 +33153,7 @@
- idldir="$datadir/idl/evolution-$BASE_VERSION"
- 
- 
--serverdir="$libdir/bonobo/servers"
-+serverdir="$prefix/libdata/bonobo/servers"
- 
- 
- evolutionuidir="$privdatadir/ui"
diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c
deleted file mode 100644
index 6aa2e9a13..000000000
--- a/mail/evolution/files/patch-mail_em-migrate.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail/em-migrate.c.orig	Tue Dec 21 15:09:30 2004
-+++ mail/em-migrate.c	Tue Dec 21 15:09:46 2004
-@@ -1447,7 +1447,7 @@
- 	ut.actime = st.st_atime;
- 	ut.modtime = st.st_mtime;
- 	utime (dest, &ut);
--	chmod (dest, st.st_mode);
-+	chmod (dest, st.st_mode | S_IWUSR);
- 	
- 	return 0;
- 	
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
deleted file mode 100644
index b3e7b9ffb..000000000
--- a/mail/evolution/files/patch-mail_em-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
-+++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
-@@ -23,6 +23,7 @@
- #ifndef __EM_UTILS_H__
- #define __EM_UTILS_H__
- 
-+#include <sys/types.h>
- #include <glib.h>
- 
- #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
deleted file mode 100644
index 4d8e131a6..000000000
--- a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
-+++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
-@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
- {
- 	EGwConnection *cnc;
- 	CamelURL *url;
--	url = camel_url_new (account->source->url, NULL);
- 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
- 	const char *use_ssl, *soap_port;
- 
diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
deleted file mode 100644
index a64407192..000000000
--- a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig	Mon Jul 10 21:50:12 2006
-+++ widgets/e-timezone-dialog/e-timezone-dialog.c	Mon Jul 10 22:11:54 2006
-@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate {
- 
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
-+#ifndef __BSD_VISIBLE
- extern long timezone;
-+#endif
- extern int daylight;
- #endif
- 
-@@ -317,9 +319,20 @@ static const icaltimezone*
- get_local_timezone()
- {
- 	icaltimezone *zone;
-+	long offset;
-+#ifdef __BSD_VISIBLE
-+	time_t tt;
-+	struct tm tm;
-+#endif
- 	
- 	tzset();
--	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+#ifdef __BSD_VISIBLE
-+	localtime_r (&tt, &tm);
-+	offset = tm.tm_gmtoff;
-+#else
-+	offset = -timezone;
-+#endif
-+	zone =  icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
- 
- 	return zone;
- }
diff --git a/mail/evolution/pkg-descr b/mail/evolution/pkg-descr
deleted file mode 100644
index 068e19e1a..000000000
--- a/mail/evolution/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Ximian Evolution[tm] is the premier personal and workgroup information
-management solution for UNIX.  Evolution seamlessly integrates email,
-calendaring, meeting scheduling, contact management and online task lists
-in one powerful, fast, and easy to use application.  It also delivers a
-comprehensive set of features that help keep work organized and projects
-on track.  The unique Ximian vFolders[tm] are virtual folders used to
-create and save powerful contextual views of email messages. 
-
-WWW: http://www.gnome.org/projects/evolution/
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
deleted file mode 100644
index 7782d112f..000000000
--- a/mail/evolution/pkg-plist
+++ /dev/null
@@ -1,825 +0,0 @@
-bin/evolution
-bin/evolution-%%VERSION%%
-include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
-include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
-include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
-include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
-include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
-include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
-include/evolution-%%VERSION%%/e-util/e-bconf-map.h
-include/evolution-%%VERSION%%/e-util/e-bit-array.h
-include/evolution-%%VERSION%%/e-util/e-categories-config.h
-include/evolution-%%VERSION%%/e-util/e-config-listener.h
-include/evolution-%%VERSION%%/e-util/e-config.h
-include/evolution-%%VERSION%%/e-util/e-corba-utils.h
-include/evolution-%%VERSION%%/e-util/e-cursor.h
-include/evolution-%%VERSION%%/e-util/e-dialog-utils.h
-include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h
-include/evolution-%%VERSION%%/e-util/e-error.h
-include/evolution-%%VERSION%%/e-util/e-event.h
-include/evolution-%%VERSION%%/e-util/e-folder-map.h
-include/evolution-%%VERSION%%/e-util/e-fsutils.h
-include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
-include/evolution-%%VERSION%%/e-util/e-gui-utils.h
-include/evolution-%%VERSION%%/e-util/e-html-utils.h
-include/evolution-%%VERSION%%/e-util/e-icon-factory.h
-include/evolution-%%VERSION%%/e-util/e-import.h
-include/evolution-%%VERSION%%/e-util/e-menu.h
-include/evolution-%%VERSION%%/e-util/e-mktemp.h
-include/evolution-%%VERSION%%/e-util/e-plugin.h
-include/evolution-%%VERSION%%/e-util/e-popup.h
-include/evolution-%%VERSION%%/e-util/e-print.h
-include/evolution-%%VERSION%%/e-util/e-profile-event.h
-include/evolution-%%VERSION%%/e-util/e-request.h
-include/evolution-%%VERSION%%/e-util/e-signature-list.h
-include/evolution-%%VERSION%%/e-util/e-signature.h
-include/evolution-%%VERSION%%/e-util/e-sorter-array.h
-include/evolution-%%VERSION%%/e-util/e-sorter.h
-include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
-include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
-include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
-include/evolution-%%VERSION%%/e-util/e-util-marshal.h
-include/evolution-%%VERSION%%/e-util/e-util.h
-include/evolution-%%VERSION%%/e-util/e-xml-utils.h
-include/evolution-%%VERSION%%/mail/Evolution-Mail.h
-include/evolution-%%VERSION%%/mail/em-composer-utils.h
-include/evolution-%%VERSION%%/mail/em-config.h
-include/evolution-%%VERSION%%/mail/em-event.h
-include/evolution-%%VERSION%%/mail/em-folder-browser.h
-include/evolution-%%VERSION%%/mail/em-folder-tree-model.h
-include/evolution-%%VERSION%%/mail/em-folder-tree.h
-include/evolution-%%VERSION%%/mail/em-folder-utils.h
-include/evolution-%%VERSION%%/mail/em-folder-view.h
-include/evolution-%%VERSION%%/mail/em-format-hook.h
-include/evolution-%%VERSION%%/mail/em-format-html-display.h
-include/evolution-%%VERSION%%/mail/em-format-html-print.h
-include/evolution-%%VERSION%%/mail/em-format-html.h
-include/evolution-%%VERSION%%/mail/em-format-quote.h
-include/evolution-%%VERSION%%/mail/em-format.h
-include/evolution-%%VERSION%%/mail/em-html-stream.h
-include/evolution-%%VERSION%%/mail/em-icon-stream.h
-include/evolution-%%VERSION%%/mail/em-inline-filter.h
-include/evolution-%%VERSION%%/mail/em-junk-hook.h
-include/evolution-%%VERSION%%/mail/em-menu.h
-include/evolution-%%VERSION%%/mail/em-message-browser.h
-include/evolution-%%VERSION%%/mail/em-popup.h
-include/evolution-%%VERSION%%/mail/em-stripsig-filter.h
-include/evolution-%%VERSION%%/mail/em-sync-stream.h
-include/evolution-%%VERSION%%/mail/em-utils.h
-include/evolution-%%VERSION%%/mail/em-vfs-stream.h
-include/evolution-%%VERSION%%/mail/mail-autofilter.h
-include/evolution-%%VERSION%%/mail/mail-component.h
-include/evolution-%%VERSION%%/mail/mail-config.h
-include/evolution-%%VERSION%%/mail/mail-mt.h
-include/evolution-%%VERSION%%/mail/mail-ops.h
-include/evolution-%%VERSION%%/mail/mail-session.h
-include/evolution-%%VERSION%%/mail/mail-tools.h
-include/evolution-%%VERSION%%/mail/mail-vfolder.h
-include/evolution-%%VERSION%%/mail/message-list.h
-include/evolution-%%VERSION%%/menus/gal-define-views-dialog.h
-include/evolution-%%VERSION%%/menus/gal-define-views-model.h
-include/evolution-%%VERSION%%/menus/gal-view-collection.h
-include/evolution-%%VERSION%%/menus/gal-view-etable.h
-include/evolution-%%VERSION%%/menus/gal-view-factory-etable.h
-include/evolution-%%VERSION%%/menus/gal-view-factory.h
-include/evolution-%%VERSION%%/menus/gal-view-instance-save-as-dialog.h
-include/evolution-%%VERSION%%/menus/gal-view-instance.h
-include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
-include/evolution-%%VERSION%%/menus/gal-view.h
-include/evolution-%%VERSION%%/misc/e-activity-handler.h
-include/evolution-%%VERSION%%/misc/e-attachment-bar.h
-include/evolution-%%VERSION%%/misc/e-attachment.h
-include/evolution-%%VERSION%%/misc/e-calendar-item.h
-include/evolution-%%VERSION%%/misc/e-calendar.h
-include/evolution-%%VERSION%%/misc/e-canvas-background.h
-include/evolution-%%VERSION%%/misc/e-canvas-utils.h
-include/evolution-%%VERSION%%/misc/e-canvas-vbox.h
-include/evolution-%%VERSION%%/misc/e-canvas.h
-include/evolution-%%VERSION%%/misc/e-cell-date-edit.h
-include/evolution-%%VERSION%%/misc/e-cell-percent.h
-include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h
-include/evolution-%%VERSION%%/misc/e-charset-picker.h
-include/evolution-%%VERSION%%/misc/e-clipped-label.h
-include/evolution-%%VERSION%%/misc/e-colors.h
-include/evolution-%%VERSION%%/misc/e-combo-button.h
-include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h
-include/evolution-%%VERSION%%/misc/e-config-page.h
-include/evolution-%%VERSION%%/misc/e-cursors.h
-include/evolution-%%VERSION%%/misc/e-dateedit.h
-include/evolution-%%VERSION%%/misc/e-dropdown-button.h
-include/evolution-%%VERSION%%/misc/e-expander.h
-include/evolution-%%VERSION%%/misc/e-gui-utils.h
-include/evolution-%%VERSION%%/misc/e-hsv-utils.h
-include/evolution-%%VERSION%%/misc/e-icon-entry.h
-include/evolution-%%VERSION%%/misc/e-image-chooser.h
-include/evolution-%%VERSION%%/misc/e-info-label.h
-include/evolution-%%VERSION%%/misc/e-map.h
-include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h
-%%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h
-include/evolution-%%VERSION%%/misc/e-popup-menu.h
-include/evolution-%%VERSION%%/misc/e-printable.h
-include/evolution-%%VERSION%%/misc/e-reflow-model.h
-include/evolution-%%VERSION%%/misc/e-reflow.h
-include/evolution-%%VERSION%%/misc/e-search-bar.h
-include/evolution-%%VERSION%%/misc/e-selection-model-array.h
-include/evolution-%%VERSION%%/misc/e-selection-model-simple.h
-include/evolution-%%VERSION%%/misc/e-selection-model.h
-include/evolution-%%VERSION%%/misc/e-send-options.h
-include/evolution-%%VERSION%%/misc/e-task-bar.h
-include/evolution-%%VERSION%%/misc/e-task-widget.h
-include/evolution-%%VERSION%%/misc/e-unicode.h
-include/evolution-%%VERSION%%/misc/e-url-entry.h
-include/evolution-%%VERSION%%/misc/gal-combo-box.h
-include/evolution-%%VERSION%%/misc/gal-combo-text.h
-include/evolution-%%VERSION%%/shell/Evolution.h
-include/evolution-%%VERSION%%/shell/e-component-view.h
-include/evolution-%%VERSION%%/shell/e-shell-utils.h
-include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h
-include/evolution-%%VERSION%%/shell/es-event.h
-include/evolution-%%VERSION%%/shell/es-menu.h
-include/evolution-%%VERSION%%/shell/evolution-component.h
-include/evolution-%%VERSION%%/shell/evolution-config-control.h
-include/evolution-%%VERSION%%/shell/evolution-listener.h
-include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h
-include/evolution-%%VERSION%%/table/e-cell-checkbox.h
-include/evolution-%%VERSION%%/table/e-cell-combo.h
-include/evolution-%%VERSION%%/table/e-cell-date.h
-include/evolution-%%VERSION%%/table/e-cell-float.h
-include/evolution-%%VERSION%%/table/e-cell-hbox.h
-include/evolution-%%VERSION%%/table/e-cell-number.h
-include/evolution-%%VERSION%%/table/e-cell-pixbuf.h
-include/evolution-%%VERSION%%/table/e-cell-popup.h
-include/evolution-%%VERSION%%/table/e-cell-progress.h
-include/evolution-%%VERSION%%/table/e-cell-size.h
-include/evolution-%%VERSION%%/table/e-cell-spin-button.h
-include/evolution-%%VERSION%%/table/e-cell-text.h
-include/evolution-%%VERSION%%/table/e-cell-toggle.h
-include/evolution-%%VERSION%%/table/e-cell-tree.h
-include/evolution-%%VERSION%%/table/e-cell-vbox.h
-include/evolution-%%VERSION%%/table/e-cell.h
-include/evolution-%%VERSION%%/table/e-table-click-to-add.h
-include/evolution-%%VERSION%%/table/e-table-col-dnd.h
-include/evolution-%%VERSION%%/table/e-table-col.h
-include/evolution-%%VERSION%%/table/e-table-column-specification.h
-include/evolution-%%VERSION%%/table/e-table-config.h
-include/evolution-%%VERSION%%/table/e-table-defines.h
-include/evolution-%%VERSION%%/table/e-table-extras.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser-dialog.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser-item.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser.h
-include/evolution-%%VERSION%%/table/e-table-group-container.h
-include/evolution-%%VERSION%%/table/e-table-group-leaf.h
-include/evolution-%%VERSION%%/table/e-table-group.h
-include/evolution-%%VERSION%%/table/e-table-header-item.h
-include/evolution-%%VERSION%%/table/e-table-header-utils.h
-include/evolution-%%VERSION%%/table/e-table-header.h
-include/evolution-%%VERSION%%/table/e-table-item.h
-include/evolution-%%VERSION%%/table/e-table-memory-callbacks.h
-include/evolution-%%VERSION%%/table/e-table-memory-store.h
-include/evolution-%%VERSION%%/table/e-table-memory.h
-include/evolution-%%VERSION%%/table/e-table-model.h
-include/evolution-%%VERSION%%/table/e-table-one.h
-include/evolution-%%VERSION%%/table/e-table-scrolled.h
-include/evolution-%%VERSION%%/table/e-table-search.h
-include/evolution-%%VERSION%%/table/e-table-selection-model.h
-include/evolution-%%VERSION%%/table/e-table-simple.h
-include/evolution-%%VERSION%%/table/e-table-sort-info.h
-include/evolution-%%VERSION%%/table/e-table-sorted-variable.h
-include/evolution-%%VERSION%%/table/e-table-sorted.h
-include/evolution-%%VERSION%%/table/e-table-sorter.h
-include/evolution-%%VERSION%%/table/e-table-sorting-utils.h
-include/evolution-%%VERSION%%/table/e-table-specification.h
-include/evolution-%%VERSION%%/table/e-table-state.h
-include/evolution-%%VERSION%%/table/e-table-subset-variable.h
-include/evolution-%%VERSION%%/table/e-table-subset.h
-include/evolution-%%VERSION%%/table/e-table-tooltip.h
-include/evolution-%%VERSION%%/table/e-table-utils.h
-include/evolution-%%VERSION%%/table/e-table-without.h
-include/evolution-%%VERSION%%/table/e-table.h
-include/evolution-%%VERSION%%/table/e-tree-memory-callbacks.h
-include/evolution-%%VERSION%%/table/e-tree-memory.h
-include/evolution-%%VERSION%%/table/e-tree-model.h
-include/evolution-%%VERSION%%/table/e-tree-scrolled.h
-include/evolution-%%VERSION%%/table/e-tree-selection-model.h
-include/evolution-%%VERSION%%/table/e-tree-sorted.h
-include/evolution-%%VERSION%%/table/e-tree-table-adapter.h
-include/evolution-%%VERSION%%/table/e-tree.h
-include/evolution-%%VERSION%%/text/e-completion-callbacks.h
-include/evolution-%%VERSION%%/text/e-completion-match.h
-include/evolution-%%VERSION%%/text/e-completion-view.h
-include/evolution-%%VERSION%%/text/e-completion.h
-include/evolution-%%VERSION%%/text/e-entry.h
-include/evolution-%%VERSION%%/text/e-table-text-model.h
-include/evolution-%%VERSION%%/text/e-text-model-repos.h
-include/evolution-%%VERSION%%/text/e-text-model-uri.h
-include/evolution-%%VERSION%%/text/e-text-model.h
-include/evolution-%%VERSION%%/text/e-text.h
-lib/evolution/%%VERSION%%/components/libevolution-addressbook.la
-lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
-lib/evolution/%%VERSION%%/components/libevolution-calendar.la
-lib/evolution/%%VERSION%%/components/libevolution-calendar.so
-lib/evolution/%%VERSION%%/components/libevolution-mail.la
-lib/evolution/%%VERSION%%/components/libevolution-mail.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so
-lib/evolution/%%VERSION%%/libeabutil.la
-lib/evolution/%%VERSION%%/libeabutil.so
-lib/evolution/%%VERSION%%/libeabutil.so.0
-lib/evolution/%%VERSION%%/libeconduit.la
-lib/evolution/%%VERSION%%/libeconduit.so
-lib/evolution/%%VERSION%%/libeconduit.so.0
-lib/evolution/%%VERSION%%/libecontacteditor.la
-lib/evolution/%%VERSION%%/libecontacteditor.so
-lib/evolution/%%VERSION%%/libecontacteditor.so.0
-lib/evolution/%%VERSION%%/libecontactlisteditor.la
-lib/evolution/%%VERSION%%/libecontactlisteditor.so
-lib/evolution/%%VERSION%%/libecontactlisteditor.so.0
-lib/evolution/%%VERSION%%/libefilterbar.la
-lib/evolution/%%VERSION%%/libefilterbar.so
-lib/evolution/%%VERSION%%/libefilterbar.so.0
-lib/evolution/%%VERSION%%/libemiscwidgets.la
-lib/evolution/%%VERSION%%/libemiscwidgets.so
-lib/evolution/%%VERSION%%/libemiscwidgets.so.0
-lib/evolution/%%VERSION%%/libeshell.la
-lib/evolution/%%VERSION%%/libeshell.so
-lib/evolution/%%VERSION%%/libeshell.so.0
-lib/evolution/%%VERSION%%/libessmime.la
-lib/evolution/%%VERSION%%/libessmime.so
-lib/evolution/%%VERSION%%/libessmime.so.0
-lib/evolution/%%VERSION%%/libetable.la
-lib/evolution/%%VERSION%%/libetable.so
-lib/evolution/%%VERSION%%/libetable.so.0
-lib/evolution/%%VERSION%%/libetext.la
-lib/evolution/%%VERSION%%/libetext.so
-lib/evolution/%%VERSION%%/libetext.so.0
-lib/evolution/%%VERSION%%/libetimezonedialog.la
-lib/evolution/%%VERSION%%/libetimezonedialog.so
-lib/evolution/%%VERSION%%/libetimezonedialog.so.0
-lib/evolution/%%VERSION%%/libeutil.la
-lib/evolution/%%VERSION%%/libeutil.so
-lib/evolution/%%VERSION%%/libeutil.so.0
-lib/evolution/%%VERSION%%/libevolution-a11y.la
-lib/evolution/%%VERSION%%/libevolution-a11y.so
-lib/evolution/%%VERSION%%/libevolution-a11y.so.0
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.la
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0
-lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
-lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
-lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0
-lib/evolution/%%VERSION%%/libevolution-mail-importers.la
-lib/evolution/%%VERSION%%/libevolution-mail-importers.so
-lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
-lib/evolution/%%VERSION%%/libevolution-smime.la
-lib/evolution/%%VERSION%%/libevolution-smime.so
-lib/evolution/%%VERSION%%/libevolution-smime.so.0
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.la
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
-lib/evolution/%%VERSION%%/libfilter.la
-lib/evolution/%%VERSION%%/libfilter.so
-lib/evolution/%%VERSION%%/libfilter.so.0
-lib/evolution/%%VERSION%%/libmenus.la
-lib/evolution/%%VERSION%%/libmenus.so
-lib/evolution/%%VERSION%%/libmenus.so.0
-lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
-lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
-%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.la
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
-lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
-%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
-lib/evolution/%%VERSION%%/plugins/publish-calendar.glade
-libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server
-libdata/pkgconfig/evolution-plugin-%%VERSION%%.pc
-libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
-libexec/evolution/%%VERSION%%/csv2vcard
-libexec/evolution/%%VERSION%%/evolution-addressbook-clean
-libexec/evolution/%%VERSION%%/evolution-addressbook-export
-libexec/evolution/%%VERSION%%/evolution-alarm-notify
-libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution-%%VERSION%%.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/evolution/%%VERSION%%/addresstypes.xml
-share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/fi/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/fr/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/lt/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/mk/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps
-share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps
-share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps
-share/gnome/evolution/%%VERSION%%/errors/addressbook.error
-share/gnome/evolution/%%VERSION%%/errors/calendar.error
-share/gnome/evolution/%%VERSION%%/errors/e-system.error
-share/gnome/evolution/%%VERSION%%/errors/filter.error
-share/gnome/evolution/%%VERSION%%/errors/mail-composer.error
-share/gnome/evolution/%%VERSION%%/errors/mail.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
-share/gnome/evolution/%%VERSION%%/errors/shell.error
-share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-memo-table.etspec
-share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
-share/gnome/evolution/%%VERSION%%/filtertypes.xml
-share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
-share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade
-share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade
-share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-attachment.glade
-share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade
-share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-foreign-folder-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade
-share/gnome/evolution/%%VERSION%%/glade/e-send-options.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-config.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
-share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
-share/gnome/evolution/%%VERSION%%/glade/event-page.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/filter.glade
-share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
-share/gnome/evolution/%%VERSION%%/glade/fullname.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-categories.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/im.glade
-share/gnome/evolution/%%VERSION%%/glade/import.glade
-share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
-share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
-share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
-share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
-share/gnome/evolution/%%VERSION%%/glade/properties.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-login-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade
-share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
-share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
-share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
-share/gnome/evolution/%%VERSION%%/glade/task-page.glade
-share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
-share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
-share/gnome/evolution/%%VERSION%%/images/about-box.png
-share/gnome/evolution/%%VERSION%%/images/bcg.png
-share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
-share/gnome/evolution/%%VERSION%%/images/minus.png
-share/gnome/evolution/%%VERSION%%/images/monkey-16.png
-share/gnome/evolution/%%VERSION%%/images/offline.png
-share/gnome/evolution/%%VERSION%%/images/online.png
-share/gnome/evolution/%%VERSION%%/images/plus.png
-share/gnome/evolution/%%VERSION%%/images/query-free-busy.png
-share/gnome/evolution/%%VERSION%%/images/world_map-960.png
-share/gnome/evolution/%%VERSION%%/searchtypes.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-message.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-memo-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-memos.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-message-composer.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-signature-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution.xml
-share/gnome/evolution/%%VERSION%%/vfoldertypes.xml
-share/gnome/evolution/%%VERSION%%/views/addressbook/Address_Cards.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/By_Company.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/Phone_List.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/galview.xml
-share/gnome/evolution/%%VERSION%%/views/calendar/List_View.galview
-share/gnome/evolution/%%VERSION%%/views/calendar/galview.xml
-share/gnome/evolution/%%VERSION%%/views/mail/As_Sent_Folder.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Follow_Up_Flag.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Sender.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Status.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Normal.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Sent.galview
-share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
-share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
-share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
-share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml
-share/gnome/evolution/%%VERSION%%/weather/category_weather_cloudy_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_fog_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_partly_cloudy_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_rain_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_snow_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_sun_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
-share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
-share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Free-Busy.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
-share/gnome/idl/evolution-%%VERSION%%/Composer.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
-share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution-%%VERSION%%.keys
-share/gnome/mime-info/evolution-%%VERSION%%.mime
-share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
-share/gnome/pixmaps/evolution-%%VERSION%%.png
-share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-@dirrm share/gnome/omf/evolution
-@dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%VERSION%%/C
-@dirrm share/gnome/help/evolution-%%VERSION%%
-@dirrm share/gnome/evolution/%%VERSION%%/weather
-@dirrm share/gnome/evolution/%%VERSION%%/views/tasks
-@dirrm share/gnome/evolution/%%VERSION%%/views/memos
-@dirrm share/gnome/evolution/%%VERSION%%/views/mail
-@dirrm share/gnome/evolution/%%VERSION%%/views/calendar
-@dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
-@dirrm share/gnome/evolution/%%VERSION%%/views
-@dirrm share/gnome/evolution/%%VERSION%%/ui
-@dirrm share/gnome/evolution/%%VERSION%%/images
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref
-@dirrm share/gnome/evolution/%%VERSION%%/help
-@dirrm share/gnome/evolution/%%VERSION%%/glade
-@dirrm share/gnome/evolution/%%VERSION%%/etspec
-@dirrm share/gnome/evolution/%%VERSION%%/errors
-@dirrm share/gnome/evolution/%%VERSION%%/ecps
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi
-@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/de
-@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/C
-@dirrm share/gnome/evolution/%%VERSION%%/default
-@dirrm share/gnome/evolution/%%VERSION%%
-@dirrm share/gnome/evolution
-@dirrm libexec/evolution/%%VERSION%%
-@dirrm libexec/evolution
-@dirrm lib/evolution/%%VERSION%%/plugins
-%%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits
-@dirrm lib/evolution/%%VERSION%%/components
-@dirrm lib/evolution/%%VERSION%%
-@dirrm lib/evolution
-@dirrm include/evolution-%%VERSION%%/text
-@dirrm include/evolution-%%VERSION%%/table
-@dirrm include/evolution-%%VERSION%%/shell
-@dirrm include/evolution-%%VERSION%%/misc
-@dirrm include/evolution-%%VERSION%%/menus
-@dirrm include/evolution-%%VERSION%%/mail
-@dirrm include/evolution-%%VERSION%%/e-util
-@dirrm include/evolution-%%VERSION%%/e-conduit
-@dirrm include/evolution-%%VERSION%%/calendar/gui
-@dirrm include/evolution-%%VERSION%%/calendar
-@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
-@dirrm include/evolution-%%VERSION%%/addressbook/gui
-@dirrm include/evolution-%%VERSION%%/addressbook
-@dirrm include/evolution-%%VERSION%%
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
deleted file mode 100644
index 56a00868b..000000000
--- a/mail/gnubiff/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# New ports collection makefile for:	gnubiff
-# Date created:		3 May 2004
-# Whom:			Tim Bishop <tim@bishnet.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnubiff
-PORTVERSION=	2.2.2
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	tdb@FreeBSD.org
-COMMENT=	A mail notification program for Gnome
-
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-
-USE_GNOME=	intlhack libglade2 esound
-USE_GMAKE=	yes
-USE_FAM=	yes
-WANT_FAM_SYSTEM=fam
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		CXXFLAGS="-Wno-long-long"
-# CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
-# /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
-
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
-MAN1=		gnubiff.1
-INFO=		gnubiff
-
-.ifdef(WITH_GNUBIFF_PASSWORD)
-CONFIGURE_ARGS+=	--with-password
-.endif
-
-.ifndef(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-USE_GETTEXT=		yes
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-# This application can dock in the GNOME panel, or it can not.
-# Only install support if gnomepanel is already installed.
-WANT_GNOME=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel gconf2 gnomeprefix gnomehack
-PKGNAMESUFFIX+=		-gnome
-PLIST_SUB+=		SHAREDIR="share/gnome"
-PLIST_SUB+=		BONOBODIR="libdata/bonobo"
-PLIST_SUB+=		WITH_GNOME=""
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=		SHAREDIR="share"
-PLIST_SUB+=		BONOBODIR="lib/bonobo"
-PLIST_SUB+=		WITH_GNOME="@comment "
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
deleted file mode 100644
index a80887248..000000000
--- a/mail/gnubiff/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnubiff-2.2.2.tar.gz) = 54e026ed12571350dcf8965a090dfa45
-SHA256 (gnubiff-2.2.2.tar.gz) = 120b6f1486f5c78df7fc3190ac1d19151f603261d2afd9e2c97a5c7eb4575306
-SIZE (gnubiff-2.2.2.tar.gz) = 812648
diff --git a/mail/gnubiff/files/patch-configure b/mail/gnubiff/files/patch-configure
deleted file mode 100644
index 22ac73a85..000000000
--- a/mail/gnubiff/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Sat Apr 22 14:41:45 2006
-+++ ./configure	Sun Jun 25 12:37:49 2006
-@@ -4117,7 +4117,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lssl  $LIBS"
-+LIBS="-lssl -lcrypto  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/mail/gnubiff/files/patch-src__mailbox.cc b/mail/gnubiff/files/patch-src__mailbox.cc
deleted file mode 100644
index 50cf51ed7..000000000
--- a/mail/gnubiff/files/patch-src__mailbox.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/mailbox.cc.orig	Sun Sep  3 13:08:05 2006
-+++ ./src/mailbox.cc	Sun Sep  3 13:07:46 2006
-@@ -30,6 +30,7 @@
- // ========================================================================
- 
- #include <algorithm>
-+#include <sys/types.h>
- #include <regex.h>
- #include "support.h"
- #include "mailbox.h"
diff --git a/mail/gnubiff/files/patch-src__mailbox.h b/mail/gnubiff/files/patch-src__mailbox.h
deleted file mode 100644
index f8e9955b6..000000000
--- a/mail/gnubiff/files/patch-src__mailbox.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/mailbox.h.orig	Sun Sep  3 16:34:22 2006
-+++ ./src/mailbox.h	Sun Sep  3 16:34:36 2006
-@@ -38,6 +38,7 @@
- #include <functional>
- #include <glib.h>
- #include <map>
-+#include <sys/types.h>
- #include <regex.h>
- #include <set>
- #include <string>
diff --git a/mail/gnubiff/pkg-descr b/mail/gnubiff/pkg-descr
deleted file mode 100644
index ea77cffa9..000000000
--- a/mail/gnubiff/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-gnubiff is a mail notification program that checks for mail, displays
-headers when new mail has arrived and allow to read first lines of
-new mails.
-
-It relies on the GNOME and GTK libraries but can be compiled and
-used with or without GNOME support. Supported protocols are pop3,
-apop, imap4, mh, qmail and mailfile.
-
-Furthermore, gnubiff is fully configurable with a lot of options
-like polltime, poptime, sounds, mail reader, mailbox names, etc.
-and can also filter spam.
-
-WWW: http://gnubiff.sourceforge.net/
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
deleted file mode 100644
index 07d5924ba..000000000
--- a/mail/gnubiff/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/gnubiff
-%%NLS%%share/locale/cs/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/fr_CA/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/fr_FR/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gnubiff.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/applet-gtk.glade
-%%SHAREDIR%%/gnubiff/authentication.glade
-%%SHAREDIR%%/gnubiff/certificate.glade
-%%SHAREDIR%%/gnubiff/coin.wav
-%%SHAREDIR%%/gnubiff/envelopes.png
-%%SHAREDIR%%/gnubiff/gnubiff.png
-%%SHAREDIR%%/gnubiff/mail.wav
-%%SHAREDIR%%/gnubiff/popup.glade
-%%SHAREDIR%%/gnubiff/preferences.glade
-%%SHAREDIR%%/gnubiff/properties.glade
-%%SHAREDIR%%/gnubiff/tux-awake.png
-%%SHAREDIR%%/gnubiff/tux-big.png
-%%SHAREDIR%%/gnubiff/tux-jump(64x64).png
-%%SHAREDIR%%/gnubiff/tux-sleep(64x64).png
-%%SHAREDIR%%/gnubiff/tux-sleep.png
-%%SHAREDIR%%/pixmaps/gnubiff.png
-%%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server
-%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
-@dirrmtry %%BONOBODIR%%/servers
-@dirrmtry %%BONOBODIR%%
-@dirrmtry %%SHAREDIR%%/gnome-2.0/ui
-@dirrmtry %%SHAREDIR%%/gnome-2.0
-@dirrmtry share/pixmaps
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
-@dirrmtry share/locale/fr_CA/LC_MESSAGES
-@dirrmtry share/locale/fr_CA
-@dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
deleted file mode 100644
index c0d382f05..000000000
--- a/mail/mail-notification/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# New ports collection makefile for:	mail-notification
-# Date created:			18 Sep 2003
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mail-notification
-PORTVERSION=	3.0
-PORTREVISION=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	mailnotify
-
-MAINTAINER=	jylefort@FreeBSD.org
-COMMENT=	A mail notification for freedesktop.org-compliant system trays
-
-USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack eel2
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-GCONF_SCHEMAS=	mail-notification.schemas
-INSTALLS_OMF=	yes
-
-OPTIONS=	MBOX "mbox support" on \
-		MH "MH support" on \
-		MAILDIR "Maildir support" on \
-		POP3 "POP3 support" on \
-		IMAP "IMAP support" on \
-		SSL "SSL/TLS support" on \
-		SASL "SASL authentication support" on \
-		GMAIL "Gmail support" on \
-		EVOLUTION "Evolution support" off \
-		SYLPHEED "Sylpheed support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_MBOX)
-CONFIGURE_ARGS+=--disable-mbox
-.endif
-.if defined(WITHOUT_MH)
-CONFIGURE_ARGS+=--disable-mh
-.endif
-.if defined(WITHOUT_MAILDIR)
-CONFIGURE_ARGS+=--disable-maildir
-.endif
-.if defined(WITHOUT_POP3)
-CONFIGURE_ARGS+=--disable-pop3
-.endif
-.if defined(WITHOUT_IMAP)
-CONFIGURE_ARGS+=--disable-imap
-.endif
-.if defined(WITHOUT_POP3) && defined(WITHOUT_IMAP)
-# only POP3 and IMAP use SSL and SASL
-WITHOUT_SSL=	yes
-WITHOUT_SASL=	yes
-.endif
-.if defined(WITHOUT_GMAIL)
-CONFIGURE_ARGS+=--disable-gmail
-PLIST_SUB+=	GMAIL="@comment "
-.else
-PLIST_SUB+=	GMAIL=""
-.endif
-.if defined(WITHOUT_EVOLUTION)
-CONFIGURE_ARGS+=--disable-evolution
-PLIST_SUB+=	EVOLUTION="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-PLIST_SUB+=	EVOLUTION=""
-.endif
-.if defined(WITHOUT_SYLPHEED)
-CONFIGURE_ARGS+=--disable-sylpheed
-.endif
-.if defined(WITH_MBOX) \
-	|| defined(WITH_MH) \
-	|| defined(WITH_MAILDIR) \
-	|| defined(WITH_POP3) \
-	|| defined(WITH_IMAP) \
-	|| defined(WITH_SYLPHEED)
-LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
-.endif
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--disable-ssl
-.else
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.endif
-.if defined(WITHOUT_SASL)
-CONFIGURE_ARGS+=--disable-sasl
-.else
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
deleted file mode 100644
index 68520fff7..000000000
--- a/mail/mail-notification/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mail-notification-3.0.tar.gz) = d19fb5c96a0f54d1b1541fbddf73488e
-SHA256 (mail-notification-3.0.tar.gz) = a5bf3f5857cc8895dfe4d356a14a3ac8407d5623a97e361ba3ba7316bfba8055
-SIZE (mail-notification-3.0.tar.gz) = 914814
diff --git a/mail/mail-notification/pkg-descr b/mail/mail-notification/pkg-descr
deleted file mode 100644
index 3301a81ad..000000000
--- a/mail/mail-notification/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Mail Notification is a status icon (aka tray icon) that informs you if you
-have new mail.
-
-It works with system trays implementing the freedesktop.org System Tray
-Specification, such as the GNOME Panel Notification Area, the Xfce
-Notification Area and the KDE System Tray.
-
-Mail Notification features include:
-
-	* multiple mailbox support
-	* mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution and Sylpheed support
-	* SASL authentication support
-	* APOP authentication support
-	* SSL/TLS support
-	* automatic detection of mailbox format
-	* immediate notification (the status icon is updated immediately or
-	  within seconds after a mailbox changes)
-	* a mail summary
-	* HIG 2.0 compliance
-
-WWW: http://www.nongnu.org/mailnotify/
-
-- Jean-Yves Lefort
-jylefort@FreeBSD.org
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
deleted file mode 100644
index 052b49975..000000000
--- a/mail/mail-notification/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-bin/mail-notification
-etc/xdg/autostart/mail-notification.desktop
-libdata/bonobo/servers/GNOME_MailNotification.server
-%%EVOLUTION%%libdata/bonobo/servers/GNOME_MailNotification_Evolution.server
-share/gnome/applications/mail-notification-properties.desktop
-share/gnome/help/mail-notification/C/documentation-license.xml
-share/gnome/help/mail-notification/C/figures/mail.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png
-share/gnome/help/mail-notification/C/mail-notification.xml
-share/gnome/help/mail-notification/C/software-license.xml
-%%GMAIL%%share/gnome/mail-notification/ui/gmail.png
-share/gnome/mail-notification/ui/logo.png
-share/gnome/mail-notification/ui/mail-summary-popup.glade
-share/gnome/mail-notification/ui/mailbox-properties-dialog.glade
-share/gnome/mail-notification/ui/properties-dialog.glade
-share/gnome/omf/mail-notification/mail-notification-C.omf
-share/gnome/pixmaps/mail-notification.png
-share/locale/bg/LC_MESSAGES/mail-notification.mo
-share/locale/cs/LC_MESSAGES/mail-notification.mo
-share/locale/de/LC_MESSAGES/mail-notification.mo
-share/locale/fr/LC_MESSAGES/mail-notification.mo
-share/locale/ja/LC_MESSAGES/mail-notification.mo
-share/locale/nl/LC_MESSAGES/mail-notification.mo
-share/locale/pl/LC_MESSAGES/mail-notification.mo
-share/locale/pt/LC_MESSAGES/mail-notification.mo
-share/locale/pt_BR/LC_MESSAGES/mail-notification.mo
-share/locale/ru/LC_MESSAGES/mail-notification.mo
-share/locale/sr/LC_MESSAGES/mail-notification.mo
-share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
-share/locale/sv/LC_MESSAGES/mail-notification.mo
-%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.a
-%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.la
-%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.so
-%%EVOLUTION%%lib/evolution/2.6/plugins/org-gnome-mail-notification.eplug
-@dirrm share/gnome/omf/mail-notification
-@dirrm share/gnome/mail-notification/ui
-@dirrm share/gnome/mail-notification
-@dirrm share/gnome/help/mail-notification/C/figures
-@dirrm share/gnome/help/mail-notification/C
-@dirrm share/gnome/help/mail-notification
-@dirrmtry etc/xdg/autostart
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
deleted file mode 100644
index 0ed0f8efe..000000000
--- a/mail/mboxcheck-applet/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for: xmms-status-plugin
-# Date created:			Sep 28, 2003
-# Whom:				Pav Lucistnik <pav@oook.cz>
-#
-# $FreeBSD$
-
-PORTNAME=	mboxcheck-applet
-PORTVERSION=	0.3
-PORTREVISION=	5
-CATEGORIES=	mail
-MASTER_SITES=	http://perso.orange.fr/seb128/fichiers/
-
-MAINTAINER=	pav@FreeBSD.org
-COMMENT=	Mailbox checking applet for GNOME 2
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
-
-USE_XLIB=	yes
-USE_PYTHON=	yes
-NO_BUILD=	yes
-
-do-patch:
-	@${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/*.py
-	@${REINPLACE_CMD} 's|/usr/share/pixmaps/|${LOCALBASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
-	@${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${LOCALBASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
-	@${REINPLACE_CMD} 's|mbox.png|mboxcheck.png|' ${WRKSRC}/GNOME_MboxCheck.server
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${LOCALBASE}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${LOCALBASE}/libexec
-	${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${LOCALBASE}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${LOCALBASE}/libdata/bonobo/servers
-
-.include <bsd.port.mk>
diff --git a/mail/mboxcheck-applet/distinfo b/mail/mboxcheck-applet/distinfo
deleted file mode 100644
index 4d2865f2c..000000000
--- a/mail/mboxcheck-applet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mboxcheck-applet-0.3.tar.gz) = f781858c3483f7de42442d24beec63f8
-SHA256 (mboxcheck-applet-0.3.tar.gz) = 4cfe0e18abcbc837b65e93731aca4da96240d7812d05333a6c86264f6505b75d
-SIZE (mboxcheck-applet-0.3.tar.gz) = 29574
diff --git a/mail/mboxcheck-applet/pkg-descr b/mail/mboxcheck-applet/pkg-descr
deleted file mode 100644
index 49e4db55c..000000000
--- a/mail/mboxcheck-applet/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Mboxcheck is a GNOME2 applet which check mails arrive in your mboxes. It uses
-python and its gnome binding.
-
-WWW: http://perso.orange.fr/seb128/mboxcheck-en.html
diff --git a/mail/mboxcheck-applet/pkg-plist b/mail/mboxcheck-applet/pkg-plist
deleted file mode 100644
index 5a8f4a097..000000000
--- a/mail/mboxcheck-applet/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-libdata/bonobo/servers/GNOME_MboxCheck.server
-libexec/mboxcheck.py
-libexec/configmbox.py
-share/gnome/pixmaps/mboxcheck.png
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
deleted file mode 100644
index 8c0ea2a19..000000000
--- a/mail/moztraybiff/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# New ports collection makefile for:	moztraybiff
-# Date created:				19 March, 2005
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	moztraybiff
-PORTVERSION=	1.2.2
-PORTREVISION=	2
-CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	mozTrayBiff-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	New mail tray icon for Thunderbird
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird
-
-.if !exists(../thunderbird/Makefile)
-BROKEN=		${PORTNAME} needs the Thunderbird port in order to build
-.else
-TBVER!=		cd ../thunderbird && ${MAKE} -V PORTVERSION
-.endif
-
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_GNOME=	libgnome
-MAKE_ARGS+=	MOZILLA_PLATFORM=tbird TBVER=${TBVER} MOZ_TRUNK=0
-
-FILENAME=	mozTrayBiff-${PORTVERSION}-tb${TBVER}.xpi
-PLIST_FILES=	share/${PORTNAME}/${FILENAME}
-PLIST_DIRS=	share/${PORTNAME}
-
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e "s|-fshort-wchar||" \
-		${WRKSRC}/components/Makefile
-.endif
-	@${REINPLACE_CMD} -e "s|^#!/bin/bash|#!/bin/sh|" \
-		${WRKSRC}/get-platform
-
-do-install:
-	@${MKDIR} ${DATADIR}
-	@${INSTALL} -m 644 ${WRKSRC}/${FILENAME} ${DATADIR}
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/mail/moztraybiff/distinfo b/mail/moztraybiff/distinfo
deleted file mode 100644
index 3b415268f..000000000
--- a/mail/moztraybiff/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mozTrayBiff-1.2.2.tar.gz) = d599f3772eb4c905f2fa5c7a17a81a55
-SHA256 (mozTrayBiff-1.2.2.tar.gz) = d8d819a33ac632cb64776e5f926d1d6f99a3986f7f322ac36fb48187e4d55775
-SIZE (mozTrayBiff-1.2.2.tar.gz) = 47948
diff --git a/mail/moztraybiff/files/patch-Makefile b/mail/moztraybiff/files/patch-Makefile
deleted file mode 100644
index 2ac53bf3e..000000000
--- a/mail/moztraybiff/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Fri Sep  1 17:13:10 2006
-+++ Makefile	Fri Sep  1 17:13:42 2006
-@@ -19,7 +19,7 @@
- XPI_EXTRA_FILES = install.js
- endif
- ifeq ($(MOZILLA_PLATFORM),tbird)
--REAL_CONFIG = mozilla-thunderbird-config
-+REAL_CONFIG = thunderbird-config
- XPI_VERSION := $(XPI_VERSION)-tb${MOZILLA_VERSION}
- XPI_EXTRA_FILES = install.rdf
- endif
-@@ -36,7 +36,7 @@
- 	PLATFORM_FILES = platform/
- else
- 	PLATFORM_FILES = components/libtraybiff.so
--	XPI_VERSION := $(XPI_VERSION)-$(PLATFORM)
-+	XPI_VERSION := $(XPI_VERSION)
- endif
- 
- export DEBUG MOZ_TRUNK MOZILLA_PLATFORM REAL_CONFIG
diff --git a/mail/moztraybiff/files/patch-components_Makefile b/mail/moztraybiff/files/patch-components_Makefile
deleted file mode 100644
index 583bc78d8..000000000
--- a/mail/moztraybiff/files/patch-components_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/Makefile.orig	Sun Apr 24 09:25:02 2005
-+++ components/Makefile	Fri Sep  9 01:47:59 2005
-@@ -27,7 +27,7 @@
- 	$(shell pkg-config --libs $(GTK_PACKAGE))
- 
- MOZ_INCLUDES := \
--	$(shell $(MOZILLA_CONFIG) --cflags)
-+	$(shell $(MOZILLA_CONFIG) --cflags) $(shell $(REAL_CONFIG) --cflags)
- 
- CFLAGS += \
- 	-fPIC
diff --git a/mail/moztraybiff/files/patch-make-install.rdf b/mail/moztraybiff/files/patch-make-install.rdf
deleted file mode 100644
index 6cf5fd26f..000000000
--- a/mail/moztraybiff/files/patch-make-install.rdf
+++ /dev/null
@@ -1,14 +0,0 @@
---- make-install.rdf.orig	Mon Dec 12 14:23:05 2005
-+++ make-install.rdf	Mon Dec 12 14:23:39 2005
-@@ -1,9 +1,9 @@
- #!/usr/bin/perl
- 
--my $machine = `gcc -dumpmachine`;
-+my $machine = `uname`;
- chomp $machine;
- 
--$machine =~ /^(.*?)\-/
-+$machine =~ /^(.*?)$/
- 	or die "Unable to parse machine name";
- my $arch = $1;
- 
diff --git a/mail/moztraybiff/files/pkg-message.in b/mail/moztraybiff/files/pkg-message.in
deleted file mode 100644
index cc9d44ea4..000000000
--- a/mail/moztraybiff/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-The extension has been installed in %%DATADIR%%/
-
-To use this extension:
-	* Open up Thunderbird
-	* Choose Tools|Extensions from the menu
-	* Click the "Install" button
-	* Navigate to %%DATADIR%%/
-	* Select the file that appears in that directory
-	* Restart Thunderbird
diff --git a/mail/moztraybiff/pkg-descr b/mail/moztraybiff/pkg-descr
deleted file mode 100644
index b19d62dff..000000000
--- a/mail/moztraybiff/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Mozilla New Mail Icon is an extension which displays an icon in the
-system tray when new mail arrives in Mozilla Thunderbird. While it
-supports the standard (FreeDesktop.org) system tray, as used by GNOME,
-KDE and IceWM, it requires GNOME libraries to build and run.
-
-It builds and installs an .xpi file, which can be installed through
-Thunderbird's extension manager. See the pkg-message for more details.
-
-WWW: http://moztraybiff.mozdev.org/
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
deleted file mode 100644
index f5769a404..000000000
--- a/mail/thunderbird-dictionaries/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-# Ports collection Makefile for:	thunderbird-dictionaries
-# Date created:				19 February 2006
-# Whom:					Matthew Luckie <mjl@luckie.org.nz>
-# Based on:				multimedia/mplayer-skins
-#
-# $FreeBSD$
-#
-
-PORTNAME=	thunderbird-dictionaries
-PORTVERSION=	20060220
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR=	dictionaries
-DISTFILES=	# filled in later after options
-DIST_SUBDIR=	thunderbird
-
-MAINTAINER=	mjl@luckie.org.nz
-COMMENT=	Dictionaries for Mozilla Thunderbird
-
-RUN_DEPENDS=	thunderbird:${PORTSDIR}/mail/thunderbird
-
-USE_ZIP=	yes
-WRKSRC=		${WRKDIR}/dictionaries
-
-# Dictionary files
-AF_ZA_FILE=	spell-af-ZA.xpi
-BG_FILE=	spell-bg.xpi
-CA_FILE=	spell-ca.xpi
-CS_FILE=	spell-cs.xpi
-CY_GB_FILE=	spell-cy-GB.xpi
-DA_FILE=	spell-da.xpi
-DE_AT_FILE=	spell-de-AT.xpi
-DE_CH_FILE=	spell-de-CH.xpi
-DE_DE_FILE=	spell-de-DE.xpi
-EL_FILE=	spell-el.xpi
-EN_AU_FILE=	spell-en-AU.xpi
-EN_CA_FILE=	spell-en-CA.xpi
-EN_GB_FILE=	spell-en-GB.xpi
-EN_NZ_FILE=	spell-en-NZ.xpi
-ES_ES_FILE=	spell-es-ES.xpi
-ES_MX_FILE=	spell-es-MX.xpi
-FO_FILE=	spell-fo.xpi
-FR_FR_FILE=	spell-fr-FR.xpi
-GA_FILE=	spell-ga.xpi
-GL_FILE=	spell-gl.xpi
-HE_IL_FILE=	spell-he-IL.xpi
-HR_FILE=	spell-hr.xpi
-HU_FILE=	spell-hu.xpi
-IA_FILE=	spell-ia.xpi
-IT_FILE=	spell-it.xpi
-LA_FILE=	spell-la.xpi
-LT_FILE=	spell-lt.xpi
-LV_LV_FILE=	spell-lv-LV.xpi
-MI_FILE=	spell-mi.xpi
-MS_FILE=	spell-ms.xpi
-NB_FILE=	spell-nb.xpi
-NL_FILE=	spell-nl.xpi
-NN_FILE=	spell-nn.xpi
-PL_FILE=	spell-pl.xpi
-PT_FILE=	spell-pt.xpi
-PT_BR_FILE=	spell-pt-BR.xpi
-RO_FILE=	spell-ro.xpi
-RU_FILE=	spell-ru.xpi
-SK_FILE=	spell-sk.xpi
-SL_FILE=	spell-sl.xpi
-SV_FILE=	spell-sv.xpi
-UK_FILE=	spell-uk.xpi
-ZU_ZA_FILE=	spell-zu-ZA.xpi
-
-# Dictionary options
-OPTIONS=	DICT_ALL "all dictionaries" on
-OPTIONS+=	DICT_AF_ZA "Afrikaans" off
-OPTIONS+=	DICT_BG "Bulgarian" off
-OPTIONS+=	DICT_CA "Catalan" off
-OPTIONS+=	DICT_HR "Croatian" off
-OPTIONS+=	DICT_CS "Czech" off
-OPTIONS+=	DICT_DA "Danish" off
-OPTIONS+=	DICT_NL "Dutch" off
-OPTIONS+=	DICT_EN_AU "English (Australia)" off
-OPTIONS+=	DICT_EN_CA "English (Canada)" off
-OPTIONS+=	DICT_EN_NZ "English (New Zealand)" off
-OPTIONS+=	DICT_EN_GB "English (United Kingdom)" off
-OPTIONS+=	DICT_FR_FR "French (France)" off
-OPTIONS+=	DICT_FO "Faroese" off
-OPTIONS+=	DICT_GL "Galician (Spain)" off
-OPTIONS+=	DICT_DE_AT "German (Austria)" off
-OPTIONS+=	DICT_DE_DE "German (Germany)" off
-OPTIONS+=	DICT_DE_CH "German (Switzerland)" off
-OPTIONS+=	DICT_EL "Greek" off
-OPTIONS+=	DICT_HE_IL "Hebrew" off
-OPTIONS+=	DICT_HU "Hungarian" off
-OPTIONS+=	DICT_IA "Interlingua" off
-OPTIONS+=	DICT_GA "Irish" off
-OPTIONS+=	DICT_IT "Italian" off
-OPTIONS+=	DICT_LA "Latin" off
-OPTIONS+=	DICT_LV_LV "Latvian" off
-OPTIONS+=	DICT_LT "Lithuanian" off
-OPTIONS+=	DICT_MS "Malay" off
-OPTIONS+=	DICT_MI "Maori" off
-OPTIONS+=	DICT_NB "Norwegian (Bokmal)" off
-OPTIONS+=	DICT_NN "Norwegian (Nynorsk)" off
-OPTIONS+=	DICT_PL "Polish" off
-OPTIONS+=	DICT_PT "Portuguese (Portugal)" off
-OPTIONS+=	DICT_PT_BR "Portuguese (Brasil)" off
-OPTIONS+=	DICT_RO "Romanian" off
-OPTIONS+=	DICT_RU "Russian" off
-OPTIONS+=	DICT_ES_MX "Spanish (Mexico)" off
-OPTIONS+=	DICT_ES_ES "Spanish (Spain)" off
-OPTIONS+=	DICT_SK "Slovak" off
-OPTIONS+=	DICT_SL "Slovenian" off
-OPTIONS+=	DICT_SV "Swedish" off
-OPTIONS+=	DICT_UK "Ukrainian" off
-OPTIONS+=	DICT_CY_GB "Welsh" off
-OPTIONS+=	DICT_ZU_ZA "Zulu (South Africa)" off
-
-.include <bsd.port.pre.mk>
-
-# For batch building, build all dictionaries
-.if defined(BATCH)
-WITH_DICT_ALL=yes
-.endif
-
-# All available dictionaries
-ALLDICTS=	AF_ZA BG CA CS CY_GB DA DE_AT DE_CH DE_DE EL EN_AU EN_CA \
-		EN_GB EN_NZ ES_ES ES_MX FO FR_FR GA GL HE_IL HR HU IA IT \
-		LA LT LV_LV MI MS NB NL NN PL PT PT_BR RO RU SK SL SV \
-		UK ZU_ZA
-
-# this dictionary requires special handling in do-install
-BG_DICT=	BG
-
-# Build and install all dictionaries
-.if defined(WITH_DICT_ALL)
-.for f in ${ALLDICTS}
-WITH_DICT_${f}=	yes
-.endfor
-.endif
-
-# Figure out which distfiles to use, and how to construct the plist
-.for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
-PLIST_SUB+=	${f}=""
-HAVE_DICT=	yes
-DISTFILES+=	${${f}_FILE}
-.else
-PLIST_SUB+=	${f}="@comment "
-.endif
-.endfor
-
-# Extract the relevant distfiles
-do-extract:
-	@${MKDIR} ${WRKSRC}
-.for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
-	@${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -d ${WRKSRC}/${${f}_FILE}
-.endif
-.endfor
-
-# Check to make sure that at least one dictionary was selected
-do-build:
-.if !defined(HAVE_DICT)
-	@${ECHO_MSG} "No dictionary selected"
-	@${FALSE}
-.else
-	@${DO_NADA}
-.endif
-
-# Install the requested dictionaries
-do-install:
-	@${MKDIR} ${PREFIX}/lib/thunderbird/components/myspell
-.for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
-.if ${BG_DICT}==${f}
-	@${INSTALL_DATA} \
-		${WRKSRC}/${${f}_FILE}/bin/components/myspell/${${f}_FILE:S/spell-//:S/xpi//}aff \
-		${PREFIX}/lib/thunderbird/components/myspell
-	@${INSTALL_DATA} \
-		${WRKSRC}/${${f}_FILE}/bin/components/myspell/${${f}_FILE:S/spell-//:S/xpi//}dic \
-		${PREFIX}/lib/thunderbird/components/myspell
-.else
-	@${INSTALL_DATA} \
-		${WRKSRC}/${${f}_FILE}/${${f}_FILE:S/spell-//:S/xpi//}aff \
-		${PREFIX}/lib/thunderbird/components/myspell
-	@${INSTALL_DATA} \
-		${WRKSRC}/${${f}_FILE}/${${f}_FILE:S/spell-//:S/xpi//}dic \
-		${PREFIX}/lib/thunderbird/components/myspell
-.endif
-.endif
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-dictionaries/distinfo b/mail/thunderbird-dictionaries/distinfo
deleted file mode 100644
index 217dd193e..000000000
--- a/mail/thunderbird-dictionaries/distinfo
+++ /dev/null
@@ -1,129 +0,0 @@
-MD5 (thunderbird/spell-af-ZA.xpi) = ae85349fb1274fe9c32ab05f85b5f463
-SHA256 (thunderbird/spell-af-ZA.xpi) = 2032dd39d317cda0eac8a36e8d89cd2f11af2e5a88bed8b958149622c77fb306
-SIZE (thunderbird/spell-af-ZA.xpi) = 595437
-MD5 (thunderbird/spell-bg.xpi) = 7a0bd2330808766be3576a480721b593
-SHA256 (thunderbird/spell-bg.xpi) = 481b9995d6cf40cbcfe64a0ac622966fccd3151f56b5c0426d61abdbeb9028c1
-SIZE (thunderbird/spell-bg.xpi) = 264986
-MD5 (thunderbird/spell-ca.xpi) = 2c1b1c98b33bc768aed7dc92a0a0c54b
-SHA256 (thunderbird/spell-ca.xpi) = a4d8c852e1fc420f2c16d97fbaca55b68d3b7198bc3456e41512032891f89a91
-SIZE (thunderbird/spell-ca.xpi) = 495044
-MD5 (thunderbird/spell-cs.xpi) = 2b97865792d0afdecb7acae16454a459
-SHA256 (thunderbird/spell-cs.xpi) = bafc6037efc3d733201703b2d5d9b2852e657222f31421498f1bea9d218828d1
-SIZE (thunderbird/spell-cs.xpi) = 628321
-MD5 (thunderbird/spell-cy-GB.xpi) = a0a673640b3b7ee3f0d8e1bafe20862f
-SHA256 (thunderbird/spell-cy-GB.xpi) = dd7b5b1ec2eed7977740b3249bad4b1cae176c4c7d84ddcad799b2a7ead86597
-SIZE (thunderbird/spell-cy-GB.xpi) = 689165
-MD5 (thunderbird/spell-da.xpi) = 950335a5cf28e1a425a2d0db825a5839
-SHA256 (thunderbird/spell-da.xpi) = 3460e85e6d0b0b5565f42a96feaaac01fb5ad6076ecd355f2e435b0a3318acc0
-SIZE (thunderbird/spell-da.xpi) = 537114
-MD5 (thunderbird/spell-de-AT.xpi) = b498f24a49120f9c33a73c50dfa00bd3
-SHA256 (thunderbird/spell-de-AT.xpi) = f403105aee755ad8230868343a67874935006f02d59261dbf894ecd94f05ebe9
-SIZE (thunderbird/spell-de-AT.xpi) = 11093
-MD5 (thunderbird/spell-de-CH.xpi) = 594cba9e951fdb0964b92f9de4da0ead
-SHA256 (thunderbird/spell-de-CH.xpi) = 36eb4c768c0a3976dc258298de504971e5bd5e73390f3f79e5990fa8ea5bef62
-SIZE (thunderbird/spell-de-CH.xpi) = 352216
-MD5 (thunderbird/spell-de-DE.xpi) = ca983441de50359c9aad8123ecc7adda
-SHA256 (thunderbird/spell-de-DE.xpi) = f77b26671cbf11d790b6c896440e778331acebe52ad80c80c0c46ece1d2e864e
-SIZE (thunderbird/spell-de-DE.xpi) = 352463
-MD5 (thunderbird/spell-el.xpi) = d8c16c4a44ad4620edbcc6fc17207f97
-SHA256 (thunderbird/spell-el.xpi) = c21faa3fa59b370f29a92f4b271672c49265ad475f5b75927f7800828b077d55
-SIZE (thunderbird/spell-el.xpi) = 1448270
-MD5 (thunderbird/spell-en-AU.xpi) = a762af69e11eaad5d3d413dd2c86c745
-SHA256 (thunderbird/spell-en-AU.xpi) = 4f9aea2dbd13ffe047f5b1953d43a3f1ad6d9c017a6f03b9e185e33b37b9dbd1
-SIZE (thunderbird/spell-en-AU.xpi) = 205713
-MD5 (thunderbird/spell-en-CA.xpi) = b74e470762636ffe34c5084f0dbf5399
-SHA256 (thunderbird/spell-en-CA.xpi) = eed4ff6cca059a80200b9676cea0479d08bccd7366f5101efc9741c452b7a675
-SIZE (thunderbird/spell-en-CA.xpi) = 336411
-MD5 (thunderbird/spell-en-GB.xpi) = ba686d49605c87a766f8f79f28825e01
-SHA256 (thunderbird/spell-en-GB.xpi) = 52ba3f48971438071ce8379280cacfe08dfd5cb16c6d757a908a42f1498df5b4
-SIZE (thunderbird/spell-en-GB.xpi) = 248327
-MD5 (thunderbird/spell-en-NZ.xpi) = 181ee877bcbbb54460c64592273c0680
-SHA256 (thunderbird/spell-en-NZ.xpi) = f1c08b9ea156a29433dc3dc56bb5ae90b7a57a54445691e25b9e7329ad58ab8b
-SIZE (thunderbird/spell-en-NZ.xpi) = 223483
-MD5 (thunderbird/spell-es-ES.xpi) = 71e9a6229f9fc12e3b4748e274bd8638
-SHA256 (thunderbird/spell-es-ES.xpi) = 34cf54e8831330f822cc59415d79537f34cad758e08868d217681de8df9571da
-SIZE (thunderbird/spell-es-ES.xpi) = 195111
-MD5 (thunderbird/spell-es-MX.xpi) = ff753ee0ba4dba693c22f610aa56f5f0
-SHA256 (thunderbird/spell-es-MX.xpi) = 258d34b78e3e16b697ffad321e343d0ce92147e492f6fa5b3e8bf9db91ad4d66
-SIZE (thunderbird/spell-es-MX.xpi) = 201380
-MD5 (thunderbird/spell-fo.xpi) = 002ee510e098f695d3421e67c0e43ff2
-SHA256 (thunderbird/spell-fo.xpi) = 6c31c5c339b82abec601a1da0c1c950c460e7a3170c829b85170455f7707f7fe
-SIZE (thunderbird/spell-fo.xpi) = 241210
-MD5 (thunderbird/spell-fr-FR.xpi) = d50a3a4cc8c303016330cab9eef07cd1
-SHA256 (thunderbird/spell-fr-FR.xpi) = 77ea9cd3fd24489337d5996514e002a1b026276d0df63cb85b9c60ed5edc1c7f
-SIZE (thunderbird/spell-fr-FR.xpi) = 326263
-MD5 (thunderbird/spell-ga.xpi) = 0939c83e4a773634e41689712e3f8859
-SHA256 (thunderbird/spell-ga.xpi) = 53b70e56764ddd5f89a28969a588698bb5ada04127ceff8b8a8545f92eb64859
-SIZE (thunderbird/spell-ga.xpi) = 210288
-MD5 (thunderbird/spell-gl.xpi) = 0f1d330326c1af0e8d119f378735fc91
-SHA256 (thunderbird/spell-gl.xpi) = ea88734c14479c803c9a8de50a8264c539c101889399983c9fe02d1c7309a614
-SIZE (thunderbird/spell-gl.xpi) = 148959
-MD5 (thunderbird/spell-he-IL.xpi) = 15895fdb19dc8fbcb98d088605f2c685
-SHA256 (thunderbird/spell-he-IL.xpi) = f26d7605bc00bf9ac896ae740897881dd7ffb062cee0501ca828643106835595
-SIZE (thunderbird/spell-he-IL.xpi) = 840097
-MD5 (thunderbird/spell-hr.xpi) = 499a5a499de28948fae196cc245c9f85
-SHA256 (thunderbird/spell-hr.xpi) = d21d9b67d4ca8a1bc30f0456af7c959035c8ced09f0865c20902af7d26095140
-SIZE (thunderbird/spell-hr.xpi) = 811483
-MD5 (thunderbird/spell-hu.xpi) = 622830acfcf1f9ed8a4b2944837577a4
-SHA256 (thunderbird/spell-hu.xpi) = c4f5507615665f64e82be3ad8a358b2e644b8a816b83a5dcb4a82291c6c91ff5
-SIZE (thunderbird/spell-hu.xpi) = 1043917
-MD5 (thunderbird/spell-ia.xpi) = 509a326095849a5655a01fb1bab5b253
-SHA256 (thunderbird/spell-ia.xpi) = 60d060f8c20d1a8630f8cdbd9b37a8183ff580172181a0c52523930d1770f818
-SIZE (thunderbird/spell-ia.xpi) = 91587
-MD5 (thunderbird/spell-it.xpi) = ffb0c12c0e985f178503575b78bde581
-SHA256 (thunderbird/spell-it.xpi) = 0ee25550d30f2b87beab13208b96473431b0e8e5f267ba3d7d644293198f2b6c
-SIZE (thunderbird/spell-it.xpi) = 338288
-MD5 (thunderbird/spell-la.xpi) = c8c4326301d1cf72caacdd0961279a31
-SHA256 (thunderbird/spell-la.xpi) = a14a03e476678337eab4b408d24ebcb14d709c41c7a1fbde7dc04cf235451609
-SIZE (thunderbird/spell-la.xpi) = 57617
-MD5 (thunderbird/spell-lt.xpi) = 089e299885b3239c32c86054c8e919a4
-SHA256 (thunderbird/spell-lt.xpi) = 82c82f627483ae1e23cb6b7628a30a20c5defe87d988711c5570ea263f8d609d
-SIZE (thunderbird/spell-lt.xpi) = 66613
-MD5 (thunderbird/spell-lv-LV.xpi) = a2178096c52f03b5b9d6acaadd6fe1be
-SHA256 (thunderbird/spell-lv-LV.xpi) = 1050e5b297ebbbcbf2b76ff313477eb083579c7752aa76c823947948b55c2d26
-SIZE (thunderbird/spell-lv-LV.xpi) = 1098233
-MD5 (thunderbird/spell-mi.xpi) = f863592c869991d596de45380338f793
-SHA256 (thunderbird/spell-mi.xpi) = 07bc7c0c9cb1b8a793b8f6dda3a636302bfa8b89ea28d4fe5fca2c0e7a959bff
-SIZE (thunderbird/spell-mi.xpi) = 79020
-MD5 (thunderbird/spell-ms.xpi) = 11ceedc2fe20e8eb4ed16c485abcc35f
-SHA256 (thunderbird/spell-ms.xpi) = f0eb3b3a88b327937954ecc425667b136628f1631eacb559fd5daf4269470f93
-SIZE (thunderbird/spell-ms.xpi) = 65498
-MD5 (thunderbird/spell-nb.xpi) = a57b2683b7cc57832c6deedd805fbe5f
-SHA256 (thunderbird/spell-nb.xpi) = ac19d858b931817ad19dc77875555ef2f381d059924ac57ab60037a38fe84112
-SIZE (thunderbird/spell-nb.xpi) = 587114
-MD5 (thunderbird/spell-nl.xpi) = bac8d295dbf57dd86d0a9259b05a775d
-SHA256 (thunderbird/spell-nl.xpi) = 289460f51f6f788087e4f82754d4292eed3f63b570651a63fd8353fbc853304d
-SIZE (thunderbird/spell-nl.xpi) = 508812
-MD5 (thunderbird/spell-nn.xpi) = 450d19ee5f5bfd6cd3f4e39956c3a7ce
-SHA256 (thunderbird/spell-nn.xpi) = 8dcd82ccfeb1d8ba5e725c68a70060ea091d13492d88d6bdf6ca149aebad4421
-SIZE (thunderbird/spell-nn.xpi) = 462744
-MD5 (thunderbird/spell-pl.xpi) = 4951aefa9afd2be89c4dfedc71c26f59
-SHA256 (thunderbird/spell-pl.xpi) = 0ebb2d5369fdd8029c67a795f99f1560b9b955e68dc6b559ddd117c0e7319159
-SIZE (thunderbird/spell-pl.xpi) = 759342
-MD5 (thunderbird/spell-pt.xpi) = 24d60a61f7143ab7ead1f19892180ce7
-SHA256 (thunderbird/spell-pt.xpi) = 71a16ce0cac73a6325a6f2f8197ad280c82d19b4a6f8a88dbf0b34943794294b
-SIZE (thunderbird/spell-pt.xpi) = 136899
-MD5 (thunderbird/spell-pt-BR.xpi) = 58da6b1e64fb47fe3fad1f4cb5ad6a07
-SHA256 (thunderbird/spell-pt-BR.xpi) = 5c4b68b821e76ec87c023472c7b49a24ca7deaf0f95d33b7a5c9e9b5e2aecb18
-SIZE (thunderbird/spell-pt-BR.xpi) = 95922
-MD5 (thunderbird/spell-ro.xpi) = 63b3e971e0d6196b44b8f097931b38fb
-SHA256 (thunderbird/spell-ro.xpi) = 444164f92d0b1432bace8d91e9eba9dc5850c3bdae3f54a9f782aed8b935bf17
-SIZE (thunderbird/spell-ro.xpi) = 139001
-MD5 (thunderbird/spell-ru.xpi) = 401f130c50df97b3859fe17b261a5a69
-SHA256 (thunderbird/spell-ru.xpi) = 2d3fba0bfdf8ac782927e70c2a8e7de331f0508473bcce5937fa7215f1c82917
-SIZE (thunderbird/spell-ru.xpi) = 467757
-MD5 (thunderbird/spell-sk.xpi) = 25eec563c43484001d3beaed90ed9213
-SHA256 (thunderbird/spell-sk.xpi) = 9dc481fdb4f788712cc286a00d6be90a8142954f8b345ebb404a12b10c93a475
-SIZE (thunderbird/spell-sk.xpi) = 187733
-MD5 (thunderbird/spell-sl.xpi) = 01e96c3f0a86bd6e4dfc17d610640259
-SHA256 (thunderbird/spell-sl.xpi) = be3b8acfe9610ea255aed791e79a98cdb12dbb4177dd9f802b139721f65c8b6d
-SIZE (thunderbird/spell-sl.xpi) = 1186588
-MD5 (thunderbird/spell-sv.xpi) = 47da6dc9dc9331a82190731d19c80ec1
-SHA256 (thunderbird/spell-sv.xpi) = 497b80d29b7246a0e37909365f850fc29ef1a606709d508c0e0c63cb4e130e32
-SIZE (thunderbird/spell-sv.xpi) = 118607
-MD5 (thunderbird/spell-uk.xpi) = 3db52608eea5db2fc48319562e06530e
-SHA256 (thunderbird/spell-uk.xpi) = 648295fd0f0819cc7280980474be905b8a84334a81aecefc2c2b2225f313822d
-SIZE (thunderbird/spell-uk.xpi) = 1378571
-MD5 (thunderbird/spell-zu-ZA.xpi) = ed25d59f25ff31a4e4d88df484389f99
-SHA256 (thunderbird/spell-zu-ZA.xpi) = 00a54ffb7b79a50f7c5341b9f19d00aa1cdfef884c5e430ceeb93aefcdddddd6
-SIZE (thunderbird/spell-zu-ZA.xpi) = 218351
diff --git a/mail/thunderbird-dictionaries/pkg-descr b/mail/thunderbird-dictionaries/pkg-descr
deleted file mode 100644
index 57c862aa4..000000000
--- a/mail/thunderbird-dictionaries/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Localized Dictionaries for Mozilla Thunderbird
-
-WWW: http://www.mozilla.com/thunderbird/dictionaries.html
diff --git a/mail/thunderbird-dictionaries/pkg-plist b/mail/thunderbird-dictionaries/pkg-plist
deleted file mode 100644
index 969289466..000000000
--- a/mail/thunderbird-dictionaries/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-%%AF_ZA%%lib/thunderbird/components/myspell/af-ZA.aff
-%%AF_ZA%%lib/thunderbird/components/myspell/af-ZA.dic
-%%BG%%lib/thunderbird/components/myspell/bg.aff
-%%BG%%lib/thunderbird/components/myspell/bg.dic
-%%CA%%lib/thunderbird/components/myspell/ca.aff
-%%CA%%lib/thunderbird/components/myspell/ca.dic
-%%CS%%lib/thunderbird/components/myspell/cs.aff
-%%CS%%lib/thunderbird/components/myspell/cs.dic
-%%CY_GB%%lib/thunderbird/components/myspell/cy-GB.aff
-%%CY_GB%%lib/thunderbird/components/myspell/cy-GB.dic
-%%DA%%lib/thunderbird/components/myspell/da.aff
-%%DA%%lib/thunderbird/components/myspell/da.dic
-%%DE_AT%%lib/thunderbird/components/myspell/de-AT.aff
-%%DE_AT%%lib/thunderbird/components/myspell/de-AT.dic
-%%DE_CH%%lib/thunderbird/components/myspell/de-CH.aff
-%%DE_CH%%lib/thunderbird/components/myspell/de-CH.dic
-%%DE_DE%%lib/thunderbird/components/myspell/de-DE.aff
-%%DE_DE%%lib/thunderbird/components/myspell/de-DE.dic
-%%EL%%lib/thunderbird/components/myspell/el.aff
-%%EL%%lib/thunderbird/components/myspell/el.dic
-%%EN_AU%%lib/thunderbird/components/myspell/en-AU.aff
-%%EN_AU%%lib/thunderbird/components/myspell/en-AU.dic
-%%EN_CA%%lib/thunderbird/components/myspell/en-CA.aff
-%%EN_CA%%lib/thunderbird/components/myspell/en-CA.dic
-%%EN_GB%%lib/thunderbird/components/myspell/en-GB.aff
-%%EN_GB%%lib/thunderbird/components/myspell/en-GB.dic
-%%EN_NZ%%lib/thunderbird/components/myspell/en-NZ.aff
-%%EN_NZ%%lib/thunderbird/components/myspell/en-NZ.dic
-%%ES_ES%%lib/thunderbird/components/myspell/es-ES.aff
-%%ES_ES%%lib/thunderbird/components/myspell/es-ES.dic
-%%ES_MX%%lib/thunderbird/components/myspell/es-MX.aff
-%%ES_MX%%lib/thunderbird/components/myspell/es-MX.dic
-%%FO%%lib/thunderbird/components/myspell/fo.aff
-%%FO%%lib/thunderbird/components/myspell/fo.dic
-%%FR_FR%%lib/thunderbird/components/myspell/fr-FR.aff
-%%FR_FR%%lib/thunderbird/components/myspell/fr-FR.dic
-%%GA%%lib/thunderbird/components/myspell/ga.aff
-%%GA%%lib/thunderbird/components/myspell/ga.dic
-%%GL%%lib/thunderbird/components/myspell/gl.aff
-%%GL%%lib/thunderbird/components/myspell/gl.dic
-%%HE_IL%%lib/thunderbird/components/myspell/he-IL.aff
-%%HE_IL%%lib/thunderbird/components/myspell/he-IL.dic
-%%HR%%lib/thunderbird/components/myspell/hr.aff
-%%HR%%lib/thunderbird/components/myspell/hr.dic
-%%HU%%lib/thunderbird/components/myspell/hu.aff
-%%HU%%lib/thunderbird/components/myspell/hu.dic
-%%IA%%lib/thunderbird/components/myspell/ia.aff
-%%IA%%lib/thunderbird/components/myspell/ia.dic
-%%IT%%lib/thunderbird/components/myspell/it.aff
-%%IT%%lib/thunderbird/components/myspell/it.dic
-%%LA%%lib/thunderbird/components/myspell/la.aff
-%%LA%%lib/thunderbird/components/myspell/la.dic
-%%LT%%lib/thunderbird/components/myspell/lt.aff
-%%LT%%lib/thunderbird/components/myspell/lt.dic
-%%LV_LV%%lib/thunderbird/components/myspell/lv-LV.aff
-%%LV_LV%%lib/thunderbird/components/myspell/lv-LV.dic
-%%MI%%lib/thunderbird/components/myspell/mi.aff
-%%MI%%lib/thunderbird/components/myspell/mi.dic
-%%MS%%lib/thunderbird/components/myspell/ms.aff
-%%MS%%lib/thunderbird/components/myspell/ms.dic
-%%NB%%lib/thunderbird/components/myspell/nb.aff
-%%NB%%lib/thunderbird/components/myspell/nb.dic
-%%NL%%lib/thunderbird/components/myspell/nl.aff
-%%NL%%lib/thunderbird/components/myspell/nl.dic
-%%NN%%lib/thunderbird/components/myspell/nn.aff
-%%NN%%lib/thunderbird/components/myspell/nn.dic
-%%PL%%lib/thunderbird/components/myspell/pl.aff
-%%PL%%lib/thunderbird/components/myspell/pl.dic
-%%PT%%lib/thunderbird/components/myspell/pt.aff
-%%PT%%lib/thunderbird/components/myspell/pt.dic
-%%PT_BR%%lib/thunderbird/components/myspell/pt-BR.aff
-%%PT_BR%%lib/thunderbird/components/myspell/pt-BR.dic
-%%RO%%lib/thunderbird/components/myspell/ro.aff
-%%RO%%lib/thunderbird/components/myspell/ro.dic
-%%RU%%lib/thunderbird/components/myspell/ru.aff
-%%RU%%lib/thunderbird/components/myspell/ru.dic
-%%SK%%lib/thunderbird/components/myspell/sk.aff
-%%SK%%lib/thunderbird/components/myspell/sk.dic
-%%SL%%lib/thunderbird/components/myspell/sl.aff
-%%SL%%lib/thunderbird/components/myspell/sl.dic
-%%SV%%lib/thunderbird/components/myspell/sv.aff
-%%SV%%lib/thunderbird/components/myspell/sv.dic
-%%UK%%lib/thunderbird/components/myspell/uk.aff
-%%UK%%lib/thunderbird/components/myspell/uk.dic
-%%ZU_ZA%%lib/thunderbird/components/myspell/zu-ZA.aff
-%%ZU_ZA%%lib/thunderbird/components/myspell/zu-ZA.dic
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
deleted file mode 100644
index be48ee3e1..000000000
--- a/mail/thunderbird/Makefile
+++ /dev/null
@@ -1,98 +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.17 2006/09/14 13:49:54 ahze Exp $
-#
-
-PORTNAME=	thunderbird
-DISTVERSION=	1.5.0.7
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-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_GCC=	3.4+
-CFLAGS+=	-I${X11BASE}/include
-
-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}/icons/default.xpm
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/Makefile.common"
-
-.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
-IGNORE=	core dumps at runtime
-.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
-
-.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
-IGNORE=	core dumps on ${ARCH}, kern.osreldate>=601101 needed
-.endif
-
-.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:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}/defaults
-	@cd ${FAKEDIR}/lib/${PORTNAME}/defaults/isp && \
-		${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/defaults/isp/|' >> ${PLIST} && \
-		${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/defaults/isp/|' \
-		>> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults/isp 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/defaults 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	@${ECHO_CMD} '${PORTNAME_ICON:S|${PREFIX}/||}' >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PORTNAME_ICON}
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
deleted file mode 100644
index abb2764d1..000000000
--- a/mail/thunderbird/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-1.5.0.7-source.tar.bz2) = c3933149147567471000e53dbeac7429
-SHA256 (thunderbird-1.5.0.7-source.tar.bz2) = 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
-SIZE (thunderbird-1.5.0.7-source.tar.bz2) = 35994957
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-build_unix_run-mozilla.sh b/mail/thunderbird/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d..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_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/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_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-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-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 7fcb98bd2..000000000
--- a/mail/thunderbird/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/files/patch-nopangoxft b/mail/thunderbird/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c48..000000000
--- a/mail/thunderbird/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/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-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-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/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-descr b/mail/thunderbird/pkg-descr
deleted file mode 100644
index 9ef9a8246..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.com/thunderbird/
author	marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>	2006-10-14 18:33:48 +0800
committer	marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>	2006-10-14 18:33:48 +0800
commit	1b3327761c8bcb98d89b529daeae9600844b4361 (patch)
tree	0be1cd4eb5fec6661da4798906b0d9bd522e794f /mail
parent	a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff)
download	marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip