Add optional IPv6 support. Bump package revision because of this change.

3 files changed, 30 insertions, 9 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index e08d6984668..46ea2cda8aa 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.95 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2005/08/01 20:34:31 tron 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
@@ -6,7 +7,7 @@
 
 DISTNAME=       imap-2004c1
 PKGNAME=        imap-uw-2004c1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -15,7 +16,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.washington.edu/imap/
 COMMENT=	University of Washington's IMAP, POP2, and POP3 servers
 
-USE_LIBTOOL=	# defined
+USE_LIBTOOL=	yes
 
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_LIB}
@@ -54,6 +55,17 @@ MAKE_ENV+=	GSS_EXTRA_LDFLAGS="-ldes"
 .  endif
 .endif
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.imap-uw
+PKG_SUPPORTED_OPTIONS= 	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if empty(PKG_OPTIONS:Minet6)
+MAKE_ENV+=	IP=4
+.else
+MAKE_ENV+=	IP=6
+.endif
+
 BUILD_DEFS+=	IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_NO_CLEARTEXT IMAP_UW_USE_WHOSON
 CCLIENT_INCS=	c-client.h env.h env_unix.h flocksim.h flstring.h	\
 		fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h misc.h	\
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 13d096b2b21..49be5f92ce2 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2005/06/17 14:49:47 hira Exp $
+$NetBSD: distinfo,v 1.23 2005/08/01 20:34:31 tron Exp $
 
 SHA1 (imap-2004c1.tar.Z) = 47009504d409c41c5ea7f5e2e77178ef60282e3e
 RMD160 (imap-2004c1.tar.Z) = 1975a484d7553eb9208cc0feca3561ac357ea54b
 Size (imap-2004c1.tar.Z) = 2227092 bytes
-SHA1 (patch-aa) = 2109d076b1f50ca461b2b2a00ee927207a64f766
+SHA1 (patch-aa) = f9ce776164fe55aeb08ec0e87bbc6ac80b97d439
 SHA1 (patch-ab) = 97ff711184b820262b2b84b50076e8839c869c6c
 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
 SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 0795f12bbf4..9e3183f9e47 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.14 2004/05/13 18:14:34 adam Exp $
+$NetBSD: patch-aa,v 1.15 2005/08/01 20:34:31 tron Exp $
 
---- Makefile.orig	2004-04-27 19:56:49.000000000 +0000
-+++ Makefile
-@@ -446,9 +446,9 @@ sslunix sslsco:
+--- Makefile.orig	2004-12-25 19:05:25.000000000 +0000
++++ Makefile	2005-08-01 19:27:56.000000000 +0100
+@@ -180,7 +180,7 @@
+ # 4	(default) IPv4 support only
+ # 6	IPv6 and IPv4 support
+ 
+-IP=4
++#IP=4
+ 
+ 
+ # The following extra compilation flags are defined.  None of these flags are
+@@ -461,9 +461,9 @@
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++