diff options
| author | paul <paul@FreeBSD.org> | 2000-05-14 01:20:07 +0800 |
|---|---|---|
| committer | paul <paul@FreeBSD.org> | 2000-05-14 01:20:07 +0800 |
| commit | 23a44bcf7ee999369efd87bb1dc2eb29b9e9198e (patch) | |
| tree | 6cfe6813f163f16336c6221cdcb0c3bec6e5886e /mail | |
| parent | e058c6ce806db1d1c6d39c95671f680ee73bb786 (diff) | |
| download | freebsd-ports-gnome-23a44bcf7ee999369efd87bb1dc2eb29b9e9198e.tar.gz freebsd-ports-gnome-23a44bcf7ee999369efd87bb1dc2eb29b9e9198e.tar.zst freebsd-ports-gnome-23a44bcf7ee999369efd87bb1dc2eb29b9e9198e.zip | |
Update port to 1.6.22
Diffstat (limited to 'mail')
54 files changed, 480 insertions, 192 deletions
diff --git a/mail/cyrus-imapd/files/patch-aa b/mail/cyrus-imapd/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus-imapd/files/patch-aa +++ b/mail/cyrus-imapd/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus-imapd/files/patch-ac b/mail/cyrus-imapd/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus-imapd/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus-imapd/files/patch-ad b/mail/cyrus-imapd/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus-imapd/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd/files/patch-bb b/mail/cyrus-imapd/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus-imapd/files/patch-bb +++ b/mail/cyrus-imapd/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd/files/patch-bc b/mail/cyrus-imapd/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus-imapd/files/patch-bc +++ b/mail/cyrus-imapd/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @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 index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus-imapd/files/patch-bd +++ b/mail/cyrus-imapd/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus-imapd/files/patch-bh b/mail/cyrus-imapd/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus-imapd/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd/files/patch-bi b/mail/cyrus-imapd/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus-imapd/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd/files/patch-bj b/mail/cyrus-imapd/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus-imapd/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; diff --git a/mail/cyrus-imapd2/files/patch-aa b/mail/cyrus-imapd2/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus-imapd2/files/patch-aa +++ b/mail/cyrus-imapd2/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus-imapd2/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus-imapd2/files/patch-ad b/mail/cyrus-imapd2/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus-imapd2/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd2/files/patch-bb b/mail/cyrus-imapd2/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus-imapd2/files/patch-bb +++ b/mail/cyrus-imapd2/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus-imapd2/files/patch-bc +++ b/mail/cyrus-imapd2/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus-imapd2/files/patch-bd b/mail/cyrus-imapd2/files/patch-bd index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus-imapd2/files/patch-bd +++ b/mail/cyrus-imapd2/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus-imapd2/files/patch-bh b/mail/cyrus-imapd2/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus-imapd2/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd2/files/patch-bi b/mail/cyrus-imapd2/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus-imapd2/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd2/files/patch-bj b/mail/cyrus-imapd2/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus-imapd2/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus-imapd22/files/patch-aa +++ b/mail/cyrus-imapd22/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus-imapd22/files/patch-ad b/mail/cyrus-imapd22/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd22/files/patch-bb b/mail/cyrus-imapd22/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus-imapd22/files/patch-bb +++ b/mail/cyrus-imapd22/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd22/files/patch-bc b/mail/cyrus-imapd22/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus-imapd22/files/patch-bc +++ b/mail/cyrus-imapd22/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus-imapd22/files/patch-bd b/mail/cyrus-imapd22/files/patch-bd index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus-imapd22/files/patch-bd +++ b/mail/cyrus-imapd22/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus-imapd22/files/patch-bh b/mail/cyrus-imapd22/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd22/files/patch-bi b/mail/cyrus-imapd22/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd22/files/patch-bj b/mail/cyrus-imapd22/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus-imapd23/files/patch-aa +++ b/mail/cyrus-imapd23/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus-imapd23/files/patch-ad b/mail/cyrus-imapd23/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd23/files/patch-bb b/mail/cyrus-imapd23/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus-imapd23/files/patch-bb +++ b/mail/cyrus-imapd23/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus-imapd23/files/patch-bc +++ b/mail/cyrus-imapd23/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus-imapd23/files/patch-bd b/mail/cyrus-imapd23/files/patch-bd index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus-imapd23/files/patch-bd +++ b/mail/cyrus-imapd23/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus-imapd23/files/patch-bh b/mail/cyrus-imapd23/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd23/files/patch-bi b/mail/cyrus-imapd23/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd23/files/patch-bj b/mail/cyrus-imapd23/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus-imapd24/files/patch-aa +++ b/mail/cyrus-imapd24/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus-imapd24/files/patch-ad b/mail/cyrus-imapd24/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd24/files/patch-bb b/mail/cyrus-imapd24/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus-imapd24/files/patch-bb +++ b/mail/cyrus-imapd24/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus-imapd24/files/patch-bc +++ b/mail/cyrus-imapd24/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus-imapd24/files/patch-bd b/mail/cyrus-imapd24/files/patch-bd index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus-imapd24/files/patch-bd +++ b/mail/cyrus-imapd24/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus-imapd24/files/patch-bh b/mail/cyrus-imapd24/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd24/files/patch-bi b/mail/cyrus-imapd24/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus-imapd24/files/patch-bj b/mail/cyrus-imapd24/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; diff --git a/mail/cyrus/files/patch-aa b/mail/cyrus/files/patch-aa index 3b39dfb1440f..34dc4a7d4d9b 100644 --- a/mail/cyrus/files/patch-aa +++ b/mail/cyrus/files/patch-aa @@ -6,6 +6,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 + $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ + $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 diff --git a/mail/cyrus/files/patch-ac b/mail/cyrus/files/patch-ac new file mode 100644 index 000000000000..ab7854846479 --- /dev/null +++ b/mail/cyrus/files/patch-ac @@ -0,0 +1,11 @@ +--- configure Thu Jan 6 22:28:51 2000 ++++ /tmp/configure.new Sat Apr 8 20:55:29 2000 +@@ -4951,7 +4951,7 @@ + # try the user-specified path --- too lazy to test for it right now + LIB_SASL="-L$sasldir/lib -lsasl" + +- SASLFLAGS="-I$sasldir/include" ++ SASLFLAGS="-I$sasldir/include/sasl" + + fi + diff --git a/mail/cyrus/files/patch-ad b/mail/cyrus/files/patch-ad new file mode 100644 index 000000000000..bcd310e991d3 --- /dev/null +++ b/mail/cyrus/files/patch-ad @@ -0,0 +1,11 @@ +--- configure.in.orig Sun Apr 9 01:13:23 2000 ++++ configure.in Sun Apr 9 01:13:43 2000 +@@ -528,7 +528,7 @@ + # filename, it should be safe to add it (to the front of the line -- + # somef vendors have older, badly installed tclshs that we want to avoid + # if we can) +- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") ++ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") + fi + + # Do we know where to get a tclsh? diff --git a/mail/cyrus/files/patch-bb b/mail/cyrus/files/patch-bb index 6efc9669a653..11f8698c92eb 100644 --- a/mail/cyrus/files/patch-bb +++ b/mail/cyrus/files/patch-bb @@ -5,9 +5,9 @@ DEFS = @DEFS@ @TCL_DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.2 -+LIBS = -L$(prefix)/lib -ltcl82 -lm @LIBS@ +-LIBS = @TCL_LIBS@ @IMAP_LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ ++LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus/files/patch-bc b/mail/cyrus/files/patch-bc index 35f9f254c36a..5310441ee96c 100644 --- a/mail/cyrus/files/patch-bc +++ b/mail/cyrus/files/patch-bc @@ -1,19 +1,19 @@ -*** imap/Makefile.in Wed Aug 26 11:40:10 1998 ---- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 +--- imap/Makefile.in Thu Mar 9 18:59:14 2000 *************** -*** 47,53 **** +*** 45,51 **** CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ ! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ ---- 47,53 ---- + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ +--- 45,51 ---- CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ - LIBS = @LIBS@ @COM_ERR_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus/files/patch-bd b/mail/cyrus/files/patch-bd index 66480bf2bc2f..83a7d53f4c40 100644 --- a/mail/cyrus/files/patch-bd +++ b/mail/cyrus/files/patch-bd @@ -1,22 +1,14 @@ -*** imap/config.c.orig Fri May 15 23:48:14 1998 ---- imap/config.c Wed Aug 26 11:44:18 1998 +*** imap/config.c.orig Thu Mar 9 19:07:14 2000 +--- imap/config.c Thu Mar 9 19:06:48 2000 *************** -*** 37,43 **** +*** 39,45 **** +--- 39,47 ---- extern int errno; -! #define CONFIG_FILENAME "/etc/imapd.conf" - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a ---- 37,46 ---- ++ #if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" ++ #endif - extern int errno; - -! #if !defined(CONFIG_FILENAME) -! # define CONFIG_FILENAME "/etc/imapd.conf" -! #endif -! - /* You'd think this'd be EX_CONFIG, but you'd be wrong. - If it's EX_CONFIG then sendmail's result is to fatally reject the - message; this isn't desireable, we just want to fail the message in a + struct configlist { + char *key; diff --git a/mail/cyrus/files/patch-bh b/mail/cyrus/files/patch-bh new file mode 100644 index 000000000000..d9fcb4716f4d --- /dev/null +++ b/mail/cyrus/files/patch-bh @@ -0,0 +1,11 @@ +--- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 ++++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 +@@ -34,7 +34,7 @@ + CYRUS_GROUP=@cyrus_group@ + + DEFS = @DEFS@ @LOCALDEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus/files/patch-bi b/mail/cyrus/files/patch-bi new file mode 100644 index 000000000000..38f5bb4ad0e7 --- /dev/null +++ b/mail/cyrus/files/patch-bi @@ -0,0 +1,11 @@ +--- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 ++++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 +@@ -28,7 +28,7 @@ + CC = @CC@ + + DEFS = @DEFS@ +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + diff --git a/mail/cyrus/files/patch-bj b/mail/cyrus/files/patch-bj new file mode 100644 index 000000000000..adc8e7e3274d --- /dev/null +++ b/mail/cyrus/files/patch-bj @@ -0,0 +1,11 @@ +--- timsieved/config.c Sun Apr 9 07:58:37 2000 ++++ config.c Sun Apr 9 07:58:47 2000 +@@ -41,7 +41,7 @@ + + extern int errno; + +-#define CONFIG_FILENAME "/etc/imapd.conf" ++#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" + + struct configlist { + char *key; |