Fix up pthread related source:

- PTHREAD_MUTEX_RECURSIVE is POSIX, _NP doesn't exist
- try to link when looking for pthread_mutex_timedlock
- don't hard-code -lpthread

Bump revision, since the generated library changed.

4 files changed, 123 insertions, 8 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index e5ff7b52955..cdeb8d4a07a 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/04/12 18:30:04 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2006/05/16 15:56:43 joerg Exp $
 
 DISTNAME=	pwlib-v1_8_3-src
 PKGNAME=	pwlib-1.8.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES+=	http://www.voxgratia.org/releases/
 EXTRACT_SUFX=	-tar.gz
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index bf5531fd155..ce043557986 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/03/29 04:05:08 uebayasi Exp $
+$NetBSD: distinfo,v 1.20 2006/05/16 15:56:43 joerg Exp $
 
 SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e
 RMD160 (pwlib-v1_8_3-src-tar.gz) = 1ce2544ef631c8344543e62988f97022c998bb05
@@ -7,14 +7,14 @@ SHA1 (patch-aa) = e8dc5e42fc758ec2a437caed47a29495b3017b5e
 SHA1 (patch-ab) = 597cbdcd050b4c0d20d8dee7358bbf5dbf3cf210
 SHA1 (patch-ac) = c0284e67ce689d774b715be4dc17214aa88c3d4a
 SHA1 (patch-ad) = 75e346285b12fad914b31fb83a9d625d48dce255
-SHA1 (patch-ae) = ebe340836c7456a355b4518789a49b7550766b06
+SHA1 (patch-ae) = 0dac8899df0c169d69196827c6316edc51c024f1
 SHA1 (patch-af) = c38f646d75d57f17101ce42813f8e66232778447
 SHA1 (patch-ag) = bc08c8fc6d14021b1ebfab12d6ffb86404a588bb
 SHA1 (patch-ah) = fff6483f2a2f5864df57a6d90489846b5cc7ffdf
 SHA1 (patch-ai) = f0a9a80914dd4ae0f531c646001bce06c68e8e2f
 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0
 SHA1 (patch-ak) = 74c9733c010c6620d7d6355afb8f482f7087a2b0
-SHA1 (patch-al) = 306d4e7882c1e717ae51f0eda70d08e89b40d20e
+SHA1 (patch-al) = a849ef5c4486948919299815f1627158482adb75
 SHA1 (patch-am) = 5b80fce03de136913dadfdbbdc161edef2f72919
 SHA1 (patch-an) = f79776e86d32bd15fd9f8fe1c0c02196ce4bcd3e
 SHA1 (patch-ao) = 665d7c87476b8bb7afe3bdb1a892cf98f7bff8d2
diff --git a/devel/pwlib/patches/patch-ae b/devel/pwlib/patches/patch-ae
index e14bd2f68e1..b4b59c9ecaf 100644
--- a/devel/pwlib/patches/patch-ae
+++ b/devel/pwlib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2006/01/08 04:57:55 joerg Exp $
+$NetBSD: patch-ae,v 1.5 2006/05/16 15:56:43 joerg Exp $
 
---- configure.orig	2006-01-08 03:13:16.000000000 +0000
+--- configure.orig	2004-11-21 23:15:48.000000000 +0000
 +++ configure
 @@ -2059,6 +2059,14 @@ case "$target_os" in
                     need_pragma=yes ;
@@ -17,3 +17,90 @@ $NetBSD: patch-ae,v 1.4 2006/01/08 04:57:55 joerg Exp $
    openbsd* )       OSTYPE=OpenBSD ;
  		   OS_TAG="P_OPENBSD" ;
                     OSRELEASE="`sysctl -n kern.osrevision`" ;
+@@ -3144,13 +3152,13 @@ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3214,7 +3222,7 @@ else
+ fi
+ 
+ if test ${HAS_PTHREADS} = yes ; then
+-  ENDLDLIBS="$ENDLDLIBS -lpthread"
++  ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+   STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
+ else
+     echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
+@@ -3303,6 +3311,8 @@ fi
+ if test ${HAS_PTHREADS} = yes ; then
+   echo "$as_me:$LINENO: checking if pthread_mutex_timedlock is available" >&5
+ echo $ECHO_N "checking if pthread_mutex_timedlock is available... $ECHO_C" >&6
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3320,7 +3330,7 @@ pthread_mutex_timedlock(NULL, NULL);
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++  (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3346,6 +3356,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ HAS_PTHREADS_XPG6=no
+ fi
++LIBS=$ac_check_lib_save_LIBS
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   if test ${HAS_PTHREADS_XPG6} = yes ; then
+     echo "$as_me:$LINENO: result: yes" >&5
+@@ -3360,13 +3371,13 @@ _ACEOF
+ echo "${ECHO_T}no" >&6
+   fi
+ 
+-  echo "$as_me:$LINENO: checking for sem_timedwait in -lpthread" >&5
+-echo $ECHO_N "checking for sem_timedwait in -lpthread... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for sem_timedwait in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for sem_timedwait in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_sem_timedwait+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3504,7 +3515,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-pthread_mutexattr_t attr; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++pthread_mutexattr_t attr; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+   ;
+   return 0;
+ }
+@@ -6492,7 +6503,7 @@ if test "${ac_cv_lib_SDL_SDL_CreateYUVOv
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lSDL -L${X11LIBDIR} -lpthread -lX11 -lXext -laa $LIBS"
++LIBS="-lSDL -L${X11LIBDIR} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lX11 -lXext -laa $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/devel/pwlib/patches/patch-al b/devel/pwlib/patches/patch-al
index 50b90a892ff..77f3d556c30 100644
--- a/devel/pwlib/patches/patch-al
+++ b/devel/pwlib/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2004/11/30 16:44:47 adam Exp $
+$NetBSD: patch-al,v 1.4 2006/05/16 15:56:43 joerg Exp $
 
 --- src/ptlib/unix/tlibthrd.cxx.orig	2004-09-02 07:55:44.000000000 +0000
 +++ src/ptlib/unix/tlibthrd.cxx
@@ -12,3 +12,31 @@ $NetBSD: patch-al,v 1.3 2004/11/30 16:44:47 adam Exp $
  
      lastTime = PTime();
    }
+@@ -1587,17 +1589,13 @@ BOOL PSemaphore::WillBlock() const
+ #endif
+ }
+ 
+-#if defined(P_QNX) && (P_HAS_RECURSIVE_MUTEX == 1)
+-#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+-#endif
+-
+ PMutex::PMutex()
+   : PSemaphore(PXMutex)
+ {
+ #if P_HAS_RECURSIVE_MUTEX
+   pthread_mutexattr_t attr;
+   pthread_mutexattr_init(&attr);
+-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+   pthread_mutex_init(&mutex, &attr);
+ #else
+   ownerThreadId = (pthread_t)-1;
+@@ -1610,7 +1608,7 @@ PMutex::PMutex(const PMutex & /*mut*/)
+ #if P_HAS_RECURSIVE_MUTEX
+   pthread_mutexattr_t attr;
+   pthread_mutexattr_init(&attr);
+-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+   pthread_mutex_init(&mutex, &attr);
+ #else
+   ownerThreadId = (pthread_t)-1;