pkg/41623: Update mail/cone to 0.78

[netbsd-lists%guigui2.net@localhost]

>Number:         41623
>Category:       pkg
>Synopsis:       Update mail/cone to 0.78
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 21 21:50:00 +0000 2009
>Originator:     Guillaume Lasmayous
>Release:        5.99.10
>Organization:
>Environment:
NetBSD lopette.guigui2.net 5.99.10 NetBSD 5.99.10 (GENERIC) #0: Fri Apr 10 
04:47:20 PDT 2009  
builds@wb38:/home/builds/ab/HEAD/i386/200904100002Z-obj/home/builds/ab/HEAD/src/sys/arch/i386/compile/GENERIC
 i386

>Description:
I tried to update mail/cone to the latest available version, 0.78.
I activated the certdb, pointing it to /etc/openssl/certs, that I think is the 
standard location for certificates on NetBSD.
Can you please review and commit the patch if it is OK ? 

diff -ruN mail/cone/Makefile wip/cone/Makefile
--- mail/cone/Makefile  2008-02-21 02:08:42.000000000 +0100
+++ wip/cone/Makefile   2009-06-13 13:07:59.000000000 +0200
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.5 2008/02/20 22:31:06 jlam Exp $

-DISTNAME=      cone-0.74
+DISTNAME=      cone-0.78
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -19,7 +19,7 @@

 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --without-certdb
+CONFIGURE_ARGS+=       --with-certdb=/etc/openssl/certs

 # Cone doesn't really need the openssl or c_rehash binaries, but the
 # rootcerts/configure script is written poorly and directly overrides

diff -ruN mail/cone/PLIST wip/cone/PLIST
--- mail/cone/PLIST     2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/PLIST      2009-06-13 15:54:10.000000000 +0200
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+@comment $NetBSD$
 bin/cone
 bin/leaf
 bin/mailtool
@@ -64,10 +64,11 @@
 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/cone10certificates.html
+share/cone/cone11encryption.html
+share/cone/cone12filters.html
+share/cone/cone13addressbook.html
+share/cone/cone14ldapaddressbook.html
 share/cone/conn.html
 share/cone/cppnamespace.html
 share/cone/emailaddress.html

diff -ruN mail/cone/distinfo wip/cone/distinfo
--- mail/cone/distinfo  2008-02-21 02:08:42.000000000 +0100
+++ wip/cone/distinfo   2009-06-13 15:50:06.000000000 +0200
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.2 2008/02/20 22:31:06 jlam Exp $

-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
-SHA1 (patch-ad) = 578dde2e725ca4e1b332ad2e9135446534aa3184
-SHA1 (patch-ae) = f11842f29aadd91aaab74dff8583d6b62c06673d
-SHA1 (patch-af) = e78186b709c4eae63b5b05e5bf57dcc6a2967613
+SHA1 (cone-0.78.tar.bz2) = 197247d745e6026dcb05fb471f1771ce63abb2bd
+RMD160 (cone-0.78.tar.bz2) = c02e84cc039de6f643b84c40e6e889a90cfab251
+Size (cone-0.78.tar.bz2) = 4217446 bytes
+SHA1 (patch-aa) = 83f3d642479a46d40274eaeb97048f3024fe63de
+SHA1 (patch-ab) = 7772eebf509ef3d5c4ff63ea8481d0b0022de194
+SHA1 (patch-ac) = 638523893a4ec31550fcab82673bff3c872e6e8d
+SHA1 (patch-ad) = 828444b2e0808e36a8437b5aa6333eb508bb6ccd
+SHA1 (patch-ae) = c9424c723f192f81dc1d4a29b97f0e1871df079f
+SHA1 (patch-af) = eee8f5768631d88934dc9b3f548391cbcf287891

diff -ruN mail/cone/patches/patch-aa wip/cone/patches/patch-aa
--- mail/cone/patches/patch-aa  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-aa   2009-06-13 15:46:23.000000000 +0200
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- curses/configure.in.orig   Sat Nov 20 02:37:20 2004
+--- curses/configure.in.orig   2009-02-15 23:50:47.000000000 +0100
 +++ curses/configure.in
 @@ -101,7 +101,7 @@ AC_C_CONST
  dnl Checks for library functions.
diff -ruN mail/cone/patches/patch-ab wip/cone/patches/patch-ab
--- mail/cone/patches/patch-ab  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-ab   2009-06-13 15:46:23.000000000 +0200
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- curses/configure.orig      Sun Jul 22 00:35:48 2007
+--- curses/configure.orig      2009-02-15 23:50:53.000000000 +0100
 +++ curses/configure
-@@ -5846,7 +5846,7 @@ _ACEOF
+@@ -6247,7 +6247,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
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

diff -ruN mail/cone/patches/patch-ac wip/cone/patches/patch-ac
--- mail/cone/patches/patch-ac  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-ac   2009-06-13 15:46:23.000000000 +0200
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- curses/curses.C.orig       Sat Mar 27 16:05:46 2004
+--- curses/curses.C.orig       2004-03-27 16:54:16.000000000 +0100
 +++ curses/curses.C
 @@ -422,6 +422,16 @@ bool Curses::processKeyInFocus(const Key
        return false;
@@ -9,10 +9,10 @@
 +#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');
++       if (s == NULL) return 0;
++       if (n == 0) return (size_t)-1;
++       if (pw) *pw = (wchar_t) *s;
++       return (*s != '\0');
 +}
 +#endif
 +
@@ -26,9 +26,9 @@
 +#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;
++       if (s == NULL) return 0;
++       *s = (char) w;
++       return 1;
 +}
 +#endif

diff -ruN mail/cone/patches/patch-ad wip/cone/patches/patch-ad
--- mail/cone/patches/patch-ad  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-ad   2009-06-13 15:50:03.000000000 +0200
@@ -1,7 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- curses/curses_config.h.in.orig     Sun Jul 22 00:57:45 2007
+--- curses/curses_config.h.in.orig     2009-02-15 23:50:56.000000000 +0100
 +++ curses/curses_config.h.in
+@@ -1,4 +1,4 @@
+-/* curses_config.h.in.  Generated from configure.in by autoheader.  */
++/* curses_config.h.in.  Generated from configure.in by autoheader.  */
+ 
+ /* Whether curses implements function keys with known semantics */
+ #undef HAS_FUNCTIONKEYS
 @@ -19,6 +19,9 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
@@ -12,13 +18,13 @@
  /* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H

-@@ -62,6 +65,9 @@
- 
+@@ -63,6 +66,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 -ruN mail/cone/patches/patch-ae wip/cone/patches/patch-ae
--- mail/cone/patches/patch-ae  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-ae   2009-06-13 15:46:23.000000000 +0200
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- curses/cursesscreen.C.orig Mon Jul 30 02:47:52 2007
+--- curses/cursesscreen.C.orig 2008-06-14 15:50:47.000000000 +0200
 +++ curses/cursesscreen.C
 @@ -533,6 +533,16 @@ int Curses::runCommand(vector<const char
        return WIFEXITED(waitstat) ? WEXITSTATUS(waitstat):-1;
@@ -9,10 +9,10 @@
 +#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');
++       if (s == NULL) return 0;
++       if (n == 0) return (size_t)-1;
++       if (pw) *pw = (wchar_t) *s;
++       return (*s != '\0');
 +}
 +#endif
 +
diff -ruN mail/cone/patches/patch-af wip/cone/patches/patch-af
--- mail/cone/patches/patch-af  2007-11-13 19:02:15.000000000 +0100
+++ wip/cone/patches/patch-af   2009-06-13 15:46:23.000000000 +0200
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD$

---- libmail/mail.H.orig        Wed Jun 23 00:55:25 2004
+--- libmail/mail.H.orig        2008-07-07 05:25:41.000000000 +0200
 +++ libmail/mail.H
 @@ -11,10 +11,10 @@
  #include <time.h>

>How-To-Repeat:

>Fix: