pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail Fix building with db5; revision bump for db4 update



details:   https://anonhg.NetBSD.org/pkgsrc/rev/02266742ef25
branches:  trunk
changeset: 576131:02266742ef25
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 02 12:53:49 2010 +0000

description:
Fix building with db5; revision bump for db4 update

diffstat:

 mail/claws-mail/Makefile                 |   9 +++--
 mail/cyrus-imapd/Makefile                |  20 ++++++------
 mail/cyrus-imapd/distinfo                |   4 +-
 mail/cyrus-imapd/patches/patch-ag        |  47 +++++++++++++++++++++++++++++++-
 mail/etpan/Makefile                      |   8 ++--
 mail/evolution-data-server/Makefile      |  13 ++++----
 mail/evolution-data-server/buildlink3.mk |   7 ++--
 mail/exim/Makefile                       |   4 +-
 mail/exim/options.mk                     |  16 +++-------
 mail/isync/Makefile                      |  16 +++++-----
 mail/isync/distinfo                      |   6 +---
 mail/isync/patches/patch-aa              |  18 ------------
 mail/isync/patches/patch-ab              |  17 -----------
 mail/isync/patches/patch-ac              |  13 --------
 mail/isync/patches/patch-ad              |  13 --------
 mail/libetpan/Makefile                   |  24 ++++++++--------
 mail/libetpan/buildlink3.mk              |   7 ++--
 mail/libetpan/distinfo                   |   3 +-
 mail/libetpan/patches/patch-ab           |  13 ++++++++
 19 files changed, 125 insertions(+), 133 deletions(-)

diffs (truncated from 579 to 300 lines):

diff -r 53c9a33cf761 -r 02266742ef25 mail/claws-mail/Makefile
--- a/mail/claws-mail/Makefile  Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/claws-mail/Makefile  Wed Jun 02 12:53:49 2010 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2010/02/03 19:45:04 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/02 12:53:49 adam Exp $
+
+PKGREVISION=   1
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 INSTALLATION_DIRS+=    ${EGDIR}
@@ -17,7 +19,7 @@
 PKGCONFIG_OVERRIDE+=   claws-mail.pc.in
 
 PKG_SYSCONFSUBDIR=     claws-mail
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -69,12 +71,11 @@
 PLIST_SRC+=    PLIST.shred
 .endif
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 53c9a33cf761 -r 02266742ef25 mail/cyrus-imapd/Makefile
--- a/mail/cyrus-imapd/Makefile Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/cyrus-imapd/Makefile Wed Jun 02 12:53:49 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2010/01/17 12:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/02 12:56:39 adam Exp $
 
 DISTNAME=      cyrus-imapd-2.2.13p1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
                ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -18,7 +18,7 @@
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 PERL5_CONFIGURE=       no
-BDB_ACCEPTED=          db4 db3
+BDB_ACCEPTED=          db3 db4 db5
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,12 +30,12 @@
 
 PKG_GROUPS_VARS+=      CYRUS_GROUP
 PKG_USERS_VARS+=       CYRUS_USER
-FILES_SUBST+=          CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+=          CYRUS_GROUP=${CYRUS_GROUP:Q}
+FILES_SUBST+=          CYRUS_USER=${CYRUS_USER}
+FILES_SUBST+=          CYRUS_GROUP=${CYRUS_GROUP}
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --with-cyrus-user=${CYRUS_USER:Q}
-CONFIGURE_ARGS+=       --with-cyrus-group=${CYRUS_GROUP:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --with-cyrus-user=${CYRUS_USER}
+CONFIGURE_ARGS+=       --with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=       --with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=       --with-statedir=${VARBASE}/run
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
@@ -67,7 +67,7 @@
 .  endif
 .elif !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-gssapi=${KRB5BASE:Q}
+CONFIGURE_ARGS+=       --enable-gssapi=${KRB5BASE}
 CONFIGURE_ARGS+=       --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=       heimdal
 GSSIMPL.mit-krb5=      mit
@@ -131,7 +131,7 @@
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
-CONFIGURE_ENV+=        BDB_TYPE=${BDB_TYPE:Q}
+CONFIGURE_ENV+=        BDB_TYPE=${BDB_TYPE}
 
 # Only imap/mupdate needs to be build with pthreads support, so selectively
 # enable it via patches for just that one program.
diff -r 53c9a33cf761 -r 02266742ef25 mail/cyrus-imapd/distinfo
--- a/mail/cyrus-imapd/distinfo Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/cyrus-imapd/distinfo Wed Jun 02 12:53:49 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2009/09/10 05:13:56 obache Exp $
+$NetBSD: distinfo,v 1.31 2010/06/02 12:56:39 adam Exp $
 
 SHA1 (cyrus-imapd-2.2.13p1.tar.gz) = b9bc268c40fbb60aeb5253d61c4bfe5cffd3fb15
 RMD160 (cyrus-imapd-2.2.13p1.tar.gz) = 1604f07491d41f05563181bce46ff1b7a6e5f739
@@ -9,7 +9,7 @@
 SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
 SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
 SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
-SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd
+SHA1 (patch-ag) = e51020accbd2a259a9abe27e5d220e61c9ab314e
 SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c
 SHA1 (patch-am) = 6e67366a0ad01cf075c23c5a32f1c9d456e1498f
 SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
diff -r 53c9a33cf761 -r 02266742ef25 mail/cyrus-imapd/patches/patch-ag
--- a/mail/cyrus-imapd/patches/patch-ag Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/cyrus-imapd/patches/patch-ag Wed Jun 02 12:53:49 2010 +0000
@@ -1,7 +1,25 @@
-$NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $
+$NetBSD: patch-ag,v 1.5 2010/06/02 12:56:39 adam Exp $
 
 --- lib/cyrusdb_berkeley.c.orig        2006-03-17 16:12:32.000000000 +0000
 +++ lib/cyrusdb_berkeley.c
+@@ -104,7 +104,7 @@ static void db_panic(DB_ENV *dbenv __att
+     exit(EC_TEMPFAIL);
+ }
+ 
+-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+ static void db_err(const DB_ENV *dbenv __attribute__((unused)),
+                  const char *db_prfx, const char *buffer)
+ #else
+@@ -160,7 +160,7 @@ static int init(const char *dbdir, int m
+ #endif
+     }
+ 
+-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+     dbenv->set_msgcall(dbenv, db_msg);
+ #endif
+     dbenv->set_errcall(dbenv, db_err);
 @@ -173,7 +173,15 @@ static int init(const char *dbdir, int m
        syslog(LOG_WARNING,
               "DBERROR: invalid berkeley_locks_max value, using internal default");
@@ -18,3 +36,30 @@
        if (r) {
            dbenv->err(dbenv, r, "set_lk_max");
            syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
+@@ -270,7 +278,7 @@ static int mysync(void)
+ 
+     assert(dbinit);
+ 
+-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
+     do {
+ #endif
+ #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0))
+@@ -278,7 +286,7 @@ static int mysync(void)
+ #else
+       r = txn_checkpoint(dbenv, 0, 0);
+ #endif
+-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
+     } while (r == DB_INCOMPLETE);  /* Never returned by BDB 4.1 */
+ #endif
+     if (r) {
+@@ -393,7 +401,7 @@ static int myopen(const char *fname, DBT
+     }
+     /* xxx set comparator! */
+ 
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+     r = db->open(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664);
+ #else
+     r = db->open(db, fname, NULL, type, dbflags, 0664);
diff -r 53c9a33cf761 -r 02266742ef25 mail/etpan/Makefile
--- a/mail/etpan/Makefile       Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/etpan/Makefile       Wed Jun 02 12:53:49 2010 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/04 02:08:22 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.13 2010/06/02 12:57:48 adam Exp $
 
 DISTNAME=      etpan-ng-0.7.1
 PKGNAME=       ${DISTNAME:S/-ng//}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
@@ -13,6 +12,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+BDB_ACCEPTED=          db4 db5
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            perl:run yacc
 GNU_CONFIGURE=         yes
@@ -27,9 +27,9 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/CONFIG ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/doc/INTERNAL ${DESTDIR}${DOCDIR}
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mail/libetpan/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 53c9a33cf761 -r 02266742ef25 mail/evolution-data-server/Makefile
--- a/mail/evolution-data-server/Makefile       Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/evolution-data-server/Makefile       Wed Jun 02 12:53:49 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2010/04/13 16:22:47 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.98 2010/06/02 13:03:11 adam Exp $
 
 DISTNAME=      evolution-data-server-2.28.3.1
+PKGREVISION=   1
 CATEGORIES=    mail gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/evolution-data-server/2.28/}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,11 +13,12 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-GNU_CONFIGURE=         YES
+BDB_ACCEPTED=          db4 db5
 USE_TOOLS+=            bison gmake intltool msgfmt pkg-config
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           YES
 USE_PKGLOCALEDIR=      YES
+GNU_CONFIGURE=         YES
 
 PYTHON_FOR_BUILD_ONLY= YES
 PYTHON_PATCH_SCRIPTS=  addressbook/libebook/gen-western-table.py
@@ -46,8 +47,7 @@
 CONFIGURE_ARGS+=       --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
 CONFIGURE_ARGS+=       --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib
 CONFIGURE_ARGS+=       --with-openldap
-CONFIGURE_ARGS+=       --with-libdb=${LOCALBASE}
-BUILDLINK_TRANSFORM+=  l:db:db4
+CONFIGURE_ARGS+=       --with-libdb=${BDBBASE}
 
 PKGCONFIG_OVERRIDE+=   addressbook/libebook/libebook.pc.in
 PKGCONFIG_OVERRIDE+=   addressbook/libedata-book/libedata-book.pc.in
@@ -60,11 +60,11 @@
 PKGCONFIG_OVERRIDE+=   servers/groupwise/libegroupwise.pc.in
 PKGCONFIG_OVERRIDE+=   evolution-data-server.pc.in
 
+BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 BUILDLINK_TRANSFORM+=  rm:-ldl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -81,5 +81,6 @@
 BUILDLINK_API_DEPENDS.libical+=        libical>=0.43
 .include "../../time/libical/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 53c9a33cf761 -r 02266742ef25 mail/evolution-data-server/buildlink3.mk
--- a/mail/evolution-data-server/buildlink3.mk  Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/evolution-data-server/buildlink3.mk  Wed Jun 02 12:53:49 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2009/10/25 13:23:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2010/06/02 13:03:11 adam Exp $
 
 BUILDLINK_TREE+=       evolution-data-server
 
@@ -6,18 +6,19 @@
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution-data-server+=  evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server?=  evolution-data-server>=2.22.3nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server+=  evolution-data-server>=2.22.3nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=    ../../mail/evolution-data-server
 
+BDB_ACCEPTED?=         db4 db5
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -evolution-data-server
diff -r 53c9a33cf761 -r 02266742ef25 mail/exim/Makefile
--- a/mail/exim/Makefile        Wed Jun 02 12:50:03 2010 +0000
+++ b/mail/exim/Makefile        Wed Jun 02 12:53:49 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2010/01/31 21:06:29 heinz Exp $
+# $NetBSD: Makefile,v 1.101 2010/06/02 13:04:04 adam Exp $
 



Home | Main Index | Thread Index | Old Index