From a2cfea00b4d433ae06ef470fc9b90c991da0ec3b Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 Sep 2002 12:49:55 +0000
Subject: buildlink1 -> buildlink2

---
 emulators/xmame/Makefile  | 15 +++++++--------
 graphics/clanlib/Makefile | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index b73c8b6ebcf..655a1cffb8d 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2002/06/25 09:21:35 cjep Exp $
+# $NetBSD: Makefile,v 1.78 2002/09/21 12:53:48 jlam Exp $
 #
 
 DISTNAME=		xmame-0.60.1
@@ -15,6 +15,7 @@ RESTRICTED=		"selling is not allowed"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 MAKEFILE=		makefile.unix
@@ -24,16 +25,15 @@ UNLIMIT_RESOURCES=	datasize
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm")
-.if (${CFLAGS:M-O2} == "-O2")
+.  if (${CFLAGS:M-O2} == "-O2")
 CFLAGS:=         ${CFLAGS:S/-O2/-O0/} 
-.endif
+.  endif
 .endif
 
 ROMPATH=		${PREFIX}/share/${TARGET}
 SPOOLDIR=		/var/games/${TARGET}
 
 MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
-MAKE_FLAGS+=		CC="${CC}"
 MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
 MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
 MAKE_FLAGS+=		X11INC= X11LIB=
@@ -86,10 +86,10 @@ post-configure:
 	${SED}	-e "s|@ROMPATH@|${ROMPATH}|g"				\
 		-e "s|@SPOOLDIR@|${SPOOLDIR}|g"				\
 		xmamerc.dist > ${TARGET}rc
-.if ${MAKE_FLAGS:M*USB*} != ""
+.if !empty(MAKE_FLAGS:M*USB*)
 	${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include
 	for FILE in /usr/lib/libusb*; do				\
-	  ${LN} -fs $$FILE ${BUILDLINK_DIR}/lib;			\
+		${LN} -fs $$FILE ${BUILDLINK_DIR}/lib;			\
 	done
 .endif
 
@@ -101,7 +101,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${ROMPATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 693328b293b..2aa12944452 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/08/25 19:22:46 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2002/09/21 12:49:55 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 PKGREVISION=		2
@@ -9,12 +9,14 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 COMMENT=		The ClanLib Game SDK
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-asm386
 .else
@@ -34,14 +36,12 @@ MAKE_ENV+=		X11BASE="${X11BASE}"
 post-patch:
 	${CHMOD} +x ${WRKSRC}/configure
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../graphics/hermes/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 
-.include "../../graphics/hermes/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "NetBSD"
-- 
cgit v1.2.3