[pkgsrc/trunk]: pkgsrc/databases/openldap Add (conflicting) "iodbc" and "unix...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6231641ab0dd
branches:  trunk
changeset: 505062:6231641ab0dd
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Dec 29 20:10:23 2005 +0000

description:
Add (conflicting) "iodbc" and "unixodbc" options to openldap for ODBC support,
from PR#31960.  Ok by jlam and wiz.

diffstat:

 databases/openldap/distinfo         |   3 ++-
 databases/openldap/options.mk       |  25 ++++++++++++++++++++++++-
 databases/openldap/patches/patch-ao |  17 +++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diffs (77 lines):

diff -r 1990acc89653 -r 6231641ab0dd databases/openldap/distinfo
--- a/databases/openldap/distinfo       Thu Dec 29 19:55:22 2005 +0000
+++ b/databases/openldap/distinfo       Thu Dec 29 20:10:23 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2005/11/19 18:41:15 joerg Exp $
+$NetBSD: distinfo,v 1.44 2005/12/29 20:10:23 ghen Exp $
 
 SHA1 (openldap-2.3.11.tgz) = e7a4a5b2d50b8138ed835b7e9e722814f1877806
 RMD160 (openldap-2.3.11.tgz) = 4947c7f15b70dfd55ff30028228ec915064feba1
@@ -12,3 +12,4 @@
 SHA1 (patch-ak) = 80685a7b46ded94722ea91c2842db424572d6513
 SHA1 (patch-am) = 12929851d1cfae97e1afa082cb82a00341a0d9ed
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
+SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
diff -r 1990acc89653 -r 6231641ab0dd databases/openldap/options.mk
--- a/databases/openldap/options.mk     Thu Dec 29 19:55:22 2005 +0000
+++ b/databases/openldap/options.mk     Thu Dec 29 20:10:23 2005 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.14 2005/12/05 20:49:58 rillig Exp $
+# $NetBSD: options.mk,v 1.15 2005/12/29 20:10:23 ghen Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
+PKG_OPTIONS_OPTIONAL_GROUPS+=  odbc
+PKG_OPTIONS_GROUP.odbc=        iodbc unixodbc
 PKG_SUGGESTED_OPTIONS= bdb
 
 .include "../../mk/bsd.options.mk"
@@ -25,6 +27,27 @@
 .endif
 
 ###
+### Whether to build with iODBC to enable SQL based slapd backends
+###
+.if !empty(PKG_OPTIONS:Miodbc)
+.  include "../../databases/iodbc/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-sql
+.endif
+
+###
+### Whether to build with unixODBC to enable SQL based slapd backends
+###
+.if !empty(PKG_OPTIONS:Munixodbc)
+.  include "../../databases/unixodbc/buildlink3.mk"
+.  include "../../devel/libltdl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-sql
+.endif
+
+.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc)
+CONFIGURE_ARGS+=       --disable-sql
+.endif
+
+###
 ### Kerberos authentication is via SASL.
 ###
 .if !empty(PKG_OPTIONS:Mkerberos)
diff -r 1990acc89653 -r 6231641ab0dd databases/openldap/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-ao       Thu Dec 29 20:10:23 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2005/12/29 20:10:23 ghen Exp $
+
+SQL_NO_DATA is called SQL_NO_DATA_FOUND in ODBC versions >= 3.0,
+as provided by databases/iodbc and databases/unixodbc.
+
+
+--- servers/slapd/back-sql/delete.c.orig       2005-08-09 23:04:06.000000000 +0200
++++ servers/slapd/back-sql/delete.c
+@@ -363,7 +363,7 @@ backsql_delete( Operation *op, SlapReply
+ 
+       rc = SQLExecute( sth );
+       switch ( rc ) {
+-      case SQL_NO_DATA:
++      case SQL_NO_DATA_FOUND:
+               /* apparently there were no "auxiliary" objectClasses
+                * for this entry... */
+       case SQL_SUCCESS: