Add a fix to LDAP extension build to properly detect LDAP capabilities,

such as TLS support.

Patch provided by Stoned Elipot in private e-mail.

5 files changed, 31 insertions, 4 deletions

diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index b38438372f7..1bc5027bf7e 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/07 21:09:28 jdolecek Exp $
 
 MODNAME=		ldap
-PKGREVISION=		# empty
+PKGREVISION=		1
 CATEGORIES+=		databases
 COMMENT=		PHP extension for LDAP database access
 
+USE_PHP_EXT_PATCHES=	yes
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
 
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 001c1693ffd..fd69825879f 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/09/08 18:49:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.9 2005/10/07 21:09:28 jdolecek Exp $
 
 SHA1 (php-5.0.5.tar.bz2) = ffcc050f879265eb96f2c8dc79fa895047da9d4a
 RMD160 (php-5.0.5.tar.bz2) = 6a9a892affba229770154407860cd1c2a098eaf9
@@ -6,3 +6,4 @@ Size (php-5.0.5.tar.bz2) = 4895556 bytes
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
+SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9
diff --git a/lang/php5/patches/patch-am b/lang/php5/patches/patch-am
new file mode 100644
index 00000000000..2debaa29ec5
--- /dev/null
+++ b/lang/php5/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2005/10/07 21:09:28 jdolecek Exp $
+
+--- ext/ldap/config.m4.orig	2005-05-08 16:06:24.000000000 +0000
++++ ext/ldap/config.m4
+@@ -114,6 +114,7 @@ if test "$PHP_LDAP" != "no"; then
+   _SAVE_CPPFLAGS=$CPPFLAGS
+   _SAVE_LDFLAGS=$LDFLAGS
+   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
++  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
+   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
+   [AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)],
+   ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)])
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 2c0ec1b6282..b57a12850a8 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2005/10/05 15:59:47 tron Exp $
+$NetBSD: distinfo,v 1.45 2005/10/07 21:09:27 jdolecek Exp $
 
 SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
 RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
+SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9
diff --git a/www/php4/patches/patch-am b/www/php4/patches/patch-am
new file mode 100644
index 00000000000..71ff02daf8c
--- /dev/null
+++ b/www/php4/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.3 2005/10/07 21:09:28 jdolecek Exp $
+
+--- ext/ldap/config.m4.orig	2005-05-08 16:06:24.000000000 +0000
++++ ext/ldap/config.m4
+@@ -114,6 +114,7 @@ if test "$PHP_LDAP" != "no"; then
+   _SAVE_CPPFLAGS=$CPPFLAGS
+   _SAVE_LDFLAGS=$LDFLAGS
+   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
++  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
+   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
+   [AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)],
+   ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)])