Update balsa to 0.9.3. Changes are bugfixes and initial APOP support.

6 files changed, 52 insertions, 13 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 7dfac860f20..727a6bab47b 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2000/08/14 13:02:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/29 11:37:15 rh Exp $
 #
 
-DISTNAME=	balsa-0.9.0
+DISTNAME=	balsa-0.9.3
 CATEGORIES=	mail gnome
-MASTER_SITES=	ftp://ftp.newton.cx/pub/balsa/ \
-		http://www.theochem.kth.se/~pawsa/balsa/
+MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
+		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.balsa.net/
@@ -17,5 +17,7 @@ GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=--disable-more-warnings
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/files/md5 b/mail/balsa/files/md5
index 507421f64ea..dac340e4562 100644
--- a/mail/balsa/files/md5
+++ b/mail/balsa/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/07/05 18:46:46 rh Exp $
+$NetBSD: md5,v 1.5 2000/08/29 11:37:16 rh Exp $
 
-MD5 (balsa-0.9.0.tar.gz) = 19c8a615b3949bcb5ccbc006d1e5d122
+MD5 (balsa-0.9.3.tar.gz) = c25203bfbb340f3c2ccf0914b5402a3b
diff --git a/mail/balsa/files/patch-sum b/mail/balsa/files/patch-sum
index 9efb612da95..660417d0e22 100644
--- a/mail/balsa/files/patch-sum
+++ b/mail/balsa/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:41 danw Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/29 11:37:16 rh Exp $
 
-This placeholder file is generated by the ``makepatchsum'' target
-whenever the patches directory is empty or missing. Its purpose
-is to ensure that the presence of any obsolete patches will cause
-the proper error to be emitted at build time.
+MD5 (patch-aa) = 0b631a59d92b4e972a35f5481c408e30
+MD5 (patch-ab) = dd8ef963c27786bb951d1798970edff2
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
new file mode 100644
index 00000000000..1174481e5d2
--- /dev/null
+++ b/mail/balsa/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2000/08/29 11:37:17 rh Exp $
+
+--- configure.orig	Mon Aug 28 20:05:57 2000
++++ configure
+@@ -4805,7 +4805,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -5067,7 +5067,7 @@
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=share
+ 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
new file mode 100644
index 00000000000..fdeffed51f8
--- /dev/null
+++ b/mail/balsa/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.4 2000/08/29 11:37:17 rh Exp $
+
+--- libbalsa/send.c.orig	Mon Aug 28 12:03:59 2000
++++ libbalsa/send.c
+@@ -22,6 +22,9 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
diff --git a/mail/balsa/pkg/PLIST b/mail/balsa/pkg/PLIST
index 0267fbe83b6..b0502bd4519 100644
--- a/mail/balsa/pkg/PLIST
+++ b/mail/balsa/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/07/05 18:46:46 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/08/29 11:37:17 rh Exp $
 bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
@@ -10,6 +10,7 @@ share/gnome/help/balsa/C/getting-started.html
 share/gnome/help/balsa/C/glossary.html
 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
@@ -46,6 +47,7 @@ share/locale/ca/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_GB/LC_MESSAGES/balsa.mo
 share/locale/es/LC_MESSAGES/balsa.mo
 share/locale/es_ES/LC_MESSAGES/balsa.mo
 share/locale/et/LC_MESSAGES/balsa.mo
@@ -67,7 +69,8 @@ share/locale/sl/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/zh_CN/LC_MESSAGES/balsa.mo
+share/locale/wa/LC_MESSAGES/balsa.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/balsa.mo
 share/pixmaps/balsa/attachment.png
 share/pixmaps/balsa/balsa-logo.png
 share/pixmaps/balsa/balsa-top.png