Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

10 files changed, 104 insertions, 6 deletions

diff --git a/lang/cim/buildlink2.mk b/lang/cim/buildlink2.mk
new file mode 100644
index 00000000000..3679b9f3ea7
--- /dev/null
+++ b/lang/cim/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:01 jlam Exp $
+
+.if !defined(CIM_BUILDLINK2_MK)
+CIM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		cim
+BUILDLINK_DEPENDS.cim?=		cim>=3.30
+BUILDLINK_PKGSRCDIR.cim?=	../../lang/cim
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.cim=cim
+BUILDLINK_PREFIX.cim_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cim=		include/cim.h
+BUILDLINK_FILES.cim+=		lib/libcim-atr.*
+BUILDLINK_FILES.cim+=		lib/libcim.*
+
+BUILDLINK_TARGETS+=	cim-buildlink
+
+cim-buildlink: _BUILDLINK_USE
+
+.endif	# CIM_BUILDLINK2_MK
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 0ef5902047d..a410bc1f01d 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/07/02 14:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/08/25 19:23:02 jlam Exp $
 
 DISTNAME=	f2c-20001205
 PKGREVISION=	5
diff --git a/lang/f2c/buildlink2.mk b/lang/f2c/buildlink2.mk
new file mode 100644
index 00000000000..37bdc912d28
--- /dev/null
+++ b/lang/f2c/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:02 jlam Exp $
+
+.if !defined(F2C_BUILDLINK2_MK)
+F2C_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		f2c
+BUILDLINK_DEPENDS.f2c?=		f2c>=20001205nb3
+BUILDLINK_PKGSRCDIR.f2c?=	../../lang/f2c
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.f2c=f2c
+BUILDLINK_PREFIX.f2c_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.f2c=	include/f2c.h
+BUILDLINK_FILES.f2c+=	lib/libf2c.*
+BUILDLINK_FILES.f2c+=	lib/libf2c_p.a
+BUILDLINK_FILES.f2c+=	lib/libf2c_pic.a
+BUILDLINK_FILES.f2c+=	lib/libF77.*
+BUILDLINK_FILES.f2c+=	lib/libF77_p.a
+BUILDLINK_FILES.f2c+=	lib/libF77_pic.a
+BUILDLINK_FILES.f2c+=	lib/libI77.*
+BUILDLINK_FILES.f2c+=	lib/libI77_p.a
+BUILDLINK_FILES.f2c+=	lib/libI77_pic.a
+
+PKG_FC=			${BUILDLINK_PREFIX.f2c}/bin/f2c-f77
+
+BUILDLINK_TARGETS+=	f2c-buildlink
+
+f2c-buildlink: _BUILDLINK_USE
+
+.endif	# F2C_BUILDLINK2_MK
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index fe5d1d80aac..9481451f85b 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/06/17 04:21:08 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:23:02 jlam Exp $
 
 SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
 Size (f2c-20001205.tar.gz) = 988607 bytes
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 7ac8c5bab94..126af6db8da 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2002/06/17 04:21:09 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.12 2002/08/25 19:23:02 jlam Exp $
 
 Add a top level Makefile
 
diff --git a/lang/gb/buildlink2.mk b/lang/gb/buildlink2.mk
new file mode 100644
index 00000000000..f5861fd7a7c
--- /dev/null
+++ b/lang/gb/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:03 jlam Exp $
+
+.if !defined(GB_BUILDLINK2_MK)
+GB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gb
+BUILDLINK_DEPENDS.gb?=		gb>=0.0.20nb1
+BUILDLINK_PKGSRCDIR.gb?=	../../lang/gb
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gb=gb
+BUILDLINK_PREFIX.gb_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gb=		include/gb/*
+BUILDLINK_FILES.gb+=		include/gbrun/*
+BUILDLINK_FILES.gb+=		lib/libgbrun.*
+
+.include "../../print/gnome-print/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gb-buildlink
+
+gb-buildlink: _BUILDLINK_USE
+
+.endif	# GB_BUILDLINK2_MK
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index d4dcb2583cf..f6161566378 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/07/12 07:55:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:23:03 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
diff --git a/lang/guile/buildlink2.mk b/lang/guile/buildlink2.mk
new file mode 100644
index 00000000000..4339ca38e89
--- /dev/null
+++ b/lang/guile/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:03 jlam Exp $
+
+.if !defined(GUILE_BUILDLINK2_MK)
+GUILE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		guile
+BUILDLINK_DEPENDS.guile?=	guile>=1.4
+BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.guile=guile
+BUILDLINK_PREFIX.guile_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.guile+=	include/guile/*
+BUILDLINK_FILES.guile+=	include/guile-readline/*
+BUILDLINK_FILES.guile+=	include/libguile.h
+BUILDLINK_FILES.guile+=	include/libguile/*
+BUILDLINK_FILES.guile+=	lib/libguile.*
+BUILDLINK_FILES.guile+=	lib/libguilereadline.*
+
+USE_GNU_READLINE=	# defined
+
+.include "../../devel/readline/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	guile-buildlink
+
+guile-buildlink: _BUILDLINK_USE
+
+.endif	# GUILE_BUILDLINK2_MK
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 2c98ff85e2e..4496c12c90a 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/23 21:29:28 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:23:03 jlam Exp $
 
 SHA1 (guile-1.4.tar.gz) = b143efaff0820f7c701eea0b25aa87af2693c4ac
 Size (guile-1.4.tar.gz) = 1132852 bytes
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index b9be47ad655..35e9499e148 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/23 21:29:29 agc Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:04 jlam Exp $
 
 --- guile-readline/configure	2002/07/23 21:24:40	1.1
 +++ guile-readline/configure	2002/07/23 21:25:00