Cleanup

(Portage version: 2.1.4)

9 files changed, 9 insertions, 549 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index d39673a4df3f..7126708ec732 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.119 2008/01/14 18:57:40 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.120 2008/01/18 21:26:30 dertobi123 Exp $
+
+  18 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imapd-2.2.12-gcc4.patch,
+  -files/cyrus-imapd-2.2.13-deliver.patch,
+  -files/cyrus-imapd-2.2-db45.patch, -files/cyrus-imapd-2.2.13-afs.patch,
+  -files/cyrus-imapd-2.2.13-drac.patch, -files/cyrus-imapd-2.2.13-pts.patch,
+  -files/cyrus-imapd-unsupported-8bit.patch, -cyrus-imapd-2.2.13-r1.ebuild:
+  Cleanup
 
   14 Jan 2008; Christoph Mende <angelos@gentoo.org>
   cyrus-imapd-2.3.9-r1.ebuild:
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild
deleted file mode 100644
index 1c78ee6f2804..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild
+++ /dev/null
@@ -1,327 +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.2.13-r1.ebuild,v 1.9 2007/10/01 18:55:51 philantrop Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam flag-o-matic
-
-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"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
-
-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 )
-	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"
-
-# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
-check_useflag() {
-	local my_pkg=$(best_version ${1})
-	local my_flag=${2}
-
-	if [[ $(grep -wo ${my_flag} ${ROOT}/var/db/pkg/${my_pkg}/USE) ]]; then
-		return 0
-	fi
-
-	return 1
-}
-
-tcpd_flag_check() {
-	local tcpd_flag
-	local cyrus_imapd_has_tcpd_flag
-	local my_pkg=${1}
-	einfo "${my_pkg} found"
-	check_useflag ${my_pkg} tcpd
-	tcpd_flag="$?"
-
-	if [ "${tcpd_flag}" == "0" ]; then
-		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
-	else
-		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
-	fi
-
-	if use tcpd; then
-		cyrus_imapd_has_tcpd_flag="0"
-	else
-		cyrus_imapd_has_tcpd_flag="1"
-	fi
-
-	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
-		eerror "with or without \"tcpd\" USE flag if you want to emerge"
-		eerror "this package with \"snmp\" USE flag. Bug #68254"
-		die "see above error message."
-	fi
-}
-
-net-snmp_check() {
-	if has_version net-analyzer/ucd-snmp; then
-		tcpd_flag_check net-analyzer/ucd-snmp
-	fi
-
-	if has_version net-analyzer/net-snmp; then
-		tcpd_flag_check net-analyzer/net-snmp
-		# check for minimal USE flag.
-		local has_minimal
-		check_useflag net-analyzer/net-snmp minimal
-		has_minimal="$?"
-		if [ "${has_minimal}" == "0" ]; then
-			eerror "If you want to emerge this package with \"snmp\" USE flag"
-			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
-			die "see error message above"
-		fi
-
-		# check for tcpd USE flag in sync for both packages.
-
-		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
-			eerror "with or without \"tcpd\" USE flag if you want to emerge"
-			eerror "this package with \"snmp\" USE flag. Bug #68254"
-			die "see above error message."
-		fi
-
-		# an attempt to solve bug #67411. Is there a better solution?
-		# check for net-snmp-config exit and executable.
-		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
-	fi
-}
-
-pkg_setup() {
-	if use snmp; then
-		net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# Fix prestripped binaries
-	epatch "${FILESDIR}/${PN}-strip.patch"
-
-	# fix segfault in deliver wrt #186338
-	epatch "${FILESDIR}/${P}-deliver.patch"
-
-	# Parallel make fix
-	epatch "${FILESDIR}"/${PN}-parallel.patch
-
-	# db-4.5 fix
-	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
-
-	# Add unsupported patch wrt #18706 and #80630
-	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
-
-	if use afs; then
-		epatch "${FILESDIR}/${P}-afs.patch" || die "epatch failed"
-		epatch "${FILESDIR}/${P}-pts.patch" || die "epatch failed"
-	fi
-
-	# Add drac database support.
-	if use drac ; then
-		# better check for drac. Bug #79442.
-		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
-		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
-	fi
-
-	# DB4 detection and versioned symbols.
-	# The new cyrus-imapd has a new DB detection.
-	# Hopefully we don't need this patch anymore.
-	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
-
-	# 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() {
-	# as-needed fix wrt net-snmp-5.4, bug #187138
-	if use snmp ; then
-		append-ldflags -Wl,--no-as-needed
-	fi
-
-	local myconf
-	myconf="${myconf} $(use_with afs)"
-	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)"
-
-	if use idled; then
-		myconf="${myconf} --with-idle=idled"
-	else
-		myconf="${myconf} --with-idle=poll"
-	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 \
-		--with-auth=unix \
-		--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
-
-	if use ssl ; 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() {
-	ewarn "*****NOTE*****"
-	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
-	ewarn "be sure to read the following thoroughly:"
-	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
-	ewarn "*****NOTE*****"
-	echo
-
-	ewarn "If you change the fs-type of /var/imap or"
-	ewarn "/var/spool/imap you should read step 9 of"
-	ewarn "/usr/share/doc/${P}/html/install-configure.html."
-	echo
-
-	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
-
-	einfo "For correct logging add the following to /etc/syslog.conf:"
-	einfo "    local6.*         /var/log/imapd.log"
-	einfo "    auth.debug       /var/log/auth.log"
-	echo
-
-	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
-	ewarn "    saslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
deleted file mode 100644
index c92f957953c8..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib.old/cyrusdb_berkeley.c	2007-04-05 01:23:42.518845824 +0200
-+++ lib/cyrusdb_berkeley.c	2007-04-05 01:22:20.000000000 +0200
-@@ -159,7 +159,15 @@
- 	syslog(LOG_WARNING,
- 	       "DBERROR: invalid berkeley_locks_max value, using internal default");
-     } else {
-+#if DB_VERSION_MAJOR >= 4
-+  r = dbenv->set_lk_max_locks(dbenv, opt);
-+  if (!r)
-+  r = dbenv->set_lk_max_lockers(dbenv, opt);
-+  if (!r)
-+  r = dbenv->set_lk_max_objects(dbenv, opt);
-+#else
- 	r = dbenv->set_lk_max(dbenv, opt);
-+#endif
- 	if (r) {
- 	    dbenv->err(dbenv, r, "set_lk_max");
- 	    syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
---- cmulocal/berkdb.m4.orig	2007-05-01 18:05:00.000000000 +0200
-+++ cmulocal/berkdb.m4	2007-05-01 18:05:17.000000000 +0200
-@@ -212,7 +212,7 @@
- 	fi
- 
- 	saved_LIBS=$LIBS
--        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
- 	    AC_TRY_LINK([#include <db.h>],
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch
deleted file mode 100644
index 4a0f89ab0100..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/config2header.orig	2006-01-30 09:30:16.000000000 -0800
-+++ tools/config2header	2006-01-30 09:31:05.000000000 -0800
-@@ -214,7 +214,6 @@
- print HFILE <<EOF
-   IMAPOPT_LAST
- };
--extern struct imapopt_s imapopts[];
- 
- enum enum_value {
-   IMAP_ENUM_ZERO = 0,
-@@ -260,6 +259,7 @@
- 
- print HFILE <<EOF
- };
-+extern struct imapopt_s imapopts[];
- #endif /* INCLUDED_IMAPOPTIONS_H */
- EOF
-     ;
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
deleted file mode 100644
index 96bde0546097..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig   2006-03-31 15:09:06.000000000 -0800
-+++ configure.in        2006-03-31 15:08:16.000000000 -0800
-@@ -466,8 +466,12 @@
-          AC_DEFINE(AFSPTS_USE_KRB5,[],[Should the AFS PTS plugin use krb5?])])
-
- if test "x$with_afs" != "xno"; then
--    if test ! -d $with_afs; then
--        $with_afs=/usr/local
-+    if test "x$with_afs" != "xyes"; then
-+        if test ! -d $with_afs; then
-+            with_afs=/usr/local
-+        fi
-+    else
-+        with_afs=/usr
-     fi
-     CFLAGS="${CFLAGS} -I${with_afs}/include"
-     AFS_LIBS="${with_afs}/lib/afs/libkauth.a
-${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a
-${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a
-${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a
-${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a
-${with_afs}/lib/afs/util.a" 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-deliver.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-deliver.patch
deleted file mode 100644
index aaa00f48e54d..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-deliver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/backend.c.orig	2007-07-23 20:22:06.000000000 +0200
-+++ imap/backend.c	2007-07-23 20:22:24.000000000 +0200
-@@ -271,7 +271,7 @@
-     /* need to (re)establish connection to server or create one */
-     int sock = -1;
-     int r;
--    int err = 0;
-+    int err = -1;
-     struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res;
-     struct sockaddr_un sunsock;
-     char buf[2048], *mechlist = NULL;
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
deleted file mode 100644
index 7279c6618569..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- contrib/drac_auth.patch.orig	2005-01-25 10:56:05.263875816 -0800
-+++ contrib/drac_auth.patch	2005-01-25 10:59:32.395359608 -0800
-@@ -71,7 +71,7 @@
- diff -u -r1.273 configure.in
- --- configure.in	15 Dec 2003 20:00:35 -0000	1.273
- +++ configure.in	19 Dec 2003 19:56:16 -0000
--@@ -945,6 +945,19 @@
-+@@ -945,6 +945,20 @@
-  SNMP_SUBDIRS=""
-  AC_SUBST(SNMP_SUBDIRS)
-  
-@@ -80,12 +80,13 @@
- +dnl
- +DRACLIBS=
- +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
--+	if test -d "$withval"; then
--+		LDFLAGS="$LDFLAGS -L${withval}"
--+		AC_CHECK_LIB(drac, dracauth,
--+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
--+			DRACLIBS="-ldrac")
--+	fi)
-++       drac="$withval",
-++       drac="no")
-++if test "$drac" != "no"; then
-++       AC_CHECK_LIB(drac, dracauth,
-++               AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
-++               DRACLIBS="-ldrac")
-++fi
- +AC_SUBST(DRACLIBS)
- +
-  CMU_LIBWRAP
-
-
---- contrib/drac_auth.patch.orig        2006-03-31 15:12:05.000000000 -0800
-+++ contrib/drac_auth.patch     2006-03-31 15:14:20.000000000 -0800
-@@ -373,6 +373,6 @@
- +{ "drachost", "localhost", STRING }
- +/* Hostname of the RPC dracd server. */
- +
-- { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist")}
-+ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
-  /* The cyrusdb backend to use for the duplicate delivery suppression
-     and sieve. */ 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
deleted file mode 100644
index 31b08569ba91..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.old	2007-07-22 10:00:33.652378056 +0200
-+++ configure.in	2007-07-22 10:00:51.386672578 +0200
-@@ -544,11 +544,11 @@
-     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
- 
- SERVER_SUBDIRS="master imap"
- AC_ARG_ENABLE(server,
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch
deleted file mode 100644
index cf6084456bae..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- cyrus-imapd-2.2.10/imap/message.c.munge8bit	2004-02-27 18:44:55.000000000 +0100
-+++ cyrus-imapd-2.2.10/imap/message.c	2004-07-27 18:20:13.725563440 +0200
-@@ -227,6 +227,7 @@
-     int n;
-     int sawcr = 0, sawnl;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
-     int inheader = 1, blankline = 1;
- 
-     while (size) {
-@@ -262,7 +263,7 @@
- 			/* We have been configured to reject all mail of this
- 			   form. */
- 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
--		    } else {
-+		    } else if (munge8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			*p = 'X';
---- cyrus-imapd-2.2.10/imap/spool.c.munge8bit	2004-03-04 17:09:34.000000000 +0100
-+++ cyrus-imapd-2.2.10/imap/spool.c	2004-07-27 18:20:13.726563149 +0200
-@@ -140,6 +140,7 @@
-     state s = NAME_START;
-     int r = 0;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
-     const char **skip = NULL;
- 
-     if (namelen == 0) {
-@@ -266,7 +267,7 @@
- 			   form. */
- 			r = IMAP_MESSAGE_CONTAINS8BIT;
- 			goto ph_error;
--		    } else {
-+		    } else if (munge8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			c = 'X';
---- cyrus-imapd-2.2.10/lib/imapoptions.munge8bit	2004-07-21 21:07:45.000000000 +0200
-+++ cyrus-imapd-2.2.10/lib/imapoptions	2004-07-27 18:20:13.722564314 +0200
-@@ -458,6 +458,12 @@
- { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")}
- /* The cyrusdb backend to use for the mailbox list. */
- 
-+{ "munge8bit", 1, SWITCH }
-+/* If enabled, lmtpd munges messages with 8-bit characters.  These characters
-+   are changed to .  If \fBreject8bit\fR is enabled, setting \fBmunge8bit\fR
-+   has no effect.  (A proper soultion to non-ASCII characters in headers is
-+   offered by RFC 2047 and its predecessors.) */
-+
- # xxx badly worded
- { "mupdate_connections_max", 128, INT }
- /* The max number of connections that a mupdate process will allow, this
-@@ -670,9 +676,7 @@
- 
- { "reject8bit", 0, SWITCH }
- /* If enabled, lmtpd rejects messages with 8-bit characters in the
--   headers.  Otherwise, 8-bit characters are changed to `X'.  (A
--   proper soultion to non-ASCII characters in headers is offered by  
--   RFC 2047 and its predecessors.) */
-+   headers. */
- 
- { "rfc2046_strict", 0, SWITCH }
- /* If enabled, imapd will be strict (per RFC 2046) when matching MIME
---- cyrus-imapd-2.2.10/man/deliver.8.munge8bit	2004-06-21 20:40:10.000000000 +0200
-+++ cyrus-imapd-2.2.10/man/deliver.8	2004-07-27 18:20:13.719565188 +0200
-@@ -147,8 +147,10 @@
- Accept messages using the LMTP protocol.
- .SH NOTES
- Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver
--either rejects messages with 8-bit-set characters in the headers or 
--changes these characters to `X'.
-+either rejects/accepts messages with 8-bit-set characters in the headers.
-+If we accept messages with 8-bit-set characters in the headers, then depending
-+on the setting of \fBmunge8bit\fR, these characters are either left un-touched
-+or changed to .
- This is because such characters can't be interpreted since the
- character set is not known, although some communities not well-served by
- US-ASCII assume that those characters can be used to represent characters not