Update mail/cone to version 0.74. Changes from version 0.73 include:

+ Add full DESTDIR support.

+ New "gnutls" option to select between using GNU TLS and OpenSSL.
  Default to "ssl".

+ New "wide-curses" option to select between curses and wide-curses
  displays.  Default to "curses".

* Add/fix GNU TLS support in cone.

3 files changed, 47 insertions, 15 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index d04fc61eabb..f6ab9d07316 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2008/02/20 13:18:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/20 22:31:06 jlam Exp $
 
-DISTNAME=	cone-0.73
-PKGREVISION=	3
+DISTNAME=	cone-0.74
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,9 +9,10 @@ MAINTAINER=	jlam@pkgsrc.org
 HOMEPAGE=	http://www.courier-mta.org/cone/
 COMMENT=	Console newsreader and emailer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake perl true
 USE_LANGUAGES=		c c++
-USE_NCURSES=		yes # termattrs
 GCC_REQD+=		3.0	# need Standard C++ Library
 
 .include "options.mk"
@@ -37,7 +37,5 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 CONF_FILES=		${EGDIR}/cone.dist ${PKG_SYSCONFDIR}/cone
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index a260eb09d8e..2ad11cf455c 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD: distinfo,v 1.2 2008/02/20 22:31:06 jlam Exp $
 
-SHA1 (cone-0.73.tar.bz2) = 99adc13fa70e26cc4e107808acde6d7c272f630d
-RMD160 (cone-0.73.tar.bz2) = ee51f79c34e08b45e300a3e8e93cf6ab659315a1
-Size (cone-0.73.tar.bz2) = 4148825 bytes
+SHA1 (cone-0.74.tar.bz2) = 74a68e8468494bb020da7f7fd4dc3abd1ef67b83
+RMD160 (cone-0.74.tar.bz2) = 30a7d64d04426d975a602999db28e47caaa97e80
+Size (cone-0.74.tar.bz2) = 4150864 bytes
 SHA1 (patch-aa) = 379e4875619bda6d7094f906e2cba34f19d879fe
 SHA1 (patch-ab) = 897bec29acdab95f679a3b95195614ae94509e29
 SHA1 (patch-ac) = 2a6a8ad9c8cc6773b219bfbefabc11eac31f6cb3
diff --git a/mail/cone/options.mk b/mail/cone/options.mk
index 80b68622f48..077234122f9 100644
--- a/mail/cone/options.mk
+++ b/mail/cone/options.mk
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2008/02/20 13:18:24 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2008/02/20 22:31:06 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cone
 PKG_SUPPORTED_OPTIONS=		aspell ldap
-PKG_SUGGESTED_OPTIONS=		aspell ldap
+PKG_OPTIONS_REQUIRED_GROUPS=	display tls
+PKG_OPTIONS_GROUP.display=	curses wide-curses
+PKG_OPTIONS_GROUP.tls=		gnutls ssl
+PKG_SUGGESTED_OPTIONS=		aspell curses ldap ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,10 +20,11 @@ CONFIGURE_ARGS+=	--with-spellcheck=aspell
 .endif
 
 ###
-### LDAP addressbook support
+### Curses display
 ###
-.if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap-client/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcurses)
+USE_NCURSES=	yes	# termattrs()
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif
 
 ###
@@ -29,3 +33,33 @@ CONFIGURE_ARGS+=	--with-spellcheck=aspell
 .if !empty(PKG_OPTIONS:Mfam)
 .  include "../../mk/fam.buildlink3.mk"
 .endif
+
+###
+### GNU TLS support
+###
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gnutls
+.endif
+
+###
+### LDAP addressbook support
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+###
+### OpenSSL TLS support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+###
+### Wide curses display
+###
+.if !empty(PKG_OPTIONS:Mwide-curses)
+USE_NCURSESW=	yes	# termattrs()
+.  include "../../devel/ncursesw/buildlink3.mk"
+.endif