ports/73568: [PATCH] `devel/apr' builded with db4, used db4.2, if installed, but port indicate dependency on 4.0.

[Lev A. Serebryakov]

>Number:         73568
>Category:       ports
>Synopsis:       [PATCH] `devel/apr' builded with db4, used db4.2, if installed, but port indicate dependency on 4.0.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 05 15:50:35 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Lev A. Serebryakov <lev at FreeBSD.org>
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freebsd4-vmware 4.10-RELEASE FreeBSD 4.10-RELEASE #4: Sat Jul 24 18:41:28 MSD 2004 root@:/usr/src/sys/compile/VMWARE i386
Ports: 04 Nov 2004.

>Description:

  When system contains `databases/db4' and `databases/db42' installed, `devel/apr'
  used `db42', but ports system thinks, that it depends on `db4'.

>How-To-Repeat:

  Install `databases/db42' and build `devel/apr' with `APR_UTIL_WITH_BERKELEYDB=yes' knob.
  `databases/db4' will be installed and registered as dependency.
  Run `apu-1-config --libs'.

>Fix:

  It is good idea to update `devel/apr' to use `databases/db42' in any case :)
  Here is the patch:

--- Makefile.orig	Fri Nov  5 18:07:42 2004
+++ Makefile	Fri Nov  5 18:08:44 2004
@@ -8,8 +8,8 @@
 # APR_UTIL_WITHOUT_THREADS:	disable threads support
 # 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
+# APR_UTIL_WITH_BERKELEY_DB:	force dependency on Sleepycat's Berkeley DB 4.2
+# APR_UTIL_WITHOUT_BERKELEY_DB:	unconditionally disable the use of db4.2
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
 # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
@@ -67,8 +67,8 @@
 
 .if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
 APR_UTIL_CONF_ARGS+=	--without-berkeley-db
-.elif defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb4.so.0)
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+.elif defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb-4.2.so.2)
+LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
 APR_UTIL_CONF_ARGS+=	--with-berkeley-db=${PREFIX}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-db4
@@ -114,7 +114,7 @@
 	@${ECHO_MSG} "Berkeley db4 support is disabled."
 .elif defined(APR_UTIL_WITH_BERKELEY_DB)
 	@${ECHO_MSG} "Berkeley db4 support forced."
-.elif exists(${LOCALBASE}/lib/libdb4.so.0)
+.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2)
 	@${ECHO_MSG} "Berkeley db4 support is enabled."
 	@${ECHO_MSG} "You can disable Berkeley db4 support by defining APR_UTIL_WITHOUT_BERKELEY_DB."
 .else
>Release-Note:
>Audit-Trail:
>Unformatted: