Bug 185630 - [PATCH] net/openldap24-server: add support of Berkeley DB 6.x
Summary: [PATCH] net/openldap24-server: add support of Berkeley DB 6.x
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Xin LI
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-10 07:20 UTC by Yasuhiro Kimura
Modified: 2014-01-14 01:10 UTC (History)
0 users

See Also:


Attachments
patch-openldap24-server (2.01 KB, text/plain)
2014-01-10 07:20 UTC, Yasuhiro Kimura
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2014-01-10 07:20:00 UTC
	
	Add support of Berkeley DB 6.x.
	Patch is obtained from following URL:

	http://git.pld-linux.org/?p=packages/openldap.git;a=blob_plain;f=openldap-db.patch;h=3e3a78b0e2126f3723e6f223ecfb70bc1bd714f3;hb=HEAD
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-10 07:20:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->delphij

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Xin LI freebsd_committer freebsd_triage 2014-01-14 01:02:32 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-14 01:02:39 UTC
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])
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"