Cleanup and modernization of mail/cyrus-imapd2*.

With hat:	portmgr
Sponsored by:	Absolight

6 files changed, 93 insertions, 129 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 79e9f628d472..305ea4c0f9f5 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -18,15 +18,14 @@ LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].*
 
-PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
-
 USE_RC_SUBR=	imapd
 
 USES=		cpe perl5
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
+CYRUS_PREFIX=	${PREFIX}/cyrus
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
-		--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-prefix=${CYRUS_PREFIX} \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
@@ -87,25 +86,37 @@ SQLITE_DESC=		Enable SQLite backend (experimental)
 SQLITE_USE=		SQLITE=yes
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
-
 # Autocreate Inbox and Autosieve patches from UoA
 # WWW: http://email.uoa.gr/projects/cyrus/
 
-.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE}
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES+=	http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/
-.endif
-
-.if ${PORT_OPTIONS:MAUTOCREATE}
 AUTOCREATE_VERSION=	0.10-0
-PATCHFILES+=	${PORTNAME}-2.3.16-autocreate-${AUTOCREATE_VERSION}.diff
-.endif
+AUTOCREATE_PATCH_SITES=	http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/:autocreate
+AUTOCREATE_PATCHFILES=	${PORTNAME}-2.3.16-autocreate-${AUTOCREATE_VERSION}.diff:autocreate
 
-.if ${PORT_OPTIONS:MAUTOSIEVE}
 AUTOSIEVE_VERSION=	0.6.0
-PATCHFILES+=	${PORTNAME}-2.3.16-autosieve-${AUTOSIEVE_VERSION}.diff
-.endif
+AUTOSIETE_PATCH_SITES=	http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/:autosieve
+AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.3.16-autosieve-${AUTOSIEVE_VERSION}.diff
+AUTOSIEVE_BROKEN=	Not buildable with autosieve patch
+
+DRAC_EXTRA_PATCHES=	${WRKSRC}/contrib/drac_auth.patch \
+			${FILESDIR}/extra-patch-configure.in \
+			${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
+			${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+DRAC_USE=	AUTOTOOLS=autoconf,autoheader
+
+MANDIRS=	${CYRUS_PREFIX}/man
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
+
+SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} 
+
+CYRUS_USER?=	cyrus
+CYRUS_GROUP?=	cyrus
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
@@ -113,66 +124,11 @@ INVALID_BDB_VER=2
 BDB_LIB_NAME=	no
 .endif
 
-.if ${PORT_OPTIONS:MDRAC}
-EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in \
-		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
-USE_AUTOTOOLS=	autoconf autoheader
-.endif
-
-.if ${OSVERSION} >= 900022
-PLIST_SUB+=	MANCONF=""
-.else
-PLIST_SUB+=	MANCONF="@comment "
-.endif
-
 .if !exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN_MAN1=	cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN_MAN3=	imclient.3
-MAN_MAN5=	cyrus.conf.5 imapd.conf.5 krb.equiv.5
-CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
-		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
-CYRUS_MAN8=	arbitron.8 chk_cyrus.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		ctl_mboxlist.8 cvt_cyrusdb.8 cyr_dbtool.8 cyr_df.8 \
-		cyr_expire.8 cyr_synclog.8 deliver.8 fetchnews.8 fud.8 \
-		idled.8 imapd.8 ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 \
-		master.8 mbexamine.8 mbpath.8 nntpd.8 notifyd.8 pop3d.8 \
-		quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
-		sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
-		timsieved.8 tls_prune.8 unexpunge.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-replication \
-		install-sieve install-snmpmon install-testing \
-		install-upgrade install-virtdomains install mailing-list \
-		man notes os overview questions readme sieve-protocol \
-		sieve specs
-
-CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
-		small.conf
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
 post-patch:
-	@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-		-e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
-		${.CURDIR}/pkg-install > ${PKGINSTALL}
-	@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-		-e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
-		${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
@@ -180,62 +136,29 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \
-		${FILESDIR}/cyrus-imapd-man.conf \
-		> ${WRKDIR}/cyrus-imapd-man.conf
-.if ${PORT_OPTIONS:MDRAC}
+
+post-patch-DRAC-on:
 	@${RM} -rf ${WRKSRC}/autom4te.cache
-.endif
 
 post-install:
-.for f in ${CYRUS_MAN3}
-	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${PERLMAN}/man/man3/${f}
-	@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz >>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
-	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/cyrus/man/man8/${f}
-	@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/man
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/text
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${STAGEDIR}${DOCSDIR}
-	@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN_MAN1} ${MAN_MAN3} ${MAN_MAN5} ${CYRUS_MAN8}
-	@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
-			${STAGEDIR}${DOCSDIR}/man/${f}.html; \
-		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
-			>>${TMPPLIST}; \
-	fi
-.endfor
-.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-	@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
-.endfor
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} \
-		${STAGEDIR}${DOCSDIR}/text
-	@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
-.endif
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-		${STAGEDIR}${EXAMPLESDIR}
-.for f in ${CONFS}
-	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
-	@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-		${STAGEDIR}${PREFIX}/cyrus/bin/mkimap
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
-		${STAGEDIR}${PREFIX}/cyrus/bin/masssievec
-.if ${OSVERSION} >= 900022
-	@${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+		${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
+		${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec
+	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
-.endif
 
-.include <bsd.port.post.mk>
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+		"! ( -name Makefile.dist -o -name Makefile -o -name .cvsignore )"
+
+# There are already files in EXAMPLESDIR at that point, so no
+# need to create it.
+post-install-EXAMPLES-on:
+	cd ${WRKSRC}/master/conf && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/files/cyrus-imapd-man.conf b/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in
index b7ba70fcce77..b7ba70fcce77 100644
--- a/mail/cyrus-imapd23/files/cyrus-imapd-man.conf
+++ b/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/files/pkg-deinstall.in
index e0dd1b8bb7fc..e0dd1b8bb7fc 100644
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ b/mail/cyrus-imapd23/files/pkg-deinstall.in
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/files/pkg-install.in
index 684745f23b01..684745f23b01 100644
--- a/mail/cyrus-imapd23/pkg-install
+++ b/mail/cyrus-imapd23/files/pkg-install.in
diff --git a/mail/cyrus-imapd23/pkg-message b/mail/cyrus-imapd23/files/pkg-message.in
index ff816e46e925..e58a3822c074 100644
--- a/mail/cyrus-imapd23/pkg-message
+++ b/mail/cyrus-imapd23/files/pkg-message.in
@@ -1,7 +1,7 @@
 ****************************************************************************
 
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
+To setup mail spool, modify %%PREFIX%%/etc/imapd.conf appropriately,
+then run %%PREFIX%%/cyrus/bin/mkimap.
 To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
 /etc/rc.conf.
 
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index b2f3a236d767..fc3d2ae141a0 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -57,7 +57,44 @@ cyrus/bin/squatter
 cyrus/bin/timsieved
 cyrus/bin/tls_prune
 cyrus/bin/unexpunge
-%%MANCONF%%etc/man.d/cyrus-imapd.conf
+cyrus/man/man8/arbitron.8.gz
+cyrus/man/man8/chk_cyrus.8.gz
+cyrus/man/man8/ctl_cyrusdb.8.gz
+cyrus/man/man8/ctl_deliver.8.gz
+cyrus/man/man8/ctl_mboxlist.8.gz
+cyrus/man/man8/cvt_cyrusdb.8.gz
+cyrus/man/man8/cyr_dbtool.8.gz
+cyrus/man/man8/cyr_df.8.gz
+cyrus/man/man8/cyr_expire.8.gz
+cyrus/man/man8/cyr_synclog.8.gz
+cyrus/man/man8/deliver.8.gz
+cyrus/man/man8/fetchnews.8.gz
+cyrus/man/man8/fud.8.gz
+cyrus/man/man8/idled.8.gz
+cyrus/man/man8/imapd.8.gz
+cyrus/man/man8/ipurge.8.gz
+cyrus/man/man8/lmtpd.8.gz
+cyrus/man/man8/make_md5.8.gz
+cyrus/man/man8/make_sha1.8.gz
+cyrus/man/man8/master.8.gz
+cyrus/man/man8/mbexamine.8.gz
+cyrus/man/man8/mbpath.8.gz
+cyrus/man/man8/nntpd.8.gz
+cyrus/man/man8/notifyd.8.gz
+cyrus/man/man8/pop3d.8.gz
+cyrus/man/man8/quota.8.gz
+cyrus/man/man8/reconstruct.8.gz
+cyrus/man/man8/rmnews.8.gz
+cyrus/man/man8/smmapd.8.gz
+cyrus/man/man8/squatter.8.gz
+cyrus/man/man8/sync_client.8.gz
+cyrus/man/man8/sync_reset.8.gz
+cyrus/man/man8/sync_server.8.gz
+cyrus/man/man8/syncnews.8.gz
+cyrus/man/man8/timsieved.8.gz
+cyrus/man/man8/tls_prune.8.gz
+cyrus/man/man8/unexpunge.8.gz
+etc/man.d/cyrus-imapd.conf
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -96,13 +133,18 @@ include/cyrus/xstrlcat.h
 include/cyrus/xstrlcpy.h
 lib/libcyrus.a
 lib/libcyrus_min.a
+%%SITE_ARCH%%/Cyrus/IMAP.pm
 %%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
 %%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
 %%SITE_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_ARCH%%/Cyrus/IMAP.pm
 %%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm
 %%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
 %%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%PERL5_MAN3%%/Cyrus::IMAP.3.gz
+%%PERL5_MAN3%%/Cyrus::IMAP::Admin.3.gz
+%%PERL5_MAN3%%/Cyrus::IMAP::IMSP.3.gz
+%%PERL5_MAN3%%/Cyrus::IMAP::Shell.3.gz
+%%PERL5_MAN3%%/Cyrus::SIEVE::managesieve.3.gz
 man/man1/cyradm.1.gz
 man/man1/imtest.1.gz
 man/man1/installsieve.1.gz
@@ -117,4 +159,3 @@ man/man3/imclient.3.gz
 man/man5/cyrus.conf.5.gz
 man/man5/imapd.conf.5.gz
 man/man5/krb.equiv.5.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf