summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/cyrus-imapd23/Makefile14
-rw-r--r--mail/cyrus-imapd23/distinfo6
-rw-r--r--mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m428
-rw-r--r--mail/cyrus-imapd23/files/patch-configure17
-rw-r--r--mail/cyrus-imapd23/files/patch-imap::reconstruct.c14
-rw-r--r--mail/cyrus-imapd23/files/patch-imtest::imtest.c8
-rw-r--r--mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c20
-rw-r--r--mail/cyrus-imapd23/pkg-plist1
-rw-r--r--mail/cyrus-imapd24/Makefile14
-rw-r--r--mail/cyrus-imapd24/distinfo6
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m428
-rw-r--r--mail/cyrus-imapd24/files/patch-configure17
-rw-r--r--mail/cyrus-imapd24/files/patch-imap::reconstruct.c14
-rw-r--r--mail/cyrus-imapd24/files/patch-imtest::imtest.c8
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c20
-rw-r--r--mail/cyrus-imapd24/pkg-plist1
16 files changed, 20 insertions, 196 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 8d6758d305cd..b7f3c3fa4a21 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.3.8
-PORTREVISION= 1
+PORTVERSION= 2.3.9
+#PORTREVISION= 0
CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
+ http://ftp.andrew.cmu.edu/pub/cyrus/ \
http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
@@ -101,8 +102,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
.if defined(WITH_DRAC)
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
- ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
${FILESDIR}/extra-patch-configure.in
USE_AUTOTOOLS= autoconf:259 autoheader:259
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
@@ -146,8 +146,8 @@ MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
- cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
- fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
+ cyr_dbtool.8 cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 \
+ deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
make_md5.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index e8f999f9e408..a00eb372adf3 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.8.tar.gz) = ac03b02c1ae08d52f807b58c488b204f
-SHA256 (cyrus-imapd-2.3.8.tar.gz) = 0f5c04a7de2da737e5ca0b4f8df8647175188b22972000192bbc7cd87ffda7fe
-SIZE (cyrus-imapd-2.3.8.tar.gz) = 2207366
+MD5 (cyrus-imapd-2.3.9.tar.gz) = 113433c1fdc777e3b0466b5ce643b8bc
+SHA256 (cyrus-imapd-2.3.9.tar.gz) = 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
+SIZE (cyrus-imapd-2.3.9.tar.gz) = 2272004
diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4
deleted file mode 100644
index 27c0f42453a8..000000000000
--- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: cmulocal/berkdb.m4
-diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
---- cmulocal/berkdb.m4.orig Tue May 23 22:27:15 2006
-+++ cmulocal/berkdb.m4 Wed May 24 00:08:16 2006
-@@ -213,10 +213,11 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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.4 db4.4 db44 db-4.3 db4.3 db43 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
- LIBS="$saved_LIBS -l$dbname"
-- AC_TRY_LINK([#include <db.h>],
-+ AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- [db_create(NULL, NULL, 0);],
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
- dblib="no")
-@@ -224,7 +225,8 @@
- done
- if test "$dblib" = "no"; then
- LIBS="$saved_LIBS -ldb"
-- AC_TRY_LINK([#include <db.h>],
-+ AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
- dblib="no")
diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure
index 05612707d217..73908ab528cf 100644
--- a/mail/cyrus-imapd23/files/patch-configure
+++ b/mail/cyrus-imapd23/files/patch-configure
@@ -10,23 +10,6 @@ diff -u configure.orig configure
ac_subst_files=''
# Initialize some variables set by options.
-@@ -8768,7 +8769,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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.4 db4.4 db44 db-4.3 db4.3 db43 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8777,6 +8778,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
@@ -16716,6 +16718,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
diff --git a/mail/cyrus-imapd23/files/patch-imap::reconstruct.c b/mail/cyrus-imapd23/files/patch-imap::reconstruct.c
deleted file mode 100644
index 0f82ae45543b..000000000000
--- a/mail/cyrus-imapd23/files/patch-imap::reconstruct.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: imap/reconstruct.c
-diff -u -p imap/reconstruct.c.orig imap/reconstruct.c
---- imap/reconstruct.c.orig Tue Feb 6 03:41:48 2007
-+++ imap/reconstruct.c Sat Feb 10 18:52:48 2007
-@@ -577,8 +577,7 @@ reconstruct_expunge (char * path, struct
- free(expuid);
- return IMAP_IOERROR;
- }
-- unsigned msgno;
-- const char *p = index_base + start_offset;
-+ p = index_base + start_offset;
-
- /*
- * verify the message files exist -
diff --git a/mail/cyrus-imapd23/files/patch-imtest::imtest.c b/mail/cyrus-imapd23/files/patch-imtest::imtest.c
index e1fd1efa8c06..30b84fb9556a 100644
--- a/mail/cyrus-imapd23/files/patch-imtest::imtest.c
+++ b/mail/cyrus-imapd23/files/patch-imtest::imtest.c
@@ -2,14 +2,6 @@ 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 @@
}
diff --git a/mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c b/mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c
deleted file mode 100644
index 722b7bde206d..000000000000
--- a/mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/cyrusdb_berkeley.c
-diff -u -p lib/cyrusdb_berkeley.c.orig lib/cyrusdb_berkeley.c
---- lib/cyrusdb_berkeley.c.orig 2007-02-06 03:43:26.000000000 +0900
-+++ lib/cyrusdb_berkeley.c 2007-08-06 23:04:15.000000000 +0900
-@@ -176,7 +176,15 @@ static int init(const char *dbdir, int m
- syslog(LOG_WARNING,
- "DBERROR: invalid berkeley_locks_max value, using internal default");
- } else {
-+#if DB_VERSION_MAJOR >= 4
-+ r = dbenv->set_lk_max_locks(dbenv, opt);
-+ if (!r)
-+ r = dbenv->set_lk_max_lockers(dbenv, opt);
-+ if (!r)
-+ r = dbenv->set_lk_max_objects(dbenv, opt);
-+#else
- r = dbenv->set_lk_max(dbenv, opt);
-+#endif
- if (r) {
- dbenv->err(dbenv, r, "set_lk_max");
- syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 9d0befe9ab4e..e81ea3ceba10 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -83,7 +83,6 @@ include/cyrus/prot.h
include/cyrus/retry.h
include/cyrus/rfc822date.h
include/cyrus/strhash.h
-include/cyrus/strhash.o
include/cyrus/stristr.h
include/cyrus/sysexits.h
include/cyrus/util.h
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 8d6758d305cd..b7f3c3fa4a21 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= cyrus-imapd
-PORTVERSION= 2.3.8
-PORTREVISION= 1
+PORTVERSION= 2.3.9
+#PORTREVISION= 0
CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
+ http://ftp.andrew.cmu.edu/pub/cyrus/ \
http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
@@ -101,8 +102,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
.if defined(WITH_DRAC)
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
- ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
${FILESDIR}/extra-patch-configure.in
USE_AUTOTOOLS= autoconf:259 autoheader:259
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
@@ -146,8 +146,8 @@ MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
- cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
- fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
+ cyr_dbtool.8 cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 \
+ deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
make_md5.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index e8f999f9e408..a00eb372adf3 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.8.tar.gz) = ac03b02c1ae08d52f807b58c488b204f
-SHA256 (cyrus-imapd-2.3.8.tar.gz) = 0f5c04a7de2da737e5ca0b4f8df8647175188b22972000192bbc7cd87ffda7fe
-SIZE (cyrus-imapd-2.3.8.tar.gz) = 2207366
+MD5 (cyrus-imapd-2.3.9.tar.gz) = 113433c1fdc777e3b0466b5ce643b8bc
+SHA256 (cyrus-imapd-2.3.9.tar.gz) = 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
+SIZE (cyrus-imapd-2.3.9.tar.gz) = 2272004
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4
deleted file mode 100644
index 27c0f42453a8..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: cmulocal/berkdb.m4
-diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
---- cmulocal/berkdb.m4.orig Tue May 23 22:27:15 2006
-+++ cmulocal/berkdb.m4 Wed May 24 00:08:16 2006
-@@ -213,10 +213,11 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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.4 db4.4 db44 db-4.3 db4.3 db43 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
- LIBS="$saved_LIBS -l$dbname"
-- AC_TRY_LINK([#include <db.h>],
-+ AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- [db_create(NULL, NULL, 0);],
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
- dblib="no")
-@@ -224,7 +225,8 @@
- done
- if test "$dblib" = "no"; then
- LIBS="$saved_LIBS -ldb"
-- AC_TRY_LINK([#include <db.h>],
-+ AC_TRY_LINK([#include <stdio.h>
-+#include <db.h>],
- [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
- dblib="no")
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 05612707d217..73908ab528cf 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -10,23 +10,6 @@ diff -u configure.orig configure
ac_subst_files=''
# Initialize some variables set by options.
-@@ -8768,7 +8769,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 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.4 db4.4 db44 db-4.3 db4.3 db43 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8777,6 +8778,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
@@ -16716,6 +16718,7 @@
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
diff --git a/mail/cyrus-imapd24/files/patch-imap::reconstruct.c b/mail/cyrus-imapd24/files/patch-imap::reconstruct.c
deleted file mode 100644
index 0f82ae45543b..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::reconstruct.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: imap/reconstruct.c
-diff -u -p imap/reconstruct.c.orig imap/reconstruct.c
---- imap/reconstruct.c.orig Tue Feb 6 03:41:48 2007
-+++ imap/reconstruct.c Sat Feb 10 18:52:48 2007
-@@ -577,8 +577,7 @@ reconstruct_expunge (char * path, struct
- free(expuid);
- return IMAP_IOERROR;
- }
-- unsigned msgno;
-- const char *p = index_base + start_offset;
-+ p = index_base + start_offset;
-
- /*
- * verify the message files exist -
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
index e1fd1efa8c06..30b84fb9556a 100644
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
@@ -2,14 +2,6 @@ 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 @@
}
diff --git a/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c b/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c
deleted file mode 100644
index 722b7bde206d..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::cyrusdb_berkeley.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/cyrusdb_berkeley.c
-diff -u -p lib/cyrusdb_berkeley.c.orig lib/cyrusdb_berkeley.c
---- lib/cyrusdb_berkeley.c.orig 2007-02-06 03:43:26.000000000 +0900
-+++ lib/cyrusdb_berkeley.c 2007-08-06 23:04:15.000000000 +0900
-@@ -176,7 +176,15 @@ static int init(const char *dbdir, int m
- syslog(LOG_WARNING,
- "DBERROR: invalid berkeley_locks_max value, using internal default");
- } else {
-+#if DB_VERSION_MAJOR >= 4
-+ r = dbenv->set_lk_max_locks(dbenv, opt);
-+ if (!r)
-+ r = dbenv->set_lk_max_lockers(dbenv, opt);
-+ if (!r)
-+ r = dbenv->set_lk_max_objects(dbenv, opt);
-+#else
- r = dbenv->set_lk_max(dbenv, opt);
-+#endif
- if (r) {
- dbenv->err(dbenv, r, "set_lk_max");
- syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 9d0befe9ab4e..e81ea3ceba10 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -83,7 +83,6 @@ include/cyrus/prot.h
include/cyrus/retry.h
include/cyrus/rfc822date.h
include/cyrus/strhash.h
-include/cyrus/strhash.o
include/cyrus/stristr.h
include/cyrus/sysexits.h
include/cyrus/util.h