From owner-freebsd-ports Thu Mar 2 19:50: 6 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id A0F4E37BE9F for ; Thu, 2 Mar 2000 19:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id TAA71235; Thu, 2 Mar 2000 19:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from paris.dppl.com (paris.dppl.com [205.230.74.150]) by hub.freebsd.org (Postfix) with ESMTP id AAA2637B5A6 for ; Thu, 2 Mar 2000 19:45:40 -0800 (PST) (envelope-from yds@dppl.com) Received: by paris.dppl.com (Postfix, from userid 1001) id 83CD1963B; Thu, 2 Mar 2000 22:45:35 -0500 (EST) Message-Id: <20000303034535.83CD1963B@paris.dppl.com> Date: Thu, 2 Mar 2000 22:45:35 -0500 (EST) From: yds@dppl.com Reply-To: yds@dppl.com To: FreeBSD-gnats-submit@freebsd.org Cc: ulmo@earthling.net X-Send-Pr-Version: 3.2 Subject: ports/17136: PATCH: OpenLDAP to optionally build with BerkleyDB2 and tcp_wrappers Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17136 >Category: ports >Synopsis: PATCH: OpenLDAP to optionally build with BerkleyDB2 and tcp_wrappers >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 2 19:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Yarema >Release: FreeBSD 3.4-STABLE i386 >Organization: >Environment: FreeBSD paris.dppl.com 3.4-STABLE FreeBSD 3.4-STABLE #0: Tue Feb 29 02:21:05 EST 2000 >Description: PATCH: OpenLDAP to optionally build with BerkleyDB2, tcp_wrappers and shared libraries. OpenLDAP is written to work with db2 better than db me thinks. So perhaps the dependance should not be optional, but I'd rather have others agree with me on that rather than make it the default in this patch. TCP_wrappers support is just a Good Thing (TM) and shouldn't need justification. Shared libraries are a good thing also for other ports providing LDAP support such as PHP[34]. Removed --prefix=${PREFIX} from CONFIGURE_ARGS since according to the Handbook it is not needed when using GNU_CONFIGURE as opposed to HAS_CONFIGURE. New file openldap/patches/patch-db to properly detect db2. >How-To-Repeat: cd /usr/ports/net/openldap/ && make -DWITH_DB2 and it still builds with db1 :-) >Fix: diff -ruN openldap.old/Makefile openldap/Makefile --- openldap.old/Makefile Sun Jan 30 02:15:58 2000 +++ openldap/Makefile Thu Mar 2 22:01:19 2000 @@ -21,8 +21,19 @@ MAINTAINER= ulmo@earthling.net +.if defined(WITH_DB2) +BUILD_DEPENDS= ${PREFIX}/lib/libdb2.a:${PORTSDIR}/databases/db/ +CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/db2 -D_THREAD_SAFE" \ + LDFLAGS=-L${PREFIX}/lib +.endif + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/run +CONFIGURE_ARGS= --localstatedir=/var/run --enable-shared --enable-dns + +# Include tcp-wrapper support +.if exists(/usr/include/tcpd.h) +CONFIGURE_ARGS+= --enable-wrappers +.endif .include .include "${FILESDIR}/manpages" diff -ruN openldap.old/patches/patch-db openldap/patches/patch-db --- openldap.old/patches/patch-db Wed Dec 31 19:00:00 1969 +++ openldap/patches/patch-db Thu Mar 2 18:42:47 2000 @@ -0,0 +1,29 @@ +--- configure.orig Mon Jan 17 11:53:36 2000 ++++ configure Thu Mar 2 18:40:40 2000 +@@ -6011,14 +6011,14 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ol_LIBS="$LIBS" +- echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 +-echo "configure:6016: checking for db_open in -ldb" >&5 ++ echo $ac_n "checking for db_open in -ldb2""... $ac_c" 1>&6 ++echo "configure:6016: checking for db_open in -ldb2" >&5 + ac_lib_var=`echo db'_'db_open | sed 'y%./+-:%__p__%'` + if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ldb $LIBS" ++LIBS="-ldb2 $LIBS" + cat > conftest.$ac_ext <&6 +- ol_cv_lib_db2=-ldb ++ ol_cv_lib_db2=-ldb2 + else + echo "$ac_t""no" 1>&6 + ol_cv_lib_db2=no diff -ruN openldap.old/pkg/PLIST openldap/pkg/PLIST --- openldap.old/pkg/PLIST Fri Dec 24 02:08:40 1999 +++ openldap/pkg/PLIST Thu Mar 2 22:07:39 2000 @@ -19,8 +19,12 @@ include/srchpref.h lib/liblber.a lib/liblber.la +lib/liblber.so +lib/liblber.so.1 lib/libldap.a lib/libldap.la +lib/libldap.so +lib/libldap.so.1 libexec/fax500 libexec/go500 libexec/go500gw >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message