This commit was manufactured by cvs2svn to create tag 'RELEASE_5_2_0'.release/5.2.0

18 files changed, 0 insertions, 737 deletions

diff --git a/mail/cyrus-imapd24/files/extra-patch-acconfig.h b/mail/cyrus-imapd24/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
deleted file mode 100644
index 69be3bdc61b9..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: aclocal.m4
-diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig	Wed Oct 29 02:24:46 2003
-+++ aclocal.m4	Wed Oct 29 04:28:37 2003
-@@ -505,7 +505,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
-             AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-               dblib="berkeley"; break, dblib="no")
-@@ -1664,7 +1664,7 @@
-   LIB_UCDSNMP=""
-   if test "$with_ucdsnmp" != no; then
-     AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-   fi
diff --git a/mail/cyrus-imapd24/files/extra-patch-config.h.in b/mail/cyrus-imapd24/files/extra-patch-config.h.in
deleted file mode 100644
index f377af64f544..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Wed Oct 29 02:24:49 2003
-+++ config.h.in	Sat Nov 22 18:43:54 2003
-@@ -100,6 +100,9 @@
- /* Does SASL support APOP? */
- #undef HAVE_APOP
- 
-+/* the Dynamic Relay Authorization Control package */
-+#undef DRAC_AUTH
-+
- /* Define to 1 if you have the `daemon' function. */
- #undef HAVE_DAEMON
- 
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index 36794aeb8f6f..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of the SASL PLAIN mechanism.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-# Note that duplicate delivery suppression is required for Sieve.
-# Disabling duplicate delivery suppression will also disable Sieve,
-# and as such should only be disabled for performance reasons.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh
deleted file mode 100644
index 265876b13b82..000000000000
--- a/mail/cyrus-imapd24/files/imapd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: FreeBSD shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
-
-# Define these cyrus_imapd_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO"	# Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master"	# Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. %%RC_SUBR%%
-
-name="cyrus_imapd"
-rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa
deleted file mode 100644
index 616c7b3c61fe..000000000000
--- a/mail/cyrus-imapd24/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Fri Jun 20 05:49:50 2003
-+++ man/Makefile.in	Fri Jul 18 00:30:05 2003
-@@ -69,7 +69,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.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 $(srcdir)/master.8 \
- 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
diff --git a/mail/cyrus-imapd24/files/patch-ab b/mail/cyrus-imapd24/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd24/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-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
deleted file mode 100644
index bf700856699a..000000000000
--- a/mail/cyrus-imapd24/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Wed Oct 29 02:24:50 2003
-+++ configure	Wed Oct 29 03:52:02 2003
-@@ -6811,7 +6811,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
-             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
-@@ -13851,7 +13851,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
- 
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc
deleted file mode 100644
index 9b2b0276a019..000000000000
--- a/mail/cyrus-imapd24/files/patch-bc
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Jul 15 00:56:08 2003
-+++ imap/Makefile.in	Fri Jul 18 00:35:34 2003
-@@ -241,13 +241,13 @@
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd24/files/patch-config.h.in b/mail/cyrus-imapd24/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd24/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/patch-dc b/mail/cyrus-imapd24/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd24/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-df b/mail/cyrus-imapd24/files/patch-df
deleted file mode 100644
index 69a0841343ee..000000000000
--- a/mail/cyrus-imapd24/files/patch-df
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service.c
-diff -u master/service.c.orig master/service.c
---- master/service.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service.c	Wed Jan 22 22:57:20 2003
-@@ -102,6 +102,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd24/files/patch-dg b/mail/cyrus-imapd24/files/patch-dg
deleted file mode 100644
index 5c54d21287d8..000000000000
--- a/mail/cyrus-imapd24/files/patch-dg
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Mon Mar 10 03:39:36 2003
-+++ tools/mkimap	Fri Mar 21 17:24:10 2003
-@@ -61,6 +61,9 @@
- 
- $imapdconf = shift || "/etc/imapd.conf";
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- open CONF, $imapdconf or die "can't open $imapdconf";
- print "reading configure file...\n";
- while (<CONF>) {
-@@ -86,6 +89,7 @@
- 
- print "configuring $d...\n";
- 
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
- 
- mkdir "proc", 0755;
-@@ -95,11 +99,14 @@
- mkdir "msg", 0755;
- mkdir "ptclient", 0755;
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
-     print "creating $part...\n";
-     mkdir $part, 0755;
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755;
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
deleted file mode 100644
index e1fd1efa8c06..000000000000
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Sun Jul 13 05:10:56 2003
-+++ imtest/imtest.c	Fri Jul 18 00:52:29 2003
-@@ -51,6 +51,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -419,8 +420,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd24/files/patch-master::service-thread.c b/mail/cyrus-imapd24/files/patch-master::service-thread.c
deleted file mode 100644
index 9a2016c3c64a..000000000000
--- a/mail/cyrus-imapd24/files/patch-master::service-thread.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service-thread.c
-diff -u master/service-thread.c.orig master/service-thread.c
---- master/service-thread.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service-thread.c	Wed Jan 22 23:09:52 2003
-@@ -99,6 +99,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
deleted file mode 100644
index cbc212929f04..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
- 
-@@ -58,7 +59,7 @@
- 
- install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
- 
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)