From 1d9ecc4ec00c45add83e1c32676f6adcd1e7c4f7 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Tue, 11 Sep 2001 12:20:17 +0000
Subject: Upgrade to 1.3.10

---
 mail/courier-imap/Makefile  | 10 ++++------
 mail/courier-imap/distinfo  |  2 +-
 mail/courier-imap/pkg-plist | 20 ++++++++------------
 3 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'mail')

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f4c868cedb31..0df312781859 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.3.8.1
-PORTREVISION=	1
+PORTVERSION=	1.3.10
+PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -39,10 +39,10 @@ VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 .if !defined(WITH_VPOPMAIL)
 CONFIGURE_ARGS+=	\
 		--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
 .else
+CONFIGURE_ARGS+=	\
+		--with-authvchkpw
 BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
 .endif
 
 .if !defined(WITH_MYSQL)
@@ -57,11 +57,9 @@ PLIST_SUB+=	MYSQLFLAG=""
 .if !defined(WITHOUT_PAM)
 CONFIGURE_ARGS+=	\
 		--with-authpam
-PLIST_SUB+=	PAMFLAG=""
 .else
 CONFIGURE_ARGS+=	\
 		--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
 MAN1=		maildirmake.1
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 40edd1bfa034..b275c99a017b 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1 +1 @@
-MD5 (courier-imap-1.3.8.1.tar.gz) = 4f49f99121cddfa2c0ce465ad5579cf1
+MD5 (courier-imap-1.3.10.tar.gz) = 14c9ca01daf4a816da4cb943a2f27757
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 76aa5a06efd9..fd4ca54a1c10 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -2,6 +2,8 @@
 bin/imapd
 bin/maildirmake
 bin/pop3d
+etc/courier-imap/authdaemonrc.dist
+%%MYSQLFLAG%%etc/courier-imap/authmysqlrc.dist
 etc/courier-imap/imapd-ssl.dist
 etc/courier-imap/imapd.cnf.dist
 etc/courier-imap/imapd.dist
@@ -9,12 +11,10 @@ etc/courier-imap/pop3d-ssl.dist
 etc/courier-imap/pop3d.cnf.dist
 etc/courier-imap/pop3d.dist
 etc/courier-imap/quotawarnmsg.example
-libexec/courier-imap/authlib/authcustom
-%%MYSQLFLAG%%libexec/courier-imap/authlib/authmysql
-%%PAMFLAG%%libexec/courier-imap/authlib/authpam
-libexec/courier-imap/authlib/authpwd
-libexec/courier-imap/authlib/authuserdb
-%%VPOPMAILFLAG%%libexec/courier-imap/authlib/authvchkpw
+libexec/courier-imap/authlib/authdaemon
+libexec/courier-imap/authlib/authdaemond
+%%MYSQLFLAG%%libexec/courier-imap/authlib/authdaemond.mysql
+libexec/courier-imap/authlib/authdaemond.plain
 libexec/courier-imap/couriertcpd
 libexec/courier-imap/deliverquota
 libexec/courier-imap/imapd-ssl.rc
@@ -24,14 +24,8 @@ libexec/courier-imap/makedatprog
 libexec/courier-imap/pop3d-ssl.rc
 libexec/courier-imap/pop3d.rc
 sbin/imaplogin
-sbin/makeuserdb
-sbin/mkimapdcert
-sbin/mkpop3dcert
 sbin/pop3login
-sbin/pw2userdb
-sbin/userdb
 sbin/userdbpw
-sbin/vchkpw2userdb
 share/courier-imap/makeuserdb
 share/courier-imap/mkimapdcert
 share/courier-imap/mkpop3dcert
@@ -42,6 +36,8 @@ share/doc/courier-imap/AUTHORS
 share/doc/courier-imap/ChangeLog
 share/doc/courier-imap/INSTALL
 share/doc/courier-imap/README
+@dirrm var/authdaemon
+@dirrm var
 @dirrm share/doc/courier-imap
 @dirrm share/courier-imap
 @dirrm libexec/courier-imap/authlib
-- 
cgit v1.2.3