Date: Thu, 23 Oct 2003 22:22:24 -0400 (EDT) From: Craig Rodrigues <rodrigc@crodrigues.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Thomas-Martin Seck <tmseck@netcologne.de> Subject: ports/58474: devel/apr update Message-ID: <200310240222.h9O2MOeQ013622@h00609772adf0.ne.client2.attbi.com> Resent-Message-ID: <200310240230.h9O2UDRn083435@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58474
>Category: ports
>Synopsis: devel/apr update
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 23 19:30:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Craig Rodrigues
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.crodrigues.org 5.1-CURRENT FreeBSD 5.1-CURRENT #10: Tue Oct 21 20:27:15 EDT 2003 rodrigc@dibbler.crodrigues.org:/usr/obj/usr/src/sys/MYKERNEL1 i386
>Description:
>How-To-Repeat:
>Fix:
Tunables provided by Thomas-Martin Seck
to conditionally add dependencies on gdbm or db4.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 3 Oct 2003 05:25:03 -0000 1.21
+++ Makefile 19 Oct 2003 17:26:15 -0000
@@ -4,6 +4,13 @@
#
# $FreeBSD: ports/devel/apr/Makefile,v 1.21 2003/10/03 05:25:25 max Exp $
#
+# Tunables:
+# APR_UTIL_WITH_GDBM: force dependency on the GNU dbm
+# APR_UTIL_WITHOUT_GDBM: unconditionally disable the use of GNU dbm
+# APR_UTIL_WITH_BERKELEY_DB: force dependency on Sleepycat's Berkeley DB 4
+# APR_UTIL_WITHOUT_BERKELEY_DB: unconditionally disable the use of db4
+# (the database bindings are detected and recorded automatically if these
+# switches are not set)
PORTNAME= apr
PORTVERSION= 0.9.4
@@ -27,6 +34,8 @@
WRKSRC= ${WRKDIR}
+CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}"
+
APR_CONF_ENV= ${CONFIGURE_ENV} \
CONFIG_SHELL=/bin/sh
@@ -39,6 +48,34 @@
--with-expat=${PREFIX} \
--with-iconv=${PREFIX}
+.include <bsd.port.pre.mk>
+
+.if defined(APR_UTIL_WITHOUT_GDBM)
+APR_UTIL_CONF_ARGS+= --without-gdbm
+.else
+.if defined(APR_UTIL_WITH_GDBM) || exists(${LOCALBASE}/lib/libgdbm.so.3)
+LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
+.else
+PKGNAMESUFFIX= -gdbm
+.endif
+.endif
+.endif
+
+.if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
+APR_UTIL_CONF_ARGS+= --without-berkeley-db
+.else
+.if defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb4.so.0)
+LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-db4
+.else
+PKGNAMESUFFIX= -db4
+.endif
+.endif
+.endif
+
pre-configure:
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
@@ -60,4 +97,4 @@
cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} install
cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} install
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310240222.h9O2MOeQ013622>