-update to 2.0.12

 changes:
 -Undo function in the message composer
 -extended GPG support
 -bugfixes
-Remove a hack which appearently helps finding iconv() in libiconv.
 Every other pkg finds it itself; and it breaks in -current.

5 files changed, 37 insertions, 13 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index b84bcba5659..ab7996f6a7e 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:45:42 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/25 18:25:45 drochner Exp $
 #
 
-DISTNAME=		balsa-2.0.10
-PKGREVISION=		2
+DISTNAME=		balsa-2.0.12
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
@@ -22,7 +21,7 @@ USE_PKGLOCALEDIR=	yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}
 CONFIGURE_ARGS+=	--disable-more-warnings
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-pcre
@@ -54,9 +53,4 @@ CONFIGURE_ARGS+=        --enable-ldap
 .include "../../www/libgtkhtml/buildlink2.mk"
 .include "../../mail/libesmtp/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-
-.if defined(BUILDLINK_LIBICONV_LDADD) && !empty(BUILDLINK_LIBICONV_LDADD)
-CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv_open=yes
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
index 610cf235084..65404b29387 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/25 18:25:45 drochner Exp $
 bin/balsa
 bin/balsa-ab
 man/man1/balsa.1
@@ -63,6 +63,8 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/balsa.mo
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index c6a80e6eb89..0a5a63a92d0 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/07/25 18:25:45 drochner Exp $
 
-SHA1 (balsa-2.0.10.tar.bz2) = ec55d49c1797fdb52e46129b29e34191e103c24b
-Size (balsa-2.0.10.tar.bz2) = 2574787 bytes
+SHA1 (balsa-2.0.12.tar.bz2) = d47b40fb2beb18a296678dd26c02156de343a9fc
+Size (balsa-2.0.12.tar.bz2) = 2771286 bytes
 SHA1 (patch-aa) = 115368550ab0be9be35cafdab5e354139b8c5634
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = 8a6eb00c8969040bec4aac63075563fcc586754d
 SHA1 (patch-ad) = 963c35de785ba3d37c4a2df396cf391ef1aa9082
+SHA1 (patch-ae) = dc0bb9dbc5c1392c0dcc3a515d44d40fe26d93e3
+SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
diff --git a/mail/balsa2/patches/patch-ae b/mail/balsa2/patches/patch-ae
new file mode 100644
index 00000000000..6472afacc9b
--- /dev/null
+++ b/mail/balsa2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/07/25 18:25:46 drochner Exp $
+
+--- libbalsa/filter-file.c.orig	2003-07-25 19:39:19.000000000 +0200
++++ libbalsa/filter-file.c	2003-07-25 19:39:41.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include "config.h"
+ 
+ /* define _XOPEN_SOURCE to make strptime visible */
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+ /* extensions  needed additonally on Solaris for strptime */
+ #define __EXTENSIONS__
+ #include <stdio.h>
diff --git a/mail/balsa2/patches/patch-af b/mail/balsa2/patches/patch-af
new file mode 100644
index 00000000000..af36dbc9666
--- /dev/null
+++ b/mail/balsa2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/07/25 18:25:46 drochner Exp $
+
+--- src/filter-edit-callbacks.c.orig	2003-07-25 20:01:17.000000000 +0200
++++ src/filter-edit-callbacks.c	2003-07-25 20:01:30.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include "config.h"
+ 
+-#define _XOPEN_SOURCE /* glibc2 needs this */
++#define _XOPEN_SOURCE 600 /* glibc2 needs this */
+ /* yellow dog has crappy libc and needs pthread.h to be included here */
+ #ifdef BALSA_USE_THREADS
+ #  include <pthread.h>