diff options
| author | adam <adam@pkgsrc.org> | 2010-06-02 13:14:47 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-06-02 13:14:47 +0000 |
| commit | af27353ec8a9e63f0b4eb306119a8e8596d5f28e (patch) | |
| tree | 67b3e0570f90708d3283ac9230d0d2d9777800d5 /devel/apr-util | |
| parent | c48946fd88a792ba21627554b5ef83e116bdebb9 (diff) | |
| download | pkgsrc-af27353ec8a9e63f0b4eb306119a8e8596d5f28e.tar.gz | |
Fix building with db5; revision bump for db4 update
Diffstat (limited to 'devel/apr-util')
| -rw-r--r-- | devel/apr-util/Makefile | 11 | ||||
| -rw-r--r-- | devel/apr-util/buildlink3.mk | 5 | ||||
| -rw-r--r-- | devel/apr-util/options.mk | 11 |
3 files changed, 15 insertions, 12 deletions
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile index 866473fe45d..6d7fc5fb3b4 100644 --- a/devel/apr-util/Makefile +++ b/devel/apr-util/Makefile @@ -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_DESTDIR_SUPPORT= user-destdir 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 --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk index ba3db22eb0d..3d4a2a963ac 100644 --- a/devel/apr-util/buildlink3.mk +++ b/devel/apr-util/buildlink3.mk @@ -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 @@ pkgbase := apr-util .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 --git a/devel/apr-util/options.mk b/devel/apr-util/options.mk index 5ea69db5ab8..82b07d253c8 100644 --- a/devel/apr-util/options.mk +++ b/devel/apr-util/options.mk @@ -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 $ PKG_OPTIONS_VAR= PKG_OPTIONS.apr-util PKG_SUPPORTED_OPTIONS= db4 ldap mysql pgsql sqlite3 @@ -8,10 +8,11 @@ PKG_SUPPORTED_OPTIONS= db4 ldap mysql pgsql sqlite3 PLIST_VARS+= ldap mysql pgsql sqlite3 db4 .if !empty(PKG_OPTIONS:Mdb4) -CONFIGURE_ARGS+= \ - --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} -PLIST.db4= yes -. include "../../databases/db4/buildlink3.mk" +BDB_ACCEPTED= db4 db5 +BUILDLINK_TRANSFORM+= l:db4:${BDB_TYPE} +CONFIGURE_ARGS+= --with-berkeley-db=${BDBBASE}/include:${LOCALBASE} +PLIST.db4= yes +. include "../../mk/bdb.buildlink3.mk" .else CONFIGURE_ARGS+= --with-dbm=sdbm .endif |