Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

7 files changed, 30 insertions, 6 deletions

diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 81ab9f9d404..9ecad8cf98b 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/31 17:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:22:35 jlam Exp $
 #
 
 DISTNAME=		oaf-0.6.10
diff --git a/devel/oaf/PLIST b/devel/oaf/PLIST
index befc113be80..bc56cb1a643 100644
--- a/devel/oaf/PLIST
+++ b/devel/oaf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/18 10:54:16 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:35 jlam Exp $
 bin/oaf-client
 bin/oaf-config
 bin/oaf-empty-server
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index 4210c916d84..d12382a5dbc 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2002/07/14 01:11:42 rh Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/08/25 19:22:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use oaf.
 #
diff --git a/devel/oaf/buildlink2.mk b/devel/oaf/buildlink2.mk
new file mode 100644
index 00000000000..ff301afc31b
--- /dev/null
+++ b/devel/oaf/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:35 jlam Exp $
+
+.if !defined(OAF_BUILDLINK2_MK)
+OAF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		oaf
+BUILDLINK_DEPENDS.oaf?=		oaf>=0.6.7nb1
+BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.oaf=oaf
+BUILDLINK_PREFIX.oaf_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.oaf=		include/liboaf/*
+BUILDLINK_FILES.oaf+=		lib/liboaf.*
+BUILDLINK_FILES.oaf+=		lib/oafConf.sh
+
+.include "../../devel/popt/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		oaf-buildlink
+
+oaf-buildlink: _BUILDLINK_USE
+
+.endif	# OAF_BUILDLINK2_MK
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index c3f824ca716..eedc4163ec5 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/18 10:54:16 mjl Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:22:35 jlam Exp $
 
 SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5
 Size (oaf-0.6.10.tar.bz2) = 435621 bytes
diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac
index e2db5f3cbcb..f865a087213 100644
--- a/devel/oaf/patches/patch-ac
+++ b/devel/oaf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/05/18 10:54:17 mjl Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 19:22:35 jlam Exp $
 
 --- liboaf/Makefile.in.orig	Sat May 18 12:22:48 2002
 +++ liboaf/Makefile.in	Sat May 18 12:23:02 2002
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index 49401b8dd58..e5930d9ab5d 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.6 2002/05/18 10:54:18 mjl Exp $
+$NetBSD: patch-ag,v 1.7 2002/08/25 19:22:35 jlam Exp $
 
 --- configure.orig	Sat May 18 12:24:35 2002
 +++ configure	Sat May 18 12:25:54 2002