Use the "Official Pthreads Replacement" in kdenetwork2.

Bump PKGREVISION and depend on it.

3 files changed, 9 insertions, 33 deletions

diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index f024f182382..92b5d2242bf 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:30 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/13 06:59:37 skrll Exp $
 
 DISTNAME=	kdenetwork-2.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
 .include "../../x11/kde2/Makefile.kde2"
 
+PTHREAD_OPT+=	require
+
 BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 
 USE_BUILDLINK_ONLY=	YES
 
 .include "../../converters/uulib/buildlink.mk"
 .include "../../databases/gdbm/buildlink.mk"
-.include "../../devel/ptl2/buildlink.mk"
 .include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/pthread/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 3220f26922a..eed1bb3b169 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2001/12/13 00:58:31 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/09/13 06:59:38 skrll Exp $
 
 SHA1 (kdenetwork-2.2.2.tar.bz2) = 2f29ebd72fbb9f8c8ae21e092cc9b89e7f2ebab2
 Size (kdenetwork-2.2.2.tar.bz2) = 3168454 bytes
 SHA1 (patch-aa) = 2d189779c1bcd3059ada271c7b87ec5bf5f403e4
-SHA1 (patch-ab) = 38f731b7e8e50a703a4d1a3a46820c03fa0f1b9d
+SHA1 (patch-ab) = f1b100d222961464d0ac18bb3c208f401b1cd3a4
 SHA1 (patch-ac) = db243a2ef536d7967dc43a9eba3ba7e2aaf7349f
 SHA1 (patch-ad) = db3ad0f88fb91976c6388ec017852e0b3502422d
 SHA1 (patch-ae) = 1880a2861f908f39091924eef003b4548e8cd457
diff --git a/net/kdenetwork2/patches/patch-ab b/net/kdenetwork2/patches/patch-ab
index 5c089859e2a..b461b57bf95 100644
--- a/net/kdenetwork2/patches/patch-ab
+++ b/net/kdenetwork2/patches/patch-ab
@@ -1,33 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/12/03 15:37:17 skrll Exp $
+$NetBSD: patch-ab,v 1.5 2002/09/13 06:59:38 skrll Exp $
 
 --- configure.orig	Wed Nov 14 14:39:38 2001
 +++ configure	Mon Nov 26 12:56:30 2001
-@@ -10832,13 +10832,13 @@
- 
- fi
- 
--echo "$as_me:10835: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:10835: checking for pthread_create in -lPTL" >&5
-+echo $ECHO_N "checking for pthread_create in -lPTL... $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="-lPTL  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 10843 "configure"
- #include "confdefs.h"
-@@ -10882,7 +10882,7 @@
- echo "$as_me:10882: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
--  LIBPTHREAD="-lpthread"
-+  LIBPTHREAD="-lPTL"
- fi
- 
-     # Check whether --enable-kernel-threads or --disable-kernel-threads was given.
 @@ -11086,6 +11086,11 @@
          freebsd*)
                  CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
@@ -35,7 +9,7 @@ $NetBSD: patch-ab,v 1.4 2001/12/03 15:37:17 skrll Exp $
 +                ;;
 +        netbsd*)
 +                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+		USE_THREADS="-I${BUILDLINK_DIR}/PTL/include"
++		USE_THREADS="-I${BUILDLINK_DIR}/include"
 +                echo "Setting NetBSD pthread compilation options"
                  ;;
          aix*)