This commit was manufactured by cvs2svn to create tag 'RELEASE_4_5_0'.release/4.5.0

22 files changed, 0 insertions, 758 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
deleted file mode 100644
index fded530a49ce..000000000000
--- a/mail/cyrus-imapd23/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Jan 4th 2001
-# Whom:						ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-
-PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
-
-MAINTAINER=	ume@FreeBSD.org
-
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
-		db3.2:${PORTSDIR}/databases/db3
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-group=cyrus \
-		--with-sasl=${LOCALBASE} \
-		--with-dbdir=${LOCALBASE} \
-		--with-auth=unix \
-		--with-com_err
-
-.if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
-.else
-CONFIGURE_ARGS+=--with-ucdsnmp=no
-.endif
-
-MAN1=		cyradm.1 imtest.1 installsieve.1
-MAN3=		imclient.3
-MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
-		syncnews.8 timsieved.8
-
-DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
-		changes copyrights feedback index install install-admin-mb \
-		install-compile install-configure install-murder install-perf \
-		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list notes os overview questions \
-		quota-extension readme server-design sieve sieve-protocol
-HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
-		install-auth install-compile install-configure install-murder \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install mailing-list man \
-		notes os overview questions readme sieve-protocol sieve specs
-
-post-patch:
-		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
-			> ${WRKSRC}/tools/mkimap.new
-		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-		@${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
-.endfor
-.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
-		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
-		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
-		fi
-.endfor
-		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
-.endif
-		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
-			${PREFIX}/etc/rc.d/imapd.sh.sample
-		${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} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
deleted file mode 100644
index 75d8b622c99b..000000000000
--- a/mail/cyrus-imapd23/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (cyrus-imapd-2.0.16.tar.gz) = ce20ec83762e89bcb98567f396668b8d
-MD5 (cyrus-imapd-2.0.16-ipv6-20020118.diff.gz) = 9752c325aeeeb39b82c7a427fee076b2
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
deleted file mode 100644
index c9de5a5a31b4..000000000000
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ /dev/null
@@ -1,144 +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
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# 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
-
-# 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 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>
-
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <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 only used when the server is compiled with Kerberos
-# authentication.
-#
-#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, deliver wil 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
-
-# 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
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
-#
-sasl_pwcheck_method: pwcheck
-
-# If  enabled,  the  SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
-
-#
-# EOF
diff --git a/mail/cyrus-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh
deleted file mode 100644
index 5230d76473ae..000000000000
--- a/mail/cyrus-imapd23/files/imapd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-case "$1" in
-start)
-	if [ -x /usr/local/cyrus/bin/master -a \
-	     -f /usr/local/etc/cyrus.conf -a \
-	     -f /usr/local/etc/imapd.conf ]; then
-		/usr/local/cyrus/bin/master &
-		echo -n ' imapd'
-	fi
-	;;
-stop)
-	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa
deleted file mode 100644
index 34dc4a7d4d9b..000000000000
--- a/mail/cyrus-imapd23/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
- 
diff --git a/mail/cyrus-imapd23/files/patch-ab b/mail/cyrus-imapd23/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd23/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
deleted file mode 100644
index c9a2a9eb6353..000000000000
--- a/mail/cyrus-imapd23/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
- 	cmu_saved_LIBS=$LIBS
- 	if test -d ${with_sasl}; then
-           ac_cv_sasl_where_lib=${with_sasl}/lib
--          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
- 
- 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
- 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd23/files/patch-af b/mail/cyrus-imapd23/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd23/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
-@@ -407,7 +407,7 @@
-     }
- }
- 
--#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-imapd23/files/patch-ag b/mail/cyrus-imapd23/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd23/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
-@@ -398,7 +398,7 @@
-     }
- }
- 
--#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-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc
deleted file mode 100644
index f31ed31d722f..000000000000
--- a/mail/cyrus-imapd23/files/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
-@@ -64,7 +64,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../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
- IMAP_LIBS = @IMAP_LIBS@
- SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd23/files/patch-bd b/mail/cyrus-imapd23/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd23/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-imapd23/files/patch-be b/mail/cyrus-imapd23/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd23/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-imapd23/files/patch-dc b/mail/cyrus-imapd23/files/patch-dc
deleted file mode 100644
index c913dc4f35ee..000000000000
--- a/mail/cyrus-imapd23/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	Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in	Sat Jan  6 06:08:21 2001
-@@ -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) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-dd b/mail/cyrus-imapd23/files/patch-dd
deleted file mode 100644
index 94c0d694fa90..000000000000
--- a/mail/cyrus-imapd23/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-imapd23/files/patch-df b/mail/cyrus-imapd23/files/patch-df
deleted file mode 100644
index 93540e209402..000000000000
--- a/mail/cyrus-imapd23/files/patch-df
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: master/service.c
-===================================================================
-RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
-retrieving revision 1.2
-diff -u -r1.2 service.c
---- master/service.c	2001/02/01 14:11:43	1.2
-+++ master/service.c	2001/02/01 22:10:35
-@@ -99,7 +99,13 @@
-     
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
--	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
-+	switch (((struct sockaddr *)&sin)->sa_family) {
-+	case AF_INET:
-+#ifdef INET6
-+	case AF_INET6:
-+#endif
-+	    break;
-+	default:
- 	    return 1;
- 	}
-     }
diff --git a/mail/cyrus-imapd23/files/patch-dg b/mail/cyrus-imapd23/files/patch-dg
deleted file mode 100644
index 94682461fa25..000000000000
--- a/mail/cyrus-imapd23/files/patch-dg
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Thu Jan 25 06:26:51 2001
-+++ tools/mkimap	Sat Apr  7 05:42:24 2001
-@@ -119,6 +119,8 @@
- mkdir "deliverdb", 0755;
- mkdir "deliverdb/db", 0755;
- 
-+system "/usr/sbin/chown -R cyrus:cyrus .";
-+
- # create the sieve stuff
- if (!$nosievedir) {
-     print "creating $sievedir...\n";
-@@ -127,6 +129,7 @@
-     if (chdir $sievedir) {
- 	foreach $i ("a".."z") { mkdir "$i", 0755; }
-     }
-+    system "/usr/sbin/chown -R cyrus:cyrus $sievedir";
- }
- 
- $flag = 0;
-@@ -138,6 +141,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:cyrus $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd23/pkg-comment b/mail/cyrus-imapd23/pkg-comment
deleted file mode 100644
index b829c82f694d..000000000000
--- a/mail/cyrus-imapd23/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3 and IMAP4 protocols
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall
deleted file mode 100644
index 7660fcc588a6..000000000000
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-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
-}
-
-# Uninstall timseived's Cyrus.conf file.
-
-cyrus_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf.tmp
-		if cmp -s ${PKG_PREFIX}/lib/sasl/Cyrus.conf ${PKG_PREFIX}/lib/sasl/Cyrus.conf.tmp; then
-			rm -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf
-		fi
-		rm -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf.tmp
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		checkfile ${PKG_PREIFX}/etc/imapd.conf
-		checkfile ${PKG_PREIFX}/etc/cyrus.conf
-		;;
-	POST-DEINSTALL)
-		;;
-
-esac
diff --git a/mail/cyrus-imapd23/pkg-descr b/mail/cyrus-imapd23/pkg-descr
deleted file mode 100644
index 79d06da9dd9b..000000000000
--- a/mail/cyrus-imapd23/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://asg.web.cmu.edu/cyrus/
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
deleted file mode 100644
index e79eba73b245..000000000000
--- a/mail/cyrus-imapd23/pkg-install
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	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
-}
-
-# Install timseived's Cyrus.conf file
-
-cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-                echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf
-        fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		create
-		;;
-
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		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-imapd23/pkg-message b/mail/cyrus-imapd23/pkg-message
deleted file mode 100644
index e4429259e376..000000000000
--- a/mail/cyrus-imapd23/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
deleted file mode 100644
index ab8b7c30120d..000000000000
--- a/mail/cyrus-imapd23/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/sieveshell
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cyrdump
-cyrus/bin/cyrquota
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/master
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-cyrus/bin/pop3d
-cyrus/bin/reconstruct
-cyrus/bin/timsieved
-@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
-etc/rc.d/imapd.sh.sample
-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/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libacap.a
-lib/libcyrus.a
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus