Index: head/mail/cyrus-imapd23/pkg-message
===================================================================
--- head/mail/cyrus-imapd23/pkg-message	(revision 396671)
+++ head/mail/cyrus-imapd23/pkg-message	(nonexistent)
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************

Property changes on: head/mail/cyrus-imapd23/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/pkg-deinstall
===================================================================
--- head/mail/cyrus-imapd23/pkg-deinstall	(revision 396671)
+++ head/mail/cyrus-imapd23/pkg-deinstall	(nonexistent)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			rm $1
-			;;
-		1)	# config file exists and differs
-			;;
-		*)	# no config file exists
-			;;
-	esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac

Property changes on: head/mail/cyrus-imapd23/pkg-deinstall
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/pkg-install
===================================================================
--- head/mail/cyrus-imapd23/pkg-install	(revision 396671)
+++ head/mail/cyrus-imapd23/pkg-install	(nonexistent)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version";
-			echo "   of the port.  See $1.dist for details.";
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $2 $1
-			;;
-	esac
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (4190/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac

Property changes on: head/mail/cyrus-imapd23/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/Makefile
===================================================================
--- head/mail/cyrus-imapd23/Makefile	(revision 396671)
+++ head/mail/cyrus-imapd23/Makefile	(revision 396672)
@@ -1,241 +1,164 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.19
 #PORTREVISION=	10
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 PKGNAMESUFFIX=	23
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 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} \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED \
 			LDAP_PTLOADER LISTEXT MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP_5 \
 			SQLITE DOCS EXAMPLES
 OPTIONS_DEFAULT=	BDB
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Use autocreate INBOX patch (UoA)
 AUTOSIEVE_DESC=		Use autosievefolder patch (UoA)
 BDB_USE=		BDB=yes
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
 DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_PTLOADER_DESC=	Enable LDAP ptloader
 LDAP_PTLOADER_USE=	OPENLDAP=yes
 LDAP_PTLOADER_CONFIGURE_ON=--with-ldap=${LOCALBASE}
 LISTEXT_DESC=		Enable IMAP List extensions
 LISTEXT_CONFIGURE_ENABLE=listext
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_CFLAGS=
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=yes \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql
 NETSCAPEHACK_DESC=	Enable X-NETSCAPE extensions
 NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_DESC=		Enable PostgreSQL backend (experimental)
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_5_DESC=		Enable SNMP support
 SNMP_5_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 SNMP_5_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_5_CONFIGURE_OFF=	--with-snmp=no
 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
 .else
 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" \
 		${WRKSRC}/tools/mkimap
 	@${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 \
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
-.for f in ${CONFS}
-	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
-		${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>
Index: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf
===================================================================
--- head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf	(revision 396671)
+++ head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf	(nonexistent)
@@ -1 +0,0 @@
-MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in
===================================================================
--- head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in	(nonexistent)
+++ head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in	(revision 396672)
@@ -0,0 +1 @@
+MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/files/pkg-deinstall.in
===================================================================
--- head/mail/cyrus-imapd23/files/pkg-deinstall.in	(nonexistent)
+++ head/mail/cyrus-imapd23/files/pkg-deinstall.in	(revision 396672)
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			rm $1
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
+}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	if [ -x /usr/sbin/nologin ]; then
+		shell=/usr/sbin/nologin
+	elif [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
+	uhome=/nonexistent
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+case $2 in
+	DEINSTALL)
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		;;
+	POST-DEINSTALL)
+		modify_cyrus_user
+		;;
+
+esac

Property changes on: head/mail/cyrus-imapd23/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/files/pkg-install.in
===================================================================
--- head/mail/cyrus-imapd23/files/pkg-install.in	(nonexistent)
+++ head/mail/cyrus-imapd23/files/pkg-install.in	(revision 396672)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	shell=/bin/csh
+	uhome=${PKG_PREFIX}/cyrus
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			;;
+		1)	# config file exists and differs
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
+			;;
+		*)	# no config file exists, copy it
+			install -c -m 644 $2 $1
+			;;
+	esac
+}
+
+case $2 in
+	PRE-INSTALL)
+		;;
+
+	POST-INSTALL)
+		modify_cyrus_user
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		if grep 'sieve' /etc/services; then
+			echo
+		else
+			echo
+			echo "** Please add an entry for the sieve protocol (4190/tcp)"
+			echo "   to /etc/services"
+			echo
+		fi
+		;;
+esac

Property changes on: head/mail/cyrus-imapd23/files/pkg-install.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/files/pkg-message.in
===================================================================
--- head/mail/cyrus-imapd23/files/pkg-message.in	(nonexistent)
+++ head/mail/cyrus-imapd23/files/pkg-message.in	(revision 396672)
@@ -0,0 +1,8 @@
+****************************************************************************
+
+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.
+
+****************************************************************************

Property changes on: head/mail/cyrus-imapd23/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd23/pkg-plist
===================================================================
--- head/mail/cyrus-imapd23/pkg-plist	(revision 396671)
+++ head/mail/cyrus-imapd23/pkg-plist	(revision 396672)
@@ -1,120 +1,161 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
 bin/lmtptest
 bin/mupdatetest
 bin/nntptest
 bin/pop3test
 bin/sieveshell
 bin/sivtest
 bin/smtptest
 bin/synctest
 cyrus/bin/arbitron
 cyrus/bin/chk_cyrus
 %%AUTOCREATE%%cyrus/bin/compile_sieve
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_df
 cyrus/bin/cyr_expire
 cyrus/bin/cyr_synclog
 cyrus/bin/cyrdump
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
 cyrus/bin/fud
 %%IDLED%%cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
 cyrus/bin/lmtpd
 cyrus/bin/lmtpproxyd
 %%REPLICATION%%cyrus/bin/make_md5
 %%REPLICATION%%cyrus/bin/make_sha1
 cyrus/bin/masssievec
 cyrus/bin/master
 cyrus/bin/mbexamine
 cyrus/bin/mbpath
 cyrus/bin/mkimap
 %%MURDER%%cyrus/bin/mupdate
 %%NNTP%%cyrus/bin/nntpd
 cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/pop3proxyd
 cyrus/bin/proxyd
 %%LDAP_PTLOADER%%cyrus/bin/ptdump
 %%LDAP_PTLOADER%%cyrus/bin/ptexpire
 %%LDAP_PTLOADER%%cyrus/bin/ptloader
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/sievec
 cyrus/bin/sieved
 cyrus/bin/smmapd
 cyrus/bin/squatter
 %%REPLICATION%%cyrus/bin/sync_client
 %%REPLICATION%%cyrus/bin/sync_reset
 %%REPLICATION%%cyrus/bin/sync_server
 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
 include/cyrus/bsearch.h
 include/cyrus/byteorder64.h
 include/cyrus/charset.h
 include/cyrus/cyrusdb.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/hash.h
 include/cyrus/hmac-md5.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/iptostring.h
 include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
 include/cyrus/lock.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/md5.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
 include/cyrus/prot.h
 include/cyrus/retry.h
 include/cyrus/rfc822date.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
 include/cyrus/util.h
 include/cyrus/xmalloc.h
 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
 man/man1/lmtptest.1.gz
 man/man1/mupdatetest.1.gz
 man/man1/nntptest.1.gz
 man/man1/pop3test.1.gz
 man/man1/sieveshell.1.gz
 man/man1/sivtest.1.gz
 man/man1/smtptest.1.gz
 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
Index: head/mail/cyrus-imapd24/pkg-message
===================================================================
--- head/mail/cyrus-imapd24/pkg-message	(revision 396671)
+++ head/mail/cyrus-imapd24/pkg-message	(nonexistent)
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************

Property changes on: head/mail/cyrus-imapd24/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/pkg-deinstall
===================================================================
--- head/mail/cyrus-imapd24/pkg-deinstall	(revision 396671)
+++ head/mail/cyrus-imapd24/pkg-deinstall	(nonexistent)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			rm $1
-			;;
-		1)	# config file exists and differs
-			;;
-		*)	# no config file exists
-			;;
-	esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac

Property changes on: head/mail/cyrus-imapd24/pkg-deinstall
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/pkg-install
===================================================================
--- head/mail/cyrus-imapd24/pkg-install	(revision 396671)
+++ head/mail/cyrus-imapd24/pkg-install	(nonexistent)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version";
-			echo "   of the port.  See $1.dist for details.";
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $2 $1
-			;;
-	esac
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (4190/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac

Property changes on: head/mail/cyrus-imapd24/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/Makefile
===================================================================
--- head/mail/cyrus-imapd24/Makefile	(revision 396671)
+++ head/mail/cyrus-imapd24/Makefile	(revision 396672)
@@ -1,261 +1,181 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.18
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
 PKGNAMESUFFIX=	24
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].*
 
-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} \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \
 			MURDER MYSQL NETSCAPEHACK NNTP PGSQL \
 			REPLICATION SNMP SQLITE DOCS EXAMPLES
 OPTIONS_DEFAULT=	BDB IDLED
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Use autocreate INBOX patch (UoA)
 AUTOSIEVE_DESC=		Use autosievefolder patch (UoA)
 BDB_USE=		BDB=yes
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
 DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_CFLAGS=
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=yes \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql
 NETSCAPEHACK_DESC=	Enable X-NETSCAPE extensions
 NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_USE=		SQLITE=yes
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
 OPTIONS_RADIO=			GSSAPI
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_DESC=		Use Heimdal in base
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_DESC=		Use Heimdal from ports
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_DESC=		Use MIT Kerberos V5
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
-.include <bsd.port.pre.mk>
-
 # Autocreate Inbox and Autosieve patches from UoA
 # http://email.uoa.gr/projects/cyrus/
 # http://blog.vx.sk/archives/13-Cyrus-IMAP-UoA.html
 
-.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE}
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES+=		LOCAL/mm
-.endif
-
-.if ${PORT_OPTIONS:MAUTOCREATE}
 AUTOCREATE_VERSION=	0.10-0
-PATCHFILES+=	${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch
-PLIST_FILES+=	cyrus/bin/compile_sieve
-.endif
+AUTOCREATE_PATCH_SITES=	LOCAL/mm:autocreate
+AUTOCREATE_PATCHFILES=	${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch:-p1:autocreate
 
-.if ${PORT_OPTIONS:MAUTOSIEVE}
 AUTOSIEVE_VERSION=	0.6.0
-PATCHFILES+=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch
-BROKEN=		Not buildable with autosieve patch
-.endif
+AUTOSIEVE_PATCH_SITES=	LOCAL/mm:autosieve
+AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
+AUTOSIEVE_BROKEN=	Not buildable with autosieve patch
 
+DRAC_EXTRA_PATCHES=	${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
 .else
 BDB_LIB_NAME=	no
 .endif
 
-.if ${PORT_OPTIONS:MDRAC}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
-USE_AUTOTOOLS=	autoconf autoheader
-.endif
-
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-.if ${OSVERSION} >= 900022
-PLIST_SUB+=	MANCONF=""
-.else
-PLIST_SUB+=	MANCONF="@comment "
-.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 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=		ag 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
-
-.if ${PORT_OPTIONS:MDRAC}
-pre-patch:
+pre-patch-DRAC-on:
 	${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \
 		< ${WRKSRC}/contrib/drac_auth.patch
-.endif
 
 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" \
 		${WRKSRC}/tools/mkimap
 	@${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 \
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
-.for f in ${CONFS}
-	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
-		${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>
Index: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf
===================================================================
--- head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf	(revision 396671)
+++ head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf	(nonexistent)
@@ -1 +0,0 @@
-MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in
===================================================================
--- head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in	(nonexistent)
+++ head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in	(revision 396672)
@@ -0,0 +1 @@
+MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/files/pkg-deinstall.in
===================================================================
--- head/mail/cyrus-imapd24/files/pkg-deinstall.in	(nonexistent)
+++ head/mail/cyrus-imapd24/files/pkg-deinstall.in	(revision 396672)
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			rm $1
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
+}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	if [ -x /usr/sbin/nologin ]; then
+		shell=/usr/sbin/nologin
+	elif [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
+	uhome=/nonexistent
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+case $2 in
+	DEINSTALL)
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		;;
+	POST-DEINSTALL)
+		modify_cyrus_user
+		;;
+
+esac

Property changes on: head/mail/cyrus-imapd24/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/files/pkg-install.in
===================================================================
--- head/mail/cyrus-imapd24/files/pkg-install.in	(nonexistent)
+++ head/mail/cyrus-imapd24/files/pkg-install.in	(revision 396672)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	shell=/bin/csh
+	uhome=${PKG_PREFIX}/cyrus
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			;;
+		1)	# config file exists and differs
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
+			;;
+		*)	# no config file exists, copy it
+			install -c -m 644 $2 $1
+			;;
+	esac
+}
+
+case $2 in
+	PRE-INSTALL)
+		;;
+
+	POST-INSTALL)
+		modify_cyrus_user
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		if grep 'sieve' /etc/services; then
+			echo
+		else
+			echo
+			echo "** Please add an entry for the sieve protocol (4190/tcp)"
+			echo "   to /etc/services"
+			echo
+		fi
+		;;
+esac

Property changes on: head/mail/cyrus-imapd24/files/pkg-install.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/files/pkg-message.in
===================================================================
--- head/mail/cyrus-imapd24/files/pkg-message.in	(nonexistent)
+++ head/mail/cyrus-imapd24/files/pkg-message.in	(revision 396672)
@@ -0,0 +1,8 @@
+****************************************************************************
+
+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.
+
+****************************************************************************

Property changes on: head/mail/cyrus-imapd24/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd24/pkg-plist
===================================================================
--- head/mail/cyrus-imapd24/pkg-plist	(revision 396671)
+++ head/mail/cyrus-imapd24/pkg-plist	(revision 396672)
@@ -1,121 +1,161 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
 bin/lmtptest
 bin/mupdatetest
 bin/nntptest
 bin/pop3test
 bin/sieveshell
 bin/sivtest
 bin/smtptest
 bin/synctest
 cyrus/bin/arbitron
 cyrus/bin/chk_cyrus
+%%AUTOCREATE%%cyrus/bin/compile_sieve
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_df
 cyrus/bin/cyr_expire
 cyrus/bin/cyr_sequence
 cyrus/bin/cyr_synclog
 cyrus/bin/cyr_userseen
 cyrus/bin/cyrdump
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
 cyrus/bin/fud
 %%IDLED%%cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
 cyrus/bin/lmtpd
 cyrus/bin/lmtpproxyd
 cyrus/bin/masssievec
 cyrus/bin/master
 cyrus/bin/mbexamine
 cyrus/bin/mbpath
 cyrus/bin/mkimap
 %%MURDER%%cyrus/bin/mupdate
 %%NNTP%%cyrus/bin/nntpd
 cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/pop3proxyd
 cyrus/bin/proxyd
 %%LDAP%%cyrus/bin/ptdump
 %%LDAP%%cyrus/bin/ptexpire
 %%LDAP%%cyrus/bin/ptloader
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/sievec
 cyrus/bin/sieved
 cyrus/bin/smmapd
 cyrus/bin/squatter
 %%REPLICATION%%cyrus/bin/sync_client
 %%REPLICATION%%cyrus/bin/sync_reset
 %%REPLICATION%%cyrus/bin/sync_server
 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/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
 include/cyrus/bsearch.h
 include/cyrus/byteorder64.h
 include/cyrus/charset.h
 include/cyrus/crc32.h
 include/cyrus/cyr_lock.h
 include/cyrus/cyrusdb.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/hash.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/iptostring.h
 include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/md5.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
 include/cyrus/prot.h
 include/cyrus/retry.h
 include/cyrus/rfc822date.h
 include/cyrus/signals.h
 include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
 include/cyrus/util.h
 include/cyrus/xmalloc.h
 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
 man/man1/lmtptest.1.gz
 man/man1/mupdatetest.1.gz
 man/man1/nntptest.1.gz
 man/man1/pop3test.1.gz
 man/man1/sieveshell.1.gz
 man/man1/sivtest.1.gz
 man/man1/smtptest.1.gz
 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
Index: head/mail/cyrus-imapd25/pkg-message
===================================================================
--- head/mail/cyrus-imapd25/pkg-message	(revision 396671)
+++ head/mail/cyrus-imapd25/pkg-message	(nonexistent)
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************

Property changes on: head/mail/cyrus-imapd25/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/pkg-deinstall
===================================================================
--- head/mail/cyrus-imapd25/pkg-deinstall	(revision 396671)
+++ head/mail/cyrus-imapd25/pkg-deinstall	(nonexistent)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			rm $1
-			;;
-		1)	# config file exists and differs
-			;;
-		*)	# no config file exists
-			;;
-	esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac

Property changes on: head/mail/cyrus-imapd25/pkg-deinstall
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/pkg-install
===================================================================
--- head/mail/cyrus-imapd25/pkg-install	(revision 396671)
+++ head/mail/cyrus-imapd25/pkg-install	(nonexistent)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version";
-			echo "   of the port.  See $1.dist for details.";
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $2 $1
-			;;
-	esac
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (4190/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac

Property changes on: head/mail/cyrus-imapd25/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/Makefile
===================================================================
--- head/mail/cyrus-imapd25/Makefile	(revision 396671)
+++ head/mail/cyrus-imapd25/Makefile	(revision 396672)
@@ -1,275 +1,200 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.6
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
 PKGNAMESUFFIX=	25
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].*
 
-PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
-
 USE_RC_SUBR=	imapd
 
 USES=		cpe libtool 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} \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BDB HTTP IDLED LDAP MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \
 			EXAMPLES
 #OPTIONS_DEFINE+=	CLAMAV DRAC
 OPTIONS_DEFAULT=	BDB IDLED
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BDB_USE=		BDB=yes
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
 DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 HTTP_DESC=		Enable HTTP (beta quality)
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
 			libical.so:${PORTSDIR}/devel/libical
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_CFLAGS=
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=yes \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql
 NETSCAPEHACK_DESC=	Enable X-NETSCAPE extensions
 NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
 UNAMER!=	uname -r
 OSMAJOR=	${UNAMER:C/[.-].*//}
 
 OPTIONS_RADIO=			GSSAPI
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 .if ${OSMAJOR} >= 9
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 .endif
 GSSAPI_BASE_DESC=		Use Heimdal in base
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_DESC=		Use Heimdal from ports
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_DESC=		Use MIT Kerberos V5
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
-.include <bsd.port.pre.mk>
+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
 .else
 BDB_LIB_NAME=	no
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 IGNORE=		CLAMAV is not available yet
 .endif
 PLIST_SUB+=	CLAMAV="@comment "
 
 .if ${PORT_OPTIONS:MDRAC}
 IGNORE=		DRAC is not available
 # EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal__sasl2.m4
 # USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=yes
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-.if ${OSVERSION} >= 900022
-PLIST_SUB+=	MANCONF=""
-.else
-PLIST_SUB+=	MANCONF="@comment "
-.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::Annotator::Daemon.3 Cyrus::Annotator::Message.3 \
-		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_deny.8 cyr_df.8 \
-		cyr_expire.8 cyr_info.8 cyr_synclog.8 deliver.8 fud.8 idled.8 \
-		imapd.8 ipurge.8 lmtpd.8 master.8 mbexamine.8 mbpath.8 \
-		notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 smmapd.8 \
-		squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
-		timsieved.8 tls_prune.8 unexpunge.8
-.if ${PORT_OPTIONS:MHTTP}
-CYRUS_MAN8+=	ctl_zoneinfo.8 httpd.8
-.endif
-.if ${PORT_OPTIONS:MNNTP}
-CYRUS_MAN8+=	fetchnews.8 nntpd.8
-.endif
-
-DOCS=		ag altnamespace anoncvs bugs changes faq feedback index \
-		install-admin-mb install-auth install-compile \
-		install-configure install-http 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
-
 .if ${PORT_OPTIONS:MDRAC}
 pre-patch:
 	${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \
 		< ${WRKSRC}/contrib/drac_auth.patch
 .endif
 
 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" \
 		${WRKSRC}/tools/mkimap
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
-	@${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}
-#	@${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 netnews.fig
-	@${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 \
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
-.for f in ${CONFS}
-	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
-		${STAGEDIR}${EXAMPLESDIR}
-	@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${PREFIX}/cyrus/bin/mkimap
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 		${STAGEDIR}${PREFIX}/cyrus/bin/masssievec
-.if ${OSVERSION} >= 900022
-	@${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
+	${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 .gitignore )"
+
+# 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>
Index: head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf
===================================================================
--- head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf	(revision 396671)
+++ head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf	(nonexistent)
@@ -1 +0,0 @@
-MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf.in
===================================================================
--- head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf.in	(nonexistent)
+++ head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf.in	(revision 396672)
@@ -0,0 +1 @@
+MANPATH %%PREFIX%%/cyrus/man

Property changes on: head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/files/pkg-deinstall.in
===================================================================
--- head/mail/cyrus-imapd25/files/pkg-deinstall.in	(nonexistent)
+++ head/mail/cyrus-imapd25/files/pkg-deinstall.in	(revision 396672)
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			rm $1
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
+}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	if [ -x /usr/sbin/nologin ]; then
+		shell=/usr/sbin/nologin
+	elif [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
+	uhome=/nonexistent
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+case $2 in
+	DEINSTALL)
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		;;
+	POST-DEINSTALL)
+		modify_cyrus_user
+		;;
+
+esac

Property changes on: head/mail/cyrus-imapd25/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/files/pkg-install.in
===================================================================
--- head/mail/cyrus-imapd25/files/pkg-install.in	(nonexistent)
+++ head/mail/cyrus-imapd25/files/pkg-install.in	(revision 396672)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
+EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+	USER=${CYRUS_USER}
+	PW=/usr/sbin/pw
+	shell=/bin/csh
+	uhome=${PKG_PREFIX}/cyrus
+
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+
+checkfile() {
+	diff -bBqw $1 $2 >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			;;
+		1)	# config file exists and differs
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
+			;;
+		*)	# no config file exists, copy it
+			install -c -m 644 $2 $1
+			;;
+	esac
+}
+
+case $2 in
+	PRE-INSTALL)
+		;;
+
+	POST-INSTALL)
+		modify_cyrus_user
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
+		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
+		if grep 'sieve' /etc/services; then
+			echo
+		else
+			echo
+			echo "** Please add an entry for the sieve protocol (4190/tcp)"
+			echo "   to /etc/services"
+			echo
+		fi
+		;;
+esac

Property changes on: head/mail/cyrus-imapd25/files/pkg-install.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/files/pkg-message.in
===================================================================
--- head/mail/cyrus-imapd25/files/pkg-message.in	(nonexistent)
+++ head/mail/cyrus-imapd25/files/pkg-message.in	(revision 396672)
@@ -0,0 +1,8 @@
+****************************************************************************
+
+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.
+
+****************************************************************************

Property changes on: head/mail/cyrus-imapd25/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cyrus-imapd25/pkg-plist
===================================================================
--- head/mail/cyrus-imapd25/pkg-plist	(revision 396671)
+++ head/mail/cyrus-imapd25/pkg-plist	(revision 396672)
@@ -1,154 +1,196 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
 bin/lmtptest
 bin/mupdatetest
 bin/nntptest
 bin/pop3test
 bin/sieveshell
 bin/sivtest
 bin/smtptest
 bin/synctest
 cyrus/bin/arbitron
 cyrus/bin/chk_cyrus
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 %%HTTP%%cyrus/bin/ctl_zoneinfo
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_deny
 cyrus/bin/cyr_df
 cyrus/bin/cyr_expire
 cyrus/bin/cyr_info
 cyrus/bin/cyr_sequence
 cyrus/bin/cyr_synclog
 cyrus/bin/cyr_userseen
 %%CLAMAV%%cyrus/bin/cyr_virusscan
 cyrus/bin/cyrdump
 %%HTTP%%cyrus/bin/dav_reconstruct
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
 cyrus/bin/fud
 %%HTTP%%cyrus/bin/httpd
 %%IDLED%%cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
 cyrus/bin/lmtpd
 cyrus/bin/lmtpproxyd
 cyrus/bin/masssievec
 cyrus/bin/master
 cyrus/bin/mbexamine
 cyrus/bin/mbpath
 cyrus/bin/mbtool
 cyrus/bin/mkimap
 %%MURDER%%cyrus/bin/mupdate
 %%NNTP%%cyrus/bin/nntpd
 cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/pop3proxyd
 cyrus/bin/proxyd
 %%LDAP%%cyrus/bin/ptdump
 %%LDAP%%cyrus/bin/ptexpire
 %%LDAP%%cyrus/bin/ptloader
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/sievec
 cyrus/bin/sieved
 cyrus/bin/smmapd
 cyrus/bin/squatter
 %%REPLICATION%%cyrus/bin/sync_client
 %%REPLICATION%%cyrus/bin/sync_reset
 %%REPLICATION%%cyrus/bin/sync_server
 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_deny.8.gz
+cyrus/man/man8/cyr_df.8.gz
+cyrus/man/man8/cyr_expire.8.gz
+cyrus/man/man8/cyr_info.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/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/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/arrayu64.h
 include/cyrus/assert.h
 include/cyrus/auth.h
 include/cyrus/auth_pts.h
 include/cyrus/bitvector.h
 include/cyrus/bsearch.h
 include/cyrus/charset.h
 include/cyrus/chartable.h
 include/cyrus/command.h
 include/cyrus/crc32.h
 include/cyrus/cyr_lock.h
 include/cyrus/cyrusdb.h
 include/cyrus/exitcodes.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/hash.h
 include/cyrus/hashu64.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/iostat.h
 include/cyrus/iptostring.h
 include/cyrus/libcyr_cfg.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/mappedfile.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
 include/cyrus/retry.h
 include/cyrus/rfc822tok.h
 include/cyrus/sieve/sieve_err.h
 include/cyrus/sieve/sieve_interface.h
 include/cyrus/signals.h
 include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
 include/cyrus/times.h
 include/cyrus/tok.h
 include/cyrus/vparse.h
 include/cyrus/wildmat.h
 include/cyrus/xmalloc.h
 lib/libcyrus.so
 lib/libcyrus.so.0
 lib/libcyrus.so.0.0.0
 lib/libcyrus_com_err.so
 lib/libcyrus_com_err.so.0
 lib/libcyrus_com_err.so.0.0.0
 lib/libcyrus_imap.so
 lib/libcyrus_imap.so.0
 lib/libcyrus_imap.so.0.0.0
 lib/libcyrus_min.so
 lib/libcyrus_min.so.0
 lib/libcyrus_min.so.0.0.0
 lib/libcyrus_sieve.so
 lib/libcyrus_sieve.so.0
 lib/libcyrus_sieve.so.0.0.0
 %%SITE_PERL%%/Cyrus/Annotator/Daemon.pm
 %%SITE_PERL%%/Cyrus/Annotator/Message.pm
 %%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/SIEVE/managesieve.pm
 %%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
 %%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%PERL5_MAN3%%/Cyrus::Annotator::Daemon.3.gz
+%%PERL5_MAN3%%/Cyrus::Annotator::Message.3.gz
+%%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
 libdata/pkgconfig/libcyrus.pc
 libdata/pkgconfig/libcyrus_min.pc
 libdata/pkgconfig/libcyrus_sieve.pc
 man/man1/cyradm.1.gz
 man/man1/imtest.1.gz
 man/man1/installsieve.1.gz
 man/man1/lmtptest.1.gz
 man/man1/mupdatetest.1.gz
 man/man1/nntptest.1.gz
 man/man1/pop3test.1.gz
 man/man1/sieveshell.1.gz
 man/man1/sivtest.1.gz
 man/man1/smtptest.1.gz
 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