Update balsa to 0.8.0p1. Changes are tons of bug fixes, usable IMAP

support, and a manpage.

6 files changed, 51 insertions, 53 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 291f18ba3e3..e73b19fc86c 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/12 18:13:53 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/04/25 07:07:28 rh Exp $
 #
 
-DISTNAME=	balsa-0.4.9.5
+DISTNAME=	balsa-0.8.0-pre1
+PKGNAME=	balsa-0.8.0p1
 CATEGORIES=	mail gnome
-MASTER_SITES=	ftp://ftp.balsa.net/pub/balsa/ \
-		ftp://ftp.univie.ac.at/systems/linux/metalab/X11/gtkbuffet/apps/balsa/
+MASTER_SITES=	ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.balsa.net/
@@ -14,7 +14,8 @@ DEPENDS+=	libproplist-*:../../devel/libproplist
 DEPENDS+=	gnome-core-*:../../x11/gnome-core
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 USE_X11BASE=	yes
+USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/files/md5 b/mail/balsa/files/md5
index 2cf92e0c904..f647dba4c65 100644
--- a/mail/balsa/files/md5
+++ b/mail/balsa/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/12/12 18:13:54 rh Exp $
+$NetBSD: md5,v 1.2 2000/04/25 07:07:29 rh Exp $
 
-MD5 (balsa-0.4.9.5.tar.gz) = b723043e86768d9c09af6fc76a9a63c2
+MD5 (balsa-0.8.0-pre1.tar.gz) = ed17976f21775efcb44003ca3bdae769
diff --git a/mail/balsa/files/patch-sum b/mail/balsa/files/patch-sum
index 43c98e02167..7045c670ec6 100644
--- a/mail/balsa/files/patch-sum
+++ b/mail/balsa/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/12/12 18:13:54 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/25 07:07:29 rh Exp $
 
-MD5 (patch-aa) = 4422068d7f82e89d43b708fa6005d2ba
-MD5 (patch-ab) = a5d0e52fd1a4673d2a5febec24a2f8d3
+MD5 (patch-aa) = 14fed93b017268db5013b42834e77fec
+MD5 (patch-ab) = ea46c12a13d077a766c7ddd718397347
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index 47a0a14a67b..ce3dd3456f2 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,24 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/12 18:13:54 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/04/25 07:07:29 rh Exp $
 
---- configure.orig	Tue Apr 20 12:44:56 1999
-+++ configure	Sun Dec 12 18:24:35 1999
-@@ -2344,6 +2344,7 @@
-   ac_tool_prefix=
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -2576,6 +2577,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -5569,10 +5571,12 @@
+--- configure.orig	Wed Apr 19 05:45:15 2000
++++ configure	Tue Apr 25 08:39:41 2000
+@@ -6072,10 +6072,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -31,7 +15,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/12 18:13:54 rh Exp $
  
    echo creating "$ac_file"
    rm -f "$ac_file"
-@@ -5793,10 +5797,13 @@
+@@ -6345,10 +6347,13 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
index 3b3a21c3004..fa1dd82e7e3 100644
--- a/mail/balsa/patches/patch-ab
+++ b/mail/balsa/patches/patch-ab
@@ -1,24 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/12 18:13:54 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/04/25 07:07:30 rh Exp $
 
---- libmutt/configure.orig	Tue Apr 20 12:44:58 1999
-+++ libmutt/configure	Sun Dec 12 18:25:22 1999
-@@ -1542,6 +1542,7 @@
-   ac_tool_prefix=
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1774,6 +1775,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3768,10 +3770,12 @@
+--- libmutt/configure.orig	Fri Jan  7 04:00:18 2000
++++ libmutt/configure	Tue Apr 25 08:41:20 2000
+@@ -3480,10 +3480,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/mail/balsa/pkg/PLIST b/mail/balsa/pkg/PLIST
index 07925fa56fe..151dcbda850 100644
--- a/mail/balsa/pkg/PLIST
+++ b/mail/balsa/pkg/PLIST
@@ -1,23 +1,52 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/12 18:13:53 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/04/25 07:07:30 rh Exp $
 bin/balsa
 etc/CORBA/servers/balsa.gnorba
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-lib/libbalsasrv.a
+man/man1/balsa.1
+share/idl/balsa.idl
+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/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/ja/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
+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/gnome/help/balsa/C/topic.dat
+share/gnome/help/balsa/C/images/balsa_logo.png
+share/gnome/help/balsa/C/images/druid-start.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
+share/gnome/help/balsa/C/images/newmsg-window-toolbar.png
+share/gnome/help/balsa/C/images/newmsg-window.png
+share/gnome/help/balsa/C/stylesheet-images
+share/gnome/apps/Internet/balsa.desktop
+share/pixmaps/gnome-balsa2.png
 share/pixmaps/balsa/attachment.png
 share/pixmaps/balsa/balsa_icon.png
 share/pixmaps/balsa/balsa_logo.png
+share/pixmaps/balsa/balsa-top.png
+share/pixmaps/balsa/balsa-watermark.png
+share/pixmaps/balsa/balsa-logo.png
 share/sounds/balsa/newmail.wav
 share/sounds/balsa/startup.wav
+@dirrm share/gnome/help/balsa/C/images
+@dirrm share/gnome/help/balsa/C
+@dirrm share/gnome/help/balsa
 @dirrm share/sounds/balsa
 @dirrm share/pixmaps/balsa