update courier-imap to 2.0.0

install ssl rc scripts [1]
install authuserdb binary [2]
take maintainership [3]

PR:		52949 [1], 82947 [2]
Approved by:	nbm [3]

3 files changed, 49 insertions, 38 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 341978d91b93..8f4a78b0a945 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.7.1
+PORTVERSION=	2.0.0
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -44,11 +44,16 @@ LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
+PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
+		RCDIR=${RCDIR:S,^${PREFIX}/,,} \
+		USERDB=${USERDB:S,^${PREFIX}/,,} \
+		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
+
 .if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	YES
-PLIST_SUB=	OPENSSLFLAG=
+PLIST_SUB+=	OPENSSLFLAG=
 .else
-PLIST_SUB=	OPENSSLFLAG="@comment "
+PLIST_SUB+=	OPENSSLFLAG="@comment "
 .endif
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -158,9 +163,12 @@ post-patch:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authuserdb \
+	${PREFIX}/libexec/courier-imap/authlib
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
 	${LN} -s ${LIBEXECDIR}/${i}.rc ${RCDIR}/${PORTNAME}-${i}.sh.sample
+	${LN} -s ${LIBEXECDIR}/${i}-ssl.rc ${RCDIR}/${PORTNAME}-${i}-ssl.sh.sample
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index b85db4c8a828..01e4ebd0eaa4 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1 +1 @@
-MD5 (courier-imap-1.7.1.tar.bz2) = ce3a78cabd3d69e4982907de69ecac96
+MD5 (courier-imap-2.0.0.tar.bz2) = 636816de2338eac4ad66d9d406020cba
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index fbe5d428cf38..006e31922172 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -4,32 +4,35 @@ bin/deliverquota
 bin/imapd
 bin/maildirmake
 bin/pop3d
-etc/courier-imap/authdaemonrc.dist
-%%LDAPFLAG%%etc/courier-imap/authldaprc.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
-etc/courier-imap/pop3d-ssl.dist
-etc/courier-imap/pop3d.cnf.dist
-etc/courier-imap/pop3d.dist
-etc/courier-imap/quotawarnmsg.example
-etc/rc.d/courier-imap-imapd.sh.sample
-etc/rc.d/courier-imap-pop3d.sh.sample
-libexec/courier-imap/authlib/authdaemon
-libexec/courier-imap/authlib/authdaemond
-%%LDAPFLAG%%libexec/courier-imap/authlib/authdaemond.ldap
-%%MYSQLFLAG%%libexec/courier-imap/authlib/authdaemond.mysql
-%%PGSQLFLAG%%libexec/courier-imap/authlib/authdaemond.pgsql
-libexec/courier-imap/authlib/authdaemond.plain
-libexec/courier-imap/courierlogger
-libexec/courier-imap/couriertcpd
-libexec/courier-imap/imapd-ssl.rc
-libexec/courier-imap/imapd.rc
-libexec/courier-imap/makedatprog
-libexec/courier-imap/pop3d-ssl.rc
-libexec/courier-imap/pop3d.rc
+%%CONFDIR%%/authdaemonrc.dist
+%%LDAPFLAG%%%%CONFDIR%%/authldaprc.dist
+%%MYSQLFLAG%%%%CONFDIR%%/authmysqlrc.dist
+%%PGSQLFLAG%%%%CONFDIR%%/authpgsqlrc.dist
+%%CONFDIR%%/imapd-ssl.dist
+%%CONFDIR%%/imapd.cnf.dist
+%%CONFDIR%%/imapd.dist
+%%CONFDIR%%/pop3d-ssl.dist
+%%CONFDIR%%/pop3d.cnf.dist
+%%CONFDIR%%/pop3d.dist
+%%CONFDIR%%/quotawarnmsg.example
+%%RCDIR%%/courier-imap-imapd.sh.sample
+%%RCDIR%%/courier-imap-imapd-ssl.sh.sample
+%%RCDIR%%/courier-imap-pop3d.sh.sample
+%%RCDIR%%/courier-imap-pop3d-ssl.sh.sample
+%%LIBEXECDIR%%/authlib/authdaemon
+%%LIBEXECDIR%%/authlib/authdaemond
+%%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.ldap
+%%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.mysql
+%%PGSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.pgsql
+%%LIBEXECDIR%%/authlib/authdaemond.plain
+%%LIBEXECDIR%%/authlib/authuserdb
+%%LIBEXECDIR%%/courierlogger
+%%LIBEXECDIR%%/couriertcpd
+%%LIBEXECDIR%%/imapd-ssl.rc
+%%LIBEXECDIR%%/imapd.rc
+%%LIBEXECDIR%%/makedatprog
+%%LIBEXECDIR%%/pop3d-ssl.rc
+%%LIBEXECDIR%%/pop3d.rc
 sbin/imaplogin
 sbin/makeuserdb
 sbin/mkimapdcert
@@ -45,14 +48,14 @@ share/courier-imap/mkpop3dcert
 share/courier-imap/pw2userdb
 share/courier-imap/userdb
 share/courier-imap/vchkpw2userdb
-share/doc/courier-imap/AUTHORS
-share/doc/courier-imap/ChangeLog
-share/doc/courier-imap/INSTALL
-share/doc/courier-imap/README
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README
 @dirrm var/authdaemon
 @dirrm var
-@dirrm share/doc/courier-imap
+@dirrm %%DOCSDIR%%
 @dirrm share/courier-imap
-@dirrm libexec/courier-imap/authlib
-@dirrm libexec/courier-imap
-@dirrm etc/courier-imap
+@dirrm %%LIBEXECDIR%%/authlib
+@dirrm %%LIBEXECDIR%%
+@dirrm %%CONFDIR%%