diff options
| author | jdolecek <jdolecek> | 2004-01-17 12:06:59 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2004-01-17 12:06:59 +0000 |
| commit | 1224b669b6d89a8f01a457831d7074b8b71c1660 (patch) | |
| tree | 62d002e1e93fc53465f1b9043bbe979c60152132 | |
| parent | f8c5050ff37ac1c5b2166bec4b8e0412fd9c79f8 (diff) | |
| download | pkgsrc-1224b669b6d89a8f01a457831d7074b8b71c1660.tar.gz | |
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
| -rw-r--r-- | databases/php4-ldap/Makefile | 6 | ||||
| -rw-r--r-- | databases/php4-ldap/distinfo | 5 | ||||
| -rw-r--r-- | databases/php4-ldap/patches/patch-aa | 22 |
3 files changed, 2 insertions, 31 deletions
diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile index a0bb53cb464..00b295a2a5d 100644 --- a/databases/php4-ldap/Makefile +++ b/databases/php4-ldap/Makefile @@ -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 --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo deleted file mode 100644 index 87d5045d21a..00000000000 --- a/databases/php4-ldap/distinfo +++ /dev/null @@ -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 --git a/databases/php4-ldap/patches/patch-aa b/databases/php4-ldap/patches/patch-aa deleted file mode 100644 index 1e62bcebeaa..00000000000 --- a/databases/php4-ldap/patches/patch-aa +++ /dev/null @@ -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) - |