[pkgsrc/trunk]: pkgsrc/databases/openldap Fixed building on NetBSD 2.0 and -c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04e716d1d373
branches:  trunk
changeset: 485498:04e716d1d373
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Dec 14 09:08:37 2004 +0000

description:
Fixed building on NetBSD 2.0 and -current

diffstat:

 databases/openldap/Makefile         |  20 ++++++++++----------
 databases/openldap/distinfo         |   4 ++--
 databases/openldap/patches/patch-ac |  19 +++++++++++++++----
 3 files changed, 27 insertions(+), 16 deletions(-)

diffs (76 lines):

diff -r 4484c2713d67 -r 04e716d1d373 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Tue Dec 14 06:59:11 2004 +0000
+++ b/databases/openldap/Makefile       Tue Dec 14 09:08:37 2004 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.90 2004/11/26 03:00:24 jlam Exp $
+# $NetBSD: Makefile,v 1.91 2004/12/14 09:08:37 adam 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
+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@localhost
-HOMEPAGE=              http://www.OpenLDAP.org/
-COMMENT=               Lightweight directory access protocol server and client package
+MAINTAINER=    jlam%NetBSD.org@localhost
+HOMEPAGE=      http://www.OpenLDAP.org/
+COMMENT=       Lightweight directory access protocol server and client package
 
 CONFLICTS+=            ldapsdk-[0-9]*
 
diff -r 4484c2713d67 -r 04e716d1d373 databases/openldap/distinfo
--- a/databases/openldap/distinfo       Tue Dec 14 06:59:11 2004 +0000
+++ b/databases/openldap/distinfo       Tue Dec 14 09:08:37 2004 +0000
@@ -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 -r 4484c2713d67 -r 04e716d1d373 databases/openldap/patches/patch-ac
--- a/databases/openldap/patches/patch-ac       Tue Dec 14 06:59:11 2004 +0000
+++ b/databases/openldap/patches/patch-ac       Tue Dec 14 09:08:37 2004 +0000
@@ -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();