[pkgsrc/trunk]: pkgsrc/mail/imap-uw Update imap-uw to 2006j2. OKed by jwise@.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/470d6c77d8b2
branches:  trunk
changeset: 531640:470d6c77d8b2
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Aug 03 17:03:29 2007 +0000

description:
Update imap-uw to 2006j2.  OKed by jwise@.

Updated: 14 June 2007

imap-2006j is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.


Updated: 5 June 2007

imap-2006i is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.

imapd now supports the CHILDREN and ESEARCH extensions.

imapd's attempt to return COPYUID/APPENDUID information for a traditional
UNIX (and MMDF) format mailbox when the mailbox is open by another process
has been declared to be a failure and is now revoked.  It was subject to a
timing race, loss of which involved an expensive reset of the mailbox's UID
regime.  Any imapd COPY or APPEND to a traditional UNIX or MMDF format that
is open by some other process will now no longer return COPYUID/APPEND.
Although this is technically in violation of RFC 4315, there is a loophole
in that document and the timing race/performance problem is worse.


Updated: 4 April 2007

imap-2006h is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.


Updated: 30 March 2007

imap-2006g is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.


Updated: 30 January 2007

imap-2006f is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.

For the benefit of multi-threaded applications, use of strtok() has been
abolished in the c-client library.  imapd and ipop3d stuff use it though.
The TOPS-20 and VAX/VMS ports still use strtok() since they don't use UNIX
threads.

This version has been test-built on Linux, Mac OS X, NeXT, Windows XP,
TOPS-20, and VAX/VMS.  This will probably be the last test-build on VAX/VMS
since the system I use for that purpose is being shut down.  I have no way
to test-build on DOS, legacy Mac OS (OS 9 and earlier), OS/2, or Windows CE;
and the builds on those systems are probably broken.


Updated: 26 January 2007

imap-2006e is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.


Updated: 6 December 2006

imap-2006d is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.

The decomposition mapping, title-case mapping, and character widths tables
have been updated to comply with the Unicode 5.0 standard.

Prototypes for the utf8aux.c functions have been moved to a new utf8aux.h.

The general c-client modules now include c-client.h instead of the individual
files.  Use of c-client.h instead of individual include files insulates
against future shuffling of include files.


Updated: 23 October 2006

imap-2006c is a maintenance release, consisting primarily of bugfixes to
problems discovered in the release that affected a small number of users.

By popular request, if a user has a mix (or other dual-use) format INBOX,
it will no longer be listed as \NoInferiors.  It's a bad idea to depend
upon this due to the case ambiguity issue, but it's there.


Updated: 26 September 2006

imap-2006b is a maintenance release, consisting entirely of bugfixes to
problems discovered in the release that affected a small number of users.


Updated: 15 September 2006

imap-2006a is a maintenance release, consisting entirely of bugfixes to
problems discovered in the release that affected a small number of users.

If it is necessary to build IPv4-only on one of the ports that has IPv6
preconfigured (ldb, lfd, lmd, lrh, lsu, osx, oxp), this can be done by
using IP6=4.  You can't do IP=4 in the build command directly since these
ports set IP themselves; however, now instead of setting IP=6 they now set
IP=$(IP6).


Updated: 30 August 2006

imap-2006 is a major release.  Programs written for imap-2004g should
build with this version with minor or no modification.  imap-2005 was not
released except as development snapshots.

imap-2006 contains major extensions to its Unicode support.  Searching and
sorting are now done with strings canonicalized to titlecase and decomposed
form.  Among other things, this means that Latin letters with diacriticals
will now sort with the basic Latin letter, and case-independent searching of
such letters (e.g., German umlauts) now works.  Previously, sorting was done
strictly by Unicode codepoint, and case-independence only worked with ASCII.

imapd now supports the UIDPLUS extension for mailboxes in unix, mmdf, mbx, mx,
and mix formats.  UID EXPUNGE is fully implemented.  Note that UIDPLUS is not
supported in the little-used drivers (mh, mtx, tenex) in which meaningful
APPENDUID/COPYUID data can not be returned.  Refer to bugs.txt for more
details.

The new mix format is a dual-use mailbox format designed for performance and
reliability with large mailboxes.  mix is documented in file mixfmt.txt.

SSL/TLS certificate validation on UNIX now checks the alternative names in the
certificate if the CN does not match.

The new /tls-sslv23 flag in a mailbox name causes a TLS session to use the
(incorrect) SSLv23 client method instead of the TLSv1 client method.  Some
broken servers use the SSLv23 server method, and this flag works around that
problem.  WARNING: use of this flag will cause TLS negotiation to fail with
a server which uses the proper TLSv1 server method.  Additionally, there are
known security risks in SSLv2; so users should be suspicious if this switch
suddenly becomes necesary.

The silly mailbox flag combination /ssl/tls is now rejected as an invalid
remote specification.  Previous versions tried to negotiate TLS over an SSL
session; even if the server permitted such a thing it couldn't work.

The memory management of several drivers has been redesigned to consume less
memory and hopefully be faster.

The private.data member of the MESSAGECACHE (elt) has been replaced with
a union that contains private.spare.data and private.spare.ptr, the latter
being a pointer.

A new FT_RETURNSTRINGSTRUCT flag has been added for mail_fetch_body() and
mail_fetch_text() calls.  If this flag is set, *and* if the function returns
NIL, then the requested string data is available on a stringstruct on
stream->private.string.  This is a special hack for the IMAP and POP servers
and is subject to incompatible change.  The result is a major performance
improvement in the servers with the mbx driver, particularly with large
messages.

diffstat:

 mail/imap-uw/Makefile         |   9 ++--
 mail/imap-uw/PLIST            |  27 ++++++++++-----
 mail/imap-uw/distinfo         |  72 +++++++++++++++++++++---------------------
 mail/imap-uw/options.mk       |   6 +-
 mail/imap-uw/patches/patch-aa |  36 +++++++++++++-------
 mail/imap-uw/patches/patch-ab |  52 +++++++++++++-----------------
 mail/imap-uw/patches/patch-ac |   8 ++--
 mail/imap-uw/patches/patch-ad |   8 ++--
 mail/imap-uw/patches/patch-ae |   8 ++--
 mail/imap-uw/patches/patch-af |  10 ++--
 mail/imap-uw/patches/patch-ag |   6 +-
 mail/imap-uw/patches/patch-ah |   6 +-
 mail/imap-uw/patches/patch-ai |   6 +-
 mail/imap-uw/patches/patch-aj |  22 ++++++------
 mail/imap-uw/patches/patch-ak |  22 ++++++------
 mail/imap-uw/patches/patch-al |  10 ++--
 mail/imap-uw/patches/patch-am |  14 ++++----
 mail/imap-uw/patches/patch-ao |  12 +++---
 mail/imap-uw/patches/patch-ap |   6 +-
 mail/imap-uw/patches/patch-aq |   6 +-
 mail/imap-uw/patches/patch-ar |   6 +-
 mail/imap-uw/patches/patch-as |   6 +-
 mail/imap-uw/patches/patch-at |   6 +-
 mail/imap-uw/patches/patch-au |   6 +-
 mail/imap-uw/patches/patch-av |   6 +-
 mail/imap-uw/patches/patch-aw |   6 +-
 mail/imap-uw/patches/patch-ax |   6 +-
 mail/imap-uw/patches/patch-ay |   6 +-
 mail/imap-uw/patches/patch-az |   6 +-
 mail/imap-uw/patches/patch-ba |   6 +-
 mail/imap-uw/patches/patch-bb |   6 +-
 mail/imap-uw/patches/patch-bc |   6 +-
 mail/imap-uw/patches/patch-bd |   6 +-
 mail/imap-uw/patches/patch-be |   8 ++--
 mail/imap-uw/patches/patch-bf |   8 ++--
 mail/imap-uw/patches/patch-bg |   8 ++--
 36 files changed, 231 insertions(+), 217 deletions(-)

diffs (truncated from 966 to 300 lines):

diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/Makefile
--- a/mail/imap-uw/Makefile     Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/Makefile     Fri Aug 03 17:03:29 2007 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.116 2007/03/21 19:39:08 jwise Exp $
+# $NetBSD: Makefile,v 1.117 2007/08/03 17:03:29 obache Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system with Kerberos libraries
 # but not running Kerberos before committing the changes.
 
-DISTNAME=      imap-2004g
+DISTNAME=      imap-2006j2
 PKGNAME=       ${DISTNAME:S/-/-uw-/}
-PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=  .tar.Z
@@ -23,6 +22,8 @@
 LTINSTALL_PROGRAM=     ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM}
 LTINSTALL_LIB=         ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB}
 
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/2$//}
+
 .include "../../mk/bsd.prefs.mk"
 
 # Each platform has its own special target in the imap Makefiles.
@@ -59,7 +60,7 @@
 CCLIENT_LIB=           libc-client.la
 CCLIENT_PICLIB=                libc-client_pic.a
 CCLIENT_MAJOR=         4
-CCLIENT_MINOR=         3
+CCLIENT_MINOR=         4
 MAKE_ENV+=             CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
 MAKE_ENV+=             CCLIENT_MINOR=${CCLIENT_MINOR:Q}
 
diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/PLIST
--- a/mail/imap-uw/PLIST        Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/PLIST        Fri Aug 03 17:03:29 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/07/26 20:00:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/08/03 17:03:29 obache Exp $
 bin/dmail
 bin/mailutil
 bin/mlock
@@ -50,7 +50,6 @@
 share/doc/imap-uw/calendar.txt
 share/doc/imap-uw/commndmt.txt
 share/doc/imap-uw/draft/README
-share/doc/imap-uw/draft/compare.txt
 share/doc/imap-uw/draft/i18n.txt
 share/doc/imap-uw/draft/sort.txt
 share/doc/imap-uw/drivers.txt
@@ -59,13 +58,13 @@
 share/doc/imap-uw/internal.txt
 share/doc/imap-uw/locking.txt
 share/doc/imap-uw/md5.txt
+share/doc/imap-uw/mixfmt.txt
 share/doc/imap-uw/naming.txt
-share/doc/imap-uw/rfc/rfc1731.txt
+share/doc/imap-uw/rfc/README
 share/doc/imap-uw/rfc/rfc1732.txt
 share/doc/imap-uw/rfc/rfc1733.txt
 share/doc/imap-uw/rfc/rfc2061.txt
 share/doc/imap-uw/rfc/rfc2062.txt
-share/doc/imap-uw/rfc/rfc2086.txt
 share/doc/imap-uw/rfc/rfc2087.txt
 share/doc/imap-uw/rfc/rfc2088.txt
 share/doc/imap-uw/rfc/rfc2177.txt
@@ -74,12 +73,7 @@
 share/doc/imap-uw/rfc/rfc2193.txt
 share/doc/imap-uw/rfc/rfc2195.txt
 share/doc/imap-uw/rfc/rfc2221.txt
-share/doc/imap-uw/rfc/rfc2222.txt
-share/doc/imap-uw/rfc/rfc2234.txt
-share/doc/imap-uw/rfc/rfc2245.txt
 share/doc/imap-uw/rfc/rfc2342.txt
-share/doc/imap-uw/rfc/rfc2359.txt
-share/doc/imap-uw/rfc/rfc2595.txt
 share/doc/imap-uw/rfc/rfc2683.txt
 share/doc/imap-uw/rfc/rfc2971.txt
 share/doc/imap-uw/rfc/rfc3348.txt
@@ -89,6 +83,21 @@
 share/doc/imap-uw/rfc/rfc3516.txt
 share/doc/imap-uw/rfc/rfc3656.txt
 share/doc/imap-uw/rfc/rfc3691.txt
+share/doc/imap-uw/rfc/rfc4234.txt
+share/doc/imap-uw/rfc/rfc4314.txt
+share/doc/imap-uw/rfc/rfc4315.txt
+share/doc/imap-uw/rfc/rfc4422.txt
+share/doc/imap-uw/rfc/rfc4466.txt
+share/doc/imap-uw/rfc/rfc4467.txt
+share/doc/imap-uw/rfc/rfc4468.txt
+share/doc/imap-uw/rfc/rfc4469.txt
+share/doc/imap-uw/rfc/rfc4505.txt
+share/doc/imap-uw/rfc/rfc4549.txt
+share/doc/imap-uw/rfc/rfc4551.txt
+share/doc/imap-uw/rfc/rfc4616.txt
+share/doc/imap-uw/rfc/rfc4731.txt
+share/doc/imap-uw/rfc/rfc4752.txt
+share/doc/imap-uw/rfc/rfc4790.txt
 @dirrm share/doc/imap-uw/rfc
 @dirrm share/doc/imap-uw/draft
 @dirrm share/doc/imap-uw
diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/distinfo
--- a/mail/imap-uw/distinfo     Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/distinfo     Fri Aug 03 17:03:29 2007 +0000
@@ -1,37 +1,37 @@
-$NetBSD: distinfo,v 1.31 2006/09/11 13:44:27 tron Exp $
+$NetBSD: distinfo,v 1.32 2007/08/03 17:03:29 obache Exp $
 
-SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066
-RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687
-Size (imap-2004g.tar.Z) = 2246713 bytes
-SHA1 (patch-aa) = e18ec6b1674e71865a8aabe41b5da24c572edcb5
-SHA1 (patch-ab) = fbe43bfc811058433936e6eb61bfc7d69f819e45
-SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8
-SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727
-SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7
-SHA1 (patch-af) = 5800937da2881849508c9012bc268e5acd2fff3e
-SHA1 (patch-ag) = 452fcfc1bd17d3cc65e5012db56d37af25bcf3b6
-SHA1 (patch-ah) = 06d780220e21b4dd4b601f66efb6e73ee95991e2
-SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43
-SHA1 (patch-aj) = 607286c1fd5eb97a07ffb812387f6a005aaee9c5
-SHA1 (patch-ak) = c798b2aad17091526c667a552839cfe1ec0e23c9
-SHA1 (patch-al) = 2915edc654c185311e09cef571b443c4a9ff7e3c
-SHA1 (patch-am) = 0aea2cbe98da312740e678355b11fc964a822cda
-SHA1 (patch-ao) = 777b30793ea2e1f33be14e34d837f1f0cc5d0d67
-SHA1 (patch-ap) = ce224812b0744a699e5e07916ca04510bf62da25
-SHA1 (patch-aq) = 7cf038fcb8e072fa46604ac0ac8c02c0d6d3608e
-SHA1 (patch-ar) = 6c7cc6c03b87af90866230624c476c7868e323fe
-SHA1 (patch-as) = 3760b2126f761be4d09c807f7d21b0ed7b1b89bb
-SHA1 (patch-at) = aeb907f8a9a2438490ecd9dc0251b396b4507968
-SHA1 (patch-au) = 88c14e0f2aa61c34f0255d09f6d00e30328f5c82
-SHA1 (patch-av) = 24043b6d1ed9c4cc9a72735caf82ad5a08ff3ee6
-SHA1 (patch-aw) = 46d108d26b9cc414bb2b3b5f5c5325a3d210bf5e
-SHA1 (patch-ax) = 136eebbdac13434659583e370443ab2033969ae3
-SHA1 (patch-ay) = 6004d14891d3f7004af834d2e4b217369e2f6ee1
-SHA1 (patch-az) = 6372149e6fec8ffc5091ef5dcca959884c720d1b
-SHA1 (patch-ba) = 64b89d377501861ddeecaf58f845132b95ac8f75
-SHA1 (patch-bb) = 220bfb5885dd73cf3375b26bda6be1ea2d39d069
-SHA1 (patch-bc) = b3cd7d728de313cd00af2d9c99cadc2478006232
-SHA1 (patch-bd) = 2dbffe2f11d1c0c2b05eabe3fc976c230e821709
-SHA1 (patch-be) = 032ae39806995e27aba5ab67089a467d3fbe5597
-SHA1 (patch-bf) = 42eee80df6095a7ca0141306743786f6f44545f8
-SHA1 (patch-bg) = 778318297c8a5af995286e447c23503790152bb9
+SHA1 (imap-2006j2.tar.Z) = 41fc3f8cf11f1931a9c046240bc04ceb9f1416c0
+RMD160 (imap-2006j2.tar.Z) = 9192720a527e8977ef6e3eb6bcf8f3b26680e4fc
+Size (imap-2006j2.tar.Z) = 2686745 bytes
+SHA1 (patch-aa) = 116009b1713eb78286343293e6e57fff8b1c0e2f
+SHA1 (patch-ab) = 4fbb5d1c917eb2887cd398eb5e8cb7ceeda06dbd
+SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
+SHA1 (patch-ad) = 51d00ec69f4404536d6daf51d971c294884b23c5
+SHA1 (patch-ae) = c7befb1e0ec0184bbf076694ac7cd8df93902eaa
+SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70
+SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed
+SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
+SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
+SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9
+SHA1 (patch-ak) = 97c61cc9fbe7edb0d1b12b85e256ec91624cfd76
+SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b
+SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d
+SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f
+SHA1 (patch-ap) = 266cabd4937105352c474c85f8ff79434fb2f9dd
+SHA1 (patch-aq) = 33399fb6dd6478d3a89ec1e967b12d93d9a8219b
+SHA1 (patch-ar) = 32f3347697566439b059811be955dc2d3f56cd74
+SHA1 (patch-as) = d07e37e0789251e703805e4d120f6df86d6f5852
+SHA1 (patch-at) = 05688f632966a7ccbe0739bff502a5c27dc88818
+SHA1 (patch-au) = 5f0137f593a0fb3936d3f54310d3fb430d6f7681
+SHA1 (patch-av) = 3851cbacd805dad0c16ba7ce19879d4f3f299275
+SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494
+SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9
+SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
+SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5
+SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
+SHA1 (patch-bb) = 2e942e3d37cae74f5ba85cc9a862df7e57598959
+SHA1 (patch-bc) = 59c938431f78d6f4c29d66f4bf77b9d416147694
+SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4
+SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
+SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
+SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f
diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/options.mk
--- a/mail/imap-uw/options.mk   Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/options.mk   Fri Aug 03 17:03:29 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/07/26 20:00:27 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2007/08/03 17:03:29 obache Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,9 +26,9 @@
 ### Support both IPv6 and IPv4 connections.
 ###
 .if !empty(PKG_OPTIONS:Minet6)
-MAKE_FLAGS+=   IP=6
+MAKE_FLAGS+=   IP6=6
 .else
-MAKE_FLAGS+=   IP=4
+MAKE_FLAGS+=   IP6=4
 .endif
 
 ###
diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/patches/patch-aa
--- a/mail/imap-uw/patches/patch-aa     Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/patches/patch-aa     Fri Aug 03 17:03:29 2007 +0000
@@ -1,33 +1,43 @@
-$NetBSD: patch-aa,v 1.18 2006/09/11 13:44:27 tron Exp $
+$NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $
 
---- Makefile.orig      2005-04-30 21:50:20.000000000 +0100
-+++ Makefile   2006-09-11 14:18:20.000000000 +0100
-@@ -296,7 +296,7 @@
+--- Makefile.orig      2007-05-08 22:50:45.000000000 +0000
++++ Makefile
+@@ -307,7 +307,7 @@ SPECIALS:
  
  # Note on SCO you may have to set LN to "ln".
  
--a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
-+a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: 
an
+-a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: 
an
++a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos 
uw2: an
        $(BUILD) BUILDTYPE=$@
  
  # If you use sv4, you may find that it works to move it to use the an process.
-@@ -474,9 +474,6 @@
+@@ -559,9 +559,6 @@ sslunix sslsco:
        @echo + In order to rectify this problem, you MUST build with:
        @echo ++ SSLTYPE=$(SSLTYPE).nopwd
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 -      @echo
 -      @echo Do you want to continue this build anyway?  Type y or n please:
--      @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+-      @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
  
- sslnone:
+ nounenc:
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -489,9 +486,6 @@
+@@ -582,9 +579,6 @@ sslnone:
        @echo ++ SSLTYPE=nopwd
        @echo + You must also have OpenSSL or equivalent installed.
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 -      @echo
 -      @echo Do you want to continue this build anyway?  Type y or n please:
--      @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+-      @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
  
- 
- # C compiler types
+ nonossl:
+       @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@@ -618,9 +612,6 @@ ip6:
+       @echo + cancelled and you must rebuild.  If you did not specify IPv6
+       @echo + yourself, try adding IP6=4 to the make command line.
+       @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-      @echo
+-      @echo Do you want to build with IPv6 anyway?  Type y or n please:
+-      @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
+       @echo OK, I will remember that you really want to build with IPv6.
+       @echo You will not see this message again.
+       @$(TOUCH) ip6
diff -r 11a1b2f55800 -r 470d6c77d8b2 mail/imap-uw/patches/patch-ab
--- a/mail/imap-uw/patches/patch-ab     Fri Aug 03 16:51:10 2007 +0000
+++ b/mail/imap-uw/patches/patch-ab     Fri Aug 03 17:03:29 2007 +0000
@@ -1,41 +1,44 @@
-$NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $
+$NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
 
---- src/osdep/unix/Makefile.orig       2005-04-30 21:51:13.000000000 +0100
-+++ src/osdep/unix/Makefile    2006-09-11 14:19:56.000000000 +0100
-@@ -124,7 +124,7 @@
+--- src/osdep/unix/Makefile.orig       2007-06-17 15:37:44.000000000 +0000
++++ src/osdep/unix/Makefile
+@@ -48,7 +48,7 @@ GCCOPTLEVEL= -O2
+ # Try to have some consistency in GCC builds.  We want optimization, but we
+ # also want to be able to debug.
+ 
+-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer
++GCCCFLAGS= -pipe -fno-omit-frame-pointer
+ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
+ 
+ 
+@@ -144,7 +144,7 @@ CHUNKSIZE=65536
  
  # Normally no need to change any of these
  
 -ARCHIVE=c-client.a
 +ARCHIVE=libc-client.la
- BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -403,9 +403,9 @@
-        SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
-        ACTIVEFILE=/usr/share/news/active \
+@@ -425,7 +425,7 @@ gso:       os_sol.h        # GCC Solaris
         RSHPATH=/usr/bin/rsh \
--       BASECFLAGS="-g $(GCCOPTLEVEL)" \