diff options
Diffstat (limited to 'games')
-rw-r--r-- | games/baduki/Makefile | 4 | ||||
-rw-r--r-- | games/clanbomber/Makefile | 5 | ||||
-rw-r--r-- | games/fire/Makefile | 4 | ||||
-rw-r--r-- | games/freeciv-client-gtk/Makefile | 4 | ||||
-rw-r--r-- | games/freeciv-client/Makefile | 5 | ||||
-rw-r--r-- | games/imaze/Makefile | 4 | ||||
-rw-r--r-- | games/kulki/Makefile | 4 | ||||
-rw-r--r-- | games/kulki/distinfo | 4 | ||||
-rw-r--r-- | games/kulki/patches/patch-aa | 4 | ||||
-rw-r--r-- | games/lbreakout/Makefile | 4 | ||||
-rw-r--r-- | games/lincity/Makefile | 3 | ||||
-rw-r--r-- | games/lincity/distinfo | 4 | ||||
-rw-r--r-- | games/lincity/patches/patch-aa | 4 | ||||
-rw-r--r-- | games/nethack-qt/Makefile | 4 | ||||
-rw-r--r-- | games/nethack-qt/distinfo | 4 | ||||
-rw-r--r-- | games/nethack-qt/patches/patch-ac | 6 | ||||
-rw-r--r-- | games/nethack-x11/Makefile | 5 | ||||
-rw-r--r-- | games/nethack-x11/distinfo | 4 | ||||
-rw-r--r-- | games/nethack-x11/patches/patch-ab | 4 | ||||
-rw-r--r-- | games/newvox/Makefile | 4 | ||||
-rw-r--r-- | games/pacman/Makefile | 5 | ||||
-rw-r--r-- | games/pacman/distinfo | 4 | ||||
-rw-r--r-- | games/pacman/patches/patch-aa | 4 | ||||
-rw-r--r-- | games/xracer/Makefile | 8 |
24 files changed, 51 insertions, 54 deletions
diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 430d3a30286..f4b2b176a35 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/06/29 04:54:52 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:09 jlam Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -9,7 +9,6 @@ HOMEPAGE= http://soback.kornet21.net/~artist/baduk/baduki.html COMMENT= Go playing program based on xamigo USE_BUILDLINK_ONLY= YES -USE_X11= YES GNU_CONFIGURE= YES BUILD_USES_MSGFMT= YES @@ -17,4 +16,5 @@ CONFIGURE_ARGS+= --without-included-gettext .include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile index e0cc312ebf4..45ef52299be 100644 --- a/games/clanbomber/Makefile +++ b/games/clanbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/08/23 20:28:57 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:10 jlam Exp $ DISTNAME= clanbomber-1.01 PKGNAME= ${DISTNAME}nb1 @@ -14,8 +14,6 @@ USE_X11BASE= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CPPFLAGS+= -I${X11BASE}/include - # needs a valid X display to compile its datafiles .ifndef DISPLAY IS_INTERACTIVE= yes @@ -33,4 +31,5 @@ pre-build: fi; .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fire/Makefile b/games/fire/Makefile index b47023d2589..468b89d381b 100644 --- a/games/fire/Makefile +++ b/games/fire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:10 jlam Exp $ # DISTNAME= fire-1.0 @@ -11,7 +11,7 @@ COMMENT= organic fireworks demo USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -USE_X11= YES .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index a097c66802f..23cc5a2ea5e 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:10 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share -USE_X11= # defined USE_BUILDLINK_ONLY= # defined CONFIGURE_ARGS+= --disable-server @@ -22,4 +21,5 @@ do-install: .include "../../devel/zlib/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index 4bc0f95d3b5..16d41fe49d1 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:10 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -7,8 +7,6 @@ DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share CONFLICTS= freeciv-client-gtk<=1.11.4 -USE_X11= # defined - .include "../../mk/bsd.prefs.mk" USE_BUILDLINK_ONLY= # defined @@ -30,4 +28,5 @@ do-install: .include "../../devel/zlib/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/imaze/Makefile b/games/imaze/Makefile index c8e40b39890..3f204e5197e 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/07/04 02:23:26 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:11 jlam Exp $ DISTNAME= imaze1.3 PKGNAME= imaze-1.3 @@ -15,10 +15,10 @@ WRKSRC= ${WRKDIR}/imaze USE_BUILDLINK_ONLY= yes USE_X11BASE= yes -CFLAGS+= -I${X11BASE}/include post-build: cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar .include "../../x11/lesstif/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kulki/Makefile b/games/kulki/Makefile index 28a5e55f3f0..ee52dced1de 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/26 17:56:58 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:11 jlam Exp $ # DISTNAME= kulki-1.01 @@ -13,7 +13,6 @@ COMMENT= Simple logic game - "balls" WRKSRC= ${WRKDIR}/kulki USE_BUILDLINK_ONLY= YES -USE_X11= YES USE_GMAKE= YES MAKE_ENV+= CXX="${CXX}" @@ -31,4 +30,5 @@ do-install: ( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - ) .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kulki/distinfo b/games/kulki/distinfo index 1f8dd60f35b..e2bfea8e609 100644 --- a/games/kulki/distinfo +++ b/games/kulki/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/06/25 04:29:26 jlam Exp $ +$NetBSD: distinfo,v 1.6 2001/08/29 22:41:11 jlam Exp $ SHA1 (kulki-1.01.tgz) = 20f14bdbde44dc56d914e4451ae33824f30abaf1 Size (kulki-1.01.tgz) = 1190074 bytes -SHA1 (patch-aa) = 27a971b6be1059d258c49663c123e46c748cbc38 +SHA1 (patch-aa) = 97dd61393d4617f20a9dd2f20a6534710e208c46 diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa index 3c059b049f0..e5830506af1 100644 --- a/games/kulki/patches/patch-aa +++ b/games/kulki/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.5 2001/06/25 04:29:26 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:11 jlam Exp $ --- Makefile.orig Thu Feb 8 13:27:43 2001 +++ Makefile @@ -1,8 +1,8 @@ DEBUG = #-g -GLIBS = -L/usr/X11/lib \ -+GLIBS = -L${X11BASE}/lib \ ++GLIBS = -L${BUILDLINK_X11_DIR}/lib \ -I$(QTDIR)/include -L$(QTDIR)/lib\ -lqt -lX11 -lXext -INSTALL = /usr/games/ diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index 9a251d33b0f..fb7e2a8f809 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/08/15 19:41:44 rh Exp $ +# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $ # DISTNAME= lbreakout-010315 @@ -10,9 +10,9 @@ HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= breakout-style arcade game USE_BUILDLINK_ONLY= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-sound .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lincity/Makefile b/games/lincity/Makefile index c0897edef36..9e36ace7c66 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/30 10:39:06 zuntum Exp $ +# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $ # DISTNAME= lincity-1.11 @@ -24,4 +24,5 @@ pre-build: post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lincity/distinfo b/games/lincity/distinfo index b24f95c8dd5..cac0657a036 100644 --- a/games/lincity/distinfo +++ b/games/lincity/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:30 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/08/29 22:41:12 jlam Exp $ SHA1 (lincity-1.11.tar.gz) = b3b7fb00fffea90352fa5e5c6b7bf76d49cd493b Size (lincity-1.11.tar.gz) = 475037 bytes -SHA1 (patch-aa) = ac8b6a23b0167f98bf21bbdea7966f99aec3f61a +SHA1 (patch-aa) = 0f318f35627fc592a0f995e1cab99997c3ac79b8 SHA1 (patch-ab) = 09860dec60aefe24c020aa3daf130512ec893d09 diff --git a/games/lincity/patches/patch-aa b/games/lincity/patches/patch-aa index 3a65321f8dd..d3fda5e7c8f 100644 --- a/games/lincity/patches/patch-aa +++ b/games/lincity/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:12 jlam Exp $ --- Makefile.orig Thu Feb 25 23:17:38 1999 +++ Makefile Sat Aug 12 00:38:42 2000 @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $ -LC_XFLAGS = $(CFLAGS) -DLC_X11 -LC_XLIBS = -lXExExt -lXext -lX11 -+LC_XFLAGS = $(CFLAGS) -I${X11BASE}/include -DLC_X11 ++LC_XFLAGS = $(CFLAGS) -I${BUILDLINK_X11_DIR}/include -DLC_X11 +LC_XLIBS = ${LDFLAGS} -lXExExt -lXext -lX11 XOBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o xengine.o\ diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 4e03022e925..768166779b0 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/06/26 19:10:37 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:12 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -10,7 +10,6 @@ COMMENT= The QT-Enhanced X11 version of NetHack DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES USE_BUILDLINK_ONLY= YES ALL_TARGET= x11tiles nethack @@ -26,4 +25,5 @@ post-install: .include "../../graphics/xpm/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo index ac9bc5f0845..85e97b17d2a 100644 --- a/games/nethack-qt/distinfo +++ b/games/nethack-qt/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/06/26 19:10:18 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:13 jlam Exp $ SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9 Size (nethack-331.tgz) = 3061094 bytes SHA1 (patch-aa) = d8ec9c209bf28abda1f78159e9d240895e38db30 -SHA1 (patch-ac) = 55d083ade87986ff236994144e6d5931daaf8f2b +SHA1 (patch-ac) = f3fb0576ad1bffa88fa1fdb6c1c134536a522e19 SHA1 (patch-ad) = 580a75c7ebc55b099a702ad21ce12d960f2805ff diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac index 246754ca8db..4d8ec04648c 100644 --- a/games/nethack-qt/patches/patch-ac +++ b/games/nethack-qt/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ +$NetBSD: patch-ac,v 1.9 2001/08/29 22:41:13 jlam Exp $ --- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 +++ sys/unix/Makefile.src Thu Aug 10 20:03:19 2000 @@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS += -I../include -I${X11BASE}/include ++CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include +LFLAGS = ${LDFLAGS} # The Qt and Be window systems are written in C++, while the rest of @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt -+WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ++WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 8f660affe47..70c014114ae 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.12 2001/06/26 19:11:04 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:13 jlam Exp $ # .include "../nethack-lib/Makefile.common" PKGNAME= nethack-x11-${NETHACK_VERSION} - COMMENT= the X11 version of NetHack CATEGORIES+= x11 DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES USE_BUILDLINK_ONLY= YES ALL_TARGET= x11tiles nethack @@ -25,4 +23,5 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/nethackdir .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-x11/distinfo b/games/nethack-x11/distinfo index b77efdc2e19..4b4cf5de34a 100644 --- a/games/nethack-x11/distinfo +++ b/games/nethack-x11/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 19:11:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:13 jlam Exp $ SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9 Size (nethack-331.tgz) = 3061094 bytes SHA1 (patch-aa) = 27b14831057da6ca2863f75d0910e0479c9c6b99 -SHA1 (patch-ab) = 9cb29ef166fefa5672cad337e00fc960b46140eb +SHA1 (patch-ab) = dc195cd1fa7dbae59904847c357b9a6c7796d7fa diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 8f915a05c82..8d213557190 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2001/08/29 22:41:13 jlam Exp $ --- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 +++ sys/unix/Makefile.src Thu Aug 10 19:28:31 2000 @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 jlam Exp $ -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS += -I../include -I${X11BASE}/include ++CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include +LFLAGS = ${LDFLAGS} # The Qt and Be window systems are written in C++, while the rest of diff --git a/games/newvox/Makefile b/games/newvox/Makefile index a96d949f7ee..d7662cea028 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:13 jlam Exp $ # DISTNAME= newvox-1.0 @@ -11,7 +11,7 @@ COMMENT= voxel-style landscape rendering fly-by USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -USE_X11= YES .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pacman/Makefile b/games/pacman/Makefile index 396fe42f9b8..9ebdf68da8a 100644 --- a/games/pacman/Makefile +++ b/games/pacman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/06/30 11:27:17 zuntum Exp $ +# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:14 jlam Exp $ DISTNAME= Pacman-0.3-CVS-00-11-17 PKGNAME= Pacman-0.3 @@ -16,8 +16,6 @@ USE_X11BASE= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include - # needs a valid X display to compile its datafiles .ifndef DISPLAY IS_INTERACTIVE= yes @@ -36,4 +34,5 @@ pre-build: fi; .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pacman/distinfo b/games/pacman/distinfo index c0fa651d5fb..5935d8517d9 100644 --- a/games/pacman/distinfo +++ b/games/pacman/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/30 11:27:17 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:14 jlam Exp $ SHA1 (Pacman-0.3-CVS-00-11-17.tar.gz) = 0d30f2ae3410d2df7b3fecb5cce732ba3022041d Size (Pacman-0.3-CVS-00-11-17.tar.gz) = 62257 bytes -SHA1 (patch-aa) = 03ae72b67b3d268ecdc8d37ad00497a96725cf71 +SHA1 (patch-aa) = 28103a483316c870325e63f378ea36955b029b84 SHA1 (patch-ab) = 8d20c41dfb1a010586a3ebfb3ab4e7f675b93400 diff --git a/games/pacman/patches/patch-aa b/games/pacman/patches/patch-aa index f75ce16f942..dbc5f7646de 100644 --- a/games/pacman/patches/patch-aa +++ b/games/pacman/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:14 jlam Exp $ --- Makefile.in.orig Wed Oct 6 02:19:37 1999 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $ OBJF = .build/pacman.o .build/objects.o .build/fontblowup.o DATAFILES = pacman.dat -EXTERN_LIBS = -lclanCore -+EXTERN_LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lclanCore \ ++EXTERN_LIBS = -L${BUILDLINK_X11_DIR}/lib -Wl,-R$(X11BASE)/lib -lclanCore \ + -L${BUILDLINK_DIR}/lib -Wl,-R$(LOCALBASE)/lib -lHermes -lpth -lz all: pacman $(DATAFILES) diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 2be969c7aee..bf502128d9f 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/08/27 14:35:09 tron Exp $ +# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:14 jlam Exp $ # DISTNAME= xracer-0.96.9 @@ -11,10 +11,9 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf BUILD_DEPENDS+= automake>=1.4:../../devel/automake -BUILD_USES_MSGFMT= yes +BUILD_USES_MSGFMT= # defined -USE_BUILDLINK_ONLY= YES -USE_X11= # defined +USE_BUILDLINK_ONLY= # defined USE_GMAKE= # defined USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XRacer/.packlist @@ -43,4 +42,5 @@ pre-patch: .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |