Date: Tue, 14 Jan 2014 01:02:27 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339653 - in head/net/openldap24-server: . files Message-ID: <201401140102.s0E12RaU083364@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Jan 14 01:02:26 2014 New Revision: 339653 URL: http://svnweb.freebsd.org/changeset/ports/339653 Log: Support building against Berkeley DB 6.x. PR: ports/185630 Submitted by: Yasuhiro KIMURA <yasu utahime org> Added: head/net/openldap24-server/files/patch-bdb6 (contents, props changed) Modified: head/net/openldap24-server/Makefile Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Tue Jan 14 00:44:46 2014 (r339652) +++ head/net/openldap24-server/Makefile Tue Jan 14 01:02:26 2014 (r339653) @@ -46,6 +46,7 @@ LATEST_LINK?= ${PKGNAMEPREFIX}openldap2 USE_OPENSSL= yes USE_AUTOTOOLS= libtool .if !defined(CLIENT_ONLY) +USE_AUTOTOOLS+= autoconf USERS= ldap GROUPS= ldap .endif @@ -343,7 +344,7 @@ INVALID_BDB_VER= 42 USE_BDB= yes # XXX Can BDB 5.x use XY instead of X as version? -.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 +.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 || ${WITH_BDB_VER} == 6 CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ --enable-hdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ Added: head/net/openldap24-server/files/patch-bdb6 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openldap24-server/files/patch-bdb6 Tue Jan 14 01:02:26 2014 (r339653) @@ -0,0 +1,18 @@ +--- build/openldap.m4.orig 2013-11-15 12:31:27.000000000 +0900 ++++ build/openldap.m4 2014-01-10 15:21:33.000000000 +0900 +@@ -357,7 +357,14 @@ + AC_DEFUN([OL_BERKELEY_DB_LINK], + [ol_cv_lib_db=no + +-if test $ol_cv_bdb_major = 5 ; then ++if test $ol_cv_bdb_major = 6 ; then ++ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor]) ++ OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor]) ++ OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor]) ++ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor]) ++ OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6]) ++ OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6]) ++elif test $ol_cv_bdb_major = 5 ; then + OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor]) + OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor]) + OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401140102.s0E12RaU083364>