From b4f8836f2419241b87ccd09315e69d3cf96a9dae Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 20 Oct 2002 13:37:17 +0000
Subject: Convert to buildlink2.

---
 emulators/xcopilot/Makefile | 10 +++-------
 graphics/giram/Makefile     | 12 +++++-------
 x11/xlockmore/Makefile      |  9 +++++----
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index b02b04e6801..9d4e12af398 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/01 12:21:38 tron Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/20 13:45:31 wiz Exp $
 #
 
 DISTNAME=		xcopilot-0.6.6
@@ -11,16 +11,12 @@ COMMENT=		PalmPilot emulator for X
 
 NOT_FOR_PLATFORM=	*-*-alpha	# suspected LP64 bugs
 
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_X11=		YES
-USE_XPM=		YES
-
-EVAL_PREFIX+=		XPMDIR=xpm
-
-CFLAGS+=		-I${XPMDIR}/include
-LDFLAGS+=		-L${XPMDIR}/lib -Wl,-R${XPMDIR}/lib
 
 post-extract:
 	${RM} -f ${WRKSRC}/mc68k/custom.c
 
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index f965c14d094..e73352c3db7 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/10/08 11:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/10/20 13:37:17 wiz Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
 DISTNAME=	Giram-0.1.2
@@ -11,21 +11,19 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.minet.net/giram/
 COMMENT=	Giram is Really A Modeller
 
-DEPENDS+=	gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
 DEPENDS+=	povray-[0-9]*:../../graphics/povray
 
+USE_BUILDLINK2=	yes
 USE_X11=	yes
-USE_MESA=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-EVAL_PREFIX+=	GTKDIR=gtk+
-CONFIGURE_ENV=	GTK_CONFIG="${GTKDIR}/bin/gtk-config" \
-		PKGLOCALEDIR="${PKGLOCALEDIR}" \
-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
+CONFIGURE_ENV=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram
 	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/
 
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index cff55b9bd0f..176d7bde1c0 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2002/08/27 16:33:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.51 2002/10/20 13:42:10 wiz Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
 COMMENT=	Like the XLock session locker/screen saver, but with more
 
-CHECK_MESA=	YES
+USE_BUILDLINK2=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesa \
 		--without-xpm # --without-cxx XXX doesn't work
 CONFIGURE_ENV+= CXX="${CC}"	# no dependency on libstdc++
 .else
-USE_XPM=	YES
-USE_MESA=	YES
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 CONFIGURE_ARGS+= --with-mesagl
 .endif
 
@@ -74,4 +74,5 @@ post-install:
 			${WRKSRC}/sounds/complete.au	\
 				${PREFIX}/lib/X11/xlockmore
 
+.include "../../audio/esound/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3