Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

6 files changed, 21 insertions, 5 deletions

diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 7abdf0d11ac..57c293cee55 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/08/16 20:15:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 19:22:41 jlam Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
diff --git a/devel/unproven-pthreads/buildlink2.mk b/devel/unproven-pthreads/buildlink2.mk
new file mode 100644
index 00000000000..3ef49bb707a
--- /dev/null
+++ b/devel/unproven-pthreads/buildlink2.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:42 jlam Exp $
+
+.if !defined(UNPROVEN_PTHREADS_BUILDLINK2_MK)
+UNPROVEN_PTHREADS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			unproven-pthreads
+BUILDLINK_DEPENDS.unproven-pthreads?=	unproven-pthreads>=0.17
+BUILDLINK_PKGSRCDIR.unproven-pthreads?=	../../devel/unproven-pthreads
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.unproven-pthreads=unproven-pthreads
+BUILDLINK_PREFIX.unproven-pthreads_DEFAULT=	${LOCALBASE}
+
+CC=	${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pgcc
+CXX=	${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pg++
+
+.endif	# UNPROVEN_PTHREADS_BUILDLINK2_MK
diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo
index 349c2ca3368..e1fb7d48584 100644
--- a/devel/unproven-pthreads/distinfo
+++ b/devel/unproven-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/18 09:17:27 agc Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:42 jlam Exp $
 
 SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
 Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
diff --git a/devel/unproven-pthreads/patches/patch-ac b/devel/unproven-pthreads/patches/patch-ac
index 2c080c2805d..f6d8baa6c1e 100644
--- a/devel/unproven-pthreads/patches/patch-ac
+++ b/devel/unproven-pthreads/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:43 jlam Exp $
 
 --- config/configure.in.orig	Mon Jul 10 14:03:06 2000
 +++ config/configure.in
diff --git a/devel/unproven-pthreads/patches/patch-af b/devel/unproven-pthreads/patches/patch-af
index 56bf101ebf3..084843145b0 100644
--- a/devel/unproven-pthreads/patches/patch-af
+++ b/devel/unproven-pthreads/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-af,v 1.4 2002/08/25 19:22:43 jlam Exp $
 
 --- config/configure.orig	Mon Jul 10 14:03:06 2000
 +++ config/configure
diff --git a/devel/unproven-pthreads/patches/patch-bc b/devel/unproven-pthreads/patches/patch-bc
index 901102d8300..a346a029cda 100644
--- a/devel/unproven-pthreads/patches/patch-bc
+++ b/devel/unproven-pthreads/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2002/07/10 21:40:11 skrll Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 19:22:43 jlam Exp $
 
 --- include/pthread.h.orig	Mon Jul 10 19:23:14 2000
 +++ include/pthread.h