Update to version 0.6.0.

PR:		15665
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

8 files changed, 102 insertions, 14 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 6ad838bb72ab..d285af10c5b5 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	balsa
-# Version required:			0.4.9.5
+# Version required:			0.6.0
 # Date created:				02 December 1998
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	balsa-0.4.9.5
+DISTNAME=	balsa-0.6.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	ftp://ftp.balsa.net/pub/balsa/
 
@@ -17,12 +17,14 @@ LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libmutt/configure
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 		GTK_CONFIG='${GTK_CONFIG}' \
+		GLIB_CONFIG='${GLIB_CONFIG}' \
 		LIBS='-L${LOCALBASE}/lib'
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 6807ffbb0e88..d023df2fcf0c 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1 +1 @@
-MD5 (balsa-0.4.9.5.tar.gz) = b723043e86768d9c09af6fc76a9a63c2
+MD5 (balsa-0.6.0.tar.gz) = 3660c39d9a1a5712bfc51edf685b6308
diff --git a/mail/balsa/files/patch-ai b/mail/balsa/files/patch-ai
new file mode 100644
index 000000000000..ff6f252bd129
--- /dev/null
+++ b/mail/balsa/files/patch-ai
@@ -0,0 +1,20 @@
+--- libmutt/rfc1524.c.orig	Fri Jan  3 23:18:25 1997
++++ libmutt/rfc1524.c	Thu Dec 23 05:14:52 1999
+@@ -455,7 +455,7 @@
+   if (s[0] == '\0')
+   {
+     snprintf (s, l, "%s/muttXXXXXX", buf);
+-    mktemp (s);
++    mkstemp (s);
+   }
+   else
+   {
+@@ -466,7 +466,7 @@
+     if ((period = strrchr (tmp, '.')) != NULL)
+       *period = 0;
+     snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
+-    mktemp (s);
++    mkstemp (s);
+     if (period != NULL)
+     {
+       *period = '.';
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 7e07c23ec109..96701bd9fcbe 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -2,19 +2,41 @@ bin/balsa
 etc/CORBA/servers/balsa.gnorba
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-lib/libbalsasrv.a
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa_icon.png
-share/gnome/pixmaps/balsa/balsa_logo.png
+share/gnome/gnome/help/balsa/C/g327.htm
+@exec ln -sf t1.htm %D/share/gnome/gnome/help/balsa/C/index.html
+@unexec rm -f %D/share/gnome/gnome/help/balsa/C/index.html
+share/gnome/gnome/help/balsa/C/t1.htm
+share/gnome/gnome/help/balsa/C/topic.dat
+share/gnome/gnome/help/balsa/C/x188.htm
+share/gnome/gnome/help/balsa/C/x24.htm
+share/gnome/gnome/help/balsa/C/x244.htm
+share/gnome/gnome/help/balsa/C/x277.htm
+share/gnome/gnome/help/balsa/C/x324.htm
+share/gnome/gnome/help/balsa/C/x35.htm
+share/gnome/idl/balsa.idl
+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 
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
+share/locale/da/LC_MESSAGES/balsa.mo
 share/locale/de/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/it/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
+share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/no/LC_MESSAGES/balsa.mo
+share/locale/pl/LC_MESSAGES/balsa.mo
+share/locale/pt_BR/LC_MESSAGES/balsa.mo
+share/locale/ru/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/pixmaps/balsa
+@dirrm share/gnome/gnome/help/balsa/C
+@dirrm share/gnome/gnome/help/balsa
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 6ad838bb72ab..d285af10c5b5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	balsa
-# Version required:			0.4.9.5
+# Version required:			0.6.0
 # Date created:				02 December 1998
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	balsa-0.4.9.5
+DISTNAME=	balsa-0.6.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	ftp://ftp.balsa.net/pub/balsa/
 
@@ -17,12 +17,14 @@ LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libmutt/configure
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 		GTK_CONFIG='${GTK_CONFIG}' \
+		GLIB_CONFIG='${GLIB_CONFIG}' \
 		LIBS='-L${LOCALBASE}/lib'
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 6807ffbb0e88..d023df2fcf0c 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-0.4.9.5.tar.gz) = b723043e86768d9c09af6fc76a9a63c2
+MD5 (balsa-0.6.0.tar.gz) = 3660c39d9a1a5712bfc51edf685b6308
diff --git a/mail/balsa2/files/patch-ai b/mail/balsa2/files/patch-ai
new file mode 100644
index 000000000000..ff6f252bd129
--- /dev/null
+++ b/mail/balsa2/files/patch-ai
@@ -0,0 +1,20 @@
+--- libmutt/rfc1524.c.orig	Fri Jan  3 23:18:25 1997
++++ libmutt/rfc1524.c	Thu Dec 23 05:14:52 1999
+@@ -455,7 +455,7 @@
+   if (s[0] == '\0')
+   {
+     snprintf (s, l, "%s/muttXXXXXX", buf);
+-    mktemp (s);
++    mkstemp (s);
+   }
+   else
+   {
+@@ -466,7 +466,7 @@
+     if ((period = strrchr (tmp, '.')) != NULL)
+       *period = 0;
+     snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
+-    mktemp (s);
++    mkstemp (s);
+     if (period != NULL)
+     {
+       *period = '.';
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 7e07c23ec109..96701bd9fcbe 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -2,19 +2,41 @@ bin/balsa
 etc/CORBA/servers/balsa.gnorba
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-lib/libbalsasrv.a
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa_icon.png
-share/gnome/pixmaps/balsa/balsa_logo.png
+share/gnome/gnome/help/balsa/C/g327.htm
+@exec ln -sf t1.htm %D/share/gnome/gnome/help/balsa/C/index.html
+@unexec rm -f %D/share/gnome/gnome/help/balsa/C/index.html
+share/gnome/gnome/help/balsa/C/t1.htm
+share/gnome/gnome/help/balsa/C/topic.dat
+share/gnome/gnome/help/balsa/C/x188.htm
+share/gnome/gnome/help/balsa/C/x24.htm
+share/gnome/gnome/help/balsa/C/x244.htm
+share/gnome/gnome/help/balsa/C/x277.htm
+share/gnome/gnome/help/balsa/C/x324.htm
+share/gnome/gnome/help/balsa/C/x35.htm
+share/gnome/idl/balsa.idl
+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 
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
+share/locale/da/LC_MESSAGES/balsa.mo
 share/locale/de/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/it/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
+share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/no/LC_MESSAGES/balsa.mo
+share/locale/pl/LC_MESSAGES/balsa.mo
+share/locale/pt_BR/LC_MESSAGES/balsa.mo
+share/locale/ru/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/pixmaps/balsa
+@dirrm share/gnome/gnome/help/balsa/C
+@dirrm share/gnome/gnome/help/balsa