diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-21 13:07:03 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-21 13:07:03 +0000 |
| commit | 4b671f30ece9a94da656c8f6f45034918169be99 (patch) | |
| tree | 46e6152f4ef84ba0fb0f06d3ab22b4f7d25eaa84 | |
| parent | 83d797399342e9bf42a7d9fb1cd72382f60e5711 (diff) | |
| download | pkgsrc-4b671f30ece9a94da656c8f6f45034918169be99.tar.gz | |
buildlink1 -> buildlink2
| -rw-r--r-- | emulators/xmess/Makefile | 15 | ||||
| -rw-r--r-- | games/clanbomber/Makefile | 11 |
2 files changed, 12 insertions, 14 deletions
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index fbcfeaa523e..d4e09f27b6d 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/06/25 09:21:35 cjep Exp $ +# $NetBSD: Makefile,v 1.24 2002/09/21 13:12:26 jlam Exp $ # DISTNAME= xmame-0.56.2 @@ -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 @@ -25,16 +26,15 @@ UNLIMIT_RESOURCES= datasize # XXX On arm(32), the src/unix/video_drivers/x11_window.c causes problems .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= @@ -87,10 +87,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 @@ -102,7 +102,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/games/clanbomber/Makefile b/games/clanbomber/Makefile index 1369dfd97db..f375856f554 100644 --- a/games/clanbomber/Makefile +++ b/games/clanbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/30 02:58:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.16 2002/09/21 13:07:03 jlam Exp $ DISTNAME= clanbomber-1.01 PKGREVISION= 2 @@ -9,15 +9,14 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.clanbomber.de/ COMMENT= Bomberman clone using the ClanLib graphics system -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes USE_GMAKE= yes pre-configure: - ${ECHO} "#define BOMBERDATDIR \"${X11PREFIX}/share/clanbomber/clanbomber.dat\"" >> ${WRKSRC}/config.h.in - ${ECHO} "#define BOMBERMAPS \"${X11PREFIX}/share/clanbomber/maps\"" >> ${WRKSRC}/config.h.in + ${ECHO} "#define BOMBERDATDIR \"${PREFIX}/share/clanbomber/clanbomber.dat\"" >> ${WRKSRC}/config.h.in + ${ECHO} "#define BOMBERMAPS \"${PREFIX}/share/clanbomber/maps\"" >> ${WRKSRC}/config.h.in -.include "../../graphics/clanlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/clanlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |