From e2afa97f51a1f72e6618533019aaaae07b7d3cf2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 25 Aug 2002 18:38:05 +0000
Subject: 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.

---
 x11/Xbae/Makefile      | 11 +++++------
 x11/Xbae/buildlink2.mk | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 x11/Xbae/buildlink2.mk

(limited to 'x11/Xbae')

diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 9fbf620c81f..d9c51cc3abb 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/04/17 03:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:27 jlam Exp $
 #
 
 DISTNAME=	Xbae-4.9.1
@@ -9,14 +9,14 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.lesstif.org/Xbae.html
 COMMENT=	Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-motif-includes=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	--with-motif-libraries=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-motif-includes=${MOTIFBASE}/include
+CONFIGURE_ARGS+=	--with-motif-libraries=${MOTIFBASE}/lib
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
@@ -26,6 +26,5 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \
 		${LOCALBASE}/share/aclocal/ac_find_xbae.m4
 
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xbae/buildlink2.mk b/x11/Xbae/buildlink2.mk
new file mode 100644
index 00000000000..9a795ad90b0
--- /dev/null
+++ b/x11/Xbae/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:28 jlam Exp $
+
+.if !defined(XBAE_BUILDLINK2_MK)
+XBAE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		Xbae
+BUILDLINK_DEPENDS.Xbae?=	Xbae>=4.8.4
+BUILDLINK_PKGSRCDIR.Xbae?=	../../x11/Xbae
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.Xbae=Xbae
+BUILDLINK_PREFIX.Xbae_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.Xbae=		include/Xbae/*
+BUILDLINK_FILES.Xbae+=		lib/libXbae.*
+
+.include "../../mk/motif.buildlink2.mk"
+
+BUILDLINK_TARGETS+=	Xbae-buildlink
+
+Xbae-buildlink: _BUILDLINK_USE
+
+.endif	# XBAE_BUILDLINK2_MK
-- 
cgit v1.2.3