1 files changed, 69 insertions, 57 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index a3609b3fae95..8c030d25c868 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,96 +1,108 @@
-# New ports collection makefile for:		cyrus
-# Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.org
+# New ports collection makefile for:		cyrus-imapd
+# Date created:					Jan 4th 2001
+# Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=	cyrus
-PORTVERSION=	1.6.24
-PORTREVISION=	1
-CATEGORIES=	mail tcl82
+PORTNAME=	cyrus-imapd
+PORTVERSION= 	2.0.12
+CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
+PATCHFILES=	${DISTNAME}-ipv6-20010222.diff.gz
 
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
+MAINTAINER=	ume@FreeBSD.org
+
+LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-group=cyrus \
-		--with-sasldir=${LOCALBASE} \
-		--with-tclsh=${LOCALBASE}/bin/tclsh8.2 \
+		--with-sasl=${LOCALBASE} \
+		--with-dbdir=${LOCALBASE} \
 		--with-auth=unix \
-		--with-com-err
+		--with-com_err
+
+.if defined(WITH_SNMP)
+# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
+CONFIGURE_ENV=	LIBS=-lkvm
+.else
+CONFIGURE_ARGS+=--with-ucdsnmp=no
+.endif
 
 MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
-		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
-		timsieved.8
+MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 ctl_deliver.8 ctl_mboxlist.8 collectnews.8 \
+		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
+		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
+		syncnews.8 timsieved.8
 
-post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
+		changes copyrights feedback index install install-admin-mb \
+		install-compile install-configure install-murder install-perf \
+		install-prereq install-sieve install-snmpmon install-testing \
+		install-upgrade mailing-list notes os overview questions \
+		quota-extension readme server-design sieve sieve-protocol
+HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
+		install-auth install-compile install-configure install-murder \
+		install-perf install-prereq install-sieve install-snmpmon \
+		install-testing install-upgrade install mailing-list notes \
+		os overview questions readme sieve-protocol sieve
 
 pre-install:
 		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
 		@${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-DOCS=	README acl-extension anoncvs bugs changes copyrights install \
-	mailing-list overview quota-extension server-design
-HTDOCS=	anoncvs bugs changes index install mailing-list overview \
-	questions readme sieve-protocol sieve
 post-install:
 		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
+		${MKDIR} ${PREFIX}/share/doc/cyrus/text
+.for file in ${HTDOCS}
+		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
 			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
+		@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
 .endfor
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
-			${PREFIX}/share/doc/cyrus/html
-		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
+		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
+			${PREFIX}/share/doc/cyrus
+		@${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+.for file in ${DOCS}
+		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
+			${PREFIX}/share/doc/cyrus/text
+		@${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
 		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
 .endif
+		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
+			${PREFIX}/etc/rc.d/imapd.sh.sample
 		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
-			${PREFIX}/etc/
-		${INSTALL} -d -m 750 -o cyrus -g cyrus \
-			/var/spool/imap \
-			${PREFIX}/etc/imap \
-			${PREFIX}/etc/imap/user \
-			${PREFIX}/etc/imap/quota \
-			${PREFIX}/etc/imap/proc \
-			${PREFIX}/etc/imap/log \
-			${PREFIX}/etc/imap/msg
-		${TOUCH} ${PREFIX}/etc/imap/mailboxes
-		${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes
-		${CHOWN} cyrus:cyrus ${PREFIX}/etc/imap/mailboxes
-		@${ECHO} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST}
-.for dir in user quota proc log msg
-		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
-		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
+		${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
+			${PREFIX}/etc/cyrus.conf.dist
+		${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
+		${CHOWN} -R cyrus:cyrus /var/imap
+		${CHOWN} -R cyrus:cyrus /var/spool/imap
+		@${ECHO} "@cwd /var" >>${TMPPLIST}
+		@${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
+.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
+		@${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
+		@${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
 .endfor
-		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
-		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
+		@${ECHO} "@dirrm imap" >>${TMPPLIST}
+		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
+		@${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
 		@${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
-		@${ECHO} "@exec ${MKDIR} /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec ${CHOWN} cyrus:cyrus /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@cwd /var" >>${TMPPLIST}
+		@${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
+		@${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
+		@${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
+		@${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
 		@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL