Upgrade to 0.4.9.

PR:		ports/9887
Submitted by:	maintainer

10 files changed, 118 insertions, 160 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index b50460ee0fc5..c2ff3cc0b06f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,32 +1,35 @@
-# New ports collection makefile for:   balsa
-# Version required:    0.4.6.2
-# Date created:        02 December 1998
-# Whom:                Glenn Johnson <gljohns@bellsouth.net>
+# New ports collection makefile for:	balsa
+# Version required:			0.4.9
+# Date created:				02 December 1998
+# Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
-# $Id: Makefile,v 1.2 1999/01/17 19:59:38 vanilla Exp $
+# $Id: Makefile,v 1.3 1999/02/03 08:09:51 asami Exp $
 #
 
-DISTNAME=	balsa-0.4.6.2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.balsa.net/dist/
+DISTNAME=	balsa-0.4.9
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://www.balsa.net/dist/
+MASTER_SITE_SUBDIR=	balsa
 
 MAINTAINER=	gljohns@bellsouth.net
 
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
 		PropList.1:${PORTSDIR}/devel/libPropList
 
-BROKEN=		"can't work with gnomelibs-0.99.3"
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 MAN1=		balsa.1
 
+post-install:
+		${INSTALL_MAN} ${WRKSRC}/balsa.1 ${PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index fa2a4325b327..7bd7c0e40932 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1 +1 @@
-MD5 (balsa-0.4.6.2.tar.gz) = 08e1995aedc27b701b39df6082dd2a02
+MD5 (balsa-0.4.9.tar.gz) = 08d8dd036bca0cc0156e7d299f873d5f
diff --git a/mail/balsa/files/patch-ab b/mail/balsa/files/patch-ab
index fa766f4e91ba..882365daef00 100644
--- a/mail/balsa/files/patch-ab
+++ b/mail/balsa/files/patch-ab
@@ -1,60 +1,21 @@
---- configure.orig	Sat Oct 17 09:06:56 1998
-+++ configure	Sun Dec  6 23:12:45 1998
-@@ -939,12 +939,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:944: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:944: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
-@@ -2307,14 +2307,14 @@
- LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`"
- LIBS="$LIBS $GTK_LIBS"
- 
--echo $ac_n "checking for PLGetProplistWithPath in -lPropList""... $ac_c" 1>&6
--echo "configure:2312: checking for PLGetProplistWithPath in -lPropList" >&5
--ac_lib_var=`echo PropList'_'PLGetProplistWithPath | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for PLGetProplistWithPath in -lPropListgnome""... $ac_c" 1>&6
-+echo "configure:2312: checking for PLGetProplistWithPath in -lPropListgnome" >&5
-+ac_lib_var=`echo PropListgnome'_'PLGetProplistWithPath | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lPropList  $LIBS"
-+LIBS="-lPropListgnome  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2320 "configure"
- #include "confdefs.h"
-@@ -2342,17 +2342,17 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo PropList | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    ac_tr_lib=HAVE_LIB`echo PropListgnome | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lPropList $LIBS"
-+  LIBS="-lPropListgnome $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
--{ echo "configure: error: *** libPropList not found.  Please check http://www.balsa.net for information on the required files." 1>&2; exit 1; }
-+{ echo "configure: error: *** libPropListgnome not found.  Please check http://www.balsa.net for information on the required files." 1>&2; exit 1; }
- fi
- 
- 
+--- configure.orig	Thu Feb  4 04:23:24 1999
++++ configure	Thu Feb  4 04:24:24 1999
+@@ -1111,13 +1111,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1116: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1116: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
diff --git a/mail/balsa/pkg-descr b/mail/balsa/pkg-descr
index 5c9ee2b13963..42ec36c08328 100644
--- a/mail/balsa/pkg-descr
+++ b/mail/balsa/pkg-descr
@@ -1,10 +1,15 @@
 A mail reader for gnome. It supports local mail, pop3, and IMAP. It can
-view mail files in mbox, maildir, and mh format. However, MIME is not
-working yet and you cannot use attachments.
+view mail files in mbox, maildir, and mh format.
 
 The pop3 support is not complete. All mail retrieved will be left on the
 server, and hence retrieved again if not deleted through some other pop3
 client. I would recommend using fetchmail to retrieve pop3 mail.
 
-Website:
+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.
+
+Web site:
   * http://www.balsa.net/
+
+The web site does not appear to be up to date.
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 75496d079546..f34c1c961f19 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -1,10 +1,20 @@
 bin/balsa
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa_logo.png
-share/gnome/pixmaps/balsa/balsa_icon.png
+etc/sound/events/balsa.soundlist
+etc/sound/events/email.soundlist
+etc/CORBA/servers/balsa.gnorba
+lib/libbalsasrv.a
 share/locale/de/LC_MESSAGES/balsa.mo
+share/locale/es/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/ko/LC_MESSAGES/balsa.mo
+share/locale/no/LC_MESSAGES/balsa.mo
+share/locale/it/LC_MESSAGES/balsa.mo
+share/gnome/sounds/balsa/startup.wav
+share/gnome/sounds/balsa/newmail.wav
+share/gnome/pixmaps/balsa/attachment.png
+share/gnome/pixmaps/balsa/balsa_logo.png
+share/gnome/pixmaps/balsa/balsa_icon.png
+@dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/pixmaps/balsa
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index b50460ee0fc5..c2ff3cc0b06f 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,32 +1,35 @@
-# New ports collection makefile for:   balsa
-# Version required:    0.4.6.2
-# Date created:        02 December 1998
-# Whom:                Glenn Johnson <gljohns@bellsouth.net>
+# New ports collection makefile for:	balsa
+# Version required:			0.4.9
+# Date created:				02 December 1998
+# Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
-# $Id: Makefile,v 1.2 1999/01/17 19:59:38 vanilla Exp $
+# $Id: Makefile,v 1.3 1999/02/03 08:09:51 asami Exp $
 #
 
-DISTNAME=	balsa-0.4.6.2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.balsa.net/dist/
+DISTNAME=	balsa-0.4.9
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://www.balsa.net/dist/
+MASTER_SITE_SUBDIR=	balsa
 
 MAINTAINER=	gljohns@bellsouth.net
 
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
 		PropList.1:${PORTSDIR}/devel/libPropList
 
-BROKEN=		"can't work with gnomelibs-0.99.3"
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 MAN1=		balsa.1
 
+post-install:
+		${INSTALL_MAN} ${WRKSRC}/balsa.1 ${PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index fa2a4325b327..7bd7c0e40932 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-0.4.6.2.tar.gz) = 08e1995aedc27b701b39df6082dd2a02
+MD5 (balsa-0.4.9.tar.gz) = 08d8dd036bca0cc0156e7d299f873d5f
diff --git a/mail/balsa2/files/patch-ab b/mail/balsa2/files/patch-ab
index fa766f4e91ba..882365daef00 100644
--- a/mail/balsa2/files/patch-ab
+++ b/mail/balsa2/files/patch-ab
@@ -1,60 +1,21 @@
---- configure.orig	Sat Oct 17 09:06:56 1998
-+++ configure	Sun Dec  6 23:12:45 1998
-@@ -939,12 +939,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:944: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:944: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
-@@ -2307,14 +2307,14 @@
- LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`"
- LIBS="$LIBS $GTK_LIBS"
- 
--echo $ac_n "checking for PLGetProplistWithPath in -lPropList""... $ac_c" 1>&6
--echo "configure:2312: checking for PLGetProplistWithPath in -lPropList" >&5
--ac_lib_var=`echo PropList'_'PLGetProplistWithPath | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for PLGetProplistWithPath in -lPropListgnome""... $ac_c" 1>&6
-+echo "configure:2312: checking for PLGetProplistWithPath in -lPropListgnome" >&5
-+ac_lib_var=`echo PropListgnome'_'PLGetProplistWithPath | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lPropList  $LIBS"
-+LIBS="-lPropListgnome  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2320 "configure"
- #include "confdefs.h"
-@@ -2342,17 +2342,17 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo PropList | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    ac_tr_lib=HAVE_LIB`echo PropListgnome | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lPropList $LIBS"
-+  LIBS="-lPropListgnome $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
--{ echo "configure: error: *** libPropList not found.  Please check http://www.balsa.net for information on the required files." 1>&2; exit 1; }
-+{ echo "configure: error: *** libPropListgnome not found.  Please check http://www.balsa.net for information on the required files." 1>&2; exit 1; }
- fi
- 
- 
+--- configure.orig	Thu Feb  4 04:23:24 1999
++++ configure	Thu Feb  4 04:24:24 1999
+@@ -1111,13 +1111,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1116: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1116: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
diff --git a/mail/balsa2/pkg-descr b/mail/balsa2/pkg-descr
index 5c9ee2b13963..42ec36c08328 100644
--- a/mail/balsa2/pkg-descr
+++ b/mail/balsa2/pkg-descr
@@ -1,10 +1,15 @@
 A mail reader for gnome. It supports local mail, pop3, and IMAP. It can
-view mail files in mbox, maildir, and mh format. However, MIME is not
-working yet and you cannot use attachments.
+view mail files in mbox, maildir, and mh format.
 
 The pop3 support is not complete. All mail retrieved will be left on the
 server, and hence retrieved again if not deleted through some other pop3
 client. I would recommend using fetchmail to retrieve pop3 mail.
 
-Website:
+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.
+
+Web site:
   * http://www.balsa.net/
+
+The web site does not appear to be up to date.
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 75496d079546..f34c1c961f19 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -1,10 +1,20 @@
 bin/balsa
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa_logo.png
-share/gnome/pixmaps/balsa/balsa_icon.png
+etc/sound/events/balsa.soundlist
+etc/sound/events/email.soundlist
+etc/CORBA/servers/balsa.gnorba
+lib/libbalsasrv.a
 share/locale/de/LC_MESSAGES/balsa.mo
+share/locale/es/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/ko/LC_MESSAGES/balsa.mo
+share/locale/no/LC_MESSAGES/balsa.mo
+share/locale/it/LC_MESSAGES/balsa.mo
+share/gnome/sounds/balsa/startup.wav
+share/gnome/sounds/balsa/newmail.wav
+share/gnome/pixmaps/balsa/attachment.png
+share/gnome/pixmaps/balsa/balsa_logo.png
+share/gnome/pixmaps/balsa/balsa_icon.png
+@dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/pixmaps/balsa