Get those ports to catch up with gnome-keyring that splitted into

libgnome-keyring and gnome-keyring. It helps a lot with resolve the
conflict that prevent you to install some important ports such as
gimp and etc. Bump the PORTREVISION on those ports.


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

23 files changed, 1344 insertions, 0 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
new file mode 100644
index 000000000..bb6fc618e
--- /dev/null
+++ b/mail/balsa/Makefile
@@ -0,0 +1,99 @@
+# New ports collection makefile for:	balsa
+# Date created:				02 December 1998
+# Whom:					Glenn Johnson <gljohns@bellsouth.net>
+#
+# $FreeBSD: ports/mail/balsa/Makefile,v 1.150 2011/02/25 01:31:48 delphij Exp $
+#   $MCom: ports-stable/mail/balsa/Makefile,v 1.3 2007/12/02 19:18:50 marcus Exp $
+#
+
+PORTNAME=	balsa
+PORTVERSION=	2.4.8
+PORTREVISION=	2
+CATEGORIES=	mail gnome
+MASTER_SITES=	http://pawsa.fedorapeople.org/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.4.6:${PORTSDIR}/mail/gmime24 \
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+
+USE_GMAKE=	yes
+USE_BZIP2=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \
+		libgnomeprintui
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libltdl
+GNU_CONFIGURE=	yes
+USE_ICONV=	yes
+CONFIGURE_ARGS=	--enable-threads \
+		--disable-more-warnings \
+		--with-ssl \
+		--without-nm \
+		--with-canberra
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+
+MAN1=		balsa.1
+
+OPTIONS=	LDAP "Enable LDAP support" on \
+		GTKSPELL "Spell checking support" on \
+		GTKSV "Enable GtkSourceview support" on \
+		NOTIFY "Enable libnotify support" on \
+		GPG "Enable GnuPG support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GPG)
+LIB_DEPENDS+=		gpgme.18:${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 !defined(WITHOUT_GTKSV)
+USE_GNOME+=	gtksourceview2
+CONFIGURE_ARGS+=--with-gtksourceview=2
+.endif
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--with-libnotify=yes
+.else
+CONFIGURE_ARGS+=--with-libnotify=no
+.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}
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED_SOURCE||g ; s|-D.*_DISABLE_DEPRECATED||g'
+
+.include <bsd.port.post.mk>
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
new file mode 100644
index 000000000..432c7f94e
--- /dev/null
+++ b/mail/balsa/distinfo
@@ -0,0 +1,3 @@
+MD5 (balsa-2.4.8.tar.bz2) = 4345e440ae5faf2787f5cc324fcb234a
+SHA256 (balsa-2.4.8.tar.bz2) = 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf
+SIZE (balsa-2.4.8.tar.bz2) = 3150866
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
new file mode 100644
index 000000000..c18f9adcf
--- /dev/null
+++ b/mail/balsa/files/patch-configure
@@ -0,0 +1,227 @@
+--- configure.orig	2010-02-14 15:51:21.000000000 -0500
++++ configure	2010-02-14 15:51:21.000000000 -0500
+@@ -8884,7 +8884,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se
+   $as_echo_n "(cached) " >&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
+@@ -8949,7 +8949,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_LDAP 1
+ _ACEOF
+ 
+-              LIBS="-lldap -llber -lresolv $LIBS"
++              LIBS="-lldap -llber $LIBS"
+ else
+   { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
+ $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
+@@ -11365,13 +11365,13 @@ _ACEOF
+ else
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
+-$as_echo_n "checking for new_pspell_manager in -lpspell... " >&6; }
+-if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5
++$as_echo_n "checking for new_aspell_manager in -laspell... " >&6; }
++if test "${ac_cv_lib_aspell_new_aspell_manager+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
++LIBS="-laspell -lstdc++ -laspell-modules $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11385,11 +11385,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char new_pspell_manager ();
++char new_aspell_manager ();
+ int
+ main ()
+ {
+-return new_pspell_manager ();
++return new_aspell_manager ();
+   ;
+   return 0;
+ }
+@@ -11415,12 +11415,12 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_lib_pspell_new_pspell_manager=yes
++  ac_cv_lib_aspell_new_aspell_manager=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_pspell_new_pspell_manager=no
++	ac_cv_lib_aspell_new_aspell_manager=no
+ fi
+ 
+ rm -rf conftest.dSYM
+@@ -11428,19 +11428,19 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5
+-$as_echo "$ac_cv_lib_pspell_new_pspell_manager" >&6; }
+-if test "x$ac_cv_lib_pspell_new_pspell_manager" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5
++$as_echo "$ac_cv_lib_aspell_new_aspell_manager" >&6; }
++if test "x$ac_cv_lib_aspell_new_aspell_manager" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPSPELL 1
+ _ACEOF
+ 
+-  LIBS="-lpspell $LIBS"
++  LIBS="-laspell $LIBS"
+ 
+ else
+ 
+-            { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
+-$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
++            { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
++$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+@@ -11448,18 +11448,18 @@ fi
+ 
+ fi
+ 
+-    if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
+-$as_echo_n "checking for pspell/pspell.h... " >&6; }
+-if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
++    if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
++  { $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
++$as_echo_n "checking for aspell/aspell.h... " >&6; }
++if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
+-$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
++$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h usability" >&5
+-$as_echo_n "checking pspell/pspell.h usability... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h usability" >&5
++$as_echo_n "checking aspell/aspell.h usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11467,7 +11467,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <pspell/pspell.h>
++#include <aspell/aspell.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -11500,15 +11500,15 @@ rm -f core conftest.err conftest.$ac_obj
+ $as_echo "$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h presence" >&5
+-$as_echo_n "checking pspell/pspell.h presence... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h presence" >&5
++$as_echo_n "checking aspell/aspell.h presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <pspell/pspell.h>
++#include <aspell/aspell.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -11542,44 +11542,44 @@ $as_echo "$ac_header_preproc" >&6; }
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&2;}
+ 
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
+-$as_echo_n "checking for pspell/pspell.h... " >&6; }
+-if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
++$as_echo_n "checking for aspell/aspell.h... " >&6; }
++if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_cv_header_pspell_pspell_h=$ac_header_preproc
++  ac_cv_header_aspell_aspell_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
+-$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
++$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_pspell_pspell_h" = x""yes; then
++if test "x$ac_cv_header_aspell_aspell_h" = x""yes; then
+   :
+ else
+-  { { $as_echo "$as_me:$LINENO: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
+-$as_echo "$as_me: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
++  { { $as_echo "$as_me:$LINENO: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
++$as_echo "$as_me: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -11882,7 +11882,7 @@ fi
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE 500
++/*#define _XOPEN_SOURCE 500*/
+ _ACEOF
+ 
+ { $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5
diff --git a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c
new file mode 100644
index 000000000..a7206c822
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000..ebe565329
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_local.c
@@ -0,0 +1,33 @@
+--- libbalsa/mailbox_local.c.orig	2009-05-23 03:02:12.000000000 -0400
++++ libbalsa/mailbox_local.c	2009-12-25 12:39:52.000000000 -0500
+@@ -440,7 +440,7 @@ libbalsa_mailbox_local_load_config(LibBa
+ 
+ typedef struct {
+     GArray * array;
+-    guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno);
++    guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno);
+     LibBalsaMailboxLocal *local;
+ } LibBalsaMailboxLocalSaveTreeInfo;
+ 
+@@ -464,9 +464,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;
+@@ -524,7 +524,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;
+     save_info.array =
+         g_array_new(FALSE, FALSE, sizeof(LibBalsaMailboxLocalTreeInfo));
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.h b/mail/balsa/files/patch-libbalsa_mailbox_local.h
new file mode 100644
index 000000000..7006f7f42
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_local.h
@@ -0,0 +1,11 @@
+--- libbalsa/mailbox_local.h.orig	Sun May  6 13:57:53 2007
++++ libbalsa/mailbox_local.h	Thu May 31 01:04:10 2007
+@@ -79,7 +79,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);
+     LibBalsaMailboxLocalMessageInfo *(*get_info)(LibBalsaMailboxLocal * local,
+                                                  guint msgno);
+ };
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
new file mode 100644
index 000000000..9d865279b
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
@@ -0,0 +1,89 @@
+--- libbalsa/mailbox_maildir.c.orig	2008-04-13 06:16:40.000000000 -0400
++++ libbalsa/mailbox_maildir.c	2008-07-04 16:27:21.000000000 -0400
+@@ -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>
+@@ -49,7 +51,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) \
+@@ -175,7 +177,7 @@ libbalsa_mailbox_maildir_class_init(LibB
+     libbalsa_mailbox_local_class->check_files  = lbm_maildir_check_files;
+     libbalsa_mailbox_local_class->set_path     = lbm_maildir_set_path;
+     libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files;
+-    libbalsa_mailbox_local_class->fileno       = lbm_maildir_fileno;
++    libbalsa_mailbox_local_class->sti_fileno       = lbm_maildir_fileno;
+     libbalsa_mailbox_local_class->get_info     = lbm_maildir_get_info;
+ }
+ 
+@@ -390,7 +392,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;
+@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa
+ 	    msg_info->key=key;
+ 	    msg_info->filename=g_strdup(filename);
+ 	    msg_info->local_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);
+ }
+@@ -456,21 +458,21 @@ 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, "cur", &md_fileno);
+     /* We parse "new" after "cur", so that any recent messages will have
+      * higher msgnos than any current messages. That ensures that the
+      * message tree saved by LibBalsaMailboxLocal is still valid, and
+      * that the new messages will be inserted correctly into the tree by
+      * libbalsa_mailbox_local_add_messages. */
+-    lbm_maildir_parse(mdir, "new", &fileno);
++    lbm_maildir_parse(mdir, "new", &md_fileno);
+ }
+ 
+ static gboolean
+@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal 
+     msg_info =
+         message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno);
+ 
+-    return msg_info->fileno;
++    return msg_info->mi_fileno;
+ }
+ 
+ static LibBalsaMailboxLocalMessageInfo *
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
new file mode 100644
index 000000000..2511938ff
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000..36cd3b677
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
@@ -0,0 +1,248 @@
+--- libbalsa/mailbox_mh.c.orig	Wed May 16 13:49:05 2007
++++ libbalsa/mailbox_mh.c	Thu May 31 01:09:09 2007
+@@ -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>
+@@ -45,7 +47,7 @@
+ struct message_info {
+     LibBalsaMailboxLocalMessageInfo local_info;
+     LibBalsaMessageFlag orig_flags;     /* Has only real flags */
+-    gint fileno;
++    gint mi_fileno;
+ };
+ 
+ #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
+@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
+ 
+ #define MH_BASENAME(msg_info) \
+     g_strdup_printf((msg_info->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,
+@@ -335,7 +337,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;
+ }
+ 
+ static void
+@@ -352,7 +354,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++;
+@@ -361,22 +363,22 @@ 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->local_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);
+-		msg_info->fileno = fileno;
++		msg_info->mi_fileno = mh_fileno;
+ 	    }
+ 	    msg_info->orig_flags = delete_flag;
+ 	}
+@@ -394,17 +396,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;
+     }
+ 
+@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
+ 
+     for (seq = sequences; *seq; seq++) {
+ 	guint end = 0;
+-	guint fileno;
++	guint mh_fileno;
+ 
+ 	if (!**seq)
+ 	    continue;
+@@ -444,11 +446,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);
+@@ -580,7 +582,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;
+@@ -591,15 +593,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;
+@@ -686,7 +688,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. */
+@@ -763,11 +765,11 @@ lbm_mh_flag_line(struct message_info *ms
+     if (!(msg_info->local_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
+@@ -849,7 +851,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);
+@@ -1038,7 +1040,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;
+@@ -1049,13 +1051,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);
+ }
+ 
+@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+     int fd;
+     GMimeStream *out_stream;
+     GMimeFilter *crlffilter;
+-    int fileno;
++    int mh_fileno;
+     int retries;
+     GMimeStream *in_stream;
+ 
+@@ -1115,14 +1117,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)
+@@ -1145,9 +1147,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-src_threads.h b/mail/balsa/files/patch-src_threads.h
new file mode 100644
index 000000000..585d798ba
--- /dev/null
+++ b/mail/balsa/files/patch-src_threads.h
@@ -0,0 +1,10 @@
+--- src/threads.h.orig	2009-08-30 05:03:26.000000000 -0400
++++ src/threads.h	2009-12-25 12:41:53.000000000 -0500
+@@ -23,6 +23,7 @@
+ #define __THREADS_H__
+ 
+ #include <unistd.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
new file mode 100644
index 000000000..b7010e980
--- /dev/null
+++ b/mail/balsa/pkg-descr
@@ -0,0 +1,18 @@
+Balsa is a mail reader for the GNOME Desktop.  It supports many features:
+
+* Support for local mailbox formats: mbox, maildir, mh
+* Allows nested mailboxes
+* Support for POP3 and IMAP mail access protocols
+* Printing
+* Spell Checking
+* Multi-threaded mail retrevial (optional)
+* MIME support (view images inline, save parts)
+* Supports SMTP and/or use of local MTA, ie. Sendmail
+* Address Book that integrates with GnomeCard
+* Highly configurable
+* Active, open development
+* Multiple character sets for composing and reading messages
+* Allows file attachments to outgoing messages
+* GPG/OpenPGP mail signing and encryption
+
+WWW: http://balsa.gnome.org/
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
new file mode 100644
index 000000000..100201a2c
--- /dev/null
+++ b/mail/balsa/pkg-plist
@@ -0,0 +1,226 @@
+bin/balsa
+bin/balsa-ab
+etc/sound/events/balsa.soundlist
+libdata/bonobo/servers/GNOME_Balsa.server
+share/applications/balsa.desktop
+share/balsa/gtksourceview-2.0/balsa-mail-style.xml
+share/balsa/gtksourceview-2.0/balsa-mail.lang
+share/balsa/hicolor/16x16/apps/balsa-drop-down.png
+share/balsa/hicolor/16x16/apps/balsa-encrypted.png
+share/balsa/hicolor/16x16/apps/balsa-mark-all.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
+share/balsa/hicolor/16x16/apps/balsa-next-flagged.png
+share/balsa/hicolor/16x16/apps/balsa-next-part.png
+share/balsa/hicolor/16x16/apps/balsa-next-unread.png
+share/balsa/hicolor/16x16/apps/balsa-next.png
+share/balsa/hicolor/16x16/apps/balsa-postpone.png
+share/balsa/hicolor/16x16/apps/balsa-previous-part.png
+share/balsa/hicolor/16x16/apps/balsa-previous.png
+share/balsa/hicolor/16x16/apps/balsa-reply-all.png
+share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
+share/balsa/hicolor/16x16/apps/balsa-signature-good.png
+share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
+share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
+share/balsa/hicolor/16x16/apps/mail-inbox.png
+share/balsa/hicolor/16x16/apps/mail-outbox.png
+share/balsa/hicolor/16x16/apps/stock_book_open.png
+share/balsa/hicolor/16x16/apps/stock_book_red.png
+share/balsa/hicolor/16x16/apps/stock_contact.png
+share/balsa/hicolor/16x16/apps/stock_mail-receive.png
+share/balsa/hicolor/16x16/apps/stock_mail.png
+share/balsa/hicolor/22x22
+share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
+share/balsa/hicolor/24x24/apps/balsa-encrypt.png
+share/balsa/hicolor/24x24/apps/balsa-encrypted.png
+share/balsa/hicolor/24x24/apps/balsa-mark-all.png
+share/balsa/hicolor/24x24/apps/balsa-marked-new.png
+share/balsa/hicolor/24x24/apps/balsa-next-flagged.png
+share/balsa/hicolor/24x24/apps/balsa-next-part.png
+share/balsa/hicolor/24x24/apps/balsa-next-unread.png
+share/balsa/hicolor/24x24/apps/balsa-next.png
+share/balsa/hicolor/24x24/apps/balsa-postpone.png
+share/balsa/hicolor/24x24/apps/balsa-preview.png
+share/balsa/hicolor/24x24/apps/balsa-previous-part.png
+share/balsa/hicolor/24x24/apps/balsa-previous.png
+share/balsa/hicolor/24x24/apps/balsa-reply-all.png
+share/balsa/hicolor/24x24/apps/balsa-sign.png
+share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
+share/balsa/hicolor/24x24/apps/balsa-signature-good.png
+share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
+share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
+share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
+share/balsa/hicolor/24x24/apps/stock_book_blue.png
+share/balsa/hicolor/24x24/apps/stock_book_green.png
+share/balsa/hicolor/24x24/apps/stock_book_open.png
+share/balsa/hicolor/24x24/apps/stock_book_red.png
+share/balsa/hicolor/24x24/apps/stock_book_yellow.png
+share/balsa/hicolor/24x24/apps/stock_contact.png
+share/balsa/hicolor/24x24/apps/stock_mail-receive.png
+share/balsa/hicolor/24x24/apps/stock_mail.png
+share/balsa/hicolor/24x24/apps/stock_view-fields.png
+share/balsa/pixmaps/attachment.png
+share/balsa/pixmaps/balsa-logo.png
+share/balsa/pixmaps/balsa-top.png
+share/balsa/pixmaps/balsa-watermark.png
+share/balsa/pixmaps/balsa_icon.png
+share/balsa/pixmaps/balsa_logo.png
+share/gnome/help/balsa/C/balsa.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-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/help/balsa/de/balsa.xml
+share/gnome/help/balsa/de/figures/address-book-ldap.png
+share/gnome/help/balsa/de/figures/address-book-modify.png
+share/gnome/help/balsa/de/figures/address-book-vcard.png
+share/gnome/help/balsa/de/figures/address-book.png
+share/gnome/help/balsa/de/figures/balsa_logo.png
+share/gnome/help/balsa/de/figures/druid-start.png
+share/gnome/help/balsa/de/figures/example-alias.png
+share/gnome/help/balsa/de/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/de/figures/main-window-toolbar.png
+share/gnome/help/balsa/de/figures/main-window.png
+share/gnome/help/balsa/de/figures/message-window.png
+share/gnome/help/balsa/de/figures/msg-part-select.png
+share/gnome/help/balsa/de/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/de/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/de/figures/newmsg-window.png
+share/gnome/help/balsa/de/figures/preferences-window.png
+share/gnome/help/balsa/de/figures/spell-check.png
+share/gnome/help/balsa/es/balsa.xml
+share/gnome/help/balsa/es/figures/address-book-ldap.png
+share/gnome/help/balsa/es/figures/address-book-modify.png
+share/gnome/help/balsa/es/figures/address-book-vcard.png
+share/gnome/help/balsa/es/figures/address-book.png
+share/gnome/help/balsa/es/figures/balsa_logo.png
+share/gnome/help/balsa/es/figures/druid-start.png
+share/gnome/help/balsa/es/figures/example-alias.png
+share/gnome/help/balsa/es/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/es/figures/main-window-toolbar.png
+share/gnome/help/balsa/es/figures/main-window.png
+share/gnome/help/balsa/es/figures/message-window.png
+share/gnome/help/balsa/es/figures/msg-part-select.png
+share/gnome/help/balsa/es/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/es/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/es/figures/newmsg-window.png
+share/gnome/help/balsa/es/figures/preferences-window.png
+share/gnome/help/balsa/es/figures/spell-check.png
+share/idl/Balsa.idl
+share/omf/balsa/balsa-C.omf
+share/omf/balsa/balsa-de.omf
+share/omf/balsa/balsa-es.omf
+share/pixmaps/gnome-balsa2.png
+share/sounds/balsa/newmail.wav
+share/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/ar/LC_MESSAGES/balsa.mo
+share/locale/az/LC_MESSAGES/balsa.mo
+share/locale/be/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/dz/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/eu/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/gl/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/mk/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/oc/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/sounds/balsa
+@dirrm share/omf/balsa
+%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
+@dirrm share/gnome/help/balsa/es/figures
+@dirrm share/gnome/help/balsa/es
+@dirrm share/gnome/help/balsa/de/figures
+@dirrm share/gnome/help/balsa/de
+@dirrm share/gnome/help/balsa/C/figures
+@dirrm share/gnome/help/balsa/C
+@dirrm share/gnome/help/balsa
+@dirrm share/balsa/pixmaps
+@dirrm share/balsa/hicolor/24x24/apps
+@dirrm share/balsa/hicolor/24x24
+@dirrm share/balsa/hicolor/16x16/apps
+@dirrm share/balsa/hicolor/16x16
+@dirrm share/balsa/hicolor
+@dirrm share/balsa/gtksourceview-2.0
+@dirrm share/balsa
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
new file mode 100644
index 000000000..3411cda14
--- /dev/null
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	gnome-gmail-notifier
+# Date created:				Nov 16 2007
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/mail/gnome-gmail-notifier/Makefile,v 1.17 2010/05/31 01:59:40 ade Exp $
+#
+
+PORTNAME=	gnome-gmail-notifier
+PORTVERSION=	0.10.1
+PORTREVISION=	2
+CATEGORIES=	mail deskutils
+MASTER_SITES=	GOOGLE_CODE
+
+MAINTAINER=	avl@FreeBSD.org
+COMMENT=	A Gmail Inbox Monitor for the GNOME2 desktop
+
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+		soup-2.4:${PORTSDIR}/devel/libsoup \
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	glib20 gtk20 gconf2 libxml2 librsvg2
+USE_GSTREAMER=	good
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@DATADIRNAME@|share|' ${WRKSRC}/po/Makefile.in.in
+
+.include <bsd.port.mk>
diff --git a/mail/gnome-gmail-notifier/distinfo b/mail/gnome-gmail-notifier/distinfo
new file mode 100644
index 000000000..fe15b04ea
--- /dev/null
+++ b/mail/gnome-gmail-notifier/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-gmail-notifier-0.10.1.tar.bz2) = 697dea845b968af0f3526bad36f5855a
+SHA256 (gnome-gmail-notifier-0.10.1.tar.bz2) = a25819e55bbcbeccb1ae5ddd8e5ed1a6e0e55f77c5bf6b5661705c29541e50d0
+SIZE (gnome-gmail-notifier-0.10.1.tar.bz2) = 192949
diff --git a/mail/gnome-gmail-notifier/pkg-descr b/mail/gnome-gmail-notifier/pkg-descr
new file mode 100644
index 000000000..6633b9fb5
--- /dev/null
+++ b/mail/gnome-gmail-notifier/pkg-descr
@@ -0,0 +1,12 @@
+The Gnome Gmail Notifier project aims to provide a stable, efficient
+GTK+2.0 application that provides periodic updates that pertain to the
+user's gmail inbox.
+
+The Notifier presents itself as a system tray icon in the GNOME2
+desktop, displaying a small balloon popup when the user recieves new
+mail.
+
+WWW: http://notifier.geekysuavo.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/mail/gnome-gmail-notifier/pkg-plist b/mail/gnome-gmail-notifier/pkg-plist
new file mode 100644
index 000000000..7cb59a754
--- /dev/null
+++ b/mail/gnome-gmail-notifier/pkg-plist
@@ -0,0 +1,22 @@
+bin/gnome-gmail-notifier
+share/applications/gnome-gmail-notifier.desktop
+share/gnome-control-center/default-apps/gnome-gmail-notifier.xml
+%%DATADIR%%/ggn-about.xml
+%%DATADIR%%/ggn-edit.xml
+%%DATADIR%%/ggn-error-lg.svg
+%%DATADIR%%/ggn-error-sm.svg
+%%DATADIR%%/ggn-menu.xml
+%%DATADIR%%/ggn-new-lg.svg
+%%DATADIR%%/ggn-new-sm.svg
+%%DATADIR%%/ggn-normal-lg.svg
+%%DATADIR%%/ggn-normal-sm.svg
+%%DATADIR%%/ggn-prefs.xml
+%%DATADIR%%/ggn-wait.svg
+%%DATADIR%%/ggn-warn.svg
+%%DATADIR%%/ggn-write.svg
+share/locale/es/LC_MESSAGES/gnome-gmail-notifier.mo
+share/pixmaps/gnome-gmail-notifier.svg
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
new file mode 100644
index 000000000..539c6764c
--- /dev/null
+++ b/mail/mail-notification/Makefile
@@ -0,0 +1,146 @@
+# New ports collection makefile for:	mail-notification
+# Date created:			18 Sep 2003
+# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD: ports/mail/mail-notification/Makefile,v 1.66 2010/08/09 16:31:15 arved Exp $
+#
+
+PORTNAME=	mail-notification
+DISTVERSION=	5.4
+PORTREVISION=	8
+CATEGORIES=	mail ipv6
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	mailnotify
+
+MAINTAINER=	mwisnicki+freebsd@gmail.com
+COMMENT=	A mail notification for freedesktop.org-compliant system trays
+
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
+		notify:${PORTSDIR}/devel/libnotify
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+JB_CONF_ARGS=	cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}"
+JB_CONF_ENV=	jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
+GCONF_SCHEMAS=	mail-notification.schemas
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+
+OPTIONS=	EVOLUTION "Evolution support" off \
+		GMAIL "Gmail support" on \
+		HOTMAIL "Windows Live Hotmail support" on \
+		IMAP "IMAP support" on \
+		MAILDIR "Maildir support" on \
+		MBOX "mbox support" on \
+		MH "MH support" on \
+		MOZILLA "Mozilla products support" on \
+		POP3 "POP3 support" on \
+		SASL "SASL authentication support" on \
+		SSL "SSL/TLS support" on \
+		SYLPHEED "Sylpheed support" on \
+		YAHOO "Yahoo! Mail support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_MBOX)
+JB_CONF_ARGS+=	mbox=no
+.endif
+.if defined(WITHOUT_MH)
+JB_CONF_ARGS+=	mh=no
+.endif
+.if defined(WITHOUT_MAILDIR)
+JB_CONF_ARGS+=	maildir=no
+.endif
+.if defined(WITHOUT_POP3)
+JB_CONF_ARGS+=	pop3=no
+.endif
+.if defined(WITHOUT_IMAP)
+JB_CONF_ARGS+=	imap=no
+.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)
+JB_CONF_ARGS+=	gmail=no
+PLIST_SUB+=	GMAIL="@comment "
+.else
+PLIST_SUB+=	GMAIL=""
+.endif
+.if defined(WITHOUT_HOTMAIL)
+JB_CONF_ARGS+=	hotmail=no
+PLIST_SUB+=	HOTMAIL="@comment "
+.else
+RUN_DEPENDS+=	getlive:${PORTSDIR}/mail/getlive
+PLIST_SUB+=	HOTMAIL=""
+.endif
+.if defined(WITHOUT_YAHOO)
+JB_CONF_ARGS+=	yahoo=no
+PLIST_SUB+=	YAHOO="@comment "
+.else
+RUN_DEPENDS+=	fetchyahoo:${PORTSDIR}/mail/fetchyahoo
+PLIST_SUB+=	YAHOO=""
+.endif
+.if defined(WITHOUT_EVOLUTION)
+JB_CONF_ARGS+=	evolution=no
+PLIST_SUB+=	EVOLUTION="@comment "
+.else
+EVO_VERSION!=	make -C ${PORTSDIR}/mail/evolution -V EVO_VERSION
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution
+PLIST_SUB+=	EVOLUTION="" EVO_VERSION=${EVO_VERSION}
+# Work around the fact that MN is using evolution's private(?) api that is not part of
+# evolution-plugin thus it's includes are not covered by pkgconfig metadata.
+# That path is frozen at 3.14 even for later versions of libgtkhtml.
+CFLAGS+=	-I${LOCALBASE}/include/libgtkhtml-3.14 -I${LOCALBASE}/include/libgtkhtml-3.14/editor
+.endif
+.if defined(WITHOUT_MOZILLA)
+JB_CONF_ARGS+=	mozilla=no
+.endif
+.if defined(WITHOUT_SYLPHEED)
+JB_CONF_ARGS+=	sylpheed=no
+.endif
+.if defined(WITH_MBOX) \
+	|| defined(WITH_MH) \
+	|| defined(WITH_MAILDIR) \
+	|| defined(WITH_POP3) \
+	|| defined(WITH_IMAP) \
+	|| defined(WITH_MOZILLA) \
+	|| defined(WITH_SYLPHEED) \
+	|| defined(WITH_HOTMAIL) \
+	|| defined(WITH_YAHOO)
+LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
+.endif
+.if defined(WITHOUT_SSL)
+JB_CONF_ARGS+=	ssl=no
+.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)
+JB_CONF_ARGS+=	sasl=no
+.else
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+.endif
+
+post-patch:
+.if ${OSVERSION} < 700042
+	@${REINPLACE_CMD} -e "s,-Wno-pointer-sign,," ${WRKSRC}/jb
+.endif
+
+do-configure:
+	cd ${WRKSRC} && ${JB_CONF_ENV} ./jb configure ${JB_CONF_ARGS}
+
+do-build:
+	cd ${WRKSRC} && ./jb build
+
+do-install:
+	cd ${WRKSRC} && ./jb install
+
+.include <bsd.port.post.mk>
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
new file mode 100644
index 000000000..9f3d34071
--- /dev/null
+++ b/mail/mail-notification/distinfo
@@ -0,0 +1,3 @@
+MD5 (mail-notification-5.4.tar.bz2) = c8dc33a61251acb5474e56eab6b18f43
+SHA256 (mail-notification-5.4.tar.bz2) = 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5
+SIZE (mail-notification-5.4.tar.bz2) = 570008
diff --git a/mail/mail-notification/files/patch-openssl-threads b/mail/mail-notification/files/patch-openssl-threads
new file mode 100644
index 000000000..8c935adef
--- /dev/null
+++ b/mail/mail-notification/files/patch-openssl-threads
@@ -0,0 +1,11 @@
+--- jbsrc/lib/src/extras/jb-openssl.c.orig	2008-04-27 16:47:43.000000000 +0200
++++ jbsrc/lib/src/extras/jb-openssl.c	2008-07-10 22:48:53.000000000 +0200
+@@ -91,7 +91,7 @@
+   result = jb_test_compile_string("#define OPENSSL_THREAD_DEFINES\n"
+ 				  "#include <openssl/opensslconf.h>\n"
+ 				  "int main () {\n"
+-				  "#ifndef OPENSSL_THREADS\n"
++				  "#if !defined(OPENSSL_THREADS) && !defined(THREADS)\n"
+ 				  "#error \"no thread support\"\n"
+ 				  "#endif\n"
+ 				  "}\n",
diff --git a/mail/mail-notification/files/patch-po_pl.po b/mail/mail-notification/files/patch-po_pl.po
new file mode 100644
index 000000000..24bf6f940
--- /dev/null
+++ b/mail/mail-notification/files/patch-po_pl.po
@@ -0,0 +1,15 @@
+--- po/pl.po.orig	2008-05-22 17:38:01.000000000 +0200
++++ po/pl.po	2008-07-11 01:44:09.000000000 +0200
+@@ -777,9 +777,9 @@
+ #, c-format
+ msgid "feed retrieved successfully (%i byte)"
+ msgid_plural "feed retrieved successfully (%i bytes)"
+-msgstr[0] "nagłówek pobrany pomyślnie (%s bajt)"
+-msgstr[1] "nagłówek pobrany pomyślnie (%s bajty)"
+-msgstr[2] "nagłówek pobrany pomyślnie (%s bajtów)"
++msgstr[0] "nagłówek pobrany pomyślnie (%i bajt)"
++msgstr[1] "nagłówek pobrany pomyślnie (%i bajty)"
++msgstr[2] "nagłówek pobrany pomyślnie (%i bajtów)"
+ 
+ #: ../src/mn-gmail-mailbox.gob:203 ../src/mn-gmail-mailbox.gob:254
+ msgid "unable to parse feed"
diff --git a/mail/mail-notification/files/patch-src-mn-stock.c b/mail/mail-notification/files/patch-src-mn-stock.c
new file mode 100644
index 000000000..a2742d1eb
--- /dev/null
+++ b/mail/mail-notification/files/patch-src-mn-stock.c
@@ -0,0 +1,39 @@
+diff -Nrbu src/mn-stock.c.orig src/mn-stock.c
+--- src/mn-stock.c.orig	2008-05-22 19:45:35.000000000 +0400
++++ src/mn-stock.c	2010-05-24 19:36:03.000000000 +0400
+@@ -32,11 +32,11 @@
+     const char	*icon_name;
+     const char	*source_stock_id;
+   } icons[] = {
+-    { MN_STOCK_MAIL,			NULL, "stock_mail" },
+-    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
+-    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
+-    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
+-    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
++    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
++    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
++    { MN_STOCK_LOCAL,			NULL, "folder" },
++    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
++    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
+     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
+ #if WITH_GMAIL
+     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
+@@ -48,14 +48,14 @@
+     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
+ #endif
+ #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
+-    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
++    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
+ #endif
+ #if WITH_EVOLUTION
+     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
+ #endif
+-    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
+-    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
+-    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
++    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
++    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
++    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
+   };
+   GtkIconFactory *factory;
+   GtkIconTheme *icon_theme;
diff --git a/mail/mail-notification/pkg-descr b/mail/mail-notification/pkg-descr
new file mode 100644
index 000000000..227c14361
--- /dev/null
+++ b/mail/mail-notification/pkg-descr
@@ -0,0 +1,25 @@
+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, Mozilla products
+	  (Mozilla, SeaMonkey, Thunderbird, ...) 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)
+	* message popups
+	* 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
new file mode 100644
index 000000000..aa5729cbb
--- /dev/null
+++ b/mail/mail-notification/pkg-plist
@@ -0,0 +1,44 @@
+bin/mail-notification
+etc/xdg/autostart/mail-notification.desktop
+share/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/mail-notification.xml
+share/gnome/help/mail-notification/C/software-license.xml
+%%GMAIL%%share/mail-notification/gmail.png
+%%HOTMAIL%%share/mail-notification/hotmail.png
+share/mail-notification/logo.png
+share/mail-notification/new-mail.wav
+%%YAHOO%%share/mail-notification/yahoo.png
+share/mail-notification/mailbox-properties-dialog.glade
+share/mail-notification/properties-dialog.glade
+share/omf/mail-notification/mail-notification-C.omf
+share/icons/hicolor/16x16/apps/mail-notification.png
+share/icons/hicolor/22x22/apps/mail-notification.png
+share/icons/hicolor/24x24/apps/mail-notification.png
+share/icons/hicolor/32x32/apps/mail-notification.png
+share/icons/hicolor/48x48/apps/mail-notification.png
+share/icons/hicolor/scalable/apps/mail-notification.svg
+share/locale/bg/LC_MESSAGES/mail-notification.mo
+share/locale/ca/LC_MESSAGES/mail-notification.mo
+share/locale/cs/LC_MESSAGES/mail-notification.mo
+share/locale/de/LC_MESSAGES/mail-notification.mo
+share/locale/es/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/%%EVO_VERSION%%/plugins/liborg-jylefort-mail-notification.so
+%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/org-jylefort-mail-notification.eplug
+@dirrm share/omf/mail-notification
+@dirrm share/mail-notification
+@dirrm share/gnome/help/mail-notification/C/figures
+@dirrm share/gnome/help/mail-notification/C
+@dirrm share/gnome/help/mail-notification
+@dirrmtry share/applications