From 481feaf8bee1ef2f7dcc0563c959ae0b1d83cb18 Mon Sep 17 00:00:00 2001
From: Tobias Scherbaum <dertobi123@gentoo.org>
Date: Mon, 3 Sep 2007 19:47:05 +0000
Subject: Version bump (Portage version: 2.1.2.12)

---
 net-mail/cyrus-imapd/ChangeLog                     |   9 +-
 net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild      | 259 ---------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild      | 250 ++++++++++++++++++++
 .../cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch  |  21 --
 .../cyrus-imapd/files/digest-cyrus-imapd-2.3.8     |   6 -
 .../cyrus-imapd/files/digest-cyrus-imapd-2.3.9     |   6 +
 6 files changed, 264 insertions(+), 287 deletions(-)
 delete mode 100644 net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild
 create mode 100644 net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
 delete mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch
 delete mode 100644 net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8
 create mode 100644 net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9

(limited to 'net-mail')

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 8a2c38e9ae6d..111fc41edd15 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.103 2007/09/02 07:48:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.104 2007/09/03 19:47:05 dertobi123 Exp $
+
+*cyrus-imapd-2.3.9 (03 Sep 2007)
+
+  03 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imapd-2.3.8-pts.patch, -cyrus-imapd-2.3.8.ebuild,
+  +cyrus-imapd-2.3.9.ebuild:
+  Version bump
 
   02 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   cyrus-imapd-2.2.13-r1.ebuild:
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild
deleted file mode 100644
index e67a26333dbe..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild,v 1.3 2007/08/20 13:18:24 dertobi123 Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam
-
-DESCRIPTION="The Cyrus IMAP Server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-	mirror://gentoo/${P}-uoa.tbz2"
-LIBWRAP_PATCH_VER="2.2"
-DRAC_PATCH_VER="2.3.8"
-AUTOCREATE_PATCH_VER="0.10-0"
-AUTOSIEVE_PATCH_VER="0.6.0"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-IUSE="afs autocreate autosieve drac idled kerberos nntp pam replication snmp ssl tcpd"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( >=net-fs/openafs-1.2.2 )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	kerberos? ( virtual/krb5 )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	drac? ( >=mail-client/drac-1.12-r1 )"
-
-DEPEND="$RDEPEND
-	sys-devel/libtool
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake"
-
-new_net-snmp_check() {
-	# tcpd USE flag check. Bug #68254.
-	if use tcpd ; then
-		if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then
-			eerror "You are emerging this package with USE=\"tcpd\""
-			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\""
-			fail_msg
-		fi
-	else
-		if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then
-			eerror "You are emerging this package with USE=\"-tcpd\""
-			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\""
-			fail_msg
-		fi
-	fi
-	# DynaLoader check. Bug #67411
-
-	if [ -x "$(type -p net-snmp-config)" ]; then
-		einfo "$(type -p net-snmp-config) is found and executable."
-		NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
-		einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
-		if [ -z "$NSC_AGENTLIBS" ]; then
-			eerror "NSC_AGENTLIBS is null"
-			einfo "please report this to bugs.gentoo.org"
-		fi
-		for i in ${NSC_AGENTLIBS}; do
-			# check for the DynaLoader path.
-			if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
-				DYNALOADER_PATH="$i"
-				einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
-				if [[ ! -f "${DYNALOADER_PATH}" ]]; then
-					eerror "\""${DYNALOADER_PATH}"\" is not found."
-					einfo "Have you upgraded \"perl\" after"
-					einfo "you emerged \"net-snmp\". Please re-emerge"
-					einfo "\"net-snmp\" then try again. Bug #67411."
-					die "\""${DYNALOADER_PATH}"\" is not found."
-				fi
-			fi
-		done
-	else
-		eerror "\"net-snmp-config\" not found or not executable!"
-		die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
-	fi
-}
-
-fail_msg() {
-	eerror "enable "snmp" USE flag for this package requires"
-	eerror "that net-analyzer/net-snmp and this package both build with"
-	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
-	die "sanity check failed."
-}
-
-pkg_setup() {
-	use snmp && new_net-snmp_check
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# db-4.5 fix
-	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
-
-	# Unsupported UoA patch. Bug #112912 .
-	# http://email.uoa.gr/projects/cyrus/autocreate/
-	if use autocreate ; then
-		epatch "${WORKDIR}/${P}-autocreate-${AUTOCREATE_PATCH_VER}.diff"
-		use drac \
-			&& epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac_with_autocreate.patch" \
-			&& epatch "${S}/contrib/drac_auth.patch"
-	else
-		use drac && epatch "${S}/contrib/drac_auth.patch"
-	fi
-
-	# Unsupported UoA patch. Bug #133187 .
-	# http://email.uoa.gr/projects/cyrus/autosievefolder/
-	use autosieve && epatch	"${WORKDIR}/${P}-autosieve-${AUTOSIEVE_PATCH_VER}.diff"
-
-	# fix undefine symbols.
-	use afs && epatch "${FILESDIR}/cyrus-imapd-2.3.6-afs.patch" \
-		&& epatch "${FILESDIR}/${P}-pts.patch"
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	WANT_AUTOCONF="2.5"
-	eautoreconf
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
-}
-
-src_compile() {
-	local myconf
-	use afs && myconf="${myconf} -with-afs=/usr"
-	myconf="${myconf} $(use_with drac)"
-	myconf="${myconf} $(use_with ssl openssl)"
-	myconf="${myconf} $(use_with snmp ucdsnmp)"
-	myconf="${myconf} $(use_with tcpd libwrap)"
-	myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
-	myconf="${myconf} $(use_enable idled)"
-	myconf="${myconf} $(use_enable nntp nntp)"
-	myconf="${myconf} $(use_enable replication)"
-
-	if use kerberos; then
-		myconf="${myconf} --with-auth=krb5"
-	else
-		myconf="${myconf} --with-auth=unix"
-	fi
-
-	econf \
-		--enable-murder \
-		--enable-listext \
-		--enable-netscapehack \
-		--with-extraident=Gentoo \
-		--with-service-path=/usr/lib/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		${myconf} || die "econf failed"
-
-	# needed for parallel make. Bug #72352.
-	cd ${S}/imap
-	emake xversion.h || die "emake xversion.h failed"
-
-	cd ${S}
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd sieve; do
-		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
-	done
-
-	# Link master to cyrusmaster (postfix has a master too)
-	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
-
-	doman man/*.[0-8]
-	dodoc COPYRIGHT README*
-	dohtml doc/*.html doc/murder.png
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/cyrus/server.key && ! -f /etc/ssl/cyrus/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
-		insinto /etc/ssl/cyrus
-		docert server
-		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
-	fi
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-
-	if df -T /var/imap | grep -q ' ext[23] ' ; then
-		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
-		chattr +S /var/imap/{user,quota}{,/*}
-		eend $?
-	fi
-
-	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
-		ebegin "Making /var/spool/imap/* synchronous."
-		chattr +S /var/spool/imap{,/*}
-		eend $?
-	fi
-
-	ewarn "If the queue directory of the mail daemon resides on an ext2"
-	ewarn "or ext3 filesystem you need to set it manually to update"
-	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
-	echo
-
-	elog "For correct logging add the following to /etc/syslog.conf:"
-	elog "    local6.*         /var/log/imapd.log"
-	elog "    auth.debug       /var/log/auth.log"
-	echo
-
-	elog "You have to add user cyrus to the sasldb2. Do this with:"
-	elog "    saslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
new file mode 100644
index 000000000000..7df2bc8adbd5
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild,v 1.1 2007/09/03 19:47:05 dertobi123 Exp $
+
+inherit autotools eutils ssl-cert fixheadtails pam
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
+	mirror://gentoo/${P}-uoa.tbz2"
+LIBWRAP_PATCH_VER="2.2"
+DRAC_PATCH_VER="2.3.8"
+AUTOCREATE_PATCH_VER="0.10-0"
+AUTOSIEVE_PATCH_VER="0.6.0"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+IUSE="autocreate autosieve drac idled kerberos nntp pam replication snmp ssl tcpd"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	kerberos? ( virtual/krb5 )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=mail-client/drac-1.12-r1 )"
+
+DEPEND="$RDEPEND
+	sys-devel/libtool
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake"
+
+new_net-snmp_check() {
+	# tcpd USE flag check. Bug #68254.
+	if use tcpd ; then
+		if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then
+			eerror "You are emerging this package with USE=\"tcpd\""
+			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\""
+			fail_msg
+		fi
+	else
+		if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then
+			eerror "You are emerging this package with USE=\"-tcpd\""
+			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\""
+			fail_msg
+		fi
+	fi
+	# DynaLoader check. Bug #67411
+
+	if [ -x "$(type -p net-snmp-config)" ]; then
+		einfo "$(type -p net-snmp-config) is found and executable."
+		NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
+		einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
+		if [ -z "$NSC_AGENTLIBS" ]; then
+			eerror "NSC_AGENTLIBS is null"
+			einfo "please report this to bugs.gentoo.org"
+		fi
+		for i in ${NSC_AGENTLIBS}; do
+			# check for the DynaLoader path.
+			if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
+				DYNALOADER_PATH="$i"
+				einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
+				if [[ ! -f "${DYNALOADER_PATH}" ]]; then
+					eerror "\""${DYNALOADER_PATH}"\" is not found."
+					einfo "Have you upgraded \"perl\" after"
+					einfo "you emerged \"net-snmp\". Please re-emerge"
+					einfo "\"net-snmp\" then try again. Bug #67411."
+					die "\""${DYNALOADER_PATH}"\" is not found."
+				fi
+			fi
+		done
+	else
+		eerror "\"net-snmp-config\" not found or not executable!"
+		die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
+	fi
+}
+
+fail_msg() {
+	eerror "enable "snmp" USE flag for this package requires"
+	eerror "that net-analyzer/net-snmp and this package both build with"
+	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
+	die "sanity check failed."
+}
+
+pkg_setup() {
+	use snmp && new_net-snmp_check
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	ht_fix_file ${S}/imap/xversion.sh
+
+	# Unsupported UoA patch. Bug #112912 .
+	# http://email.uoa.gr/projects/cyrus/autocreate/
+	if use autocreate ; then
+		epatch "${WORKDIR}/${P}-autocreate-${AUTOCREATE_PATCH_VER}.diff"
+		use drac \
+			&& epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac_with_autocreate.patch" \
+			&& epatch "${S}/contrib/drac_auth.patch"
+	else
+		use drac && epatch "${S}/contrib/drac_auth.patch"
+	fi
+
+	# Unsupported UoA patch. Bug #133187 .
+	# http://email.uoa.gr/projects/cyrus/autosievefolder/
+	use autosieve && epatch	"${WORKDIR}/${P}-autosieve-${AUTOSIEVE_PATCH_VER}.diff"
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# Recreate configure.
+	WANT_AUTOCONF="2.5"
+	eautoreconf
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} $(use_with drac)"
+	myconf="${myconf} $(use_with ssl openssl)"
+	myconf="${myconf} $(use_with snmp ucdsnmp)"
+	myconf="${myconf} $(use_with tcpd libwrap)"
+	myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
+	myconf="${myconf} $(use_enable idled)"
+	myconf="${myconf} $(use_enable nntp nntp)"
+	myconf="${myconf} $(use_enable replication)"
+
+	if use kerberos; then
+		myconf="${myconf} --with-auth=krb5"
+	else
+		myconf="${myconf} --with-auth=unix"
+	fi
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-extraident=Gentoo \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--without-perl \
+		--disable-cyradm \
+		${myconf} || die "econf failed"
+
+	# needed for parallel make. Bug #72352.
+	cd ${S}/imap
+	emake xversion.h || die "emake xversion.h failed"
+
+	cd ${S}
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd sieve; do
+		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
+	done
+
+	# Link master to cyrusmaster (postfix has a master too)
+	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
+
+	doman man/*.[0-8]
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	# do not install server.{key,pem) if they are exist.
+	if use ssl && [[ ! -f /etc/ssl/cyrus/server.key && ! -f /etc/ssl/cyrus/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
+		insinto /etc/ssl/cyrus
+		docert server
+		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
+	fi
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
+
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
+		chattr +S /var/imap/{user,quota}{,/*}
+		eend $?
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/spool/imap/* synchronous."
+		chattr +S /var/spool/imap{,/*}
+		eend $?
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	elog "For correct logging add the following to /etc/syslog.conf:"
+	elog "    local6.*         /var/log/imapd.log"
+	elog "    auth.debug       /var/log/auth.log"
+	echo
+
+	elog "You have to add user cyrus to the sasldb2. Do this with:"
+	elog "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch
deleted file mode 100644
index a7bd4287a72b..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.in.old	2007-07-28 13:02:41.505734616 +0200
-+++ configure.in	2007-07-28 13:04:37.431049483 +0200
-@@ -563,12 +563,12 @@
-     LDFLAGS=$save_LDFLAGS
- fi
-  
--if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
--        EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
--        EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
--
--	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
--fi
-+#if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
-+#        EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
-+#        EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-+#
-+#	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
-+#fi
- 
- 
- 
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8
deleted file mode 100644
index 79a11d5a29b5..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 13e519dec6d0c7b8a4f41170d38c3942 cyrus-imapd-2.3.8-uoa.tbz2 17894
-RMD160 c824671df6b36aadf9c6d76131bd467a407a5e5e cyrus-imapd-2.3.8-uoa.tbz2 17894
-SHA256 dfe6d498991335c2c9f06bf2dd2c716ce865c043f857f5633650c029e17c3549 cyrus-imapd-2.3.8-uoa.tbz2 17894
-MD5 ac03b02c1ae08d52f807b58c488b204f cyrus-imapd-2.3.8.tar.gz 2207366
-RMD160 e89054f75f106c26f497bc37f7d514b0bf80bfe0 cyrus-imapd-2.3.8.tar.gz 2207366
-SHA256 0f5c04a7de2da737e5ca0b4f8df8647175188b22972000192bbc7cd87ffda7fe cyrus-imapd-2.3.8.tar.gz 2207366
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9
new file mode 100644
index 000000000000..69290b05354e
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9
@@ -0,0 +1,6 @@
+MD5 416025d721671c546bac1652c89b218e cyrus-imapd-2.3.9-uoa.tbz2 17935
+RMD160 1e46f17972552ed94496d1dfee8671332844775b cyrus-imapd-2.3.9-uoa.tbz2 17935
+SHA256 3ca66f3ec992416276daca9e43dd159797d2838ff9efd118139495a86e070f5d cyrus-imapd-2.3.9-uoa.tbz2 17935
+MD5 113433c1fdc777e3b0466b5ce643b8bc cyrus-imapd-2.3.9.tar.gz 2272004
+RMD160 c9aae3476108c0face06dfe304a136015370b166 cyrus-imapd-2.3.9.tar.gz 2272004
+SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437 cyrus-imapd-2.3.9.tar.gz 2272004
-- 
cgit v1.2.3-65-gdbad