Update to 1.3.0.

PR:		32927
Submitted by:	John Merryweather Cooper <john_m_cooper@yahoo.com>

10 files changed, 108 insertions, 14 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 25502e03f8f5..a6cf9293fe21 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	esmtp.5:${PORTSDIR}/mail/libesmtp \
-		ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
 		aspell.11:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS=	${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp
+RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell \
+		${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
@@ -29,12 +30,12 @@ CONFIGURE_ARGS=	--enable-threads \
 		--enable-ldap \
 		--disable-more-warnings \
 		--with-ssl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgiconv"
 
 MAN1=		balsa.1
 
-pre-patch:
+post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index c702b1f53463..e857076aca97 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.2.3.tar.gz) = 10fe350475b92863da6704a84be6709e
+MD5 (balsa-1.3.0.tar.gz) = 7309370fe64d633df5fe46b1a1a25a82
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
new file mode 100644
index 000000000000..7143c8afe49f
--- /dev/null
+++ b/mail/balsa/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure	Fri Dec 14 06:13:21 2001
++++ configure.new	Sun Dec 16 12:52:33 2001
+@@ -8869,7 +8869,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lldap -llber -lresolv $LIBS"
++LIBS="-lldap -llber $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 8875 "configure"
+ #include "confdefs.h"
+@@ -8900,7 +8900,7 @@
+   cat >> confdefs.h <<\EOF
+ #define ENABLE_LDAP 1
+ EOF
+- LIBS="-lldap -llber -lresolv $LIBS"
++ LIBS="-lldap -llber $LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ { echo "configure: error: *** You enabled LDAP but ldap library is not found." 1>&2; exit 1; }
diff --git a/mail/balsa/files/patch-libbalsa::address-book-ldap.c b/mail/balsa/files/patch-libbalsa::address-book-ldap.c
new file mode 100644
index 000000000000..1205fd60b698
--- /dev/null
+++ b/mail/balsa/files/patch-libbalsa::address-book-ldap.c
@@ -0,0 +1,11 @@
+--- libbalsa/address-book-ldap.c	Mon Nov 19 03:41:21 2001
++++ libbalsa/address-book-ldap.c.new	Sun Dec 16 12:59:34 2001
+@@ -31,7 +31,7 @@
+ #include <sys/time.h>
+ #include <lber.h>
+ #include <ldap.h>
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ #include "address-book.h"
+ #include "address-book-ldap.h"
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 65b175efd4e0..d5bdb7263991 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -2,11 +2,14 @@ bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
 share/gnome/apps/Internet/balsa.desktop
+share/gnome/help/balsa/C/ab-conf.html
+share/gnome/help/balsa/C/authors.html
 share/gnome/help/balsa/C/authours.html
 share/gnome/help/balsa/C/common-tasks.html
 share/gnome/help/balsa/C/folder-config.html
 share/gnome/help/balsa/C/getting-started.html
 share/gnome/help/balsa/C/glossary.html
+share/gnome/help/balsa/C/identities.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
@@ -24,8 +27,17 @@ 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/its-not-working.html
+share/gnome/help/balsa/C/ln28.html
 share/gnome/help/balsa/C/ln7.html
 share/gnome/help/balsa/C/mbox-formats.html
+share/gnome/help/balsa/C/preferences-0.html
+share/gnome/help/balsa/C/preferences-1.html
+share/gnome/help/balsa/C/preferences-2.html
+share/gnome/help/balsa/C/preferences-3.html
+share/gnome/help/balsa/C/preferences-4.html
+share/gnome/help/balsa/C/preferences-5.html
+share/gnome/help/balsa/C/preferences-6.html
+share/gnome/help/balsa/C/preferences.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
@@ -38,6 +50,7 @@ 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/toolbars.html
 share/gnome/help/balsa/C/topic.dat
 share/gnome/help/balsa/C/win-composer.html
 share/gnome/help/balsa/C/win-config-0.html
@@ -53,6 +66,7 @@ share/gnome/help/balsa/C/win-config-8.html
 share/gnome/help/balsa/C/win-config-9.html
 share/gnome/help/balsa/C/win-config.html
 share/gnome/help/balsa/C/win-main.html
+share/gnome/help/balsa/C/win-message.html
 share/gnome/pixmaps/balsa/attachment.png
 share/gnome/pixmaps/balsa/balsa-logo.png
 share/gnome/pixmaps/balsa/balsa-top.png
@@ -95,6 +109,7 @@ share/locale/tr/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
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 25502e03f8f5..a6cf9293fe21 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	esmtp.5:${PORTSDIR}/mail/libesmtp \
-		ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
 		aspell.11:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS=	${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp
+RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell \
+		${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
@@ -29,12 +30,12 @@ CONFIGURE_ARGS=	--enable-threads \
 		--enable-ldap \
 		--disable-more-warnings \
 		--with-ssl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgiconv"
 
 MAN1=		balsa.1
 
-pre-patch:
+post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index c702b1f53463..e857076aca97 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.2.3.tar.gz) = 10fe350475b92863da6704a84be6709e
+MD5 (balsa-1.3.0.tar.gz) = 7309370fe64d633df5fe46b1a1a25a82
diff --git a/mail/balsa2/files/patch-configure b/mail/balsa2/files/patch-configure
new file mode 100644
index 000000000000..7143c8afe49f
--- /dev/null
+++ b/mail/balsa2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure	Fri Dec 14 06:13:21 2001
++++ configure.new	Sun Dec 16 12:52:33 2001
+@@ -8869,7 +8869,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lldap -llber -lresolv $LIBS"
++LIBS="-lldap -llber $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 8875 "configure"
+ #include "confdefs.h"
+@@ -8900,7 +8900,7 @@
+   cat >> confdefs.h <<\EOF
+ #define ENABLE_LDAP 1
+ EOF
+- LIBS="-lldap -llber -lresolv $LIBS"
++ LIBS="-lldap -llber $LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ { echo "configure: error: *** You enabled LDAP but ldap library is not found." 1>&2; exit 1; }
diff --git a/mail/balsa2/files/patch-libbalsa::address-book-ldap.c b/mail/balsa2/files/patch-libbalsa::address-book-ldap.c
new file mode 100644
index 000000000000..1205fd60b698
--- /dev/null
+++ b/mail/balsa2/files/patch-libbalsa::address-book-ldap.c
@@ -0,0 +1,11 @@
+--- libbalsa/address-book-ldap.c	Mon Nov 19 03:41:21 2001
++++ libbalsa/address-book-ldap.c.new	Sun Dec 16 12:59:34 2001
+@@ -31,7 +31,7 @@
+ #include <sys/time.h>
+ #include <lber.h>
+ #include <ldap.h>
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ #include "address-book.h"
+ #include "address-book-ldap.h"
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 65b175efd4e0..d5bdb7263991 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -2,11 +2,14 @@ bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
 share/gnome/apps/Internet/balsa.desktop
+share/gnome/help/balsa/C/ab-conf.html
+share/gnome/help/balsa/C/authors.html
 share/gnome/help/balsa/C/authours.html
 share/gnome/help/balsa/C/common-tasks.html
 share/gnome/help/balsa/C/folder-config.html
 share/gnome/help/balsa/C/getting-started.html
 share/gnome/help/balsa/C/glossary.html
+share/gnome/help/balsa/C/identities.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
@@ -24,8 +27,17 @@ 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/its-not-working.html
+share/gnome/help/balsa/C/ln28.html
 share/gnome/help/balsa/C/ln7.html
 share/gnome/help/balsa/C/mbox-formats.html
+share/gnome/help/balsa/C/preferences-0.html
+share/gnome/help/balsa/C/preferences-1.html
+share/gnome/help/balsa/C/preferences-2.html
+share/gnome/help/balsa/C/preferences-3.html
+share/gnome/help/balsa/C/preferences-4.html
+share/gnome/help/balsa/C/preferences-5.html
+share/gnome/help/balsa/C/preferences-6.html
+share/gnome/help/balsa/C/preferences.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
@@ -38,6 +50,7 @@ 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/toolbars.html
 share/gnome/help/balsa/C/topic.dat
 share/gnome/help/balsa/C/win-composer.html
 share/gnome/help/balsa/C/win-config-0.html
@@ -53,6 +66,7 @@ share/gnome/help/balsa/C/win-config-8.html
 share/gnome/help/balsa/C/win-config-9.html
 share/gnome/help/balsa/C/win-config.html
 share/gnome/help/balsa/C/win-main.html
+share/gnome/help/balsa/C/win-message.html
 share/gnome/pixmaps/balsa/attachment.png
 share/gnome/pixmaps/balsa/balsa-logo.png
 share/gnome/pixmaps/balsa/balsa-top.png
@@ -95,6 +109,7 @@ share/locale/tr/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