Update to 2.2.5. While here, convert to options.mk to handle the openldap

option, and introduce a ssl option.

* Balsa-2.2.5 release. Release date 2004-09-02

- sent messages saved to sentbox only after being sent.
- use of fixed-height with gtk2>=2.4.9 to speed up large mailboxes.
- GPG is expected to be fully functional now.
- mbox mailbox driver fixes.

* Balsa-2.2.4 release. Release date 2004-08-28

- periodic expunge configurable.
- cleanup IMAP password quering code.
- GPE address book support -
  http://gpe.handhelds.org/projects/GPE-address.shtml
- new configuration druid.

3 files changed, 32 insertions, 13 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index bfcfbaa303f..0188debebd2 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/10/15 12:03:53 tv Exp $
+# $NetBSD: Makefile,v 1.33 2004/11/14 17:02:03 jmmv Exp $
 
-DISTNAME=		balsa-2.2.3
-PKGREVISION=		2
+DISTNAME=		balsa-2.2.5
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
@@ -27,7 +26,6 @@ CONFIGURE_ARGS=		--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-pcre
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv_open=yes
 
@@ -37,30 +35,30 @@ CONF_FILES+=	${EGDIR}/${cnf} ${PKG_SYSCONFDIR}/sound/events/${cnf}
 .endfor
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
-CONFIGURE_ARGS+=        --with-ldap
-.include "../../databases/openldap/buildlink3.mk"
-.endif
-BUILD_DEFS+=	USE_OPENLDAP
+BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml3/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 491f2e02d4a..4b2ab7a0dfc 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/08/22 17:52:50 recht Exp $
+$NetBSD: distinfo,v 1.10 2004/11/14 17:02:03 jmmv Exp $
 
-SHA1 (balsa-2.2.3.tar.bz2) = 89b66c648813c3b3718d0f9e1fce8b53e0c2234e
-Size (balsa-2.2.3.tar.bz2) = 2764078 bytes
+SHA1 (balsa-2.2.5.tar.bz2) = e5b7ee9f126c129065ffbc4d86d154f90836bab4
+Size (balsa-2.2.5.tar.bz2) = 2838410 bytes
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = d879e4afd6959cf5afe9fd941f51fb5ed367aa4f
 SHA1 (patch-ae) = 63ef5da19874848b221a594c6adbfadd21e7fd5f
diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
new file mode 100644
index 00000000000..e0fc6e66979
--- /dev/null
+++ b/mail/balsa2/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2004/11/14 17:02:03 jmmv Exp $
+#
+
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
+PKG_DEFAULT_OPTIONS+=	openldap
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa2
+PKG_SUPPORTED_OPTIONS=	openldap ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mopenldap)
+CONFIGURE_ARGS+=        --with-ldap
+.  include "../../databases/openldap/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
+.  include "../../security/openssl/buildlink3.mk"
+.endif