Allow "inet6" as a package option for net/couriertcpd and

mail/courier-mta.  Modify mail/courier-imap to build regardless of
the platforms IPv6 support and update meta-pkg/courier to the latest
versions of the Courier mail server suite.  Bump the PKGREVISIONs
of the following packages:

	mail/courier-mta	--> 7
	meta-pkgs/courier	--> 3
	net/couriertcpd		--> 2

This fixes PR pkg/37013 by Aleksej Saushev.

5 files changed, 45 insertions, 13 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index acfd965dce7..54547ed8958 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/09/17 15:28:04 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 14:12:19 jlam Exp $
 
 DISTNAME=	courier-imap-4.1.3
 PKGREVISION=	1
@@ -36,6 +36,15 @@ CONFIGURE_ARGS+=	--with-piddir=${VARBASE:Q}/run
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${TOOLS_OPENSSL:Q}
 
+# The rfc1035 and tcpd bits are built and installed by net/couriertcpd.
+# However, we still need to build in these directories because there
+# are some convenience libraries built and used by other parts of the
+# imap code.  We configure without IPv6 support because those necessary
+# convenience libraries don't have any IPv6 code, and we want to avoid
+# breakage due to IPv6 mis-detection.
+#
+CONFIGURE_ARGS+=	--without-ipv6
+
 INSTALL_AM_MAKEFLAGS=	sysconfdir=${EGDIR:Q}
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index aab43e667e3..fb0ef37f5a1 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/09/17 15:28:04 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 14:12:19 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ COMMENT=	Courier mail transport agent
 HOMEPAGE=	http://www.courier-mta.org/
 
 DEPENDS+=	courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=	couriertcpd>=${COURIER_VERSION}nb1:../../net/couriertcpd
+DEPENDS+=	couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
 DEPENDS+=	maildrop>=2.0.4:../../mail/maildrop
 
 USE_TOOLS+=		gmake openssl:run perl:run
diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
index 8cb430339e2..614ee8f2bde 100644
--- a/mail/courier-mta/options.mk
+++ b/mail/courier-mta/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2007/09/07 14:11:20 jlam Exp $
+# $NetBSD: options.mk,v 1.8 2007/09/21 14:12:19 jlam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-mta
 PKG_SUPPORTED_OPTIONS=	courier-dsn courier-esmtp courier-local		\
-			courier-uucp ldap
-PKG_SUGGESTED_OPTIONS=	courier-dsn courier-esmtp courier-local
+			courier-uucp inet6 ldap
+PKG_SUGGESTED_OPTIONS=	courier-dsn courier-esmtp courier-local inet6
 
 .include "../../mk/bsd.options.mk"
 
@@ -111,6 +111,17 @@ CONF_FILES_PERMS+=	${EGDIR}/module.uucp				\
 PKG_FAIL_REASON+=	"[courier/options.mk] No mail transports specified."
 .endif
 
+
+######################################################################
+###
+### IPv6 support (used by Courier ESMTP client)
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--with-ipv6
+.else
+CONFIGURE_ARGS+=	--without-ipv6
+.endif
+
 ######################################################################
 ###
 ### LDAP alias lookup support
diff --git a/meta-pkgs/courier/Makefile b/meta-pkgs/courier/Makefile
index 983721b0e92..8dd32137971 100644
--- a/meta-pkgs/courier/Makefile
+++ b/meta-pkgs/courier/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/09/17 15:28:05 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 14:12:19 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	meta-pkgs mail
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -20,9 +20,9 @@ COURIER_VERSION=	0.56.0
 #
 #	net/couriertcpd, mail/courier-maildir, mail/courier-mta
 #
-DEPENDS+=	couriertcpd>=${COURIER_VERSION}nb1:../../net/couriertcpd
+DEPENDS+=	couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
 DEPENDS+=	courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=	courier-mta>=${COURIER_VERSION}nb6:../../mail/courier-mta
+DEPENDS+=	courier-mta>=${COURIER_VERSION}nb7:../../mail/courier-mta
 
 # The following packages must be from the same lineage as the version
 # of Courier:
diff --git a/net/couriertcpd/Makefile b/net/couriertcpd/Makefile
index e1747b1be15..688c96cb242 100644
--- a/net/couriertcpd/Makefile
+++ b/net/couriertcpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/09/17 15:28:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 14:12:19 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/tcpd-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +16,18 @@ CONFLICTS=	courier-imap<4.11
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.couriertcpd
+PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--with-ipv6
+.else
+CONFIGURE_ARGS+=	--without-ipv6
+.endif
+
 .include "../../mail/courier-mta/Makefile.common"
 
 # This package doesn't need to depend on courier-authlib -- just fake