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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Fix building with db5; revision bump for db4 update
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:28:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc6492497731
branches:  trunk
changeset: 576138:fc6492497731
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 02 13:14:47 2010 +0000

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

diffstat:

 chat/jabberd2/Makefile            |  65 +++++++++++++++++++-------------------
 chat/jabberd2/PLIST               |   6 +-
 chat/jabberd2/options.mk          |   7 +--
 databases/p5-BDB/Makefile         |   8 ++--
 databases/p5-BDB/distinfo         |   3 +-
 databases/p5-BDB/patches/patch-aa |  31 ++++++++++++++++++
 devel/apr-util/Makefile           |  11 +++---
 devel/apr-util/buildlink3.mk      |   5 +-
 devel/apr-util/options.mk         |  11 +++---
 mail/mutt-devel/Makefile          |  17 ++++-----
 mail/mutt-devel/options.mk        |  14 ++++----
 mail/spamprobe/Makefile           |  11 +++---
 mail/spamprobe/distinfo           |   3 +-
 mail/spamprobe/options.mk         |   7 ++-
 mail/spamprobe/patches/patch-aa   |  13 +++++++
 15 files changed, 129 insertions(+), 83 deletions(-)

diffs (truncated from 461 to 300 lines):

diff -r 52c26b58d344 -r fc6492497731 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Wed Jun 02 13:13:14 2010 +0000
+++ b/chat/jabberd2/Makefile    Wed Jun 02 13:14:47 2010 +0000
@@ -1,23 +1,39 @@
-# $NetBSD: Makefile,v 1.56 2010/04/15 07:01:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/02 13:14:47 adam Exp $
 
-DISTNAME=              jabberd-2.2.9
-PKGREVISION=           2
-CATEGORIES=            chat
-MASTER_SITES=          http://codex.xiaoka.com/pub/jabberd2/releases/
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=      jabberd-2.2.9
+PKGREVISION=   3
+CATEGORIES=    chat
+MASTER_SITES=  http://codex.xiaoka.com/pub/jabberd2/releases/
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=            eric%cirr.com@localhost
-HOMEPAGE=              http://jabberd2.xiaoka.com/
-COMMENT=               XMPP (Jabber) instant messaging server
-LICENSE=               gnu-gpl-v2
+MAINTAINER=    eric%cirr.com@localhost
+HOMEPAGE=      http://jabberd2.xiaoka.com/
+COMMENT=       XMPP (Jabber) instant messaging server
+LICENSE=       gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS=             jabberd-[0-9]*
 
+BDB_ACCEPTED=          db4 db5
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
+USE_TOOLS+=            perl:run
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --enable-anon
+CONFIGURE_ARGS+=       --enable-pipe
+CONFIGURE_ARGS+=       --enable-ssl
+CONFIGURE_ARGS+=       --enable-fs
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+
+.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
+CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=                CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=             CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=             CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+.endif
 
 SUBST_CLASSES+=                path
 SUBST_STAGE.path=      post-patch
@@ -26,22 +42,6 @@
 SUBST_SED.path=                -e "s,/usr/local,${PREFIX},g"
 SUBST_SED.path+=       -e "s,\$$sysconfdir/jabberd,\$$sysconfdir,g"
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --enable-pipe
-CONFIGURE_ARGS+=       --enable-anon
-CONFIGURE_ARGS+=       --enable-ssl
-CONFIGURE_ARGS+=       --enable-fs
-
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
-CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ENV+=                CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-MAKE_ENV+=             CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-MAKE_ENV+=             CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-.endif
-
-USE_TOOLS+=            perl:run
 REPLACE_PERL+=         tools/*.pl
 
 .include "../../mk/bsd.prefs.mk"
@@ -55,10 +55,10 @@
 RCD_SCRIPTS=           jabberd c2s sm router s2s
 JABBERD_USER?=         jabberd
 JABBERD_GROUP?=                jabberd
-FILES_SUBST+=          JABBERD_USER=${JABBERD_USER:Q}
-FILES_SUBST+=          JABBERD_GROUP=${JABBERD_GROUP:Q}
-FILES_SUBST+=          JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
-FILES_SUBST+=          JABBERD_LOGDIR=${JABBERD_LOGDIR:Q}
+FILES_SUBST+=          JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+=          JABBERD_GROUP=${JABBERD_GROUP}
+FILES_SUBST+=          JABBERD_PIDDIR=${JABBERD_PIDDIR}
+FILES_SUBST+=          JABBERD_LOGDIR=${JABBERD_LOGDIR}
 PKG_USERS_VARS+=       JABBERD_USER
 PKG_GROUPS_VARS+=      JABBERD_GROUP
 PKG_GROUPS=            ${JABBERD_GROUP}
@@ -95,8 +95,7 @@
 
 pre-configure:
 .for f in ${FILES}
-       sed                                                             \
-               -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"             \
+       sed     -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"             \
                -e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"                     \
                -e "s|@LOGDIR@|${JABBERD_LOGDIR}|g"                     \
                -e "s|@SSLCERTS@|${SSLCERTS}|g"                         \
@@ -121,9 +120,9 @@
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
 .endfor
 
-.include "../../net/udns/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
+.include "../../net/udns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 52c26b58d344 -r fc6492497731 chat/jabberd2/PLIST
--- a/chat/jabberd2/PLIST       Wed Jun 02 13:13:14 2010 +0000
+++ b/chat/jabberd2/PLIST       Wed Jun 02 13:14:47 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/21 02:28:12 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/06/02 13:14:47 adam Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -32,8 +32,8 @@
 lib/jabberd/mod_offline.la
 lib/jabberd/mod_presence.la
 lib/jabberd/mod_privacy.la
+lib/jabberd/mod_roster-publish.la
 lib/jabberd/mod_roster.la
-lib/jabberd/mod_roster-publish.la
 lib/jabberd/mod_session.la
 lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
@@ -50,10 +50,10 @@
 man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
+share/doc/jabberd/ChangeLog
 share/doc/jabberd/README
 share/doc/jabberd/README.protocol
 share/doc/jabberd/UPGRADE
-share/doc/jabberd/ChangeLog
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
diff -r 52c26b58d344 -r fc6492497731 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk  Wed Jun 02 13:13:14 2010 +0000
+++ b/chat/jabberd2/options.mk  Wed Jun 02 13:14:47 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2009/09/06 04:18:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.24 2010/06/02 13:14:47 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=   auth storage sasl mio
@@ -35,9 +35,8 @@
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 CONFIGURE_ARGS+=       --enable-db
 PLIST.db=              yes
-BDB_ACCEPTED=          db4
-BUILDLINK_TRANSFORM+=  l:db:db4
-.  include "../../databases/db4/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-db
 .endif
diff -r 52c26b58d344 -r fc6492497731 databases/p5-BDB/Makefile
--- a/databases/p5-BDB/Makefile Wed Jun 02 13:13:14 2010 +0000
+++ b/databases/p5-BDB/Makefile Wed Jun 02 13:14:47 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $
-#
+# $NetBSD: Makefile,v 1.2 2010/06/02 13:21:03 adam Exp $
 
 DISTNAME=      BDB-1.88
 PKGNAME=       p5-${DISTNAME}
+PKGREVISION=   1
 SVR4_PKGNAME=  p5bdb
 CATEGORIES=    databases perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/ML/MLEHMANN/}
@@ -14,7 +14,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-BDB_ACCEPTED=          db4 db3 db2
+BDB_ACCEPTED=          db5 db4 db3 db2
 PERL5_PACKLIST=                auto/BDB/.packlist
 
 MAKE_PARAMS+=  INC=-I${BDBBASE:Q}/${BUILDLINK_INCDIRS.${BDB_TYPE}:Q}
@@ -22,6 +22,6 @@
 
 DEPENDS+=      p5-common-sense-[0-9]*:../../devel/p5-common-sense
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bdb.buildlink3.mk"
-.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 52c26b58d344 -r fc6492497731 databases/p5-BDB/distinfo
--- a/databases/p5-BDB/distinfo Wed Jun 02 13:13:14 2010 +0000
+++ b/databases/p5-BDB/distinfo Wed Jun 02 13:14:47 2010 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $
+$NetBSD: distinfo,v 1.2 2010/06/02 13:21:03 adam Exp $
 
 SHA1 (BDB-1.88.tar.gz) = 75f1701d0e768755a7789e4329ac8f8dc6c6c788
 RMD160 (BDB-1.88.tar.gz) = 0140f02283726f29c69cae66af5b2fe43155a55d
 Size (BDB-1.88.tar.gz) = 35879 bytes
+SHA1 (patch-aa) = 8f86278fa8496dc982d779293da798b5eeb0d990
diff -r 52c26b58d344 -r fc6492497731 databases/p5-BDB/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/p5-BDB/patches/patch-aa Wed Jun 02 13:14:47 2010 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2010/06/02 13:21:03 adam Exp $
+
+--- BDB.xs.orig        2010-06-01 07:59:05.000000000 +0000
++++ BDB.xs
+@@ -33,7 +33,7 @@
+ 
+ #include <db.h>
+ 
+-#if DB_VERSION_MAJOR != 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3)
++#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3)
+ # error you need Berkeley DB 4.3 or a newer 4.x version installed
+ #endif
+ 
+@@ -1228,7 +1228,7 @@ BOOT:
+           const_iv (WRITECURSOR)
+           const_iv (YIELDCPU)
+           const_iv (ENCRYPT_AES)
+-#if DB_VERSION_MINOR < 8
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 8)
+           const_iv (XA_CREATE)
+ #endif
+           const_iv (BTREE)
+@@ -1382,7 +1382,7 @@ BOOT:
+           const_iv (PRIORITY_VERY_HIGH)
+           const_iv (IGNORE_LEASE)
+ #endif
+-#if DB_VERSION_MINOR >= 7
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7)
+           //const_iv (MULTIPLE_KEY)
+           const_iv (LOG_DIRECT)
+           const_iv (LOG_DSYNC)
diff -r 52c26b58d344 -r fc6492497731 devel/apr-util/Makefile
--- a/devel/apr-util/Makefile   Wed Jun 02 13:13:14 2010 +0000
+++ b/devel/apr-util/Makefile   Wed Jun 02 13:14:47 2010 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/08/07 10:39:23 tron Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/02 13:19:43 adam Exp $
 
 DISTNAME=      apr-util-1.3.9
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=apr/}
 
@@ -13,16 +14,16 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config
-GNU_CONFIGURE= yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config
 CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=       --without-gdbm
 CONFIGURE_ARGS+=       --without-sqlite2
 PKGCONFIG_OVERRIDE+=   apr-util.pc.in
 
-MAKE_ENV+=     WRAPPER_DIR=${WRAPPER_DIR:Q}
+MAKE_ENV+=     WRAPPER_DIR=${WRAPPER_DIR}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff -r 52c26b58d344 -r fc6492497731 devel/apr-util/buildlink3.mk
--- a/devel/apr-util/buildlink3.mk      Wed Jun 02 13:13:14 2010 +0000
+++ b/devel/apr-util/buildlink3.mk      Wed Jun 02 13:14:47 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/17 12:02:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/02 13:19:43 adam Exp $
 
 BUILDLINK_TREE+=       apr-util
 
@@ -23,7 +23,8 @@
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
-.  include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED?=         db4 db5
+.  include "../../mk/bdb.buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap)
diff -r 52c26b58d344 -r fc6492497731 devel/apr-util/options.mk
--- a/devel/apr-util/options.mk Wed Jun 02 13:13:14 2010 +0000
+++ b/devel/apr-util/options.mk Wed Jun 02 13:14:47 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2009/11/23 22:57:52 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2010/06/02 13:19:43 adam Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/xmlrpc-c Use LDFLAGS before any additional li...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-MooseX-Getopt to 0.28
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/xmlrpc-c Use LDFLAGS before any additional li...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-MooseX-Getopt to 0.28
Indexes:
Home | Main Index | Thread Index | Old Index