Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

5 files changed, 30 insertions, 5 deletions

diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 91bb4c581d5..66a5926e3c0 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/08/01 13:36:08 skrll Exp $
+# $NetBSD: Makefile,v 1.47 2002/08/25 18:38:43 jlam Exp $
 #
 
 DISTNAME=		pth-1.4.1
@@ -12,7 +12,7 @@ COMMENT=		GNU Portable Thread library
 
 CONFLICTS=		pth-current-[0-9]* pth-syscall<1.4.1nb1
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		YES
@@ -37,3 +37,7 @@ post-install:
 			${PREFIX}/share/doc/pth/
 
 .include "../../mk/bsd.pkg.mk"
+
+.if (${MACHINE_ARCH} == "i386" && ${CFLAGS:M-O2} == "-O2")
+CFLAGS:=		${CFLAGS:S/-O2/-O0/}
+.endif
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index f64b2d9eee5..9a34fa03420 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2002/05/31 06:24:53 grant Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/08/25 18:38:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
diff --git a/devel/pth/buildlink2.mk b/devel/pth/buildlink2.mk
new file mode 100644
index 00000000000..11aa8d142a7
--- /dev/null
+++ b/devel/pth/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:44 jlam Exp $
+
+.if !defined(PTH_BUILDLINK2_MK)
+PTH_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		pth
+BUILDLINK_DEPENDS.pth?=		pth>=1.4.0
+BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.pth=pth
+BUILDLINK_PREFIX.pth_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.pth=	include/pth.h
+BUILDLINK_FILES.pth+=	include/pthread.h
+BUILDLINK_FILES.pth+=	lib/libpth.*
+BUILDLINK_FILES.pth+=	lib/libpthread.*
+
+BUILDLINK_TARGETS+=	pth-buildlink
+
+pth-buildlink: _BUILDLINK_USE
+
+.endif	# PTH_BUILDLINK2_MK
diff --git a/devel/pth/distinfo b/devel/pth/distinfo
index 2cb0a4314c2..a29b5180a5f 100644
--- a/devel/pth/distinfo
+++ b/devel/pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/01 13:36:08 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:38:44 jlam Exp $
 
 SHA1 (pth-1.4.1.tar.gz) = bc5b0847d57d2b78945a6c8d4ebab57e46213972
 Size (pth-1.4.1.tar.gz) = 446287 bytes
diff --git a/devel/pth/patches/patch-ag b/devel/pth/patches/patch-ag
index acce8bca0c7..fb4d421e080 100644
--- a/devel/pth/patches/patch-ag
+++ b/devel/pth/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2002/08/01 13:36:09 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 18:38:45 jlam Exp $
 
 --- pth_lib.c.orig	Sun Jan 27 11:03:40 2002
 +++ pth_lib.c