[pkgsrc/trunk]: pkgsrc/databases/php4-ldap we link against the non-thread lda...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85896a8ab0af
branches:  trunk
changeset: 466388:85896a8ab0af
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Jan 17 12:06:59 2004 +0000

description:
we link against the non-thread ldap library, so we do not need to care
about pthreads here; g/c the unneeded patch too

XXX eventually we might consider a thread-safe variant of this
module for PHP under Apache 2.x, which would use (thread-safe)
libldap_r rather than the (not thread safe) libldap

bump pkg revision just in case

diffstat:

 databases/php4-ldap/Makefile         |   6 ++----
 databases/php4-ldap/distinfo         |   5 -----
 databases/php4-ldap/patches/patch-aa |  22 ----------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diffs (58 lines):

diff -r c77471fe7615 -r 85896a8ab0af databases/php4-ldap/Makefile
--- a/databases/php4-ldap/Makefile      Sat Jan 17 09:38:18 2004 +0000
+++ b/databases/php4-ldap/Makefile      Sat Jan 17 12:06:59 2004 +0000
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2003/09/19 10:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/17 12:06:59 jdolecek Exp $
 
 MODNAME=               ldap
 CATEGORIES+=           databases
-PKGREVISION=           # empty
+PKGREVISION=           1
 COMMENT=               PHP4 extension for LDAP database access
 
 USE_BUILDLINK2=                YES
-DISTINFO_FILE=         ${.CURDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
-CONFIGURE_ENV+=                PTHREAD_TYPE="${PTHREAD_TYPE}"
 
 .include "../../databases/openldap/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c77471fe7615 -r 85896a8ab0af databases/php4-ldap/distinfo
--- a/databases/php4-ldap/distinfo      Sat Jan 17 09:38:18 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2003/11/08 06:58:10 jdolecek Exp $
-
-SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
-Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-aa) = 5c8011a8222920c07fbac8d95491eef767047eb4
diff -r c77471fe7615 -r 85896a8ab0af databases/php4-ldap/patches/patch-aa
--- a/databases/php4-ldap/patches/patch-aa      Sat Jan 17 09:38:18 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/08/31 19:55:31 jdolecek Exp $
-
---- config.m4.orig     2003-08-31 13:11:08.000000000 +0200
-+++ config.m4  2003-08-31 13:12:20.000000000 +0200
-@@ -42,13 +42,16 @@
-   dnl these here if necessary.   -RL
-   dnl Is this really necessary? -Troels Arvin
- 
--  if test `uname` = "Linux"; then
-+  if test "x${PTHREAD_TYPE}" = "xnative"; then
-     LDAP_PTHREAD=pthread
-   else
-     LDAP_PTHREAD=
-   fi
- 
-   if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
-+    if test -n "$LDAP_PTHREAD"; then
-+      PHP_ADD_LIBRARY_WITH_PATH($LDAP_PTHREAD, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-+    fi
-     PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-