diff options
| author | adam <adam@pkgsrc.org> | 2004-12-14 09:08:37 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2004-12-14 09:08:37 +0000 |
| commit | 484e7843e77cc66e509c652c69cb34bbaffb5532 (patch) | |
| tree | 1af091fce276fb52c6e1ce48188e5dca8dfe816c | |
| parent | 1abe55a88feeb52a746f44f80da8b47a1c366ac7 (diff) | |
| download | pkgsrc-484e7843e77cc66e509c652c69cb34bbaffb5532.tar.gz | |
Fixed building on NetBSD 2.0 and -current
| -rw-r--r-- | databases/openldap/Makefile | 24 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 4 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-ac | 19 |
3 files changed, 29 insertions, 18 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 3d3dfa9e9dc..954231c040d 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.90 2004/11/26 03:00:24 jlam Exp $ - -DISTNAME= openldap-2.2.18 -SVR4_PKGNAME= oldap -PKGREVISION= 3 -CATEGORIES= databases -MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -EXTRACT_SUFX= .tgz - -MAINTAINER= jlam@NetBSD.org -HOMEPAGE= http://www.OpenLDAP.org/ -COMMENT= Lightweight directory access protocol server and client package +# $NetBSD: Makefile,v 1.91 2004/12/14 09:08:37 adam Exp $ + +DISTNAME= openldap-2.2.18 +PKGREVISION= 3 +SVR4_PKGNAME= oldap +CATEGORIES= databases +MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ +EXTRACT_SUFX= .tgz + +MAINTAINER= jlam@NetBSD.org +HOMEPAGE= http://www.OpenLDAP.org/ +COMMENT= Lightweight directory access protocol server and client package CONFLICTS+= ldapsdk-[0-9]* diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index c5075bbd4c6..94a158746f2 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.31 2004/11/26 02:52:14 jlam Exp $ +$NetBSD: distinfo,v 1.32 2004/12/14 09:08:37 adam Exp $ SHA1 (openldap-2.2.18.tgz) = df7b681c2480aea39560b22e8b0c7d118915a8f1 Size (openldap-2.2.18.tgz) = 2574691 bytes -SHA1 (patch-ac) = f3d5edf5ddbad93d7a88a6837ea962820fc475ce +SHA1 (patch-ac) = 7eb78bdd4359e015a56b0dbde3ab34fec5f1fb32 SHA1 (patch-ad) = c49ccf52a60110a6fe16afaff0d327e112216c50 SHA1 (patch-af) = cd7c9527272dadf4509c4df1388d353378cdba13 SHA1 (patch-ag) = 4dcbfa758f8c69193a69cb1cc018565a54789939 diff --git a/databases/openldap/patches/patch-ac b/databases/openldap/patches/patch-ac index 1bc0bc4b5f5..c23aa4d9cc4 100644 --- a/databases/openldap/patches/patch-ac +++ b/databases/openldap/patches/patch-ac @@ -1,14 +1,25 @@ -$NetBSD: patch-ac,v 1.5 2004/07/24 03:32:24 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2004/12/14 09:08:37 adam Exp $ ---- libraries/libldap_r/thr_posix.c.orig Thu Jan 1 13:16:30 2004 +--- libraries/libldap_r/thr_posix.c.orig 2004-01-01 18:16:30.000000000 +0000 +++ libraries/libldap_r/thr_posix.c -@@ -112,7 +112,9 @@ ldap_pvt_thread_create( ldap_pvt_thread_ +@@ -112,8 +112,10 @@ ldap_pvt_thread_create( ldap_pvt_thread_ #if defined(LDAP_PVT_THREAD_STACK_SIZE) && LDAP_PVT_THREAD_STACK_SIZE > 0 /* this should be tunable */ +#if defined(_POSIX_THREAD_ATTR_STACKSIZE) pthread_attr_setstacksize( &attr, LDAP_PVT_THREAD_STACK_SIZE ); -+#endif #endif ++#endif #if HAVE_PTHREADS > 5 + detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE; +@@ -190,7 +192,8 @@ ldap_pvt_thread_yield( void ) + return thr_yield(); + + #elif HAVE_PTHREADS == 10 +- return sched_yield(); ++ sched_yield(); ++ return 0; + + #elif defined(_POSIX_THREAD_IS_GNU_PTH) + sched_yield(); |