Remove expired ports:

2014-06-30 mail/cyrus-imapd2: Cyrus IMAPd 2.1.X have been deprecated, consider using 2.4.X. 2014-06-30 mail/cyrus-imapd22: No further releases of 2.2.X are planned, consider using 2.4.X.
author: Rene Ladan <rene@FreeBSD.org> 2014-06-30 11:31:04 +0000
committer: Rene Ladan <rene@FreeBSD.org> 2014-06-30 11:31:04 +0000
commit: 8c108f1a312eb49c4820e65179aaecc40b002c51 (patch)
tree: 042dba241a120e8ea610123980307913c3c35b31
parent: - reset maintainer due to multiple timeouts [1] (diff)
62 files changed, 2 insertions, 3065 deletions
diff --git a/MOVED b/MOVED
index 33ae41041ebc..88c58f9924e3 100644
--- a/MOVED
+++ b/MOVED
@@ -6209,3 +6209,5 @@ www/mod_wsgi2|www/mod_wsgi3|2014-06-30|Has expired: No longer supported, please
 security/botan|security/botan110|2014-06-30|Has expired: Botan 1.8 have known bugs and is no longer supported upstream, migrate to security/botan110
 deskutils/checkrdf||2014-06-30|Removed: Abandonware, please consider using other software
 graphics/k3d||2014-06-30|Has expired: Broken for more than 5 months
+mail/cyrus-imapd2|mail/cyrus-imapd24|2014-06-30|Has expired: Cyrus IMAPd 2.1.X have been deprecated, consider using 2.4.X.
+mail/cyrus-imapd22|mail/cyrus-imapd24|2014-06-30|Has expired: No further releases of 2.2.X are planned, consider using 2.4.X.
diff --git a/mail/Makefile b/mail/Makefile
index 8f8fa56ad316..dba4d4d1a39f 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -78,8 +78,6 @@
     SUBDIR += crm114
     SUBDIR += cucipop
     SUBDIR += cvsmail
-    SUBDIR += cyrus-imapd2
-    SUBDIR += cyrus-imapd22
     SUBDIR += cyrus-imapd23
     SUBDIR += cyrus-imapd24
     SUBDIR += cyrus2courier
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
deleted file mode 100644
index 554728d9918c..000000000000
--- a/mail/cyrus-imapd2/Makefile
+++ /dev/null
@@ -1,182 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	cyrus-imapd
-PORTVERSION=	2.1.18
-PORTREVISION=	3
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-PKGNAMESUFFIX=	21
-
-PATCH_SITES=	http://www.mahoroba.org/~ume/ipv6/ \
-		http://home.jp.FreeBSD.org/~ume/ipv6/
-PATCHFILES=	${PORTNAME}-2.1.16-ipv6-20031121.diff.gz
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-DEPRECATED=	Cyrus IMAPd 2.1.X have been deprecated, consider using 2.4.X.
-EXPIRATION_DATE=2014-06-30
-
-LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
-
-CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].* cyrus-imapd2[^1]-2.[^1].*
-
-PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
-
-USE_RC_SUBR=	imapd
-
-USES=		perl5
-USE_OPENSSL=	yes
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-user=${CYRUS_USER} \
-		--with-cyrus-group=${CYRUS_GROUP} \
-		--with-sasl=${LOCALBASE} \
-		--with-bdb-libdir=${LOCALBASE}/lib \
-		--with-auth=unix \
-		--with-com_err \
-		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5} \
-		--with-ucdsnmp=no
-
-.if defined(WITH_BDB_VER)
-USE_BDB_VER=	${WITH_BDB_VER}
-.else
-USE_BDB_VER=	41
-.endif
-.if ${USE_BDB_VER} == 4
-USE_BDB=	40
-.elif ${USE_BDB_VER} != 41
-IGNORE=		cannot install: WITH_BDB_VER must be 4 or 41
-.endif
-USE_BDB?=	${USE_BDB_VER}
-CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
-		--with-bdb=db${USE_BDB_VER}
-
-.if defined(WITH_SKIPLIST)
-WITH_SKIPLIST_MBOX=	YES
-WITH_SKIPLIST_SEEN=	YES
-.endif
-.if defined(WITH_SKIPLIST_MBOX)
-CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
-.endif
-.if defined(WITH_SKIPLIST_SEEN)
-CONFIGURE_ARGS+=--with-seen-db=skiplist
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	MURDER=""
-.else
-PLIST_SUB+=	MURDER="@comment "
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 501400
-IGNORE=		does not build with Perl 5.14+, use mail/cyrus-imapd23 instead
-.endif
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3=		imclient.3
-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 collectnews.8 ctl_cyrusdb.8 \
-		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.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 squatter.8 syncnews.8 \
-		timsieved.8 tls_prune.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install install-admin-mb install-auth install-compile \
-		install-configure install-murder install-perf \
-		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list man notes os overview questions \
-		readme sieve sieve-protocol specs
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
-pre-everything::
-.if !defined(WITH_BDB_VER)
-	@if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \
-		${ECHO_MSG} ""; \
-		${ECHO_MSG} "It seems you have installed newer db than db3.  If"; \
-		${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \
-		${ECHO_MSG} "specify same version by WITH_BDB_VER.  For"; \
-		${ECHO_MSG} "example, WITH_BDB_VER=41 for db41."; \
-		${ECHO_MSG} ""; \
-	fi
-.endif
-
-post-patch:
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			${.CURDIR}/pkg-install > ${PKGINSTALL}
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|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
-
-post-install:
-.for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
-		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
-			>>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
-		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
-		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
-.if !defined(NOPORTDOCS)
-		@${MKDIR} ${DOCSDIR}/man
-		@${MKDIR} ${DOCSDIR}/text
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
-		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
-			${DOCSDIR}/man/${f}.html; \
-		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
-			>>${TMPPLIST}; \
-		fi
-.endfor
-		@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
-		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
-.endif
-		@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
-			${PREFIX}/etc/cyrus.conf.dist
-		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-			${PREFIX}/cyrus/bin/mkimap
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-			POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
deleted file mode 100644
index d27d8877ced0..000000000000
--- a/mail/cyrus-imapd2/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (cyrus-imapd-2.1.18.tar.gz) = dbf0df884014b409145e927b822c8dd98b92a6c5fedb06fa440a034597225031
-SIZE (cyrus-imapd-2.1.18.tar.gz) = 1711522
-SHA256 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 1187f3e61e151c679ac0e9b85a4fc31294d31b2e5dad19d53f8890988b2c79c7
-SIZE (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 33500
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
deleted file mode 100644
index 8a6f77561179..000000000000
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ /dev/null
@@ -1,373 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of the SASL PLAIN mechanism.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-# Note that duplicate delivery suppression is required for Sieve.
-# Disabling duplicate delivery suppression will also disable Sieve,
-# and as such should only be disabled for performance reasons.
-#
-#duplicatesuppression: yes
-
-# 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.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#tls_imap_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#tls_imap_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#tls_pop3_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#tls_pop3_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#tls_lmtp_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#tls_lmtp_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#tls_sieve_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#tls_sieve_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd2/files/imapd.in b/mail/cyrus-imapd2/files/imapd.in
deleted file mode 100644
index 1af0b40f32df..000000000000
--- a/mail/cyrus-imapd2/files/imapd.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-
-# Define these cyrus_imapd_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO"	# Enable imapd
-#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master"	# Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. /etc/rc.subr
-
-name="cyrus_imapd"
-rcvar=cyrus_imapd_enable
-command="%%PREFIX%%/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
-stop_postcmd="cyrus_imapd_poststop"
-
-cyrus_imapd_poststop() {
-	/bin/rm -f ${pidfile}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd2/files/patch-Makefile.in b/mail/cyrus-imapd2/files/patch-Makefile.in
deleted file mode 100644
index 501cf110817d..000000000000
--- a/mail/cyrus-imapd2/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig	Thu Nov 20 01:45:26 2003
-+++ Makefile.in	Sat Apr  3 03:15:59 2004
-@@ -98,7 +98,7 @@
- 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
- 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
- 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
-+	$(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8
- 	@for d in  $(SUBDIRS); \
- 	do \
- 		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/mail/cyrus-imapd2/files/patch-aa b/mail/cyrus-imapd2/files/patch-aa
deleted file mode 100644
index f5cb366c56f6..000000000000
--- a/mail/cyrus-imapd2/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Tue May 13 04:43:51 2003
-+++ man/Makefile.in	Sat Apr  3 03:17:17 2004
-@@ -97,7 +97,7 @@
- 	done
- 	for file in $(MAN8); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- 	done
- 
- .c.o:
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
deleted file mode 100644
index 0e94342e36bb..000000000000
--- a/mail/cyrus-imapd2/files/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Mon Mar  8 01:36:22 2004
-+++ configure	Mon Mar  8 01:44:26 2004
-@@ -3023,7 +3023,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in 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 ${with_bdb} 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
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3030: checking for db_create in -l$dbname" >&5
-@@ -6950,6 +6950,8 @@
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+    eval `${PERL} -V:cccdlflags`
-+    PERL_CCCDLFLAGS="$cccdlflags"
- fi
- 
- if test "$sievedir" != "no"; then
-@@ -7305,7 +7307,7 @@
- #define HAVE_UCDSNMP 1
- EOF
- 
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:7311: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
-@@ -7579,6 +7581,7 @@
- s%@LIB_SASL@%$LIB_SASL%g
- s%@SASLFLAGS@%$SASLFLAGS%g
- s%@PERL@%$PERL%g
-+s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g
- s%@MD5OBJ@%$MD5OBJ%g
- s%@SNMP_SUBDIRS@%$SNMP_SUBDIRS%g
- s%@LIB_WRAP@%$LIB_WRAP%g
diff --git a/mail/cyrus-imapd2/files/patch-acap::Makefile.in b/mail/cyrus-imapd2/files/patch-acap::Makefile.in
deleted file mode 100644
index 4015013eb362..000000000000
--- a/mail/cyrus-imapd2/files/patch-acap::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acap/Makefile.in
-diff -u acap/Makefile.in.orig acap/Makefile.in
---- acap/Makefile.in.orig	Mon Jul 14 00:04:56 2003
-+++ acap/Makefile.in	Mon Mar  8 02:10:58 2004
-@@ -54,7 +54,7 @@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc
deleted file mode 100644
index 5cfa94b53a1f..000000000000
--- a/mail/cyrus-imapd2/files/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Mar 25 02:54:43 2003
-+++ imap/Makefile.in	Sat May  3 03:05:40 2003
-@@ -61,7 +61,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../sieve -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- IMAP_LIBS = @IMAP_LIBS@
- SIEVE_LIBS = @SIEVE_LIBS@
-@@ -243,12 +243,12 @@
- mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd2/files/patch-bd b/mail/cyrus-imapd2/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd2/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig	Thu Mar  9 19:07:14 2000
---- imap/config.c	Thu Mar  9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-  
-  extern int errno;
-  
-+ #if !defined(CONFIG_FILENAME)
-  #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-  
-  struct configlist {
-      char *key;
diff --git a/mail/cyrus-imapd2/files/patch-be b/mail/cyrus-imapd2/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd2/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig	Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c	Wed Oct  8 13:56:58 1997
-@@ -29,7 +29,9 @@
- 
- #define EXIT_CHOKE (int) 10
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
- 
- int errno;
diff --git a/mail/cyrus-imapd2/files/patch-config.h.in b/mail/cyrus-imapd2/files/patch-config.h.in
deleted file mode 100644
index 21d0bcd1b1c6..000000000000
--- a/mail/cyrus-imapd2/files/patch-config.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Tue Aug 19 04:47:14 2003
-+++ config.h.in	Tue Aug 19 04:50:46 2003
-@@ -364,7 +364,7 @@
- #endif
- 
- /* sendmail configuration parameters */
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-dc b/mail/cyrus-imapd2/files/patch-dc
deleted file mode 100644
index 10bec3adc883..000000000000
--- a/mail/cyrus-imapd2/files/patch-dc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Tue Feb  4 20:30:08 2003
-+++ master/Makefile.in	Tue Feb  4 20:31:00 2003
-@@ -52,7 +52,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd2/files/patch-dd b/mail/cyrus-imapd2/files/patch-dd
deleted file mode 100644
index 94c0d694fa90..000000000000
--- a/mail/cyrus-imapd2/files/patch-dd
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/masterconf.c
-diff -u master/masterconf.c.orig master/masterconf.c
---- master/masterconf.c.orig	Wed May 24 05:56:30 2000
-+++ master/masterconf.c	Sat Jan  6 06:07:22 2001
-@@ -60,7 +60,9 @@
- 
- extern int errno;
- 
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd2/files/patch-df b/mail/cyrus-imapd2/files/patch-df
deleted file mode 100644
index 69a0841343ee..000000000000
--- a/mail/cyrus-imapd2/files/patch-df
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service.c
-diff -u master/service.c.orig master/service.c
---- master/service.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service.c	Wed Jan 22 22:57:20 2003
-@@ -102,6 +102,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd2/files/patch-dg b/mail/cyrus-imapd2/files/patch-dg
deleted file mode 100644
index b413044ffd6c..000000000000
--- a/mail/cyrus-imapd2/files/patch-dg
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Fri Sep 28 01:02:34 2001
-+++ tools/mkimap	Tue Jan 28 18:00:32 2003
-@@ -64,6 +64,9 @@
- $nosievedir = 0;
- $hashispool = 0;
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- open CONF, $imapdconf or die "can't open $imapdconf";
- print "reading configure file...\n";
- while (<CONF>) {
-@@ -117,6 +120,8 @@
- mkdir "log", 0755;
- mkdir "msg", 0755;
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- # create the sieve stuff
- if (!$nosievedir) {
-     print "creating $sievedir...\n";
-@@ -125,6 +130,7 @@
-     if (chdir $sievedir) {
- 	foreach $i ("a".."z") { mkdir "$i", 0755; }
-     }
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $sievedir";
- }
- 
- $flag = 0;
-@@ -136,6 +142,7 @@
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755;
-     if ($hashispool) { foreach $i ("a".."z") { mkdir $i, 0755; } }
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd2/files/patch-imap::imapd.h b/mail/cyrus-imapd2/files/patch-imap::imapd.h
deleted file mode 100644
index 174bdc896d25..000000000000
--- a/mail/cyrus-imapd2/files/patch-imap::imapd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: imap/imapd.h
-diff -u imap/imapd.h.orig imap/imapd.h
---- imap/imapd.h.orig	Fri Feb 14 05:15:25 2003
-+++ imap/imapd.h	Fri Dec 15 11:35:44 2006
-@@ -54,17 +54,8 @@
- /* Authorization state for logged in userid */
- extern struct auth_state *imapd_authstate;
- 
--/* True if user is an admin */
--extern int imapd_userisadmin;
--
--/* Currently open mailbox */
--extern struct mailbox *imapd_mailbox;
--
- /* Number of messages in currently open mailbox */
- extern int imapd_exists;
--
--/* Name of client host */
--extern char imapd_clienthost[];
- 
- /* List of strings, for fetch and search argument blocks */
- struct strlist {
diff --git a/mail/cyrus-imapd2/files/patch-imtest::imtest.c b/mail/cyrus-imapd2/files/patch-imtest::imtest.c
deleted file mode 100644
index 8e082841d319..000000000000
--- a/mail/cyrus-imapd2/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Wed Mar 19 10:29:22 2003
-+++ imtest/imtest.c	Sun May 11 16:47:11 2003
-@@ -417,8 +417,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
diff --git a/mail/cyrus-imapd2/files/patch-lib::Makefile.in b/mail/cyrus-imapd2/files/patch-lib::Makefile.in
deleted file mode 100644
index 8243d414d431..000000000000
--- a/mail/cyrus-imapd2/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Sun Jan  4 00:16:44 2004
-+++ lib/Makefile.in	Sun Mar  7 23:44:51 2004
-@@ -60,7 +60,7 @@
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-master::service-thread.c b/mail/cyrus-imapd2/files/patch-master::service-thread.c
deleted file mode 100644
index 9a2016c3c64a..000000000000
--- a/mail/cyrus-imapd2/files/patch-master::service-thread.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service-thread.c
-diff -u master/service-thread.c.orig master/service-thread.c
---- master/service-thread.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service-thread.c	Wed Jan 22 23:09:52 2003
-@@ -99,6 +99,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd2/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd2/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index eb67dcfcf5b9..000000000000
--- a/mail/cyrus-imapd2/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig	Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL	Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
-     'INC'	=> "-I../../lib $SASL_INC $OPENSSL_INC", 
-     'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in
deleted file mode 100644
index 28d4c44df294..000000000000
--- a/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: perl/sieve/lib/Makefile.in
-diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
---- perl/sieve/lib/Makefile.in.orig	Sun Jan  4 00:16:45 2004
-+++ perl/sieve/lib/Makefile.in	Sun Mar  7 23:42:37 2004
-@@ -55,7 +55,7 @@
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
- 
--CFLAGS = -g
-+CFLAGS = -g @PERL_CCCDLFLAGS@
- LDFLAGS = -g @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index 9b28ce08bdc6..000000000000
--- a/mail/cyrus-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig	Thu Oct 23 03:50:27 2003
-+++ perl/sieve/managesieve/Makefile.PL	Sun Dec 12 04:21:55 2004
-@@ -64,3 +64,10 @@
-     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'	=> "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd2/files/patch-sieve::Makefile.in b/mail/cyrus-imapd2/files/patch-sieve::Makefile.in
deleted file mode 100644
index 75245207c3a4..000000000000
--- a/mail/cyrus-imapd2/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Sun Jul 13 23:40:05 2003
-+++ sieve/Makefile.in	Mon Mar  8 01:38:00 2004
-@@ -35,7 +35,7 @@
- 
- DEFS = @DEFS@
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd2/pkg-deinstall b/mail/cyrus-imapd2/pkg-deinstall
deleted file mode 100644
index 79a1e28eead2..000000000000
--- a/mail/cyrus-imapd2/pkg-deinstall
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/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_PREIFX}/etc/imapd.conf
-		checkfile ${PKG_PREIFX}/etc/cyrus.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac
diff --git a/mail/cyrus-imapd2/pkg-descr b/mail/cyrus-imapd2/pkg-descr
deleted file mode 100644
index 64e5e4bcbcc2..000000000000
--- a/mail/cyrus-imapd2/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol. 
-The Cyrus IMAP server is a scaleable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers.  It differs from other
-IMAP server implementations in that it is run on "sealed" servers, where
-users are not normally permitted to log in.  The mailbox database is stored
-in parts of the filesystem that are private to the Cyrus IMAP system.  All
-user access to mail is through software using the IMAP, POP3, or KPOP
-protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability.  Multiple concurrent
-read/write connections to the same mailbox are permitted.  The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
-WWW: http://cyrusimap.web.cmu.edu/
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
deleted file mode 100644
index 68285b641b88..000000000000
--- a/mail/cyrus-imapd2/pkg-install
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-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 $1.dist >/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 $1.dist $1
-			;;
-	esac
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (2000/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd2/pkg-message b/mail/cyrus-imapd2/pkg-message
deleted file mode 100644
index ff816e46e925..000000000000
--- a/mail/cyrus-imapd2/pkg-message
+++ /dev/null
@@ -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.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
deleted file mode 100644
index 21f2df4bca30..000000000000
--- a/mail/cyrus-imapd2/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-%%MURDER%%cyrus/bin/lmtpproxyd
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-%%MURDER%%cyrus/bin/pop3proxyd
-%%MURDER%%cyrus/bin/proxyd
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
-etc/cyrus.conf.dist
-@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
-@unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi
-etc/imapd.conf.dist
-@exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf
-include/cyrus/acap.h
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.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/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libacap.a
-lib/libcyrus.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-@dirrm cyrus/bin
-@dirrm include/cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
deleted file mode 100644
index fd554200caf2..000000000000
--- a/mail/cyrus-imapd22/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	cyrus-imapd
-PORTVERSION=	2.2.13p1
-PORTREVISION=	4
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-PKGNAMESUFFIX=	22
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-DEPRECATED=	No further releases of 2.2.X are planned, consider using 2.4.X.
-EXPIRATION_DATE=2014-06-30
-
-LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-
-CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].* cyrus-imapd2[^2]-2.[^2].*
-
-PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
-
-USE_RC_SUBR=	imapd
-USES=		perl5
-USE_OPENSSL=	yes
-USE_BDB=	yes
-INVALID_BDB_VER=2 45+
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
-		--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-user=${CYRUS_USER} \
-		--with-cyrus-group=${CYRUS_GROUP} \
-		--with-sasl=${LOCALBASE} \
-		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
-		--with-bdb-libdir=${LOCALBASE}/lib \
-		--with-bdb=${BDB_LIB_NAME} \
-		--with-com_err \
-		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5}
-
-OPTIONS_DEFINE=		DRAC IDLE_IDLED IDLE_POLL LDAP_PTLOADER LISTEXT \
-			MURDER NETSCAPEHACK NNTP SNMP_5 PASS8BITHACK
-OPTIONS_DEFAULT=	IDLE_POLL
-DRAC_DESC=		Enable DRAC support
-IDLE_IDLED_DESC=	Enable IMAP IDLE method idled
-IDLE_POLL_DESC=		Enable IMAP IDLE method idle-polling
-LDAP_PTLOADER_DESC=	Enable LDAP ptloader (experimantal)
-LISTEXT_DESC=		Enable IMAP List extensions
-MURDER_DESC=		Enable IMAP Murder support
-NETSCAPEHACK_DESC=	Enable X-NETSCAPE extensions
-NNTP_DESC=		Enable NNTP support
-SNMP_5_DESC=		Enable SNMP support
-PASS8BITHACK_DESC=	Add pass8bit option (not recommended)
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 501400
-IGNORE=		does not build with Perl 5.14+, use mail/cyrus-imapd23 instead 
-.endif
-
-.if ${PORT_OPTIONS:MNNTP}
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+=	NNTP=""
-.else
-PLIST_SUB+=	NNTP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMURDER}
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	MURDER=""
-.else
-PLIST_SUB+=	MURDER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIDLE_IDLED} && ${PORT_OPTIONS:MIDLE_POLL}
-BROKEN=		Multiple IDLE methods selected.  Run 'make config' again!
-.endif
-.if ${PORT_OPTIONS:MIDLE_IDLED}
-CONFIGURE_ARGS+=--with-idle=idled
-PLIST_SUB+=	IDLED=""
-.elif ${PORT_OPTIONS:MIDLE_POLL}
-CONFIGURE_ARGS+=--with-idle=poll
-PLIST_SUB+=	IDLED="@comment "
-.elif !${PORT_OPTIONS:MIDLE_IDLED} && !${PORT_OPTIONS:MIDLE_POLL}
-CONFIGURE_ARGS+=--with-idle=no
-PLIST_SUB+=	IDLED="@comment "
-.else
-PLIST_SUB+=	IDLED="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLISTEXT}
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if ${PORT_OPTIONS:MNETSCAPEHACK}
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if ${PORT_OPTIONS:MDRAC}
-#EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
-		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
-		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf autoheader
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if ${PORT_OPTIONS:MSNMP_5}
-LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-snmp=no
-.endif
-
-.if ${PORT_OPTIONS:MLDAP_PTLOADER}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+=	LDAP_PTLOADER=""
-.else
-PLIST_SUB+=	LDAP_PTLOADER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPASS8BITHACK}
-EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
-.endif
-
-.if !exists(/usr/lib/libkrb5.a) || ${OSVERSION} >= 800037
-CONFIGURE_ARGS+=--disable-gssapi
-.endif
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3=		imclient.3
-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 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
-		fetchnews.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 syncnews.8 \
-		timsieved.8 tls_prune.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install-virtdomains \
-		mailing-list man notes os overview questions readme sieve \
-		sieve-protocol 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
-.if ${PORT_OPTIONS:MDRAC}
-		@${RM} -rf ${WRKSRC}/autom4te.cache
-.endif
-
-post-install:
-.for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
-		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
-			>>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
-		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
-		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
-		@${MKDIR} ${DOCSDIR}/man
-		@${MKDIR} ${DOCSDIR}/text
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
-		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
-			${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} ${DOCSDIR}
-		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
-.endfor
-.for f in ${DOCS}
-		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
-		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
-.endif
-		@${MKDIR} ${EXAMPLESDIR}
-		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
-.for f in ${CONFS}
-		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
-		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
-		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
-			>>${TMPPLIST}
-		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-			${PREFIX}/cyrus/bin/mkimap
-		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
-			${PREFIX}/cyrus/bin/masssievec
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-			POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
deleted file mode 100644
index e834d4cf4f56..000000000000
--- a/mail/cyrus-imapd22/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cyrus-imapd-2.2.13p1.tar.gz) = ddb8d7702e57be9df594b96d62ef49c9011f58c551e1ae9a1228d7f7ca36a80a
-SIZE (cyrus-imapd-2.2.13p1.tar.gz) = 2045823
diff --git a/mail/cyrus-imapd22/files/drac_auth.patch b/mail/cyrus-imapd22/files/drac_auth.patch
deleted file mode 100644
index 40409d2171bb..000000000000
--- a/mail/cyrus-imapd22/files/drac_auth.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-$Id: drac_auth.patch,v 1.18 2003/12/19 20:01:58 ken3 Exp $
-
-Patch to add support for Dynamic Relay Authorization Control
-
-For more information about DRAC, see:
-	http://mail.cc.umanitoba.ca/drac/index.html
-
-
-Installation
-------------
-
-1.  Apply this patch in the toplevel directory using the following command:
-
-	# patch -p0 < contrib/drac_auth.patch
-
-2.  Cleanup any previous builds:
-
-	# make distclean
-
-3a. If you DO NOT have 'smake' and 'autoconf' installed on your system, goto
-    step 3b.
-
-    Perform the following to reconfigure your build:
-
-	# rm configure
-	# sh SMakefile
-	# ./configure ... --with-drac=<location of libdrac>
-
-    NOTE: you can find your original configure command in config.status
-
-    Proceed to step 4.
-
-3b. Edit imap/Makefile and modify the following three variables:
-
-	DEFS = ... -DDRAC_AUTH
-	LIBS = ... -ldrac
-	LDFLAGS = ... -L<location of libdrac>
-
-4.  Build and install the software:
-
-	# make
-	# make install
-
-5.  If dracd is not running on the same system as Cyrus (localhost),
-    use the 'drachost' option in imapd.conf(5) to specify the hostname of
-    the dracd server.
-
-6.  Installation is complete!
-
-
-Operation
----------
-
-The behavior of DRAC is controlled by the value of the 'dracinterval' option
-in imapd.conf(5).  If 'dracinterval' is 0 (zero), DRAC support is disabled.
-Otherwise, DRAC support is enabled and has the following behavior:
-
-pop3d: Whenever a client opens a user's INBOX, drac_auth() is called.
-
-imapd: Once a client is logged in (via LOGIN or AUTHENTICATE),
-       drac_send() will be called once every 'dracinterval' minutes.
-
-
-
-
-
-Index: configure.in
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/configure.in,v
-retrieving revision 1.273
-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 @@
- SNMP_SUBDIRS=""
- AC_SUBST(SNMP_SUBDIRS)
- 
-+dnl
-+dnl Test for DRAC
-+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)
-+AC_SUBST(DRACLIBS)
-+
- CMU_LIBWRAP
- CMU_UCDSNMP
- 
-Index: imap/Makefile.in
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/imap/Makefile.in,v
-retrieving revision 1.179
-diff -u -r1.179 Makefile.in
---- imap/Makefile.in	12 Nov 2003 04:02:01 -0000	1.179
-+++ imap/Makefile.in	19 Dec 2003 19:56:19 -0000
-@@ -67,6 +67,7 @@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
-+DRAC_LIBS = @DRACLIBS@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
- DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
-@@ -215,17 +216,17 @@
- imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o imapd \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
--	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
- 
- proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o proxyd \
-@@ -252,7 +253,7 @@
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
--	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
- 	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-Index: imap/imapd.c
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/imap/imapd.c,v
-retrieving revision 1.448
-diff -u -r1.448 imapd.c
---- imap/imapd.c	5 Dec 2003 21:33:07 -0000	1.448
-+++ imap/imapd.c	19 Dec 2003 19:56:19 -0000
-@@ -126,6 +126,18 @@
-     1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
- };
- 
-+#ifdef DRAC_AUTH
-+static struct {
-+    int interval;		/* dracd "ping" interval; 0 = disabled */
-+    unsigned long clientaddr;
-+    struct prot_waitevent *event;
-+} drac;
-+
-+extern int dracconn(char *server, char **errmsg);
-+extern int dracsend(unsigned long userip, char **errmsg);
-+extern int dracdisc(char **errmsg);
-+#endif /* DRAC_AUTH */
-+
- /* current sub-user state */
- static struct mailbox mboxstruct;
- static struct mailbox *imapd_mailbox;
-@@ -446,6 +458,23 @@
-     /* setup for sending IMAP IDLE notifications */
-     idle_enabled();
- 
-+#ifdef DRAC_AUTH
-+    /* setup for sending DRAC "pings" */
-+    drac.event = NULL;
-+    drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
-+    if (drac.interval < 0) drac.interval = 0;
-+    if (drac.interval) {
-+	char *err;
-+
-+	if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
-+	    /* disable DRAC */
-+	    drac.interval = 0;
-+	    syslog(LOG_ERR, "dracconn: %s", err);
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	}
-+    }
-+#endif /* DRAC_AUTH */
-+
-     /* create connection to the SNMP listener, if available. */
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -531,6 +560,15 @@
- 		imapd_haveaddr = 1;
- 	    }
- 	}
-+
-+#ifdef DRAC_AUTH
-+	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
-+	    drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
-+	else
-+	    drac.clientaddr = 0;
-+    } else {
-+	drac.clientaddr = 0;
-+#endif /* DRAC_AUTH */
-     }
- 
-     /* create the SASL connection */
-@@ -573,6 +611,11 @@
-     prot_flush(imapd_out);
-     snmp_increment(ACTIVE_CONNECTIONS, -1);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.event) prot_removewaitevent(imapd_in, drac.event);
-+    drac.event = NULL;
-+#endif /* DRAC_AUTH */
-+
-     /* cleanup */
-     imapd_reset();
- 
-@@ -646,6 +689,10 @@
- 
-     cyrus_done();
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval) (void) dracdisc((char **)NULL);
-+#endif /* DRAC_AUTH */
-+
-     exit(code);
- }
- 
-@@ -668,6 +715,35 @@
-     shut_down(code);
- }
- 
-+#ifdef DRAC_AUTH
-+/*
-+ * Ping dracd every 'drac.interval' minutes
-+ * to let it know that we are still connected
-+ */
-+struct prot_waitevent *drac_ping(struct protstream *s,
-+				 struct prot_waitevent *ev, void *rock)
-+{
-+    char *err;
-+    static int nfailure = 0;
-+
-+    if (dracsend(drac.clientaddr, &err) != 0) {
-+	syslog(LOG_ERR, "dracsend: %s", err);
-+	if (++nfailure >= 3) {
-+	    /* can't contact dracd for 3 consecutive tries - disable DRAC */
-+	    prot_removewaitevent(s, ev);
-+	    drac.event = NULL;
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	    return NULL;
-+	}
-+    }
-+    else
-+	nfailure = 0;
-+
-+    ev->mark = time(NULL) + (drac.interval * 60);
-+    return ev;
-+}
-+#endif /* DRAC_AUTH */
-+
- /*
-  * Top-level command loop parsing
-  */
-@@ -1680,6 +1756,11 @@
- 
-     prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
-+
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
- 
-@@ -1803,6 +1884,11 @@
- 
-     prot_setsasl(imapd_in,  imapd_saslconn);
-     prot_setsasl(imapd_out, imapd_saslconn);
-+
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
- 
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-Index: imap/pop3d.c
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/imap/pop3d.c,v
-retrieving revision 1.147
-diff -u -r1.147 pop3d.c
---- imap/pop3d.c	24 Oct 2003 18:24:07 -0000	1.147
-+++ imap/pop3d.c	19 Dec 2003 19:56:19 -0000
-@@ -101,6 +101,10 @@
- extern int opterr;
- 
- 
-+#ifdef DRAC_AUTH
-+static int drac_enabled;
-+extern int dracauth(char *server, unsigned long userip, char **errmsg);
-+#endif /* DRAC_AUTH */
- 
- #ifdef HAVE_SSL
- static SSL *tls_conn;
-@@ -394,6 +398,10 @@
-     prot_settimeout(popd_in, timeout*60);
-     prot_setflushonread(popd_in, popd_out);
- 
-+#ifdef DRAC_AUTH
-+    drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
-+#endif /* DRAC_AUTH */
-+
-     if (kflag) kpop();
- 
-     /* we were connected on pop3s port so we should do 
-@@ -1415,6 +1423,21 @@
- 	popd_mailbox = &mboxstruct;
- 	proc_register("pop3d", popd_clienthost, popd_userid,
- 		      popd_mailbox->name);
-+
-+#ifdef DRAC_AUTH
-+	if (drac_enabled &&
-+	    ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
-+	    char *err;
-+
-+	    if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
-+			 ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
-+		/* disable DRAC */
-+		drac_enabled = 0;
-+		syslog(LOG_ERR, "dracauth: %s", err);
-+		syslog(LOG_ERR, "DRAC notifications disabled");
-+	    }
-+	}
-+#endif /* DRAC_AUTH */
-     }
- 
-     /* Create telemetry log */
-Index: imap/version.c
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/imap/version.c,v
-retrieving revision 1.15
-diff -u -r1.15 version.c
---- imap/version.c	15 Dec 2003 20:00:41 -0000	1.15
-+++ imap/version.c	19 Dec 2003 19:56:19 -0000
-@@ -145,6 +145,10 @@
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; %s", SIEVE_VERSION);
- #endif
-+#ifdef DRAC_AUTH
-+    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
-+	     "; DRAC");
-+#endif
- #ifdef HAVE_LIBWRAP
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; TCP Wrappers");
-Index: lib/imapoptions
-===================================================================
-RCS file: /afs/andrew/system/cvs/src/cyrus/lib/imapoptions,v
-retrieving revision 1.8
-diff -u -r1.8 imapoptions
---- lib/imapoptions	15 Dec 2003 20:00:42 -0000	1.8
-+++ lib/imapoptions	19 Dec 2003 19:56:19 -0000
-@@ -195,6 +195,14 @@
- { "deleteright", "c", STRING }
- /* The right that a user needs to delete a mailbox. */
- 
-+{ "dracinterval", 5, INT }
-+/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
-+   Control) by the pop3d and imapd daemons.  Also sets the interval
-+   (in minutes) between re-authorization requests made by imapd. */
-+
-+{ "drachost", "localhost", STRING }
-+/* Hostname of the RPC dracd server. */
-+
- { "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/mail/cyrus-imapd22/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd22/files/extra-patch-cmulocal::berkdb.m4
deleted file mode 100644
index 6d488fdc76ca..000000000000
--- a/mail/cyrus-imapd22/files/extra-patch-cmulocal::berkdb.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: cmulocal/berkdb.m4
-diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
---- cmulocal/berkdb.m4.orig	Wed Apr 27 04:14:07 2005
-+++ cmulocal/berkdb.m4	Sat Apr  1 01:51:58 2006
-@@ -213,10 +213,11 @@
- 	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 ${with_bdb} 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>],
-+	    AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- 	    [db_create(NULL, NULL, 0);],
- 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
-             dblib="no")
-@@ -224,7 +225,8 @@
-           done
-         if test "$dblib" = "no"; then
- 	    LIBS="$saved_LIBS -ldb"
--	    AC_TRY_LINK([#include <db.h>],
-+	    AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- 	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
- 	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
-             dblib="no")
diff --git a/mail/cyrus-imapd22/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd22/files/extra-patch-cmulocal::ucdsnmp.m4
deleted file mode 100644
index 829d92d23585..000000000000
--- a/mail/cyrus-imapd22/files/extra-patch-cmulocal::ucdsnmp.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: cmulocal/ucdsnmp.m4
-diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
---- cmulocal/ucdsnmp.m4.orig	Tue May 25 10:27:58 2004
-+++ cmulocal/ucdsnmp.m4	Sat Dec 10 16:34:09 2005
-@@ -31,9 +31,12 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
-       AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
-       AC_SUBST(LIB_UCDSNMP)
-+      AC_SUBST(LDFLAGS_UCDSNMP)
-       AC_MSG_RESULT(yes)
-     else
-       AC_MSG_RESULT(no)
-@@ -59,7 +62,7 @@
-     LIB_UCDSNMP=""
-     if test "$with_snmp" != no; then
-       AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-     fi
diff --git a/mail/cyrus-imapd22/files/extra-patch-configure.in b/mail/cyrus-imapd22/files/extra-patch-configure.in
deleted file mode 100644
index 1a89d771ee93..000000000000
--- a/mail/cyrus-imapd22/files/extra-patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig	Sat May 29 04:59:21 2004
-+++ configure.in	Sat May 29 05:03:04 2004
-@@ -933,7 +933,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl    eval `${PERL} -V:cccdlflags`
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
-     AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
deleted file mode 100644
index d0f32d1bbe81..000000000000
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ /dev/null
@@ -1,412 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of cleartext passwords on the wire.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-#
-#duplicatesuppression: yes
-
-# 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.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# The cyrusdb backend to use for mailbox annotations.
-# Allowed values: berkeley, skiplist
-#
-#annotation_db: skiplist
-
-# The cyrusdb backend to use for the duplicate delivery suppression
-# and sieve.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#duplicate_db: berkeley-nosync
-
-# The cyrusdb backend to use for the mailbox list.
-# Allowed values: flat, berkeley, skiplist
-#
-#mboxlist_db: skiplist
-
-# The cyrusdb backend to use for the pts cache.
-# Allowed values: berkeley, skiplist
-#
-#ptscache_db: berkeley
-
-# The cyrusdb backend to use for the seen state.
-# Allowed values: flat, berkeley, skiplist
-#
-#seenstate_db: skiplist
-
-# The cyrusdb backend to use for the subscriptions list.
-# Allowed values: flat, berkeley, skiplist
-#
-#subscription_db: flat
-
-# The cyrusdb backend to use for the TLS cache.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#tlscache_db: berkeley-nosync
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd22/files/imapd.in b/mail/cyrus-imapd22/files/imapd.in
deleted file mode 100644
index 1af0b40f32df..000000000000
--- a/mail/cyrus-imapd22/files/imapd.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-
-# Define these cyrus_imapd_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO"	# Enable imapd
-#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master"	# Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. /etc/rc.subr
-
-name="cyrus_imapd"
-rcvar=cyrus_imapd_enable
-command="%%PREFIX%%/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
-stop_postcmd="cyrus_imapd_poststop"
-
-cyrus_imapd_poststop() {
-	/bin/rm -f ${pidfile}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd22/files/pass8bit.diff b/mail/cyrus-imapd22/files/pass8bit.diff
deleted file mode 100644
index 74389a491c30..000000000000
--- a/mail/cyrus-imapd22/files/pass8bit.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: imap/message.c
-diff -u -p imap/message.c.orig imap/message.c
---- imap/message.c.orig	Sat Feb 28 02:44:55 2004
-+++ imap/message.c	Thu Oct  7 20:21:04 2004
-@@ -227,6 +227,7 @@ unsigned size;
-     int n;
-     int sawcr = 0, sawnl;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
-     int inheader = 1, blankline = 1;
- 
-     while (size) {
-@@ -262,7 +263,7 @@ unsigned size;
- 			/* We have been configured to reject all mail of this
- 			   form. */
- 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
--		    } else {
-+		    } else if (!pass8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			*p = 'X';
-Index: imap/spool.c
-diff -u -p imap/spool.c.orig imap/spool.c
---- imap/spool.c.orig	Fri Mar  5 01:09:34 2004
-+++ imap/spool.c	Thu Oct  7 20:20:57 2004
-@@ -140,6 +140,7 @@ static int parseheader(struct protstream
-     state s = NAME_START;
-     int r = 0;
-     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
-+    int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
-     const char **skip = NULL;
- 
-     if (namelen == 0) {
-@@ -266,7 +267,7 @@ static int parseheader(struct protstream
- 			   form. */
- 			r = IMAP_MESSAGE_CONTAINS8BIT;
- 			goto ph_error;
--		    } else {
-+		    } else if (!pass8bit) {
- 			/* We have been configured to munge all mail of this
- 			   form. */
- 			c = 'X';
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Jul 22 04:07:45 2004
-+++ lib/imapoptions	Thu Oct  7 20:00:04 2004
-@@ -95,6 +95,12 @@
- { "afspts_mycell", NULL, STRING }
- /* Cell to use for AFS PTS lookups.  Defaults to the local cell. */
- 
-+{ "pass8bit", 0, SWITCH }
-+/* If enabled, lmtpd accepts messages with 8-bit characters in the
-+   headers without changing to `X'.  This option is strongly not
-+   recommended.  (A proper soultion to non-ASCII characters in headers
-+   is offered by RFC 2047 and its predecessors.) */
-+
- { "allowallsubscribe", 0, SWITCH }
- /* Allow subscription to nonexistent mailboxes.  This option is
-    typically used on backend servers in a Murder so that users can
diff --git a/mail/cyrus-imapd22/files/patch-Makefile.in b/mail/cyrus-imapd22/files/patch-Makefile.in
deleted file mode 100644
index 71800e59efb8..000000000000
--- a/mail/cyrus-imapd22/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig	Sat May 15 05:59:10 2004
-+++ Makefile.in	Wed May 19 00:23:11 2004
-@@ -97,13 +97,13 @@
- 	touch distcvs
- 
- install::
--	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
--	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
--	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
-+	$(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin
-+	$(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib
-+	$(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man1
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man3
-+	$(INSTALL) -d ${DESTDIR}$(mandir)/man5
-+	$(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
- 	@for d in  $(SUBDIRS); \
- 	do \
- 		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa
deleted file mode 100644
index 1438b30aa60f..000000000000
--- a/mail/cyrus-imapd22/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Wed Mar 31 00:18:41 2004
-+++ man/Makefile.in	Wed May 19 01:52:50 2004
-@@ -50,6 +50,7 @@
- SHELL = /bin/sh
- 
- prefix = @prefix@
-+cyrus_prefix = @cyrus_prefix@
- 
- mandir = @mandir@
- 
-@@ -93,7 +94,7 @@
- 	done
- 	for file in $(MAN8); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- 	done
- 
- clean:
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
deleted file mode 100644
index dc89adbb1673..000000000000
--- a/mail/cyrus-imapd22/files/patch-ac
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Sat Apr  1 00:25:50 2006
-+++ configure	Sat Apr  1 01:08:23 2006
-@@ -310,6 +310,7 @@
- #endif"
- 
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -7701,7 +7702,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 ${with_bdb} 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"
- 	    cat >conftest.$ac_ext <<_ACEOF
-@@ -7710,6 +7711,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
-@@ -15337,6 +15339,7 @@
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
- 
- fi
-@@ -16357,7 +16360,9 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NETSNMP 1
-@@ -16606,7 +16611,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
- 
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -17432,6 +17437,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
diff --git a/mail/cyrus-imapd22/files/patch-bc b/mail/cyrus-imapd22/files/patch-bc
deleted file mode 100644
index df4b302b3098..000000000000
--- a/mail/cyrus-imapd22/files/patch-bc
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Wed Nov 12 13:02:01 2003
-+++ imap/Makefile.in	Thu Mar 11 01:16:00 2004
-@@ -132,10 +132,10 @@
- 
- 
- install:
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
- 	for file in $(PROGS); \
- 	do \
--		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- 	done
- 	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
- 
-@@ -242,13 +242,13 @@
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd22/files/patch-dg b/mail/cyrus-imapd22/files/patch-dg
deleted file mode 100644
index 3a03d9c9325d..000000000000
--- a/mail/cyrus-imapd22/files/patch-dg
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Fri Dec  2 04:12:34 2005
-+++ tools/mkimap	Sat Apr  1 01:13:06 2006
-@@ -90,6 +90,9 @@
- 
- $imapdconf = shift || "/etc/imapd.conf";
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- push @configs, $imapdconf;
- 
- while ($conf = shift @configs) {
-@@ -100,6 +103,7 @@
- 
- print "configuring $d...\n";
- 
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
- 
- mkdir "proc", 0755 || warn "can't create $d/proc: $!";
-@@ -109,11 +113,14 @@
- mkdir "msg", 0755 || warn "can't create $d/msg: $!";
- mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!";
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
-     print "creating $part...\n";
-     mkdir $part, 0755 || warn "can't create $part: $!";
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755 || warn "can't create $part/stage.: $!";
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd22/files/patch-imap::backend.c b/mail/cyrus-imapd22/files/patch-imap::backend.c
deleted file mode 100644
index a955d0a2d6fd..000000000000
--- a/mail/cyrus-imapd22/files/patch-imap::backend.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/backend.c
-diff -u -p imap/backend.c.orig imap/backend.c
---- imap/backend.c.orig	Wed Feb  8 05:57:27 2006
-+++ imap/backend.c	Sun Apr  2 13:39:57 2006
-@@ -271,7 +271,7 @@ struct backend *backend_connect(struct b
-     /* 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/mail/cyrus-imapd22/files/patch-imap::fetchnews.c b/mail/cyrus-imapd22/files/patch-imap::fetchnews.c
deleted file mode 100644
index cba683c8faec..000000000000
--- a/mail/cyrus-imapd22/files/patch-imap::fetchnews.c
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: imap/fetchnews.c
-diff -u -p imap/fetchnews.c.orig imap/fetchnews.c
---- imap/fetchnews.c.orig	Wed Mar 23 09:40:11 2005
-+++ imap/fetchnews.c	Fri Apr 14 23:36:14 2006
-@@ -38,7 +38,7 @@
-  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  *
-- * $Id: fetchnews.c,v 1.14 2005/03/23 00:40:11 shadow Exp $
-+ * $Id: fetchnews.c,v 1.15 2006/04/10 16:19:33 murch Exp $
-  */
- 
- #include <config.h>
-@@ -60,6 +60,7 @@
- #include "cyrusdb.h"
- #include "exitcodes.h"
- #include "global.h"
-+#include "gmtoff.h"
- #include "lock.h"
- #include "prot.h"
- #include "xmalloc.h"
-@@ -388,6 +389,7 @@ int main(int argc, char *argv[])
- 	       &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec);
- 	ctime.tm_year -= 1900;
- 	ctime.tm_mon--;
-+	ctime.tm_isdst = -1;
- 
- 	/* read the previous timestamp */
- 	if (!sfile[0]) {
-@@ -417,6 +419,7 @@ int main(int argc, char *argv[])
- 	/* ask for new articles */
- 	if (stamp) stamp -= 180; /* adjust back 3 minutes */
- 	ptime = gmtime(&stamp);
-+	ptime->tm_isdst = -1;
- 	strftime(buf, sizeof(buf), datefmt, ptime);
- 	prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf);
- 	
-@@ -433,7 +436,7 @@ int main(int argc, char *argv[])
- 	   We can't change this, otherwise we'd be incompatible
- 	   with an old localtime timestamp.
- 	*/
--	stamp -= timezone;
-+	stamp += gmtoff_of(&ctime, stamp);
-     }
- 
-     if (!newnews) {
diff --git a/mail/cyrus-imapd22/files/patch-imtest::imtest.c b/mail/cyrus-imapd22/files/patch-imtest::imtest.c
deleted file mode 100644
index 957e35677d78..000000000000
--- a/mail/cyrus-imapd22/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Sun Jul 13 05:10:56 2003
-+++ imtest/imtest.c	Fri Jul 18 00:52:29 2003
-@@ -51,6 +51,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -419,8 +420,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
-@@ -886,6 +886,12 @@
-     }
-     
-     if (*str != '\r') {
-+	/* trim CRLF */
-+	char *p = str + strlen(str) - 1;
-+	if (p >= str && *p == '\n') *p-- = '\0';
-+	if (p >= str && *p == '\r') *p-- = '\0';
-+
-+	/* alloc space for decoded response */
- 	len = strlen(str) + 1;
- 	*line = malloc(len);
- 	if ((*line) == NULL) {
diff --git a/mail/cyrus-imapd22/files/patch-lib::Makefile.in b/mail/cyrus-imapd22/files/patch-lib::Makefile.in
deleted file mode 100644
index 543ece89f131..000000000000
--- a/mail/cyrus-imapd22/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Mar 11 06:25:39 2004
-+++ lib/Makefile.in	Wed May 19 00:34:19 2004
-@@ -102,7 +102,7 @@
- all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
- 
- install:
--	$(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-+	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
- 	 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
diff --git a/mail/cyrus-imapd22/files/patch-lib::imapoptions b/mail/cyrus-imapd22/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd22/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd22/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd22/files/patch-lib::libcyr_cfg.c
deleted file mode 100644
index 5cbb64001209..000000000000
--- a/mail/cyrus-imapd22/files/patch-lib::libcyr_cfg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/libcyr_cfg.c
-diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c
---- lib/libcyr_cfg.c.orig	Wed Mar 10 00:05:58 2004
-+++ lib/libcyr_cfg.c	Fri Feb 25 00:06:44 2005
-@@ -52,7 +52,7 @@
- #include "libcyr_cfg.h"
- #include "cyrusdb.h"
- 
--#if defined(__GNUC__) && __GNUC__ > 1
-+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER)
- /* We can use the GCC union constructor extension */
- #define CFGVAL(t,v)	(union cyrus_config_value)((t)(v))
- #else
diff --git a/mail/cyrus-imapd22/files/patch-master::Makefile.in b/mail/cyrus-imapd22/files/patch-master::Makefile.in
deleted file mode 100644
index c828109f247e..000000000000
--- a/mail/cyrus-imapd22/files/patch-master::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Sat May 29 03:03:05 2004
-+++ master/Makefile.in	Wed Jul 21 04:13:16 2004
-@@ -58,7 +58,7 @@
- DEPLIBS = @DEPLIBS@
- 
- CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
- LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
- 
- SHELL = /bin/sh
-@@ -76,10 +76,10 @@
- all: $(PROGS) $(LOBJS)
- 
- install:
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
- 	for file in $(PROGS); \
- 	do \
--		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- 	done
- 
- .c.o:
diff --git a/mail/cyrus-imapd22/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd22/files/patch-notifyd::Makefile.in
deleted file mode 100644
index d49703fa25b4..000000000000
--- a/mail/cyrus-imapd22/files/patch-notifyd::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: notifyd/Makefile.in
-diff -u notifyd/Makefile.in.orig notifyd/Makefile.in
---- notifyd/Makefile.in.orig	Wed Nov 12 13:02:10 2003
-+++ notifyd/Makefile.in	Fri Feb 13 18:41:07 2004
-@@ -79,7 +79,7 @@
- all: notifyd
- 
- install:
--	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-+	$(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path)
- 
- OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
- 
diff --git a/mail/cyrus-imapd22/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd22/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index eb67dcfcf5b9..000000000000
--- a/mail/cyrus-imapd22/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig	Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL	Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
-     'INC'	=> "-I../../lib $SASL_INC $OPENSSL_INC", 
-     'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd22/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd22/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index 73fd0f7a7a72..000000000000
--- a/mail/cyrus-imapd22/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig	Fri Oct 14 05:30:03 2005
-+++ perl/sieve/managesieve/Makefile.PL	Sat Apr  1 01:22:10 2006
-@@ -66,3 +66,10 @@
-     'CC'	=> $ENV{CC},
-     'LD'	=> $ENV{CC}
- );
-+
-+package MY;
-+sub install {
-+    my $inherited = shift->SUPER::install(@_);
-+    $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/;
-+    $inherited;
-+}
diff --git a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
deleted file mode 100644
index 99d494cf81d4..000000000000
--- a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in	Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
- 
-@@ -60,8 +61,8 @@
- dist: $(BUILT_SOURCES)
- 
- install: sievec
--	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
--	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-+	$(INSTALL) -d ${DESTDIR}$(service_path)
-+	$(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
- 
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd22/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd22/files/patch-timsieved::Makefile.in
deleted file mode 100644
index 4e0bc2841c2c..000000000000
--- a/mail/cyrus-imapd22/files/patch-timsieved::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timsieved/Makefile.in
-diff -u timsieved/Makefile.in.orig timsieved/Makefile.in
---- timsieved/Makefile.in.orig	Wed Nov 12 13:02:14 2003
-+++ timsieved/Makefile.in	Fri Feb 13 18:51:17 2004
-@@ -79,7 +79,7 @@
- all: timsieved
- 
- install:
--	$(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-+	$(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path)
- 
- OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
- 	../imap/tls.o
diff --git a/mail/cyrus-imapd22/pkg-deinstall b/mail/cyrus-imapd22/pkg-deinstall
deleted file mode 100644
index e0dd1b8bb7fc..000000000000
--- a/mail/cyrus-imapd22/pkg-deinstall
+++ /dev/null
@@ -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
diff --git a/mail/cyrus-imapd22/pkg-descr b/mail/cyrus-imapd22/pkg-descr
deleted file mode 100644
index 64e5e4bcbcc2..000000000000
--- a/mail/cyrus-imapd22/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol. 
-The Cyrus IMAP server is a scaleable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers.  It differs from other
-IMAP server implementations in that it is run on "sealed" servers, where
-users are not normally permitted to log in.  The mailbox database is stored
-in parts of the filesystem that are private to the Cyrus IMAP system.  All
-user access to mail is through software using the IMAP, POP3, or KPOP
-protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability.  Multiple concurrent
-read/write connections to the same mailbox are permitted.  The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
-WWW: http://cyrusimap.web.cmu.edu/
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
deleted file mode 100644
index d2ba72f75349..000000000000
--- a/mail/cyrus-imapd22/pkg-install
+++ /dev/null
@@ -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 (2000/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd22/pkg-message b/mail/cyrus-imapd22/pkg-message
deleted file mode 100644
index ff816e46e925..000000000000
--- a/mail/cyrus-imapd22/pkg-message
+++ /dev/null
@@ -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.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
deleted file mode 100644
index 08de3f26e71e..000000000000
--- a/mail/cyrus-imapd22/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyr_expire
-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
-%%MURDER%%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
-%%MURDER%%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/smmapd
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.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/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.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/strhash.o
-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_min.a
-lib/libcyrus.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%%EXAMPLESDIR%%/imapd.conf
-@dirrm cyrus/bin
-@dirrm include/cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
author	Rene Ladan <rene@FreeBSD.org>	2014-06-30 11:31:04 +0000
committer	Rene Ladan <rene@FreeBSD.org>	2014-06-30 11:31:04 +0000
commit	8c108f1a312eb49c4820e65179aaecc40b002c51 (patch)
tree	042dba241a120e8ea610123980307913c3c35b31
parent	- reset maintainer due to multiple timeouts [1] (diff)