8 files changed, 15 insertions, 91 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
index 69be3bdc61b9..f8b4d889dc4a 100644
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
@@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
  	    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
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
                dblib="berkeley"; break, dblib="no")
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index bf700856699a..2088891edc95 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,17 +1,17 @@
 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 @@
+--- configure.orig	Thu Jan 15 23:36:50 2004
++++ configure	Fri Jan 16 04:03:09 2004
+@@ -6565,7 +6565,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
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              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 @@
+@@ -13854,7 +13854,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
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-imap::idled.c b/mail/cyrus-imapd24/files/patch-imap::idled.c
deleted file mode 100644
index f08a8a677048..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::idled.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imap/idled.c
-diff -u imap/idled.c.orig imap/idled.c
---- imap/idled.c.orig	Thu Oct 23 03:50:07 2003
-+++ imap/idled.c	Tue Jan 13 23:17:21 2004
-@@ -409,3 +409,10 @@
-     /* never gets here */      
-     exit(1);
- }
-+
-+void printstring(const char *s __attribute__((unused)))
-+{
-+    /* needed to link against annotate.o */
-+    fatal("printstring() executed, but its not used for IDLED!",
-+	  EC_SOFTWARE);
-+}
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-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
index cbc212929f04..d54f608b1f92 100644
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 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 @@
+--- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
++++ sieve/Makefile.in	Fri Jan 16 03:47:03 2004
+@@ -33,6 +33,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,12 +10,12 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -58,7 +59,7 @@
+@@ -59,7 +60,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
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+-	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit
  
  test: $(DEPLIBS) libsieve.a test.o
  	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)