Update to 2.5.1.

Stagify, use short options.

Submitted by:	Gustau Perez
> Description of fields to fill in above:                     76 columns --|
> PR:            If a GNATS PR is affected by the change.
> Submitted by:  If someone else sent in the change.
> Reviewed by:   If someone else reviewed your modification.
> Approved by:   If you needed approval for this commit.
> Obtained from: If the change is from a third party.
> MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email.
> Security:      Vulnerability reference (one per line) or description.
> Sponsored by:  If the change was sponsored by an organization.
> Empty fields above will be automatically removed.

M    balsa/Makefile
M    balsa/distinfo
M    balsa/files/patch-configure
D    balsa/files/patch-libbalsa_information.c
M    balsa/files/patch-libbalsa_mailbox_mh.c
D    balsa/files/patch-src_main-window.c
A    balsa/files/patch-src_main-window.h
M    balsa/pkg-descr
M    balsa/pkg-plist

9 files changed, 226 insertions, 420 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 508bdc9111d9..dce39b13226c 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,95 +1,59 @@
 # Created by: Glenn Johnson <gljohns@bellsouth.net>
 # $FreeBSD$
-#   $MCom: ports-stable/mail/balsa/Makefile,v 1.3 2007/12/02 19:18:50 marcus Exp $
+#   $MCom$
 
 PORTNAME=	balsa
-PORTVERSION=	2.4.8
-PORTREVISION=	7
+PORTVERSION=	2.5.1
 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:${PORTSDIR}/textproc/aspell \
-		pcre:${PORTSDIR}/devel/pcre \
-		esmtp:${PORTSDIR}/mail/libesmtp \
-		gmime-2.4:${PORTSDIR}/mail/gmime24 \
-		gnome-keyring:${PORTSDIR}/security/gnome-keyring \
-		canberra-gtk:${PORTSDIR}/audio/libcanberra
-
-USE_BZIP2=	yes
-INSTALLS_OMF=	yes
+COMMENT=	Mail reader for the GNOME desktop
+
+BUILD_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+		itstool:${PORTSDIR}/textproc/itstool \
+		yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools
+LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libesmtp.so:${PORTSDIR}/mail/libesmtp \
+		libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
+		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+RUN_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
+
+# Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3 
+# in ports gets updated to > 1.10.x, balsa should depend on it.
+USES=		desktop-file-utils gettext gmake iconv pathfix \
+		perl5 pkgconfig tar:bzip2
+USE_GNOME=	gnomeprefix gtkhtml4 intlhack libxslt
 INSTALLS_ICONS=	yes
 USE_OPENSSL=	yes
-USES=		pathfix gettext iconv perl5 pkgconfig gmake
-USE_GNOME=	gnomeprefix intlhack libgnomeui gtkhtml3 \
-		libgnomeprintui
-USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-threads \
 		--disable-more-warnings \
 		--with-ssl \
 		--without-nm \
+		--with-html-widget=gtkhtml4 \
+		--with-gmime=2.6 \
 		--with-canberra
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB} ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-
-MAN1=		balsa.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	LDAP GTKSPELL GTKSV NOTIFY GPG
 OPTIONS_DEFAULT=LDAP GTKSPELL GTKSV NOTIFY
 GTKSPELL_DESC=	Spell checking support
 GTKSV_DESC=	GtkSourceview support
 GPG_DESC=	GnuPG support
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGPG}
-LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme
-CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}/bin/gpgme-config
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.endif
-
-.if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=--with-gtkspell
-.endif
-
-.if ${PORT_OPTIONS:MGTKSV}
-USE_GNOME+=	gtksourceview2
-CONFIGURE_ARGS+=--with-gtksourceview=2
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--with-libnotify=yes
-.else
-CONFIGURE_ARGS+=--with-libnotify=no
-.endif
-
-.include <bsd.port.pre.mk>
-
-.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>
+GPG_CONFIGURE_WITH=	gpgme
+GPG_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LDAP_USE=		OPENLDAP=yes	
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_LIB_DEPENDS=	libldap.so:${PORTSDIR}/net/openldap24-client
+GTKSPELL_CONFIGURE_WITH=	gtkspell
+GTKSPELL_LIB_DEPENDS=		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3
+GTKSV_USE=		GNOME=gtksourceview3
+GTKSV_CONFIGURE_WITH=	gtksourceview
+NOTIFY_CONFIGURE_WITH=	libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+
+.include <bsd.port.mk>
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index e63d3e1951dd..87e725b75071 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (balsa-2.4.8.tar.bz2) = 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf
-SIZE (balsa-2.4.8.tar.bz2) = 3150866
+SHA256 (balsa-2.5.1.tar.bz2) = 52ce445dca86eb42e2e402a5b76616a1a522b89acbb631215079022ef80a7a10
+SIZE (balsa-2.5.1.tar.bz2) = 3898061
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index c18f9adcffec..92a98f1fa52b 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,227 +1,47 @@
---- 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
+--- configure.orig	2014-04-30 13:56:20.982115758 +0000
++++ configure	2014-04-30 13:56:44.128114528 +0000
+@@ -15038,7 +15038,7 @@
+     conftest$ac_exeext conftest.$ac_ext
+ if test $have_res_init = no ; then
+     save_LIBS=$LIBS
+-    LIBS="$LIBS -lresolv"
++    LIBS="$LIBS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <resolv.h>
+@@ -16088,7 +16088,7 @@
    $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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- 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
+@@ -16122,7 +16122,7 @@
  
--  LIBS="-lpspell $LIBS"
-+  LIBS="-laspell $LIBS"
+ $as_echo "#define ENABLE_LDAP 1" >>confdefs.h
  
+-              LIBS="-lldap -llber -lresolv $LIBS"
++              LIBS="-lldap -llber $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
+   as_fn_error $? "*** You enabled LDAP but ldap library is not found." "$LINENO" 5
  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; }
+@@ -18071,8 +18071,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; }; }
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+-
+ ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
+ "
+ if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+@@ -18339,7 +18337,7 @@
+   INSTALL_MIME_ICONS_FALSE=
  fi
  
-@@ -11882,7 +11882,7 @@ fi
+-HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-3.0`/share/icons/hicolor
++HICOLOR_ICON_DIR=/usr/local/share/icons/hicolor
  
  
- 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_information.c b/mail/balsa/files/patch-libbalsa_information.c
deleted file mode 100644
index 7d37e182935f..000000000000
--- a/mail/balsa/files/patch-libbalsa_information.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbalsa/information.c.orig	2011-08-16 13:30:24.000000000 +0200
-+++ libbalsa/information.c	2011-08-16 13:30:48.000000000 +0200
-@@ -122,7 +122,7 @@ libbalsa_information_varg(GtkWindow *par
-         g_free(msg);
- 
-         note =
--            notify_notification_new("Balsa", escaped->str, icon_str, NULL);
-+            notify_notification_new("Balsa", escaped->str, icon_str);
-         g_string_free(escaped, TRUE);
- 
-         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mh.c b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
index 36cd3b677d57..2caca699b920 100644
--- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
@@ -1,5 +1,5 @@
---- libbalsa/mailbox_mh.c.orig	Wed May 16 13:49:05 2007
-+++ libbalsa/mailbox_mh.c	Thu May 31 01:09:09 2007
+--- libbalsa/mailbox_mh.c.orig	2013-03-04 19:36:37.000000000 +0000
++++ libbalsa/mailbox_mh.c	2014-04-30 13:49:32.084143219 +0000
 @@ -27,6 +27,8 @@
  /* to compile this on BSD/Darwin */
  #undef _POSIX_SOURCE
@@ -18,7 +18,7 @@
  };
  
  #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
-@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
+@@ -261,7 +263,7 @@
  
  #define MH_BASENAME(msg_info) \
      g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
@@ -27,7 +27,7 @@
  
  static GMimeStream *
  libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
-@@ -335,7 +337,7 @@ static gint
+@@ -336,7 +338,7 @@
  lbm_mh_compare_fileno(const struct message_info ** a,
  		      const struct message_info ** b)
  {
@@ -36,7 +36,7 @@
  }
  
  static void
-@@ -352,7 +354,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
+@@ -353,7 +355,7 @@
  
      while ((filename = g_dir_read_name(dir)) != NULL) {
  	LibBalsaMessageFlag delete_flag = 0;
@@ -45,12 +45,12 @@
  
  	if (filename[0] == ',') {
  	    filename++;
-@@ -361,22 +363,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
+@@ -362,22 +364,22 @@
  	if (lbm_mh_check_filename(filename) == FALSE)
  	    continue;
  
--	if (sscanf(filename, "%d", &fileno) != 1)
-+	if (sscanf(filename, "%d", &mh_fileno) != 1)
+-	if (sscanf(filename, "%10d", &fileno) != 1)
++	if (sscanf(filename, "%10d", &mh_fileno) != 1)
              break;     /* FIXME report error? */
 -	if (fileno > mh->last_fileno)
 -	    mh->last_fileno = fileno;
@@ -74,7 +74,7 @@
  	    }
  	    msg_info->orig_flags = delete_flag;
  	}
-@@ -394,17 +396,17 @@ static const gchar *LibBalsaMailboxMhRep
+@@ -395,17 +397,17 @@
  static const gchar *LibBalsaMailboxMhRecent = "recent:";
  
  static void
@@ -96,7 +96,7 @@
  	return;
      }
  
-@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
+@@ -434,7 +436,7 @@
  
      for (seq = sequences; *seq; seq++) {
  	guint end = 0;
@@ -105,12 +105,12 @@
  
  	if (!**seq)
  	    continue;
-@@ -444,11 +446,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
- 	    if (sscanf(line, "%d", &end) != 1)
+@@ -445,11 +447,11 @@
+ 	    if (sscanf(line, "%10d", &end) != 1)
                  break; /* FIXME report error? */
  	}
--	if (sscanf(*seq, "%d", &fileno) != 1)
-+	if (sscanf(*seq, "%d", &mh_fileno) != 1)
+-	if (sscanf(*seq, "%10d", &fileno) != 1)
++	if (sscanf(*seq, "%10d", &mh_fileno) != 1)
              break;     /* FIXME report error? */
  	do
 -	    lbm_mh_set_flag(mh, fileno, flag);
@@ -120,7 +120,7 @@
      }
  
      g_strfreev(sequences);
-@@ -580,7 +582,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
+@@ -581,7 +583,7 @@
  	    sequences = g_strsplit(p, " ", 0);
  	    for (seq = sequences; *seq; seq++) {
  		guint end = 0;
@@ -129,12 +129,12 @@
  
  		if (!**seq)
  		    continue;
-@@ -591,15 +593,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
- 		    if (sscanf(p, "%d", &end) != 1)
+@@ -592,15 +594,15 @@
+ 		    if (sscanf(p, "%10d", &end) != 1)
                          break; /* FIXME report error? */
  		}
--		if (sscanf(*seq, "%d", &fileno) != 1)
-+		if (sscanf(*seq, "%d", &mh_fileno) != 1)
+-		if (sscanf(*seq, "%10d", &fileno) != 1)
++		if (sscanf(*seq, "%10d", &mh_fileno) != 1)
                      break; /* FIXME report error? */
  		do {
 -		    p = g_strdup_printf("%s/%d", path, fileno);
@@ -148,7 +148,7 @@
  	    }
  	    g_strfreev(sequences);
  	    break;
-@@ -686,7 +688,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
+@@ -687,7 +689,7 @@
  	else {
  	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  	    g_hash_table_remove(mh->messages_info, 
@@ -157,7 +157,7 @@
  	    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
+@@ -764,11 +766,11 @@
      if (!(msg_info->local_info.flags & flag))
  	return;
  
@@ -172,7 +172,7 @@
  }
  
  static gboolean
-@@ -849,7 +851,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
+@@ -850,7 +852,7 @@
  	    /* free old information */
  	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  	    g_hash_table_remove(mh->messages_info, 
@@ -181,7 +181,7 @@
  	    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
+@@ -1039,7 +1041,7 @@
   * we'll just add new lines and let the next sync merge them with any
   * existing lines. */
  static void
@@ -190,7 +190,7 @@
  			LibBalsaMessageFlag flags)
  {
      FILE *fp;
-@@ -1049,13 +1051,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
+@@ -1050,13 +1052,13 @@
  	return;
  
      if (flags & LIBBALSA_MESSAGE_FLAG_NEW)
@@ -208,7 +208,7 @@
      fclose(fp);
  }
  
-@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+@@ -1073,7 +1075,7 @@
      int fd;
      GMimeStream *out_stream;
      GMimeFilter *crlffilter;
@@ -217,7 +217,7 @@
      int retries;
      GMimeStream *in_stream;
  
-@@ -1115,14 +1117,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+@@ -1116,14 +1118,14 @@
      libbalsa_mime_stream_shared_unlock(stream);
      g_object_unref(in_stream);
  
@@ -234,7 +234,7 @@
  	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
+@@ -1146,9 +1148,9 @@
                      "Too high activity?");
  	return FALSE;
      }
diff --git a/mail/balsa/files/patch-src_main-window.c b/mail/balsa/files/patch-src_main-window.c
deleted file mode 100644
index b376b7260ddc..000000000000
--- a/mail/balsa/files/patch-src_main-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main-window.c.orig	2011-08-16 13:32:27.000000000 +0200
-+++ src/main-window.c	2011-08-16 13:33:10.000000000 +0200
-@@ -3406,7 +3406,7 @@ bw_display_new_mail_notification(int num
-         } else {
-             num_total = num_new;
-             balsa_app.main_window->new_mail_note =
--                notify_notification_new("Balsa", NULL, NULL, NULL);
-+                notify_notification_new("Balsa", NULL, NULL);
-             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
-                                                new_mail_note),
-                                       (gpointer) & balsa_app.main_window->
diff --git a/mail/balsa/files/patch-src_main-window.h b/mail/balsa/files/patch-src_main-window.h
new file mode 100644
index 000000000000..c46acf3aa41b
--- /dev/null
+++ b/mail/balsa/files/patch-src_main-window.h
@@ -0,0 +1,11 @@
+--- src/main-window.h.orig	2014-04-30 17:56:08.057123807 +0000
++++ src/main-window.h	2014-04-30 17:56:29.581127225 +0000
+@@ -28,6 +28,8 @@
+ #include <libnotify/notify.h>
+ #endif
+ 
++#include <glib.h>
++
+ #if GLIB_CHECK_VERSION(2, 32, 0)
+ #include <gio/gio.h>
+ #elif defined(HAVE_LIBNM_GLIB)
diff --git a/mail/balsa/pkg-descr b/mail/balsa/pkg-descr
index b7010e9805cc..bf2178392496 100644
--- a/mail/balsa/pkg-descr
+++ b/mail/balsa/pkg-descr
@@ -15,4 +15,4 @@ Balsa is a mail reader for the GNOME Desktop.  It supports many features:
 * Allows file attachments to outgoing messages
 * GPG/OpenPGP mail signing and encryption
 
-WWW: http://balsa.gnome.org/
+WWW: http://pawsa.fedorapeople.org/balsa/
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 2dc1739ff30a..7e23b6938236 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -1,10 +1,11 @@
 bin/balsa
 bin/balsa-ab
 etc/sound/events/balsa.soundlist
-libdata/bonobo/servers/GNOME_Balsa.server
+man/man1/balsa.1.gz
+share/applications/balsa-mailto-handler.desktop
 share/applications/balsa.desktop
-share/balsa/gtksourceview-2.0/balsa-mail-style.xml
-share/balsa/gtksourceview-2.0/balsa-mail.lang
+%%GTKSV%%share/balsa/gtksourceview-2.0/balsa-mail-style.xml
+%%GTKSV%%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
@@ -62,72 +63,94 @@ 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/help/C/balsa/figures/address-book-ldap.png
+share/help/C/balsa/figures/address-book-modify.png
+share/help/C/balsa/figures/address-book-vcard.png
+share/help/C/balsa/figures/address-book.png
+share/help/C/balsa/figures/balsa_logo.png
+share/help/C/balsa/figures/druid-start.png
+share/help/C/balsa/figures/example-alias.png
+share/help/C/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/C/balsa/figures/main-window-toolbar.png
+share/help/C/balsa/figures/main-window.png
+share/help/C/balsa/figures/message-window.png
+share/help/C/balsa/figures/msg-part-select.png
+share/help/C/balsa/figures/newmsg-window-attachments.png
+share/help/C/balsa/figures/newmsg-window-toolbar.png
+share/help/C/balsa/figures/newmsg-window.png
+share/help/C/balsa/figures/preferences-window.png
+share/help/C/balsa/figures/spell-check.png
+share/help/de/balsa/figures/address-book-ldap.png
+share/help/de/balsa/figures/address-book-modify.png
+share/help/de/balsa/figures/address-book-vcard.png
+share/help/de/balsa/figures/address-book.png
+share/help/de/balsa/figures/balsa_logo.png
+share/help/de/balsa/figures/druid-start.png
+share/help/de/balsa/figures/example-alias.png
+share/help/de/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/de/balsa/figures/main-window-toolbar.png
+share/help/de/balsa/figures/main-window.png
+share/help/de/balsa/figures/message-window.png
+share/help/de/balsa/figures/msg-part-select.png
+share/help/de/balsa/figures/newmsg-window-attachments.png
+share/help/de/balsa/figures/newmsg-window-toolbar.png
+share/help/de/balsa/figures/newmsg-window.png
+share/help/de/balsa/figures/preferences-window.png
+share/help/de/balsa/figures/spell-check.png
+share/help/es/balsa/figures/address-book-ldap.png
+share/help/es/balsa/figures/address-book-modify.png
+share/help/es/balsa/figures/address-book-vcard.png
+share/help/es/balsa/figures/address-book.png
+share/help/es/balsa/figures/balsa_logo.png
+share/help/es/balsa/figures/druid-start.png
+share/help/es/balsa/figures/example-alias.png
+share/help/es/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/es/balsa/figures/main-window-toolbar.png
+share/help/es/balsa/figures/main-window.png
+share/help/es/balsa/figures/message-window.png
+share/help/es/balsa/figures/msg-part-select.png
+share/help/es/balsa/figures/newmsg-window-attachments.png
+share/help/es/balsa/figures/newmsg-window-toolbar.png
+share/help/es/balsa/figures/newmsg-window.png
+share/help/es/balsa/figures/preferences-window.png
+share/help/es/balsa/figures/spell-check.png
+share/help/fr/balsa/figures/address-book-ldap.png
+share/help/fr/balsa/figures/address-book-modify.png
+share/help/fr/balsa/figures/address-book-vcard.png
+share/help/fr/balsa/figures/address-book.png
+share/help/fr/balsa/figures/balsa_logo.png
+share/help/fr/balsa/figures/druid-start.png
+share/help/fr/balsa/figures/example-alias.png
+share/help/fr/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/fr/balsa/figures/main-window-toolbar.png
+share/help/fr/balsa/figures/main-window.png
+share/help/fr/balsa/figures/message-window.png
+share/help/fr/balsa/figures/msg-part-select.png
+share/help/fr/balsa/figures/newmsg-window-attachments.png
+share/help/fr/balsa/figures/newmsg-window-toolbar.png
+share/help/fr/balsa/figures/newmsg-window.png
+share/help/fr/balsa/figures/preferences-window.png
+share/help/fr/balsa/figures/spell-check.png
+share/help/sl/balsa/figures/address-book-ldap.png
+share/help/sl/balsa/figures/address-book-modify.png
+share/help/sl/balsa/figures/address-book-vcard.png
+share/help/sl/balsa/figures/address-book.png
+share/help/sl/balsa/figures/balsa_logo.png
+share/help/sl/balsa/figures/druid-start.png
+share/help/sl/balsa/figures/example-alias.png
+share/help/sl/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/sl/balsa/figures/main-window-toolbar.png
+share/help/sl/balsa/figures/main-window.png
+share/help/sl/balsa/figures/message-window.png
+share/help/sl/balsa/figures/msg-part-select.png
+share/help/sl/balsa/figures/newmsg-window-attachments.png
+share/help/sl/balsa/figures/newmsg-window-toolbar.png
+share/help/sl/balsa/figures/newmsg-window.png
+share/help/sl/balsa/figures/preferences-window.png
+share/help/sl/balsa/figures/spell-check.png
 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
@@ -142,7 +165,6 @@ 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
@@ -188,7 +210,7 @@ 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/sr@latin/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
@@ -197,24 +219,9 @@ 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
+share/pixmaps/gnome-balsa2.png
+share/sounds/balsa/newmail.wav
+share/sounds/balsa/startup.wav
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -223,3 +230,29 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/icons/hicolor/48x48/mimetypes
+@dirrm share/help/sl/balsa/figures
+@dirrm share/help/sl/balsa
+@dirrmtry share/help/sl
+@dirrm share/help/fr/balsa/figures
+@dirrm share/help/fr/balsa
+@dirrmtry share/help/fr
+@dirrm share/help/es/balsa/figures
+@dirrm share/help/es/balsa
+@dirrmtry share/help/es
+@dirrm share/help/de/balsa/figures
+@dirrm share/help/de/balsa
+@dirrmtry share/help/de
+@dirrm share/help/C/balsa/figures
+@dirrm share/help/C/balsa
+@dirrmtry share/help/C
+@dirrmtry share/help
+@dirrm share/sounds/balsa
+@dirrm share/balsa/pixmaps
+@dirrm share/balsa/hicolor/16x16/apps
+@dirrm share/balsa/hicolor/16x16
+@dirrm share/balsa/hicolor/24x24/apps
+@dirrm share/balsa/hicolor/24x24
+@dirrm share/balsa/hicolor
+%%GTKSV%%@dirrm share/balsa/gtksourceview-2.0
+@dirrm share/balsa