summaryrefslogtreecommitdiff
path: root/mail/cyrus-imapd/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/cyrus-imapd/files')
-rw-r--r--mail/cyrus-imapd/files/imapd.conf144
-rw-r--r--mail/cyrus-imapd/files/imapd.sh23
-rw-r--r--mail/cyrus-imapd/files/patch-Makefile.in13
-rw-r--r--mail/cyrus-imapd/files/patch-aa13
-rw-r--r--mail/cyrus-imapd/files/patch-ac30
-rw-r--r--mail/cyrus-imapd/files/patch-acap::Makefile.in13
-rw-r--r--mail/cyrus-imapd/files/patch-af13
-rw-r--r--mail/cyrus-imapd/files/patch-ag13
-rw-r--r--mail/cyrus-imapd/files/patch-bc13
-rw-r--r--mail/cyrus-imapd/files/patch-bd14
-rw-r--r--mail/cyrus-imapd/files/patch-be13
-rw-r--r--mail/cyrus-imapd/files/patch-dc13
-rw-r--r--mail/cyrus-imapd/files/patch-dd14
-rw-r--r--mail/cyrus-imapd/files/patch-df14
-rw-r--r--mail/cyrus-imapd/files/patch-dg29
-rw-r--r--mail/cyrus-imapd/files/patch-et::com_err.c14
-rw-r--r--mail/cyrus-imapd/files/patch-imtest::imtest.c15
-rw-r--r--mail/cyrus-imapd/files/patch-lib::Makefile.in13
-rw-r--r--mail/cyrus-imapd/files/patch-lib::imclient.c12
-rw-r--r--mail/cyrus-imapd/files/patch-perl::imap::Makefile.PL15
-rw-r--r--mail/cyrus-imapd/files/patch-perl::sieve::acap::Makefile.PL15
-rw-r--r--mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in13
-rw-r--r--mail/cyrus-imapd/files/patch-perl::sieve::managesieve::Makefile.PL15
-rw-r--r--mail/cyrus-imapd/files/patch-sieve::Makefile.in13
24 files changed, 0 insertions, 497 deletions
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
deleted file mode 100644
index c9de5a5a31b4..000000000000
--- a/mail/cyrus-imapd/files/imapd.conf
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used.
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# The percent of quota utilization over which the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The minimum value is 30, the default.
-#
-#timeout: 30
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes. The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between
-# successive POP logins, in minutes. The default is 0.
-#
-#popminpoll: 0
-
-# The list of userids with administrative rights. Separate each userid
-# with a space. We recommend that administrator userids be separate from
-# standard userids. Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# The list of the host names of the mail domain's IMSP servers. Separate each
-# host name with a space. The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory. Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX. The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login. For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key. This
-# option is only used when the server is compiled with Kerberos
-# authentication.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using cross-realm
-# authentications. Seperate each realm name by a space. This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user. This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, deliver wil look for Sieve scripts in user's home directories:
-# ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories. This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# The mechanism used by the server to verify plaintext passwords. Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
-#
-sasl_pwcheck_method: pwcheck
-
-# If enabled, the SASL library will automatically create authentication
-# secrets when given a plaintext password. See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
-
-#
-# EOF
diff --git a/mail/cyrus-imapd/files/imapd.sh b/mail/cyrus-imapd/files/imapd.sh
deleted file mode 100644
index 5230d76473ae..000000000000
--- a/mail/cyrus-imapd/files/imapd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-case "$1" in
-start)
- if [ -x /usr/local/cyrus/bin/master -a \
- -f /usr/local/etc/cyrus.conf -a \
- -f /usr/local/etc/imapd.conf ]; then
- /usr/local/cyrus/bin/master &
- echo -n ' imapd'
- fi
- ;;
-stop)
- kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff --git a/mail/cyrus-imapd/files/patch-Makefile.in b/mail/cyrus-imapd/files/patch-Makefile.in
deleted file mode 100644
index 7be201b26cf4..000000000000
--- a/mail/cyrus-imapd/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig Wed Dec 4 07:21:09 2002
-+++ Makefile.in Sat Apr 3 03:40:04 2004
-@@ -98,7 +98,7 @@
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
-- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
-+ $(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8
- @for d in $(SUBDIRS); \
- do \
- (cd $$d; echo "### Making" install "in" `pwd`; \
diff --git a/mail/cyrus-imapd/files/patch-aa b/mail/cyrus-imapd/files/patch-aa
deleted file mode 100644
index b0cd5872b141..000000000000
--- a/mail/cyrus-imapd/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 Mon Jul 16 03:08:15 2001
-+++ man/Makefile.in Sat Apr 3 03:40:33 2004
-@@ -89,7 +89,7 @@
- done
- for file in $(MAN8); \
- do \
-- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
-+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- done
-
- .c.o:
diff --git a/mail/cyrus-imapd/files/patch-ac b/mail/cyrus-imapd/files/patch-ac
deleted file mode 100644
index e3f73dd1f2d8..000000000000
--- a/mail/cyrus-imapd/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig Mon Mar 8 02:25:08 2004
-+++ configure Mon Mar 8 02:26:39 2004
-@@ -2286,6 +2286,8 @@
- else
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
-+ eval `${PERL} -V:cccdlflags`
-+ PERL_CCCDLFLAGS="$cccdlflags"
- fi
-
- if test "$sievedir" != "no"; then
-@@ -4187,7 +4189,7 @@
- cmu_saved_LIBS=$LIBS
- if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
-- ac_cv_sasl_where_inc=${with_sasl}/include
-+ ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
-@@ -5300,6 +5302,7 @@
- s%@LEX@%$LEX%g
- s%@LEXLIB@%$LEXLIB%g
- s%@PERL@%$PERL%g
-+s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g
- s%@WITH_NONBLOCK@%$WITH_NONBLOCK%g
- s%@WITH_GMTOFF@%$WITH_GMTOFF%g
- s%@WITH_MAP@%$WITH_MAP%g
diff --git a/mail/cyrus-imapd/files/patch-acap::Makefile.in b/mail/cyrus-imapd/files/patch-acap::Makefile.in
deleted file mode 100644
index 4015013eb362..000000000000
--- a/mail/cyrus-imapd/files/patch-acap::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acap/Makefile.in
-diff -u acap/Makefile.in.orig acap/Makefile.in
---- acap/Makefile.in.orig Mon Jul 14 00:04:56 2003
-+++ acap/Makefile.in Mon Mar 8 02:10:58 2004
-@@ -54,7 +54,7 @@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
- LIBS = @LIBS@
-
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-af b/mail/cyrus-imapd/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c Thu Jan 4 23:26:22 2001
-@@ -407,7 +407,7 @@
- }
- }
-
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
-
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd/files/patch-ag b/mail/cyrus-imapd/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c Thu Jan 4 23:26:48 2001
-@@ -398,7 +398,7 @@
- }
- }
-
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
-
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd/files/patch-bc b/mail/cyrus-imapd/files/patch-bc
deleted file mode 100644
index f31ed31d722f..000000000000
--- a/mail/cyrus-imapd/files/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in Thu Jan 4 23:30:15 2001
-@@ -64,7 +64,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
-
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
- IMAP_LIBS = @IMAP_LIBS@
- SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd/files/patch-bd b/mail/cyrus-imapd/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig Thu Mar 9 19:07:14 2000
---- imap/config.c Thu Mar 9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-
- extern int errno;
-
-+ #if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-
- struct configlist {
- char *key;
diff --git a/mail/cyrus-imapd/files/patch-be b/mail/cyrus-imapd/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c Wed Oct 8 13:56:58 1997
-@@ -29,7 +29,9 @@
-
- #define EXIT_CHOKE (int) 10
-
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+ #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
-
- int errno;
diff --git a/mail/cyrus-imapd/files/patch-dc b/mail/cyrus-imapd/files/patch-dc
deleted file mode 100644
index c913dc4f35ee..000000000000
--- a/mail/cyrus-imapd/files/patch-dc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in Sat Jan 6 06:08:21 2001
-@@ -52,7 +52,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
-
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
-
diff --git a/mail/cyrus-imapd/files/patch-dd b/mail/cyrus-imapd/files/patch-dd
deleted file mode 100644
index 94c0d694fa90..000000000000
--- a/mail/cyrus-imapd/files/patch-dd
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/masterconf.c
-diff -u master/masterconf.c.orig master/masterconf.c
---- master/masterconf.c.orig Wed May 24 05:56:30 2000
-+++ master/masterconf.c Sat Jan 6 06:07:22 2001
-@@ -60,7 +60,9 @@
-
- extern int errno;
-
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
-
- struct configlist {
- char *key;
diff --git a/mail/cyrus-imapd/files/patch-df b/mail/cyrus-imapd/files/patch-df
deleted file mode 100644
index 69a0841343ee..000000000000
--- a/mail/cyrus-imapd/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-imapd/files/patch-dg b/mail/cyrus-imapd/files/patch-dg
deleted file mode 100644
index 94682461fa25..000000000000
--- a/mail/cyrus-imapd/files/patch-dg
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig Thu Jan 25 06:26:51 2001
-+++ tools/mkimap Sat Apr 7 05:42:24 2001
-@@ -119,6 +119,8 @@
- mkdir "deliverdb", 0755;
- mkdir "deliverdb/db", 0755;
-
-+system "/usr/sbin/chown -R cyrus:cyrus .";
-+
- # create the sieve stuff
- if (!$nosievedir) {
- print "creating $sievedir...\n";
-@@ -127,6 +129,7 @@
- if (chdir $sievedir) {
- foreach $i ("a".."z") { mkdir "$i", 0755; }
- }
-+ system "/usr/sbin/chown -R cyrus:cyrus $sievedir";
- }
-
- $flag = 0;
-@@ -138,6 +141,7 @@
- chdir $part or die "couldn't change to partition $part";
- mkdir "stage.", 0755;
- if ($hashispool) { foreach $i ("a".."z") { mkdir $i, 0755; } }
-+ system "/usr/sbin/chown -R cyrus:cyrus $part";
- }
-
- print "done\n";
diff --git a/mail/cyrus-imapd/files/patch-et::com_err.c b/mail/cyrus-imapd/files/patch-et::com_err.c
deleted file mode 100644
index e4e933edd936..000000000000
--- a/mail/cyrus-imapd/files/patch-et::com_err.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: et/com_err.c
-diff -u et/com_err.c.orig et/com_err.c
---- et/com_err.c.orig Wed May 24 05:52:06 2000
-+++ et/com_err.c Sat Jul 19 23:22:43 2003
-@@ -48,6 +48,9 @@
- #include <string.h>
- #include "mit-sipb-copyright.h"
-
-+#ifdef __STDC__
-+#define HAVE_STDARG_H 1
-+#endif
- #if defined(HAVE_STDARG_H) || defined(_WINDOWS)
- #include <stdarg.h>
- #else
diff --git a/mail/cyrus-imapd/files/patch-imtest::imtest.c b/mail/cyrus-imapd/files/patch-imtest::imtest.c
deleted file mode 100644
index a2b5529e7c2f..000000000000
--- a/mail/cyrus-imapd/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig Sun May 11 17:48:08 2003
-+++ imtest/imtest.c Sun May 11 17:50:04 2003
-@@ -291,8 +291,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-imapd/files/patch-lib::Makefile.in b/mail/cyrus-imapd/files/patch-lib::Makefile.in
deleted file mode 100644
index 8243d414d431..000000000000
--- a/mail/cyrus-imapd/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig Sun Jan 4 00:16:44 2004
-+++ lib/Makefile.in Sun Mar 7 23:44:51 2004
-@@ -60,7 +60,7 @@
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
-
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-lib::imclient.c b/mail/cyrus-imapd/files/patch-lib::imclient.c
deleted file mode 100644
index 003b57a50f55..000000000000
--- a/mail/cyrus-imapd/files/patch-lib::imclient.c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/imclient.c
-diff -u lib/imclient.c.orig lib/imclient.c
---- lib/imclient.c.orig Sat Jul 28 08:30:37 2001
-+++ lib/imclient.c Sat Aug 17 16:48:58 2002
-@@ -1154,6 +1154,7 @@
- t->result = xstrdup(user);
- } else {
- printf("%s: ", t->prompt);
-+ fflush(stdout);
- if (t->id == SASL_CB_PASS) {
- char *ptr = getpass("");
- strncpy(result, ptr, sizeof(result));
diff --git a/mail/cyrus-imapd/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index 66140bf53219..000000000000
--- a/mail/cyrus-imapd/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
- 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC",
- 'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd/files/patch-perl::sieve::acap::Makefile.PL b/mail/cyrus-imapd/files/patch-perl::sieve::acap::Makefile.PL
deleted file mode 100644
index 48d3041d2809..000000000000
--- a/mail/cyrus-imapd/files/patch-perl::sieve::acap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/acap/Makefile.PL
-diff -u perl/sieve/acap/Makefile.PL.orig perl/sieve/acap/Makefile.PL
---- perl/sieve/acap/Makefile.PL.orig Wed Jun 14 05:32:21 2000
-+++ perl/sieve/acap/Makefile.PL Mon Dec 20 00:37:38 2004
-@@ -51,3 +51,10 @@
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../../../acap/ $SASL_INC", # e.g., '-I/usr/include/other'
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in
deleted file mode 100644
index 28d4c44df294..000000000000
--- a/mail/cyrus-imapd/files/patch-perl::sieve::lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: perl/sieve/lib/Makefile.in
-diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in
---- perl/sieve/lib/Makefile.in.orig Sun Jan 4 00:16:45 2004
-+++ perl/sieve/lib/Makefile.in Sun Mar 7 23:42:37 2004
-@@ -55,7 +55,7 @@
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
-
--CFLAGS = -g
-+CFLAGS = -g @PERL_CCCDLFLAGS@
- LDFLAGS = -g @LDFLAGS@
-
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index dfe74a066f49..000000000000
--- a/mail/cyrus-imapd/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003
-+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004
-@@ -64,3 +64,10 @@
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC",
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd/files/patch-sieve::Makefile.in b/mail/cyrus-imapd/files/patch-sieve::Makefile.in
deleted file mode 100644
index 75245207c3a4..000000000000
--- a/mail/cyrus-imapd/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig Sun Jul 13 23:40:05 2003
-+++ sieve/Makefile.in Mon Mar 8 01:38:00 2004
-@@ -35,7 +35,7 @@
-
- DEFS = @DEFS@
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- MAKEDEPEND = @MAKEDEPEND@