Import of the Cyrus IMAPd package

48 files changed, 1932 insertions, 0 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus-imapd/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus-imapd/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus-imapd/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus-imapd/files/patch-aa b/mail/cyrus-imapd/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus-imapd/files/patch-ab b/mail/cyrus-imapd/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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-imapd/pkg-comment b/mail/cyrus-imapd/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus-imapd/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus-imapd/pkg-descr b/mail/cyrus-imapd/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus-imapd/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus-imapd/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus-imapd2/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus-imapd2/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus-imapd2/files/patch-aa b/mail/cyrus-imapd2/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus-imapd2/files/patch-ab b/mail/cyrus-imapd2/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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-imapd2/pkg-comment b/mail/cyrus-imapd2/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus-imapd2/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus-imapd2/pkg-descr b/mail/cyrus-imapd2/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus-imapd2/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus-imapd22/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus-imapd22/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus-imapd22/files/patch-ab b/mail/cyrus-imapd22/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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-imapd22/pkg-comment b/mail/cyrus-imapd22/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus-imapd22/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus-imapd22/pkg-descr b/mail/cyrus-imapd22/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus-imapd22/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus-imapd23/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus-imapd23/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus-imapd23/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus-imapd23/files/patch-ab b/mail/cyrus-imapd23/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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/pkg-comment b/mail/cyrus-imapd23/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus-imapd23/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus-imapd23/pkg-descr b/mail/cyrus-imapd23/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus-imapd23/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus-imapd24/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus-imapd24/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus-imapd24/files/patch-ab b/mail/cyrus-imapd24/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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-imapd24/pkg-comment b/mail/cyrus-imapd24/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus-imapd24/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus-imapd24/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
new file mode 100644
index 000000000000..f224f706bf6e
--- /dev/null
+++ b/mail/cyrus/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:		cyrus
+# Version required:				1.5.2
+# Date created:					May 4th 1997
+# Whom:						jfitz@FreeBSD.ORG
+#
+# $Id$
+#
+
+DISTNAME=	cyrus-imapd-v1.5.2
+PKGNAME=	cyrus-1.5.2
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=	jfitz@FreeBSD.ORG
+
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+		--with-cyrus-group=cyrus
+
+MAN1=		cyradm.1
+MAN3=		imclient.3
+MAN5=		imapd.conf.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
+		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+
+post-configure:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+
+pre-install:
+		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+
+post-install:
+		${MKDIR} ${PREFIX}/share/doc/cyrus/html
+		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.endfor
+		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${MKDIR} -p -m 750 /var/spool/imap
+		/usr/sbin/chown cyrus.cyrus /var/spool/imap
+		${MKDIR} -p -m 700 /var/pwcheck
+		/usr/sbin/chown cyrus.cyrus /var/pwcheck
+		${MKDIR} -p -m 750 ${PREFIX}/etc/imap
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
+		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
+		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
+		/bin/mkdir -m 750 \
+			${PREFIX}/etc/imap/user \
+			${PREFIX}/etc/imap/quota \
+			${PREFIX}/etc/imap/proc \
+			${PREFIX}/etc/imap/log \
+			${PREFIX}/etc/imap/msg
+		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
+		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "	${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+
+.include <bsd.port.mk>
diff --git a/mail/cyrus/distinfo b/mail/cyrus/distinfo
new file mode 100644
index 000000000000..5b77e7070db2
--- /dev/null
+++ b/mail/cyrus/distinfo
@@ -0,0 +1 @@
+MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
diff --git a/mail/cyrus/files/imapd.conf b/mail/cyrus/files/imapd.conf
new file mode 100644
index 000000000000..abf8513a475e
--- /dev/null
+++ b/mail/cyrus/files/imapd.conf
@@ -0,0 +1,112 @@
+#
+# $Id$
+#
+# 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: /usr/local/etc/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
+
+#
+# EOF
\ No newline at end of file
diff --git a/mail/cyrus/files/patch-aa b/mail/cyrus/files/patch-aa
new file mode 100644
index 000000000000..d798ab224d1b
--- /dev/null
+++ b/mail/cyrus/files/patch-aa
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sun May  4 22:14:52 1997
++++ man/Makefile.in	Sun May  4 22:15:02 1997
+@@ -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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
+ 
+ 
diff --git a/mail/cyrus/files/patch-ab b/mail/cyrus/files/patch-ab
new file mode 100644
index 000000000000..1fc68c171063
--- /dev/null
+++ b/mail/cyrus/files/patch-ab
@@ -0,0 +1,38 @@
+--- 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/pkg-comment b/mail/cyrus/pkg-comment
new file mode 100644
index 000000000000..74916d2c2df1
--- /dev/null
+++ b/mail/cyrus/pkg-comment
@@ -0,0 +1 @@
+the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
diff --git a/mail/cyrus/pkg-descr b/mail/cyrus/pkg-descr
new file mode 100644
index 000000000000..d1b0ff780fc2
--- /dev/null
+++ b/mail/cyrus/pkg-descr
@@ -0,0 +1,18 @@
+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
diff --git a/mail/cyrus/pkg-plist b/mail/cyrus/pkg-plist
new file mode 100644
index 000000000000..140dcbb474dc
--- /dev/null
+++ b/mail/cyrus/pkg-plist
@@ -0,0 +1,75 @@
+bin/cyradm
+bin/imtest
+cyrus/bin/pwcheck
+cyrus/bin/arbitron
+cyrus/bin/collectnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/feedcyrus
+cyrus/bin/imapd
+cyrus/bin/pop3d
+cyrus/bin/reconstruct
+cyrus/bin/syncnews
+cyrus/bin/updateimsp
+etc/imapd.conf
+etc/rc.d/cyrus.sh
+include/cyrus/acl.h
+include/cyrus/assert.h
+include/cyrus/auth.h
+include/cyrus/bsearch.h
+include/cyrus/charset.h
+include/cyrus/glob.h
+include/cyrus/gmtoff.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/lock.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/sasl.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+man/man1/cyradm.1.gz
+man/man3/imclient.3.gz
+man/man5/imapd.conf.5.gz
+man/man8/arbitron.8.gz
+man/man8/collectnews.8.gz
+man/man8/cyrquota.8.gz
+man/man8/deliver.8.gz
+man/man8/imapd.8.gz
+man/man8/pop3d.8.gz
+man/man8/reconstruct.8.gz
+man/man8/rmnews.8.gz
+man/man8/syncnews.8.gz
+share/doc/cyrus/html/bugs.html
+share/doc/cyrus/html/changes.html
+share/doc/cyrus/html/htmlstrip.c
+share/doc/cyrus/html/index.html
+share/doc/cyrus/html/install.html
+share/doc/cyrus/html/overview.html
+share/doc/cyrus/html/readme.html
+share/doc/cyrus/html/unpack.html
+share/doc/cyrus/acl-extension
+share/doc/cyrus/bugs
+share/doc/cyrus/changes
+share/doc/cyrus/copyrights
+share/doc/cyrus/install
+share/doc/cyrus/overview
+share/doc/cyrus/quota-extension
+share/doc/cyrus/server-design
+@dirrm etc/imap/user
+@dirrm etc/imap/quota
+@dirrm etc/imap/proc
+@dirrm etc/imap/log
+@dirrm etc/imap/msg
+@dirrm etc/imap
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
+@dirrm share/doc/cyrus/html
+@dirrm share/doc/cyrus