11 files changed, 360 insertions, 0 deletions
diff --git a/mail/cone/DESCR b/mail/cone/DESCR
new file mode 100644
index 00000000000..3eab7991936
--- /dev/null
+++ b/mail/cone/DESCR
@@ -0,0 +1,7 @@
+Cone is a text-based mail client.  Cone seamlessly handles multiple
+POP3, IMAP accounts, and local mail folders.  Cone is also a simple
+newsreader.  Cone's interface is foolproof enough to be used by
+inexperienced users, but it also offers advanced features for power
+users.  Cone also serves as a platform for development of a new
+experimental network mail access protocol, SMAP, that offers additional
+functionality not available with IMAP or POP3.
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
new file mode 100644
index 00000000000..496d02ebae6
--- /dev/null
+++ b/mail/cone/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+DISTNAME=	cone-0.73
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jlam@pkgsrc.org
+HOMEPAGE=	http://www.courier-mta.org/cone/
+COMMENT=	console newsreader and emailer
+
+USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
+GCC_REQD+=		3.0	# need Standard C++ Library
+
+.include "options.mk"
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--without-certdb
+
+EGDIR=			${PREFIX}/share/examples/cone
+INSTALL_AM_MAKEFLAGS+=	sysconfdir=${EGDIR:Q}
+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 "../../mk/curses.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cone/PLIST b/mail/cone/PLIST
new file mode 100644
index 00000000000..5fe280dbdc7
--- /dev/null
+++ b/mail/cone/PLIST
@@ -0,0 +1,165 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+bin/cone
+bin/leaf
+bin/mailtool
+libexec/cone
+man/man1/cone.1
+man/man1/leaf.1
+man/man1/mailtool.1
+share/cone/APPLICATION.PDF.filter
+share/cone/FAQ.html
+share/cone/IMAGE.GIF.filter
+share/cone/IMAGE.JPEG.filter
+share/cone/IMAGE.PNG.filter
+share/cone/INSTALL.html
+share/cone/README.html
+share/cone/account-checknewmail.html
+share/cone/account-copymessagesto.html
+share/cone/account-createfolder.html
+share/cone/account-deletefolder.html
+share/cone/account-delrights.html
+share/cone/account-getfolderfrompath.html
+share/cone/account-getfolderfromstring.html
+share/cone/account-getfolderindexinfo.html
+share/cone/account-getfolderindexsize.html
+share/cone/account-getfolderkeywordinfo.html
+share/cone/account-getmessagecontent.html
+share/cone/account-getmessagecontentdecoded.html
+share/cone/account-getmessageenvelope.html
+share/cone/account-getmessagestructure.html
+share/cone/account-getmyrights.html
+share/cone/account-getparentfolder.html
+share/cone/account-getrights.html
+share/cone/account-getsubfolders.html
+share/cone/account-gettoplevelfolders.html
+share/cone/account-libmail-addmessage.html
+share/cone/account-login.html
+share/cone/account-logout.html
+share/cone/account-movemessagesto.html
+share/cone/account-openfolder.html
+share/cone/account-readfolderinfo.html
+share/cone/account-removemessages.html
+share/cone/account-renamefolder.html
+share/cone/account-savefolderindexinfo.html
+share/cone/account-searchmessages.html
+share/cone/account-send.html
+share/cone/account-setrights.html
+share/cone/account-translatepath.html
+share/cone/account-updatefolderindexflags.html
+share/cone/account-updatefolderindexinfo.html
+share/cone/account-updatekeywords.html
+share/cone/add.html
+share/cone/address.html
+share/cone/attributes.html
+share/cone/bk01-toc.html
+share/cone/cone.hlp
+share/cone/cone.html
+share/cone/cone00index.html
+share/cone/cone01folderlist.html
+share/cone/cone02folderindex.html
+share/cone/cone03messageview.html
+share/cone/cone04writemessage.html
+share/cone/cone05setup.html
+share/cone/cone06newaccount.html
+share/cone/cone07remoteconfig.html
+share/cone/cone08gpg.html
+share/cone/cone09masterpassword.html
+share/cone/cone10encryption.html
+share/cone/cone11filters.html
+share/cone/cone12addressbook.html
+share/cone/cone13ldapaddressbook.html
+share/cone/conn.html
+share/cone/cppnamespace.html
+share/cone/emailaddress.html
+share/cone/envelope.html
+share/cone/folder-addmessage.html
+share/cone/folder-clone.html
+share/cone/folder-create.html
+share/cone/folder-createsubfolder.html
+share/cone/folder-delrights.html
+share/cone/folder-destroy.html
+share/cone/folder-getmyrights.html
+share/cone/folder-getname.html
+share/cone/folder-getparentfolder.html
+share/cone/folder-getpath.html
+share/cone/folder-getrights.html
+share/cone/folder-hasmessages.html
+share/cone/folder-hassubfolders.html
+share/cone/folder-isparentof.html
+share/cone/folder-open.html
+share/cone/folder-readfolderinfo.html
+share/cone/folder-readsubfolders.html
+share/cone/folder-renamefolder.html
+share/cone/folder-setrights.html
+share/cone/folder-tostring.html
+share/cone/header-addresslist.html
+share/cone/header-encoded.html
+share/cone/header-list.html
+share/cone/header-mime.html
+share/cone/header-plain.html
+share/cone/http.handler
+share/cone/https.handler
+share/cone/icon.gif
+share/cone/index.html
+share/cone/leaf.html
+share/cone/libmail-folder.html
+share/cone/libmail-misc.html
+share/cone/libmail.html
+share/cone/libmailapi.html
+share/cone/mail-attachments.html
+share/cone/mail-checknewmail.html
+share/cone/mail-copymessagesto.html
+share/cone/mail-findfolder.html
+share/cone/mail-folderfromstring.html
+share/cone/mail-getfolderindexinfo.html
+share/cone/mail-getfolderindexsize.html
+share/cone/mail-getfolderkeywordinfo.html
+share/cone/mail-getsendfolder.html
+share/cone/mail-hascapability.html
+share/cone/mail-headers.html
+share/cone/mail-homedir.html
+share/cone/mail-hostname.html
+share/cone/mail-isremoteurl.html
+share/cone/mail-loginurldecode.html
+share/cone/mail-loginurlencode.html
+share/cone/mail-logout.html
+share/cone/mail-movemessagesto.html
+share/cone/mail-open.html
+share/cone/mail-poll.html
+share/cone/mail-process.html
+share/cone/mail-readmsgattr.html
+share/cone/mail-readmsgcontent.html
+share/cone/mail-readmsgcontentdecoded.html
+share/cone/mail-readtoplevel.html
+share/cone/mail-removemessages.html
+share/cone/mail-resume.html
+share/cone/mail-savefolderindexinfo.html
+share/cone/mail-searchmessages.html
+share/cone/mail-setappcharset.html
+share/cone/mail-translatepath.html
+share/cone/mail-updatefolderindexflags.html
+share/cone/mail-updatefolderindexinfo.html
+share/cone/mail-updatekeywords.html
+share/cone/mail-updatenotify.html
+share/cone/mail-upper.html
+share/cone/maillist.html
+share/cone/mailtool.html
+share/cone/manpage.css
+share/cone/mimestruct.html
+share/cone/misc.html
+share/cone/moredocs.html
+share/cone/native.html
+share/cone/search.html
+share/cone/smap1.html
+share/cone/smapconcurrency.html
+share/cone/smapcopymovemessages.html
+share/cone/smapfolders.html
+share/cone/smaplogout.html
+share/cone/smapmessagecontents.html
+share/cone/smapsyntax.html
+share/cone/smapusingfolders.html
+share/cone/store.html
+share/cone/synchronous.html
+share/examples/cone/cone.dist
+@dirrm share/examples/cone
+@dirrm share/cone
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
new file mode 100644
index 00000000000..a260eb09d8e
--- /dev/null
+++ b/mail/cone/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/11/13 18:02:15 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 (patch-aa) = 379e4875619bda6d7094f906e2cba34f19d879fe
+SHA1 (patch-ab) = 897bec29acdab95f679a3b95195614ae94509e29
+SHA1 (patch-ac) = 2a6a8ad9c8cc6773b219bfbefabc11eac31f6cb3
+SHA1 (patch-ad) = 578dde2e725ca4e1b332ad2e9135446534aa3184
+SHA1 (patch-ae) = f11842f29aadd91aaab74dff8583d6b62c06673d
+SHA1 (patch-af) = e78186b709c4eae63b5b05e5bf57dcc6a2967613
diff --git a/mail/cone/options.mk b/mail/cone/options.mk
new file mode 100644
index 00000000000..c829fd08915
--- /dev/null
+++ b/mail/cone/options.mk
@@ -0,0 +1,22 @@
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cone
+PKG_SUPPORTED_OPTIONS=		aspell ldap
+PKG_SUGGESTED_OPTIONS=		aspell ldap
+
+.include "../../mk/bsd.options.mk"
+
+# Package-specific option-handling
+
+###
+### LDAP addressbook support
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+###
+### Aspell spell-check support
+###
+.if !empty(PKG_OPTIONS:Maspell)
+.  include "../../textproc/aspell/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-spellcheck=aspell
+.endif
diff --git a/mail/cone/patches/patch-aa b/mail/cone/patches/patch-aa
new file mode 100644
index 00000000000..c3100a8bfcf
--- /dev/null
+++ b/mail/cone/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- curses/configure.in.orig	Sat Nov 20 02:37:20 2004
++++ curses/configure.in
+@@ -101,7 +101,7 @@ AC_C_CONST
+ dnl Checks for library functions.
+ AC_TYPE_SIGNAL
+ 
+-AC_CHECK_FUNCS(glob)
++AC_CHECK_FUNCS(glob mbrtowc wcrtomb)
+ if test "$GXX" = "yes"
+ then
+ 	CPPFLAGS="-Wall $CPPFLAGS"
diff --git a/mail/cone/patches/patch-ab b/mail/cone/patches/patch-ab
new file mode 100644
index 00000000000..79ef9d6164d
--- /dev/null
+++ b/mail/cone/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- curses/configure.orig	Sun Jul 22 00:35:48 2007
++++ curses/configure
+@@ -5846,7 +5846,7 @@ _ACEOF
+ 
+ 
+ 
+-for ac_func in glob
++for ac_func in glob mbrtowc wcrtomb
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/mail/cone/patches/patch-ac b/mail/cone/patches/patch-ac
new file mode 100644
index 00000000000..2e4a5fb243e
--- /dev/null
+++ b/mail/cone/patches/patch-ac
@@ -0,0 +1,36 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- curses/curses.C.orig	Sat Mar 27 16:05:46 2004
++++ curses/curses.C
+@@ -422,6 +422,16 @@ bool Curses::processKeyInFocus(const Key
+ 	return false;
+ }
+ 
++#if !HAVE_MBRTOWC
++static size_t mbrtowc(wchar_t *pw, const char *s, size_t n, mbstate_t *ps)
++{
++	if (s == NULL) return 0;
++	if (n == 0) return (size_t)-1;
++	if (pw) *pw = (wchar_t) *s;
++	return (*s != '\0');
++}
++#endif
++
+ void Curses::mbtow(const char *text, vector<wchar_t> &wbuf)
+ {
+ 	mbstate_t ps, ps_save;
+@@ -471,6 +481,14 @@ void Curses::mbtow(const char *text, vec
+ 	}
+ }
+ 
++#if !HAVE_WCRTOMB
++static size_t wcrtomb(char *s, wchar_t w, mbstate_t *ps)
++{
++	if (s == NULL) return 0;
++	*s = (char) w;
++	return 1;
++}
++#endif
+ 
+ string Curses::wtomb(const wchar_t *w)
+ {
diff --git a/mail/cone/patches/patch-ad b/mail/cone/patches/patch-ad
new file mode 100644
index 00000000000..a1213d1beda
--- /dev/null
+++ b/mail/cone/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- curses/curses_config.h.in.orig	Sun Jul 22 00:57:45 2007
++++ curses/curses_config.h.in
+@@ -19,6 +19,9 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Define to 1 if you have the `mbrtowc' function. */
++#undef HAVE_MBRTOWC
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
+@@ -62,6 +65,9 @@
+ 
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
++
++/* Define to 1 if you have the `wcrtomb' function. */
++#undef HAVE_WCRTOMB
+ 
+ /* Whether wcwidth() is available */
+ #undef HAVE_WCWIDTH
diff --git a/mail/cone/patches/patch-ae b/mail/cone/patches/patch-ae
new file mode 100644
index 00000000000..679fb97e1fd
--- /dev/null
+++ b/mail/cone/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- curses/cursesscreen.C.orig	Mon Jul 30 02:47:52 2007
++++ curses/cursesscreen.C
+@@ -533,6 +533,16 @@ int Curses::runCommand(vector<const char
+ 	return WIFEXITED(waitstat) ? WEXITSTATUS(waitstat):-1;
+ }
+ 
++#if !HAVE_MBRTOWC
++static size_t mbrtowc(wchar_t *pw, const char *s, size_t n, mbstate_t *ps)
++{
++	if (s == NULL) return 0;
++	if (n == 0) return (size_t)-1;
++	if (pw) *pw = (wchar_t) *s;
++	return (*s != '\0');
++}
++#endif
++
+ Curses::Key CursesScreen::doGetKey()
+ {
+ 	// Position cursor first.
diff --git a/mail/cone/patches/patch-af b/mail/cone/patches/patch-af
new file mode 100644
index 00000000000..e2bce8f9c73
--- /dev/null
+++ b/mail/cone/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+
+--- libmail/mail.H.orig	Wed Jun 23 00:55:25 2004
++++ libmail/mail.H
+@@ -11,10 +11,10 @@
+ #include <time.h>
+ #include <string>
+ 
++#include <sys/types.h>
+ #if HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+-#include <sys/types.h>
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>