Move balsa2 to balsa, to make directory name match PKGNAME.

17 files changed, 18 insertions, 18 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 413690653b2..2823cbbb04d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.332 2007/09/14 20:55:11 jnemeth Exp $
+# $NetBSD: Makefile,v 1.333 2007/09/20 20:50:48 wiz Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -11,7 +11,7 @@ SUBDIR+=	anomy-sanitizer
 SUBDIR+=	archivemail
 SUBDIR+=	autorespond
 SUBDIR+=	avenger
-SUBDIR+=	balsa2
+SUBDIR+=	balsa
 SUBDIR+=	bbmail
 SUBDIR+=	bmf
 SUBDIR+=	bogofilter
diff --git a/mail/balsa2/DESCR b/mail/balsa/DESCR
index 1145d85b9ee..1145d85b9ee 100644
--- a/mail/balsa2/DESCR
+++ b/mail/balsa/DESCR
diff --git a/mail/balsa2/Makefile b/mail/balsa/Makefile
index ee08786d877..fd387b22eb4 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2007/09/19 23:13:20 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2007/09/20 20:50:49 wiz Exp $
 
 DISTNAME=	balsa-2.3.10
 PKGREVISION=	9
diff --git a/mail/balsa2/PLIST b/mail/balsa/PLIST
index c23157bddbb..55c5d27d526 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/09/20 20:50:49 wiz Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
diff --git a/mail/balsa2/distinfo b/mail/balsa/distinfo
index 0131720e0ad..743a2c9260f 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/02/11 14:17:51 joerg Exp $
+$NetBSD: distinfo,v 1.12 2007/09/20 20:50:50 wiz Exp $
 
 SHA1 (balsa-2.3.10.tar.bz2) = 74315661721a7b222403988b2af8fbc690c1ddc4
 RMD160 (balsa-2.3.10.tar.bz2) = 2fba2b3ae62e0fa3c3d8092f559f8ab7a488c22c
diff --git a/mail/balsa2/options.mk b/mail/balsa/options.mk
index 411a7970c02..aab7d45426f 100644
--- a/mail/balsa2/options.mk
+++ b/mail/balsa/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2007/02/22 19:26:40 wiz Exp $
+# $NetBSD: options.mk,v 1.1 2007/09/20 20:50:50 wiz Exp $
 #
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa2
+PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa
 PKG_SUPPORTED_OPTIONS=	ldap ssl
 
 .include "../../mk/bsd.options.mk"
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa/patches/patch-aa
index 25197b1013f..4031c243dca 100644
--- a/mail/balsa2/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2006/02/11 14:17:51 joerg Exp $
+$NetBSD: patch-aa,v 1.13 2007/09/20 20:50:51 wiz Exp $
 
 --- configure.orig	2006-02-11 13:51:23.000000000 +0000
 +++ configure
diff --git a/mail/balsa2/patches/patch-ab b/mail/balsa/patches/patch-ab
index 8d4cac881bc..5612fd19ed2 100644
--- a/mail/balsa2/patches/patch-ab
+++ b/mail/balsa/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+$NetBSD: patch-ab,v 1.9 2007/09/20 20:50:51 wiz Exp $
 
 --- src/threads.h.orig	2003-01-25 23:04:31.000000000 +1000
 +++ src/threads.h
diff --git a/mail/balsa2/patches/patch-ac b/mail/balsa/patches/patch-ac
index 8c24f326a2f..7469641c8eb 100644
--- a/mail/balsa2/patches/patch-ac
+++ b/mail/balsa/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2004/11/25 09:33:41 adam Exp $
+$NetBSD: patch-ac,v 1.3 2007/09/20 20:50:51 wiz Exp $
 
 --- sounds/Makefile.in.orig	2004-11-20 20:58:54.000000000 +0000
 +++ sounds/Makefile.in
diff --git a/mail/balsa2/patches/patch-ae b/mail/balsa/patches/patch-ae
index 29991048c08..9c06eb23625 100644
--- a/mail/balsa2/patches/patch-ae
+++ b/mail/balsa/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2004/11/25 09:33:41 adam Exp $
+$NetBSD: patch-ae,v 1.1 2007/09/20 20:50:52 wiz Exp $
 
 --- libbalsa/filter-file.c.orig	2004-10-30 09:35:58.000000000 +0000
 +++ libbalsa/filter-file.c
diff --git a/mail/balsa2/patches/patch-af b/mail/balsa/patches/patch-af
index af36dbc9666..2908c5718f4 100644
--- a/mail/balsa2/patches/patch-af
+++ b/mail/balsa/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2003/07/25 18:25:46 drochner Exp $
+$NetBSD: patch-af,v 1.1 2007/09/20 20:50:52 wiz Exp $
 
 --- src/filter-edit-callbacks.c.orig	2003-07-25 20:01:17.000000000 +0200
 +++ src/filter-edit-callbacks.c	2003-07-25 20:01:30.000000000 +0200
diff --git a/mail/balsa2/patches/patch-ag b/mail/balsa/patches/patch-ag
index 674adfedc74..ec4726d0612 100644
--- a/mail/balsa2/patches/patch-ag
+++ b/mail/balsa/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: patch-ag,v 1.1 2007/09/20 20:50:53 wiz Exp $
 
 --- libbalsa/imap/imap-handle.c.orig	2005-06-11 10:23:54.000000000 +0200
 +++ libbalsa/imap/imap-handle.c
diff --git a/mail/balsa2/patches/patch-ah b/mail/balsa/patches/patch-ah
index 87b6e887311..4151f0c9079 100644
--- a/mail/balsa2/patches/patch-ah
+++ b/mail/balsa/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: patch-ah,v 1.1 2007/09/20 20:50:53 wiz Exp $
 
 --- libbalsa/imap/imap-search.c.orig	2005-06-22 22:08:59.000000000 +0200
 +++ libbalsa/imap/imap-search.c
diff --git a/mail/balsa2/patches/patch-ai b/mail/balsa/patches/patch-ai
index 43fdb34459b..e974e948ac6 100644
--- a/mail/balsa2/patches/patch-ai
+++ b/mail/balsa/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: patch-ai,v 1.1 2007/09/20 20:50:53 wiz Exp $
 
 --- libbalsa/mailbox_mh.c.orig	2005-05-22 23:11:29.000000000 +0200
 +++ libbalsa/mailbox_mh.c
diff --git a/mail/balsa2/patches/patch-aj b/mail/balsa/patches/patch-aj
index 062bd6ef0d6..215cea9ff38 100644
--- a/mail/balsa2/patches/patch-aj
+++ b/mail/balsa/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: patch-aj,v 1.1 2007/09/20 20:50:54 wiz Exp $
 
 --- libbalsa/misc.c.orig	2005-06-22 21:01:51.000000000 +0200
 +++ libbalsa/misc.c
diff --git a/mail/balsa2/patches/patch-ak b/mail/balsa/patches/patch-ak
index 9b6427eba41..27689d4370e 100644
--- a/mail/balsa2/patches/patch-ak
+++ b/mail/balsa/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2006/02/11 14:17:51 joerg Exp $
+$NetBSD: patch-ak,v 1.1 2007/09/20 20:50:54 wiz Exp $
 
 --- libbalsa/misc.h.orig	2006-02-11 13:54:44.000000000 +0000
 +++ libbalsa/misc.h
diff --git a/mail/balsa2/patches/patch-ba b/mail/balsa/patches/patch-ba
index 47d2fca0385..1e1dcbf03da 100644
--- a/mail/balsa2/patches/patch-ba
+++ b/mail/balsa/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: patch-ba,v 1.3 2007/09/20 20:50:55 wiz Exp $
 
 --- ./libbalsa/address-book-ldap.c.orig	2005-08-25 23:29:45.000000000 +0200
 +++ ./libbalsa/address-book-ldap.c