1 files changed, 50 insertions, 40 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 7b263544d420..18fe5e214488 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
+PORTVERSION= 	2.1.5
 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/
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20020630.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	YES
@@ -33,68 +33,78 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 
 .if defined(WITH_SNMP)
 # It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+#CONFIGURE_ENV=	LIBS=-lkvm
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
-MAN1=		cyradm.1 imtest.1 installsieve.1
+MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 pop3test.1 \
+		sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.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
+MAN8=		arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
+		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
+		mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \
+		squatter.8 syncnews.8 timsieved.8 tls_prune.8
 
-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 \
+DOCS=		altnamespace anoncvs bugs changes faq feedback index \
+		install install-admin-mb install-auth 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 man \
-		notes os overview questions readme sieve-protocol sieve specs
+		install-upgrade mailing-list man notes os overview questions \
+		readme sieve sieve-protocol specs
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
 
 post-patch:
 		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
 			> ${WRKSRC}/tools/mkimap.new
 		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+.if ${OSVERSION} < 500000
+		@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
+			> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new
+		@${MV} ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
+.endif
 
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
+.for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
 .endfor
 .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
 		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
 		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+			${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
+		${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
 		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2/text
+		@${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
 .endif
 		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
@@ -107,4 +117,4 @@ post-install:
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>