Update mail/courier-imap to courier-imap-4.0.1. Changes from version

3.0.5 include:

    * Implemented IMAP and POP3 proxy aggregator.  With a proxy
      aggregator, the mail accounts are split between multiple,
      independent servers, with an IMAP/POP3 server running on each
      individual server.  A separate, proxy server sits in front and
      accepts ordinary IMAP and POP3 connections.  It reads the login
      ID, determines which server the account is located on, connects
      to the server, and logs in.  Then, for the lifetime on the login
      session the front-end server takes itself out of the loop, and
      forwards all session traffic between the IMAP/POP3 client, and
      the back-end server.

    * Use courier-authlib for user authentication.

    * IPv6 support.

    * Minor bug fixes.

Please note when updating that the locations of the userdb files has
changed to be within the courier-authlib config directory, e.g.
/usr/pkg/etc/authlib/userdb*.

1 files changed, 45 insertions, 31 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 042d1f37875..53e5a76fd42 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.33 2005/02/18 22:12:46 jlam Exp $
 
-DISTNAME=	courier-imap-3.0.5
-PKGREVISION=	2
+DISTNAME=	courier-imap-4.0.1
+PKGBASE=	${DISTNAME:C/-[^-]*$//}
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=	.tar.bz2
 
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	IMAP server for access to maildir-style mailboxes
-HOMEPAGE=	http://www.inter7.com/courierimap/
+HOMEPAGE=	http://www.courier-mta.org/imap/
 
-DEPENDS+=	courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+=	courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
+DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
 USE_PERL5=		build
 
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
+.include "../../mail/courier-maildir/Makefile.common"
 
-.include "../courier-auth/Makefile.common"
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
 
+CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER}
+CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
+CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
@@ -28,10 +35,12 @@ SSLCNF_FILES=		imapd.cnf pop3d.cnf
 FILES_SUBST+=		SSLCERTS=${SSLCERTS}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+MAKE_DIRS=		${VARBASE}/run
 CONF_FILES_PERMS=	# empty
 .for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES+=		${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
 .endfor
 .for FILE in ${SSLCNF_FILES}
 CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
@@ -39,17 +48,16 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-pre-configure:
-	cd ${WRKSRC}; for file in					\
-		imap/imapd.dist.in imap/imapd-ssl.dist.in		\
-		imap/pop3d.dist.in imap/pop3d-ssl.dist.in		\
-		imap/imapd.cnf.in imap/pop3d.cnf.in			\
-		imap/mkimapdcert.in imap/mkpop3dcert.in;		\
-	do								\
-		${SED}	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
+SUBST_CLASSES+=		courier
+SUBST_MESSAGE.courier=	"Convert to match courier-mta expectations."
+SUBST_FILES.courier=	imap/imapd.dist.in imap/imapd-ssl.dist.in	\
+			imap/pop3d.dist.in imap/pop3d-ssl.dist.in	\
+			imap/imapd.cnf.in imap/pop3d.cnf.in		\
+			imap/mkimapdcert.in imap/mkpop3dcert.in		\
+			imap/imapd.8.in imap/courierpop3d.8.in		\
+			imapd-ssl.rc.in imapd.rc.in			\
+			pop3d-ssl.rc.in pop3d.rc.in
+SUBST_SED.courier=	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
 			-e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"	\
 			-e "s|^POP3DSTART=.*|POP3DSTART=YES|g"		\
 			-e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"	\
@@ -57,16 +65,22 @@ pre-configure:
 			-e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
 			-e "s|@datadir@/pop3d.pem|${SSLCERTS}/pop3d.pem|g" \
 			-e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+			-e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g" \
+			-e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" \
+			-e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" \
+			-e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
+SUBST_STAGE.courier=	pre-configure
+
+.include "../../security/courier-authlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/imapd.authpam ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/imap/pop3d.authpam ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${EGDIR}/imap.pam
+	${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${EGDIR}/pop3.pam
 
 .include "../../mk/bsd.pkg.mk"