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, 28 insertions, 6 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index dc9644ac051..b26c970554c 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/01/10 12:10:45 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 18:40:39 jlam Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -25,7 +25,7 @@ CONFLICTS+=		lesstif-[0-9]*
 DIST_SUBDIR=		openmotif
 WRKSRC=			${WRKDIR}/motif
 USE_X11BASE=		# defined
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 ALL_TARGET=		World
 
 DEINSTALL_TMPL=		${.CURDIR}/DEINSTALL
@@ -105,6 +105,5 @@ post-install:
 		${INSTALL_MAN} $${file} ${PREFIX}/man/$${file};		\
         done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/buildlink2.mk b/x11/openmotif/buildlink2.mk
new file mode 100644
index 00000000000..64e67004677
--- /dev/null
+++ b/x11/openmotif/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:40 jlam Exp $
+
+.if !defined(OPENMOTIF_BUILDLINK2_MK)
+OPENMOTIF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		openmotif
+BUILDLINK_DEPENDS.openmotif?=	openmotif>=2.1.30
+BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.openmotif=openmotif
+BUILDLINK_PREFIX.openmotif_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.openmotif=	include/Mrm/*
+BUILDLINK_FILES.openmotif+=	include/Xm/*
+BUILDLINK_FILES.openmotif+=	include/uil/*
+BUILDLINK_FILES.openmotif+=	lib/libMrm.*
+BUILDLINK_FILES.openmotif+=	lib/libUil.*
+BUILDLINK_FILES.openmotif+=	lib/libXm.*
+
+BUILDLINK_TARGETS+=		openmotif-buildlink
+
+openmotif-buildlink: _BUILDLINK_USE
+
+.endif	# OPENMOTIF_BUILDLINK2_MK
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 0365b4fdcc8..0dec8634f5c 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/06/22 04:38:31 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:40:40 jlam Exp $
 
 SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
 Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
diff --git a/x11/openmotif/patches/patch-ap b/x11/openmotif/patches/patch-ap
index d77f040d844..eaf406f84c7 100644
--- a/x11/openmotif/patches/patch-ap
+++ b/x11/openmotif/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2002/06/22 04:38:31 jlam Exp $
+$NetBSD: patch-ap,v 1.3 2002/08/25 18:40:40 jlam Exp $
 
 --- config/cf/NetBSD.cf.orig	Sat Jun 22 00:09:12 2002
 +++ config/cf/NetBSD.cf
diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as
index 64a9fbdb628..eaf3628e1ab 100644
--- a/x11/openmotif/patches/patch-as
+++ b/x11/openmotif/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1 2002/06/22 04:38:32 jlam Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $
 
 --- config/cf/Imake.cf.orig	Sat Jun 22 00:09:11 2002
 +++ config/cf/Imake.cf