[pkgsrc/trunk]: pkgsrc/mk As i described in <9883.1074028467@gould.diplodocus...

[epg <epg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61609aa1edda
branches:  trunk
changeset: 466454:61609aa1edda
user:      epg <epg%pkgsrc.org@localhost>
date:      Sun Jan 18 18:55:24 2004 +0000

description:
As i described in <9883.1074028467%gould.diplodocus.org@localhost>
(http://mail-index.netbsd.org/tech-pkg/2004/01/13/0015.html) and
<479.1074093881%gould.diplodocus.org@localhost>
(http://mail-index.netbsd.org/tech-pkg/2004/01/14/0016.html), add an
APR_USE_DB4 variable (defaulting to YES except on platforms where db4
is broken).

devel/apr now builds without db4 when APR_USE_DB4 is NO.

diffstat:

 devel/apr/Makefile      |  27 ++++++++++++++++++++++-----
 devel/apr/buildlink2.mk |   7 ++++++-
 mk/bsd.pkg.defaults.mk  |  12 +++++++++++-
 3 files changed, 39 insertions(+), 7 deletions(-)

diffs (100 lines):

diff -r d31431031d92 -r 61609aa1edda devel/apr/Makefile
--- a/devel/apr/Makefile        Sun Jan 18 18:49:08 2004 +0000
+++ b/devel/apr/Makefile        Sun Jan 18 18:55:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/13 10:09:18 jklos Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/18 18:55:24 epg Exp $
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
 PKGREVISION=   1
@@ -27,22 +27,39 @@
 .endfor
 .undef f
 
-do-configure:
-       @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \
+APR_CONFIGURE_ARGS= \
                --prefix=${PREFIX} \
                --with-devrandom=/dev/urandom \
                --with-installbuilddir=${PREFIX}/libexec/apr
-       @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
+
+APU_CONFIGURE_ARGS= \
                --prefix=${PREFIX} \
                --with-apr=${WRKSRC}/apr \
-               --with-dbm=sdbm \
                --with-expat=${BUILDLINK_PREFIX.expat}
 
+.include "../../mk/bsd.prefs.mk"
+.if ${APR_USE_DB4} == "YES"
+APU_CONFIGURE_ARGS+=\
+       --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
+.else
+APU_CONFIGURE_ARGS+=   --with-dbm=sdbm
+.endif
+
+do-configure:
+       @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \
+               ${APR_CONFIGURE_ARGS}
+       @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
+               ${APU_CONFIGURE_ARGS}
+
 post-install:
        ${RM} ${PREFIX}/libexec/apr/libtool
        ${INSTALL_SCRIPT} ${LIBTOOL} ${PREFIX}/libexec/apr/libtool
 
 .include "../../www/apache2/Makefile.common"
 
+.if ${APR_USE_DB4} == "YES"
+.include "../../databases/db4/buildlink2.mk"
+.endif
+
 .include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d31431031d92 -r 61609aa1edda devel/apr/buildlink2.mk
--- a/devel/apr/buildlink2.mk   Sun Jan 18 18:49:08 2004 +0000
+++ b/devel/apr/buildlink2.mk   Sun Jan 18 18:55:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/13 10:09:32 jklos Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/18 18:55:24 epg Exp $
 #
 
 .if !defined(APR_BUILDLINK2_MK)
@@ -19,6 +19,11 @@
 BUILDLINK_FILES.apr+=  lib/libapr-0.*
 BUILDLINK_FILES.apr+=  lib/libaprutil-0.*
 
+.include "../../mk/bsd.prefs.mk"
+.if ${APR_USE_DB4} == "YES"
+.include "../../databases/db4/buildlink2.mk"
+.endif
+
 .include "../../textproc/expat/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    apr-buildlink
diff -r d31431031d92 -r 61609aa1edda mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Sun Jan 18 18:49:08 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Sun Jan 18 18:55:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.206 2004/01/15 12:48:00 jlam Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.207 2004/01/18 18:55:24 epg Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -590,6 +590,16 @@
 # Possible: Any valid directory
 # Default: ${LOCALBASE}/share/httpd/htdocs
 
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+APR_USE_DB4?= NO
+.else
+APR_USE_DB4?= YES
+.endif
+# Used in apr to determine whether to use db4.  This should be the
+# default, but apr is broken on NetBSD/powerpc so it is disabled
+# there.
+# Default: YES
+
 ARLA_CACHE?=   ${LOCALBASE}/cache
 # Used in arla to specify the location of the cache used by arla. Should
 # be on a local disk.