Update to 2.2.1. Balsa 1.4.x is obsolete, and doesn't even build anymore.

This update effectively obsoletes the balsa2 port.

17 files changed, 227 insertions, 149 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index f2361534310d..6a9fdeb3b386 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,37 +6,51 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 CATEGORIES=	mail gnome
-MASTER_SITES=	http://balsa.gnome.org/ \
-		http://www.theochem.kth.se/~pawsa/balsa/
+MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
+DISTNAME=	balsa-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A mail reader for the GNOME desktop
+COMMENT=	A mail reader for the GNOME 2 desktop
 
 LIB_DEPENDS=	aspell.15:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		esmtp.6:${PORTSDIR}/mail/libesmtp
-RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
+		esmtp.6:${PORTSDIR}/mail/libesmtp \
+		gmime-2.0.3:${PORTSDIR}/mail/gmime2
 
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomeprint gnomevfs gtkhtml gnometarget
-USE_OPENLDAP=	yes
-USE_LIBTOOL_VER=13
+USE_PERL5=	yes
 USE_OPENSSL=	yes
-LIBTOOLFILES=	configure libmutt/configure
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui \
+		gtkhtml3
+USE_LIBTOOL_VER=15
+USE_LIBLTDL=	yes
+USE_ICONV=	yes
 CONFIGURE_ARGS=	--enable-threads \
 		--enable-gtkhtml \
-		--enable-ldap \
 		--disable-more-warnings \
-		--with-ssl
+		--with-ssl \
+		--enable-gtkhtml=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
 MAN1=		balsa.1
 
-CONFLICTS=	balsa2-*
+OPTIONS=	LDAP "Enable LDAP support" on
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+#.if defined(WITH_GPG)
+#LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
+#CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}/bin/gpgme-config
+#.endif
+
+.if !defined(WITHOUT_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 473ce6584328..61e3b9a4c821 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,2 +1,2 @@
-MD5 (balsa-1.4.4.tar.bz2) = 1625a4805becfe6da4b28b8e188487a4
-SIZE (balsa-1.4.4.tar.bz2) = 2379979
+MD5 (balsa-2.2.1.tar.bz2) = 8d6f6279843e7463527cda58633b37b5
+SIZE (balsa-2.2.1.tar.bz2) = 2913800
diff --git a/mail/balsa/files/patch-aa b/mail/balsa/files/patch-aa
deleted file mode 100644
index be8afc14a3d9..000000000000
--- a/mail/balsa/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Sat Aug 10 02:07:00 2002
-+++ src/Makefile.in	Sat Aug 10 02:09:10 2002
-@@ -224,7 +224,6 @@
- 	$(top_builddir)/libmutt/libmutt.a	\
- 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
- 	-lpspell \
--	-lltdl	\
- 	$(INTLLIBS) \
- 	$(PCRE_LIBS) \
- 	$(PTHREAD_LIB)
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index 271b95f4f99b..44f3f1b582cc 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,31 +1,24 @@
---- configure.orig	Mon Mar 24 16:14:15 2003
-+++ configure	Wed Mar 26 12:17:03 2003
-@@ -8031,6 +8031,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9281,13 +9282,13 @@
- 
+--- configure.orig	Wed Jul  7 18:16:55 2004
++++ configure	Wed Jul  7 18:16:55 2004
+@@ -20976,13 +20976,13 @@
+ else
  
  
 -echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
 -echo $ECHO_N "checking for new_pspell_manager in -lpspell... $ECHO_C" >&6
+-if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
 +echo "$as_me:$LINENO: checking for new_aspell_speller in -lpspell" >&5
 +echo $ECHO_N "checking for new_aspell_speller in -lpspell... $ECHO_C" >&6
- if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
++if test "${ac_cv_lib_pspell_new_aspell_speller+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
 +LIBS="-lpspell -lstdc++ $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -9302,11 +9303,11 @@
+ _ACEOF
+@@ -20996,11 +20996,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -39,45 +32,21 @@
    ;
    return 0;
  }
-@@ -12726,12 +12727,12 @@
- /* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
-+extern int *libintl_nl_domain_bindings;
- int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
-   ;
-   return 0;
- }
-@@ -13806,7 +13807,7 @@
+@@ -23045,7 +23045,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap -llber -lresolv $LIBS"
 +LIBS="-lldap -llber $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13860,7 +13861,7 @@
+ _ACEOF
+@@ -23109,7 +23109,7 @@
  #define ENABLE_LDAP 1
  _ACEOF
  
--             LIBS="-lldap -llber -lresolv $LIBS"
-+             LIBS="-lldap -llber $LIBS"
+-              LIBS="-lldap -llber -lresolv $LIBS"
++              LIBS="-lldap -llber $LIBS"
  else
    { { echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
  echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
-@@ -14479,7 +14480,7 @@
- echo $ECHO_N "checking whether to build SSL support... $ECHO_C" >&6
- if test "x$with_ssl" != xno  ; then
- # openssl >=0.9.7 is pkg-config compatible.
--   if pkg-config openssl >&/dev/null; then
-+   if pkg-config openssl >/dev/null 2>&1; then
-       LIBS="$LIBS `pkg-config --libs openssl`"
-       CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"
-       echo "$as_me:$LINENO: result: yes" >&5
diff --git a/mail/balsa/files/patch-doc_omf.make b/mail/balsa/files/patch-doc_omf.make
new file mode 100644
index 000000000000..dcc67260e36b
--- /dev/null
+++ b/mail/balsa/files/patch-doc_omf.make
@@ -0,0 +1,11 @@
+--- doc/omf.make.orig	Mon Sep 16 02:46:07 2002
++++ doc/omf.make	Mon Sep 16 02:46:37 2002
+@@ -27,7 +27,7 @@
+ #
+ 
+ omf_dest_dir=$(datadir)/omf/@PACKAGE@
+-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
++scrollkeeper_localstate_dir = /var/db/scrollkeeper
+ 
+ omf: omf_timestamp
+ 
diff --git a/mail/balsa/files/patch-doc_xmldocs.make b/mail/balsa/files/patch-doc_xmldocs.make
new file mode 100644
index 000000000000..9379b0d60628
--- /dev/null
+++ b/mail/balsa/files/patch-doc_xmldocs.make
@@ -0,0 +1,11 @@
+--- doc/xmldocs.make.orig	Wed Sep 18 07:12:20 2002
++++ doc/xmldocs.make	Tue Oct 29 12:20:37 2002
+@@ -36,7 +36,7 @@
+ # ************* Begin of section some packagers may need to modify  **************
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++docdir = $(datadir)/help/$(docname)/$(lang)
+ 
+ # **************  You should not have to edit below this line  *******************
+ xml_files = $(entities) $(docname).xml
diff --git a/mail/balsa/files/patch-help_C_Makefile.in b/mail/balsa/files/patch-help_C_Makefile.in
deleted file mode 100644
index 490e4c883129..000000000000
--- a/mail/balsa/files/patch-help_C_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- help/C/Makefile.in.orig	Sun May 11 13:30:24 2003
-+++ help/C/Makefile.in	Sun May 11 13:30:34 2003
-@@ -296,11 +296,6 @@
- all: index.html
- 
- index.html: $(SGML_FILES)
--	if test "$(HAVE_JW)" = 'yes' ; then 		\
--		jw -V '%use-id-as-filename%' -o balsa balsa.sgml; \
--	else 						\
--		db2html -V '%use-id-as-filename%' balsa.sgml; 	\
--	fi
- 	-cp balsa/index.html index.html || touch index.html
- 
- epsimages: $(MANUAL_IMAGES)
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 000000000000..a7f583ded422
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c
@@ -0,0 +1,34 @@
+--- libbalsa/imap/imap-handle.c.orig	Mon Jul 26 01:56:32 2004
++++ libbalsa/imap/imap-handle.c	Mon Jul 26 02:08:48 2004
+@@ -18,10 +18,13 @@
+  */
+ #include "config.h"
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_SOURCE 1
++#endif
+ #define _BSD_SOURCE   1
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <glib.h>
+ #include <glib-object.h>
+@@ -360,9 +363,17 @@
+   for (cur = res; cur != NULL; cur = cur->ai_next) {
+     fd = socket (cur->ai_family, cur->ai_socktype, cur->ai_protocol);
+     if (fd >= 0) {
++#ifdef __FreeBSD__
++      int sa_size = ((struct sockaddr_in *)cur->ai_addr)->sin_len;
++#else
+       int sa_size = sizeof (struct sockaddr_in);
++#endif
+       if (cur->ai_addr->sa_family == AF_INET6)
++#ifdef __FreeBSD__
++	sa_size = ((struct sockaddr_in6 *)cur->ai_addr)->sin6_len;
++#else
+         sa_size = sizeof (struct sockaddr_in6);
++#endif
+       if ((rc=connect(fd, cur->ai_addr, sa_size)) == 0) {
+ 	break;
+       } else {
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 000000000000..811795eed8ea
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
@@ -0,0 +1,11 @@
+--- libbalsa/mailbox_maildir.c.orig	Mon Jul 26 02:10:16 2004
++++ libbalsa/mailbox_maildir.c	Mon Jul 26 02:10:50 2004
+@@ -27,6 +27,8 @@
+ #include <libgnome/gnome-config.h>
+ #include <libgnome/gnome-i18n.h>
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
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 000000000000..7266a6867b3d
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
@@ -0,0 +1,11 @@
+--- libbalsa/mailbox_mh.c.orig	Mon Jul 26 02:11:26 2004
++++ libbalsa/mailbox_mh.c	Mon Jul 26 02:11:39 2004
+@@ -27,6 +27,8 @@
+ #define _POSIX_SOURCE          1
+ #include <libgnome/gnome-i18n.h>
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
diff --git a/mail/balsa/files/patch-libbalsa_misc.c b/mail/balsa/files/patch-libbalsa_misc.c
new file mode 100644
index 000000000000..b68d6a38aab5
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa_misc.c
@@ -0,0 +1,21 @@
+--- libbalsa/misc.c.orig	Mon Jul 26 02:12:16 2004
++++ libbalsa/misc.c	Mon Jul 26 02:17:06 2004
+@@ -23,7 +23,10 @@
+ #include "config.h"
+ 
+ #define _SVID_SOURCE           1
++#ifndef __FreeBSD__
+ #define _XOPEN_SOURCE          500
++#endif
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+ #include <ctype.h>
+@@ -31,6 +34,7 @@
+ #include <errno.h>
+ #include <dirent.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ 
+ #include <libgnomevfs/gnome-vfs-file-info.h>
+ #include <libgnomevfs/gnome-vfs-ops.h>
diff --git a/mail/balsa/files/patch-libmutt::configure b/mail/balsa/files/patch-libmutt::configure
deleted file mode 100644
index 8ffb7dd5137a..000000000000
--- a/mail/balsa/files/patch-libmutt::configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- libmutt/configure.orig	Mon Mar 24 16:18:17 2003
-+++ libmutt/configure	Wed Mar 26 12:22:07 2003
-@@ -7627,6 +7627,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10514,7 +10515,7 @@
- echo "$as_me: error: SSL support is only for IMAP, but IMAP is not enabled" >&2;}
-    { (exit 1); exit 1; }; }
- 	  fi
--          if pkg-config openssl >& /dev/null; then
-+          if pkg-config openssl >/dev/null 2>&1; then
- 	     echo here
-              LDFLAGS="$LIBS `pkg-config --libs openssl`"
-              CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"
diff --git a/mail/balsa/files/patch-src_balsa-app.c b/mail/balsa/files/patch-src_balsa-app.c
new file mode 100644
index 000000000000..b93ab17fcee9
--- /dev/null
+++ b/mail/balsa/files/patch-src_balsa-app.c
@@ -0,0 +1,13 @@
+--- src/balsa-app.c.orig	Fri Aug  6 17:43:17 2004
++++ src/balsa-app.c	Fri Aug  6 17:43:42 2004
+@@ -652,10 +652,6 @@
+     BalsaFind bf;
+     gboolean is_sub_thread = libbalsa_am_i_subthread();
+ 
+-#ifdef BALSA_USE_THREADS
+-    g_assert(!g_mutex_trylock(gdk_threads_mutex));
+-#endif
+-
+     if (is_sub_thread)
+ 	gdk_threads_enter();
+ 
diff --git a/mail/balsa/files/patch-src_main.c b/mail/balsa/files/patch-src_main.c
new file mode 100644
index 000000000000..044e51dd98db
--- /dev/null
+++ b/mail/balsa/files/patch-src_main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	Sun Jan 18 06:39:47 2004
++++ src/main.c	Sun Jan 18 21:38:15 2004
+@@ -233,7 +233,7 @@
+     gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+                        GNOME_PARAM_POPT_TABLE, options,
+                        GNOME_PARAM_APP_PREFIX, BALSA_STD_PREFIX,
+-                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share",
++                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share/gnome",
+ 		       GNOME_PARAM_HUMAN_READABLE_NAME, _("The Balsa E-Mail Client"),
+                        NULL);
+ 
diff --git a/mail/balsa/files/patch-src_threads.h b/mail/balsa/files/patch-src_threads.h
new file mode 100644
index 000000000000..62c60b878960
--- /dev/null
+++ b/mail/balsa/files/patch-src_threads.h
@@ -0,0 +1,12 @@
+--- src/threads.h.orig	Tue Dec 31 14:06:47 2002
++++ src/threads.h	Tue Dec 31 14:07:32 2002
+@@ -21,6 +21,9 @@
+ 
+ #ifndef __THREADS_H__
+ #define __THREADS_H__
++
++#include <pthread.h>
++
+ /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
+ extern pthread_mutex_t mailbox_lock;
+ 
diff --git a/mail/balsa/pkg-descr b/mail/balsa/pkg-descr
index 484e6febcc10..06d18a364ea9 100644
--- a/mail/balsa/pkg-descr
+++ b/mail/balsa/pkg-descr
@@ -1,4 +1,4 @@
-A mail reader for gnome. It supports local mail, pop3, and IMAP. It can
+A mail reader for GNOME 2. It supports local mail, pop3, and IMAP. It can
 view mail files in mbox, maildir, and mh format.
 
 The pop3 support is not complete. All mail retrieved will be left on the
@@ -9,4 +9,4 @@ Balsa is probably not fully usable as one's primary mail client at this
 time.  However, it is under active development and fits with other gnome
 applications.
 
-WWW: http://www.balsa.net/
+WWW: http://balsa.gnome.org/
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index f6f4b4d93330..8bcd5a9ec530 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -1,48 +1,40 @@
 bin/balsa
+bin/balsa-ab
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-share/gnome/apps/Internet/balsa.desktop
-share/gnome/help/balsa/C/getting-started.html
-share/gnome/help/balsa/C/images/address-book-ldap.png
-share/gnome/help/balsa/C/images/address-book-modify.png
-share/gnome/help/balsa/C/images/address-book-start.png
-share/gnome/help/balsa/C/images/address-book-vcard.png
-share/gnome/help/balsa/C/images/address-book.png
-share/gnome/help/balsa/C/images/balsa_logo.png
-share/gnome/help/balsa/C/images/druid-start.png
-share/gnome/help/balsa/C/images/example-alias.png
-share/gnome/help/balsa/C/images/main-window-toolbar.png
-share/gnome/help/balsa/C/images/main-window.png
-share/gnome/help/balsa/C/images/newmsg-window-attachments.png
-share/gnome/help/balsa/C/images/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/images/newmsg-window.png
-share/gnome/help/balsa/C/images/preferences-window.png
-share/gnome/help/balsa/C/images/spell-check.png
-share/gnome/help/balsa/C/index.html
-share/gnome/help/balsa/C/license.html
-share/gnome/help/balsa/C/stylesheet-images/caution.gif
-share/gnome/help/balsa/C/stylesheet-images/home.gif
-share/gnome/help/balsa/C/stylesheet-images/important.gif
-share/gnome/help/balsa/C/stylesheet-images/next.gif
-share/gnome/help/balsa/C/stylesheet-images/note.gif
-share/gnome/help/balsa/C/stylesheet-images/prev.gif
-share/gnome/help/balsa/C/stylesheet-images/tip.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-blank.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-minus.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-plus.gif
-share/gnome/help/balsa/C/stylesheet-images/up.gif
-share/gnome/help/balsa/C/stylesheet-images/warning.gif
-share/gnome/help/balsa/C/topic.dat
-share/gnome/help/balsa/C/win-main.html
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa-logo.png
-share/gnome/pixmaps/balsa/balsa-top.png
-share/gnome/pixmaps/balsa/balsa-watermark.png
-share/gnome/pixmaps/balsa/balsa_icon.png
-share/gnome/pixmaps/balsa/balsa_logo.png
+libdata/bonobo/servers/GNOME_Balsa.server
+share/gnome/applications/balsa.desktop
+share/gnome/balsa/pixmaps/attachment.png
+share/gnome/balsa/pixmaps/balsa-logo.png
+share/gnome/balsa/pixmaps/balsa-top.png
+share/gnome/balsa/pixmaps/balsa-watermark.png
+share/gnome/balsa/pixmaps/balsa_icon.png
+share/gnome/balsa/pixmaps/balsa_logo.png
+share/gnome/help/balsa/C/balsa.xml
+share/gnome/help/balsa/C/fdl-appendix.xml
+share/gnome/help/balsa/C/figures/address-book-ldap.png
+share/gnome/help/balsa/C/figures/address-book-modify.png
+share/gnome/help/balsa/C/figures/address-book-start.png
+share/gnome/help/balsa/C/figures/address-book-vcard.png
+share/gnome/help/balsa/C/figures/address-book.png
+share/gnome/help/balsa/C/figures/balsa_logo.png
+share/gnome/help/balsa/C/figures/druid-start.png
+share/gnome/help/balsa/C/figures/example-alias.png
+share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/C/figures/main-window-toolbar.png
+share/gnome/help/balsa/C/figures/main-window.png
+share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/C/figures/newmsg-window.png
+share/gnome/help/balsa/C/figures/preferences-window.png
+share/gnome/help/balsa/C/figures/spell-check.png
+share/gnome/idl/Balsa.idl
+share/gnome/omf/balsa/balsa-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/balsa/balsa-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-balsa2.png
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
+share/locale/am/LC_MESSAGES/balsa.mo
 share/locale/az/LC_MESSAGES/balsa.mo
 share/locale/bg/LC_MESSAGES/balsa.mo
 share/locale/ca/LC_MESSAGES/balsa.mo
@@ -50,17 +42,23 @@ share/locale/cs/LC_MESSAGES/balsa.mo
 share/locale/da/LC_MESSAGES/balsa.mo
 share/locale/de/LC_MESSAGES/balsa.mo
 share/locale/el/LC_MESSAGES/balsa.mo
+share/locale/en_CA/LC_MESSAGES/balsa.mo
 share/locale/en_GB/LC_MESSAGES/balsa.mo
 share/locale/es/LC_MESSAGES/balsa.mo
 share/locale/et/LC_MESSAGES/balsa.mo
 share/locale/fi/LC_MESSAGES/balsa.mo
 share/locale/fr/LC_MESSAGES/balsa.mo
 share/locale/ga/LC_MESSAGES/balsa.mo
+share/locale/he/LC_MESSAGES/balsa.mo
+share/locale/hi/LC_MESSAGES/balsa.mo
+share/locale/hr/LC_MESSAGES/balsa.mo
 share/locale/hu/LC_MESSAGES/balsa.mo
 share/locale/it/LC_MESSAGES/balsa.mo
 share/locale/ja/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
 share/locale/lt/LC_MESSAGES/balsa.mo
+share/locale/lv/LC_MESSAGES/balsa.mo
+share/locale/ml/LC_MESSAGES/balsa.mo
 share/locale/ms/LC_MESSAGES/balsa.mo
 share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/nn/LC_MESSAGES/balsa.mo
@@ -72,16 +70,21 @@ share/locale/ro/LC_MESSAGES/balsa.mo
 share/locale/ru/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/uk/LC_MESSAGES/balsa.mo
 share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/pixmaps/balsa
-@dirrm share/gnome/help/balsa/C/stylesheet-images
-@dirrm share/gnome/help/balsa/C/images
+@dirrm share/gnome/omf/balsa
+@dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
+@dirrm share/gnome/balsa/pixmaps
+@dirrm share/gnome/balsa
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/balsa/balsa-C.omf 2>/dev/null || /usr/bin/true