From 46e5de676073f25cdf7162b2b5e5756bed1ddcd5 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Fri, 16 Nov 2001 09:22:36 +0000
Subject: [PATCH] Upgrade to 1.3.12, which brings in postgresql authentication
 support.

---
 mail/courier-imap/Makefile  | 22 ++++++++++++++++++++--
 mail/courier-imap/distinfo  |  2 +-
 mail/courier-imap/pkg-plist |  2 ++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 0df312781859..8f4e17b21129 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.3.10
+PORTVERSION=	1.3.12
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,6 +17,15 @@ MAINTAINER=	nbm@FreeBSD.org
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
+#
+# options available:
+#
+# WITHOUT_OPENSSL:		Don't build in TLS support
+# WITHOUT_PAM:			Don't build in PAM support
+# WITH_VPOPMAIL:		Build in vpopmail support
+# WITH_MYSQL:			Build in mysql support
+# WITH_POSTGRESQL:		Build in postgresql support
+#
 
 .if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	YES
@@ -54,6 +63,15 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 PLIST_SUB+=	MYSQLFLAG=""
 .endif
 
+.if !defined(WITH_POSTGRESQL)
+CONFIGURE_ARGS+=	\
+		--without-authpgsql
+PLIST_SUB+=	PGSQLFLAG="@comment "
+.else
+LIB_DEPENDS+=	pq.2:${PORTSDIR}/databases/postgresql7
+PLIST_SUB+=	PGSQLFLAG=""
+.endif
+
 .if !defined(WITHOUT_PAM)
 CONFIGURE_ARGS+=	\
 		--with-authpam
@@ -84,7 +102,7 @@ EXTRA_DOCS=	README INSTALL AUTHORS imap/ChangeLog
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@perl -i.nbm -pe 'm#^sysconf_DATA = imapd.dist# && s@[ip][mo][ap][p3]d.cnf@@g;' \
+	@perl -i.nbm -pe 'm#^\timapd.cnf pop3d.cnf# && s@[ip][mo][ap][p3]d.cnf@@g;' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index b275c99a017b..1c9f7f135c4d 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1 +1 @@
-MD5 (courier-imap-1.3.10.tar.gz) = 14c9ca01daf4a816da4cb943a2f27757
+MD5 (courier-imap-1.3.12.tar.gz) = b8ce1ae9add8eae17a12bb0d38b2c57b
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index fd4ca54a1c10..3b172d0fb0e8 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -4,6 +4,7 @@ bin/maildirmake
 bin/pop3d
 etc/courier-imap/authdaemonrc.dist
 %%MYSQLFLAG%%etc/courier-imap/authmysqlrc.dist
+%%PGSQLFLAG%%etc/courier-imap/authpgsqlrc.dist
 etc/courier-imap/imapd-ssl.dist
 etc/courier-imap/imapd.cnf.dist
 etc/courier-imap/imapd.dist
@@ -14,6 +15,7 @@ etc/courier-imap/quotawarnmsg.example
 libexec/courier-imap/authlib/authdaemon
 libexec/courier-imap/authlib/authdaemond
 %%MYSQLFLAG%%libexec/courier-imap/authlib/authdaemond.mysql
+%%PGSQLFLAG%%libexec/courier-imap/authlib/authdaemond.pgsql
 libexec/courier-imap/authlib/authdaemond.plain
 libexec/courier-imap/couriertcpd
 libexec/courier-imap/deliverquota