diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
| commit | 95fd1f6ec9ce583a46e4351179d93b744a17d1ad (patch) | |
| tree | 614ebca62dbe176d9c75cab1cfeef7c554a336c9 /games | |
| parent | 6469e231c2dabc4fdb3edae536776b2c90cf5616 (diff) | |
| download | pkgsrc-95fd1f6ec9ce583a46e4351179d93b744a17d1ad.tar.gz | |
Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
Diffstat (limited to 'games')
95 files changed, 145 insertions, 181 deletions
diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile index 2171c11d5cf..e8a0220e8e1 100644 --- a/games/KoboDeluxe/Makefile +++ b/games/KoboDeluxe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:49 jlam Exp $ DISTNAME= KoboDeluxe-0.4pre8 PKGNAME= ${DISTNAME:S/pre/rc/} @@ -12,7 +12,6 @@ COMMENT= Multi-way scrolling shoot 'em up game for X GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" diff --git a/games/abuse/Makefile b/games/abuse/Makefile index f790feef3dc..4cfdef7ce7e 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:49 jlam Exp $ DISTNAME= abuse_pd PKGNAME= abuse-2.0 @@ -20,6 +20,8 @@ PKGSRC_USE_TOOLS+= gtar NOT_FOR_PLATFORM= NetBSD-*-arm32 +.include "../../mk/x11.buildlink3.mk" + post-extract: cd ${WRKSRC}/abuse && \ ${GZCAT} ${DISTDIR}/abuse_data.tar.gz | ${GTAR} xf - diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 7b9b4469faa..68332a52858 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= angband-3.0.3 @@ -16,7 +16,6 @@ CONFLICTS= angband-tty-[0-9]* EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_X11= # defined INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* INCOMPAT_CURSES+= NetBSD-1.6[A-M]-* @@ -38,4 +37,5 @@ post-install: ${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \; .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 6ac90748e81..4ba32c2df2c 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 18:02:49 jlam Exp $ DISTNAME= baduki-0.2.9 PKGREVISION= 3 @@ -12,7 +12,6 @@ COMMENT= Go playing program based on xamigo BUILD_USES_MSGFMT= # defined USE_PKGLOCALEDIR= # defined -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --without-included-gettext diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 0e96a28778f..8472d41e6ac 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:49 jlam Exp $ DISTNAME= battalion PKGNAME= battalion-1.4 @@ -15,7 +15,6 @@ NOT_FOR_PLATFORM= *-*-alpha # relies on Mesa (gcc) WRKSRC= ${WRKDIR}/battalionSource EXTRACT_ONLY= battalionSource1.4.tar.Z -USE_X11= yes PKGSRC_USE_TOOLS+= gtar .include "../../mk/bsd.prefs.mk" @@ -49,4 +48,5 @@ pre-clean: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 6fcb58830f6..17b61c2e50d 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:49 jlam Exp $ DISTNAME= battleball.21.src PKGNAME= battleball-2.1 @@ -11,11 +11,12 @@ HOMEPAGE= http://www.cs.utexas.edu/users/pahardin/bb.html COMMENT= 3d game of soccer, with tanks WRKSRC= ${WRKDIR}/battleball-2.1-src -USE_X11= YES USE_LANGUAGES= c c++ SED_CMDS= -e '/^INCS/s|$$|${CPPFLAGS}|' -e '/^LIBS/s|$$|${LDFLAGS}|' +.include "../../mk/x11.buildlink3.mk" + do-configure: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig; \ ${SED} ${SED_CMDS} < ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile diff --git a/games/boson/Makefile b/games/boson/Makefile index e356941f096..5239799f31f 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= boson-all-0.8 @@ -16,7 +16,6 @@ BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 2c4a1fd2f4f..ae60974506b 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:49 jlam Exp $ DISTNAME= bzflag-1.10.6.20040515 PKGNAME= ${DISTNAME:S/.20040515//} @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_NCURSES= # resize_term() USE_PERL5= build -USE_X11= yes .include "../../mk/bsd.prefs.mk" @@ -36,4 +35,5 @@ CONFIGURE_ARGS+= --with-ncurses .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile index ad5b216838f..346dddeeff1 100644 --- a/games/cgoban/Makefile +++ b/games/cgoban/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/21 16:49:36 martti Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:49 jlam Exp $ DISTNAME= cgoban-1.9.12 CATEGORIES= games @@ -8,7 +8,7 @@ MAINTAINER= bad@NetBSD.org HOMEPAGE= http://www.igoweb.org/~wms/comp/cgoban/index.html COMMENT= The complete goban. A Go server client and sgf viewer/editor -USE_X11= yes GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 31d8ae101b0..4c847ff0eaa 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/19 06:49:33 snj Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $ DISTNAME= crack-attack-1.1.14 CATEGORIES= games @@ -10,7 +10,6 @@ COMMENT= Tetris Attack inspired game GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/${PKGBASE} diff --git a/games/craft/Makefile b/games/craft/Makefile index c933431dfaf..26fff9ce0d8 100644 --- a/games/craft/Makefile +++ b/games/craft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:49 jlam Exp $ DISTNAME= craftcc35 PKGNAME= craft-3.5 @@ -14,6 +14,8 @@ WRKSRC= ${WRKDIR} USE_TOOLS+= gmake USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" + post-extract: @${FIND} ${WRKSRC} -type f -name '*~' -print | ${XARGS} ${RM} -f @${LN} -fs ${FILESDIR}/Makefile ${WRKSRC} diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 633f4a3fe10..e143c354eb0 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= CriticalMass-0.9.10 @@ -14,7 +14,6 @@ COMMENT= SDL/OpenGL space shoot'em up game GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index dd8ef0ac5f6..ea3d4bc3c12 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= crossfire-client-1.0.0 @@ -18,7 +18,6 @@ CF_SND= client-0.95.2-au-sounds.tgz CF_RAW= client-0.95.2-raw-sounds.tgz USE_PERL5= yes -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sound-dir=${LOCALBASE}/share/cfclient/sounds diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile index 872b497274c..79c41121f75 100644 --- a/games/crossfire-srv/Makefile +++ b/games/crossfire-srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= crossfire-1.0.0 @@ -17,7 +17,6 @@ EXTRACT_ONLY= ${CF_SRC} CF_SRC= crossfire-1.0.0.tar.bz2 CF_MAPS= crossfire-1.0.0-maps.tar.bz2 -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_PERL5= yes diff --git a/games/d2x/Makefile b/games/d2x/Makefile index d378d58a69b..fe37f6def13 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= d2x-0.2.5 @@ -12,7 +12,6 @@ COMMENT= Descent II port HAS_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes D2X_DATA= ${PREFIX}/share/games/${PKGBASE} MAKE_DIRS= ${D2X_DATA} diff --git a/games/dd2/Makefile b/games/dd2/Makefile index 45872007918..c9fcca13184 100644 --- a/games/dd2/Makefile +++ b/games/dd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:49 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= dd2-0.2.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.usebox.net/jjm/dd2/ COMMENT= Shoot'em up arcade game for one or two players -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile index 9959e47fad0..2b8132076ea 100644 --- a/games/defendguin/Makefile +++ b/games/defendguin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $ DISTNAME= defendguin-0.0.10 PKGREVISION= 4 @@ -9,7 +9,6 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.newbreedsoftware.com/defendguin/ COMMENT= Clone of the arcade game Defender -USE_X11= YES USE_TOOLS+= gmake diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index b318d5e12c5..3b32f949b85 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -20,7 +20,6 @@ DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2 WRKSRC= ${WRKDIR} USE_TOOLS+= bison lex MAKE_ENV+= YACC=${TOOLS_YACC:Q} -USE_X11= yes LIBS.SunOS+= -lm diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile index 5cad65cdb79..4a66a0d4ff4 100644 --- a/games/finalbattle/Makefile +++ b/games/finalbattle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= finalbattle.0.0 @@ -15,4 +15,5 @@ MAKEFILE= makefile USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fire/Makefile b/games/fire/Makefile index 0a17bb8ed7d..fa710019a1f 100644 --- a/games/fire/Makefile +++ b/games/fire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:49 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= fire-1.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/fire/index.html COMMENT= Organic fireworks demo -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/SDL/buildlink3.mk" diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index f18ba659ee2..aa801bcb37c 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= fkiss-0.33 @@ -16,7 +16,6 @@ PATCH_DIST_STRIP= -p1 DEPENDS+= lha-[0-9]*:../../archivers/lha -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CFLAGS+= -DUSE_STDARG -DHAVE_STDARG_H @@ -45,4 +44,5 @@ do-install: done .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 88c572fb7c9..2ffc5a33b1d 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= foobillard-3.0a @@ -11,7 +11,6 @@ HOMEPAGE= http://foobillard.sunsite.dk/ COMMENT= Free OpenGL-billard game USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index 707570ad4e6..ed5e1645b63 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/11/03 14:19:20 adam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface @@ -6,7 +6,6 @@ COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=gtk diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile index 8223cc89786..ee0a18c1eb1 100644 --- a/games/freeciv-client-gtk2/Makefile +++ b/games/freeciv-client-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/11/03 14:19:45 adam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk2-/} COMMENT= Freeciv client with GTK+ interface @@ -6,7 +6,6 @@ COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=gtk2 diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index ba05d3c05eb..0772378a579 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/11/03 14:18:52 adam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -8,7 +8,6 @@ DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds CONFLICTS= freeciv-client-gtk<=1.11.4 -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=xaw diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile index 74fbc246cce..620dc84d9b4 100644 --- a/games/galaxa/Makefile +++ b/games/galaxa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:50 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= galaxa.0.1 @@ -13,7 +13,8 @@ COMMENT= Space game based loosely on "Galaga" WRKSRC= ${WRKDIR}/galaxa MAKEFILE= makefile -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/galaxa diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index bca548a264e..c7bfaf6d353 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= glaxium_0.5 @@ -12,7 +12,6 @@ HOMEPAGE= http://xhosxe.free.fr/glaxium/ COMMENT= Space-ship OpenGL shoot them up GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/games/glchess/Makefile b/games/glchess/Makefile index 74b27a233c1..14c2d3d5af4 100644 --- a/games/glchess/Makefile +++ b/games/glchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:50 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= glchess-0.4.7 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://glchess.sourceforge.net/ COMMENT= 3D chess interface -USE_X11= YES GNU_CONFIGURE= YES INSTALL_DIRS= ${WRKSRC}/src ${WRKSRC}/man ${WRKSRC}/textures diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 49813fcd5e1..ef5e29194bf 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gnocatan-0.8.1.16 @@ -15,7 +15,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index c4fb4ed0538..f04724e5be0 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:50 jlam Exp $ DISTNAME= gnome-games-2.10.1 CATEGORIES= games gnome @@ -18,7 +18,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_CONFIG_WRAPPER= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes diff --git a/games/golddig/Makefile b/games/golddig/Makefile index 164bb0c775a..bfc547826e2 100644 --- a/games/golddig/Makefile +++ b/games/golddig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:38:42 grant Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= golddigC3.0 @@ -10,6 +10,7 @@ MAINTAINER= wiz@NetBSD.org COMMENT= Fast action game designed for use with X USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" post-build: for f in ${WRKSRC}/golddig.6 ${WRKSRC}/gdedit.6; do \ diff --git a/games/gtkgo/Makefile b/games/gtkgo/Makefile index eb6451c4ff1..3936bdf1291 100644 --- a/games/gtkgo/Makefile +++ b/games/gtkgo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gtkgo-0_0_10 @@ -13,7 +13,6 @@ COMMENT= Go board with skin support CPPFLAGS+= -DPKGDATADIR='"${PREFIX}/share/gtkgo/"' GNU_CONFIGURE= YES -USE_X11= YES WRKSRC= ${WRKDIR}/${DISTNAME:S/_/./g} .include "../../x11/gnome-libs/buildlink3.mk" diff --git a/games/gturing/Makefile b/games/gturing/Makefile index a33b4376393..e10dd99de14 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gturing-0.1.1 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile index 85c0f71bdab..42c17d06a83 100644 --- a/games/icbm3d/Makefile +++ b/games/icbm3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= icbm3d.0.4 @@ -12,6 +12,6 @@ COMMENT= 3D X11 game of defense WRKSRC= ${WRKDIR}/icbm3d MAKEFILE= makefile -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index 164d83b9d8a..61642d3f3f2 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= icebreaker-1.9.7 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.mattdm.org/icebreaker/ COMMENT= Penguin capturing simulation USE_TOOLS+= gmake -USE_X11= yes MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games" MAKE_ENV+= prefix="${PREFIX}" diff --git a/games/ketm/Makefile b/games/ketm/Makefile index 44eb9186475..7f7b0622a6a 100644 --- a/games/ketm/Makefile +++ b/games/ketm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= ketm-0.0.6 @@ -13,7 +13,6 @@ COMMENT= Old-school 2d-scrolling shooter BUILD_TARGET= ketm -USE_X11= YES USE_TOOLS+= gmake post-patch: diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile index f478a7727c4..898a53b8786 100644 --- a/games/knightcap/Makefile +++ b/games/knightcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:51 jlam Exp $ DISTNAME= KnightCap-3.6 PKGNAME= knightcap-3.6 @@ -13,7 +13,6 @@ COMMENT= Chess engine with 3D OpenGL-rendered chessboard BUILD_TARGET= KnightCap WRKSRC= ${WRKDIR}/Export -USE_X11= # defined MAKE_ENV+= MESA=${BUILDLINK_PREFIX.MesaLib} MAKE_ENV+= DEFINES="${DEFINES}" @@ -29,4 +28,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index 8e530ef812b..e134e212403 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lbreakout-010315 PKGREVISION= 5 @@ -9,7 +9,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --disable-sound diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index 834a8c145b5..b536b9af1f4 100644 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lbreakout2-2.5.2 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-highscore-path=${LOCALBASE}/share/games/ \ --with-docdir=${LOCALBASE}/share/doc/html diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile index 710c5e81017..3a5f9cdc8df 100644 --- a/games/lgeneral/Makefile +++ b/games/lgeneral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= lgeneral-1.1.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://lgames.sourceforge.net/index.php?project=LGeneral COMMENT= Panzer General play-a-like, uses Panzer General data files GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --disable-dl diff --git a/games/lincity/Makefile b/games/lincity/Makefile index 1eb56840f2b..9ed398b9984 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lincity-1.12.1 CATEGORIES= games x11 @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes pre-install: @@ -26,4 +25,5 @@ post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile index 51527b5d6eb..5622322fec4 100644 --- a/games/lmarbles/Makefile +++ b/games/lmarbles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/16 14:43:49 cube Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lmarbles-1.0.7 PKGREVISION= 2 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Atomix-like puzzle -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile index 5dc710fa637..4f4d9754353 100644 --- a/games/lpairs/Makefile +++ b/games/lpairs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lpairs-1.0.1 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Memory game matching pairs of cards -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/SDL/buildlink3.mk" diff --git a/games/ltris/Makefile b/games/ltris/Makefile index 80db9bbb7de..434d0626b4f 100644 --- a/games/ltris/Makefile +++ b/games/ltris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:51 jlam Exp $ DISTNAME= ltris-1.0.7 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= SDL tetris clone -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile index 21013a7eec8..b192b77fd30 100644 --- a/games/maelstrom-sdl/Makefile +++ b/games/maelstrom-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:52 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= Maelstrom-3.0.5 @@ -13,7 +13,6 @@ COMMENT= High resolution version of Asteroids (SDL version) CONFLICTS= maelstrom-x11-[0-9]* maelstrom-[0-9]* -USE_X11= YES GNU_CONFIGURE= YES MAKE_ENV+= CP=${CP} diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 74c850677bd..db1984e21fe 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= mirrormagic-2.0.2 @@ -12,12 +12,13 @@ COMMENT= Nice little puzzle game with color graphics and sound CONFLICTS= mirrormagic-sdl-[1-9]* USE_TOOLS+= gmake -USE_X11= YES PLIST_SRC= ${WRKDIR}/PLIST PLIST # if you change SCORE_PATH, don't forget to change patch-aa, too SCORE_PATH= /var/games/mirrormagic +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} -o bin -g games -m 2755 \ ${WRKSRC}/mirrormagic ${PREFIX}/bin diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 6c5248b1d17..417a3513da3 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/04/11 21:45:55 tv Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:51 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -11,7 +11,6 @@ COMMENT= The QT-Enhanced X11 version of NetHack DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= # defined BUILD_TARGET= x11tiles nethack INSTALL_TARGET= binfiles diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 61413b7670a..d52d6e5b320 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/08 10:17:30 pooka Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:51 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -10,7 +10,6 @@ CATEGORIES+= x11 DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES BUILD_TARGET= x11tiles nethack INSTALL_TARGET= binfiles diff --git a/games/nethack/Makefile b/games/nethack/Makefile index cb7d653fd71..507c5cfe002 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/10/28 11:51:04 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:51 jlam Exp $ # Needed so configure/patch rules don't get pulled in NO_BUILD= yes @@ -17,7 +17,6 @@ DEPENDS+= nethack-tty-${NETHACK_VERSION}:../nethack-tty DEPENDS+= nethack-x11-${NETHACK_VERSION}:../nethack-x11 DEPENDS+= nethack-qt-${NETHACK_VERSION}nb2:../nethack-qt -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes diff --git a/games/neverball/Makefile b/games/neverball/Makefile index 4420d1e7f36..ce9c4996ab2 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= neverball-1.2.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.icculus.org/neverball/ COMMENT= Part puzzle game, part action game and with SDL graphics USE_TOOLS+= gmake -USE_X11= yes # Avoiding multiples patches... BUILDLINK_TRANSFORM.SDL+= -e "s|/SDL/|/|g" diff --git a/games/newvox/Makefile b/games/newvox/Makefile index 25fc2bbc225..2458483a7f6 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= newvox-1.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/newvox/index.html COMMENT= Voxel-style landscape rendering fly-by -USE_X11= YES GNU_CONFIGURE= YES LIBS.SunOS+= -lm diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index 39ebd6683fa..a478667ce9e 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= nighthawk-2.1 @@ -17,7 +17,6 @@ COMMENT= C64 Paradroid clone WRKSRC= ${WRKDIR}/nighthawk USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= YES post-build: cd ${WRKSRC}/src_sound && \ diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 6d8ac3bebae..23409850cd7 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= openmortal-0.7 @@ -14,7 +14,6 @@ COMMENT= Parody of Mortal Kombat with real characters GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_PERL5= yes -USE_X11= yes REPLACE_PERL= data/script/*.pl diff --git a/games/openttd/Makefile b/games/openttd/Makefile index a76ac3c7fea..8e73b80c4bd 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:51 jlam Exp $ DISTNAME= openttd-0.3.6-source PKGNAME= openttd-0.3.6 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.openttd.com/ COMMENT= Open source clone of Transport Tycoon Deluxe USE_TOOLS+= gmake -USE_X11= yes DATA_DIR= ${PREFIX}/share/games/openttd diff --git a/games/plib/Makefile b/games/plib/Makefile index cd469987583..3a217c29754 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= plib-1.6.0 @@ -10,11 +10,11 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://plib.sourceforge.net/ COMMENT= Libraries for writing portable games/realtime interactive apps -USE_X11= YES GNU_CONFIGURE= YES USE_LANGUAGES= c++ CPPFLAGS+= -Dunix=1 .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index eb8312d4b1a..845838d8381 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= powermanga-0.79 @@ -11,7 +11,6 @@ HOMEPAGE= http://linux.tlk.fr/games/Powermanga/ COMMENT= Arcade 2D shoot-em-up game GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+= --localstatedir=${VARBASE} MAKE_ENV+= TOUCH=${TOUCH} diff --git a/games/quake/Makefile b/games/quake/Makefile index f6722a74bc5..49ca21635fd 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:52 jlam Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR} USE_TOOLS+= gmake MAKE_ENV+= MAINDIR=${WRKSRC} -USE_X11= yes MAKE_ENV+= MESA_DIR=${BUILDLINK_PREFIX.Mesa} MAKE_ENV+= X11BASE=${X11BASE} @@ -53,4 +52,5 @@ do-install: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index eea986ffa77..450b29a9afd 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= quake2-0.2.1 @@ -14,7 +14,6 @@ COMMENT= Enhanced Quake II engine USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes USE_BUILTIN.glu= yes diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile index 20bc493c847..066108c7aa9 100644 --- a/games/quake3arena-demo/Makefile +++ b/games/quake3arena-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxq3ademo-1_11-6_x86_gz PKGREVISION= 2 @@ -22,7 +22,7 @@ DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .endif NO_CONFIGURE= yes diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index a730b4ec07c..deb96944417 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGREVISION= 1 @@ -22,7 +22,6 @@ DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes .endif NO_SRC_ON_FTP= no @@ -45,6 +44,8 @@ WRKSRC= ${WRKDIR} LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME} SHAREDIR= ${PREFIX}/share/doc/lokigames +.include "../../mk/x11.buildlink3.mk" + do-build: ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ -e 's#@@LIBDIR@@#${LIBDIR}#g' \ diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 7e7da59524c..2644b2e1273 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -13,7 +13,6 @@ COMMENT= Quake over IPv6 DEPENDS= quakedata-[0-9]*:../../games/quakedata WRKSRC= ${WRKDIR}/quakeforge -USE_X11= yes post-extract: cd ${WRKSRC}; ${FIND} . -name \*.o -exec ${RM} {} \; @@ -35,4 +34,5 @@ CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index e1a36ddd4d1..dd4fcf8dd4f 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:28:47 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:52 jlam Exp $ DISTNAME= quakeforge-0.5.5 PKGREVISION= 2 @@ -15,7 +15,6 @@ CONFIGURE_ARGS+= --disable-xmms GNU_CONFIGURE= YES USE_TOOLS+= bison gmake USE_LIBTOOL= YES -USE_X11= YES SUBST_CLASSES+= dsp SUBST_STAGE.dsp= post-patch diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common index 2fe692e3968..2b957606ae3 100644 --- a/games/rocksndiamonds/Makefile.common +++ b/games/rocksndiamonds/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2005/06/01 18:02:52 jlam Exp $ DISTNAME= rocksndiamonds-3.1.0 CATEGORIES= games x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ USE_TOOLS+= gmake USE_PKGINSTALL= YES -USE_X11= YES INSTALLATION_DIRS= man/man6 @@ -30,6 +29,8 @@ MAKE_ENV+= HAVE_JOYSTICK=1 SCORE_PATH= ${VARBASE}/games/rocksndiamonds +.include "../../mk/x11.buildlink3.mk" + pre-configure: @${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \ ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \ diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile index a8fc62984a9..17afb597260 100644 --- a/games/rtcw/Makefile +++ b/games/rtcw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:52 jlam Exp $ DISTNAME= wolf-linux-1.33.x86 PKGNAME= rtcw-1.33 @@ -31,7 +31,7 @@ PKGSRC_USE_TOOLS+= gtar DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .endif pre-extract: diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk index 8f1c1a5729b..45f27fe706b 100644 --- a/games/scummvm/options.mk +++ b/games/scummvm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.4 2005/06/01 18:02:52 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scummvm PKG_SUPPORTED_OPTIONS= sdl x11 @@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --backend=sdl .endif .if !empty(PKG_OPTIONS:Mx11) -USE_X11= yes CONFIGURE_ARGS+= --backend=x11 .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .endif diff --git a/games/sirius/Makefile b/games/sirius/Makefile index 203d7040863..b9194dbe792 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= sirius-0.8.0 @@ -17,7 +17,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile index 89d67ac377a..18a9f9a8f22 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:57 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= spellcast @@ -12,5 +12,6 @@ HOMEPAGE= http://www.eblong.com/zarf/spellcast.html COMMENT= Game of dueling wizards for two players USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index e549abaef63..85965f430af 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= starfighter-1.1-1 @@ -13,7 +13,6 @@ COMMENT= Old school 2D shoot them up USE_TOOLS+= gmake USE_LANGUAGES+= c++ -USE_X11= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//} MAKEFILE= makefile diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile index 35077c73507..3fe0db01ada 100644 --- a/games/tileworld/Makefile +++ b/games/tileworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:52 jlam Exp $ DISTNAME= tworld-1.2.1 PKGNAME= ${DISTNAME:S/^t/tile/} @@ -11,7 +11,6 @@ HOMEPAGE= http://www.muppetlabs.com/~breadbox/software/tworld/ COMMENT= "Game based on Chip's Challenge" USE_TOOLS+= date gmake -USE_X11= YES GNU_CONFIGURE= YES BUILD_TARGET= tworld diff --git a/games/urban/Makefile b/games/urban/Makefile index ae8a6926d18..c3fa3bfed82 100644 --- a/games/urban/Makefile +++ b/games/urban/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:57 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= urban-1.5.3 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://urban.bengburken.net/eng/ COMMENT= U.R.B.A.N The Cyborg Project -USE_X11= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/games/wormz/Makefile b/games/wormz/Makefile index 635eabebf96..fc8c7eddc0c 100644 --- a/games/wormz/Makefile +++ b/games/wormz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= Wormz-1.0b5 @@ -11,9 +11,10 @@ HOMEPAGE= http://lide.punknet.cz/miri/wormz.html COMMENT= Networked game for X11 WRKSRC= ${WRKDIR}/Wormz -USE_X11= yes USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" + post-extract: ${MKDIR} ${WRKSRC}/NetBSD ${TOUCH} ${WRKSRC}/NetBSD/.depend diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index 69caaaa9ffe..e1bf8b39f97 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xarchon-0.60 @@ -13,7 +13,6 @@ COMMENT= Chess-like strategy game with battle options USE_TOOLS+= gmake GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c c++ .include "../../mk/bsd.prefs.mk" diff --git a/games/xboard/Makefile b/games/xboard/Makefile index fc7a9c411ca..f976607a71d 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xboard-4.2.6 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Graphical frontend for chess engines and servers CONFIGURE_ARGS+= --enable-xpm CONFIGURE_ARGS+= --enable-zippy # interface to ICS GNU_CONFIGURE= # defined -USE_X11= # defined INFO_FILES= xboard.info diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index b87cbfc06ad..214d3c13565 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xbomb-2.1a CATEGORIES= games x11 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.gedanken.demon.co.uk/xbomb/ COMMENT= Square, hexagonal, and triangual minesweeper clone USE_TOOLS+= gmake -USE_X11= yes BUILD_TARGET= xbomb MAKE_ENV+= SCORE_PATH="${SCORE_PATH}" @@ -25,6 +24,8 @@ PKG_GROUPS= ${SCORE_GROUP} PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} PLIST_SUBST+= GAME_DIR="${INSTALL} -d -o ${SCORE_USER} -g ${SCORE_GROUP} -m 775" +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${SCORE_PATH} .for score in . xbomb3.hi xbomb4.hi xbomb6.hi diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile index f446cf5542f..c504bea6880 100644 --- a/games/xbomber/Makefile +++ b/games/xbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:41 agc Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xbomber.0.8 @@ -13,7 +13,8 @@ COMMENT= Colorful game where you blow other people/robots up WRKSRC= ${WRKDIR}/xbomber MAKEFILE= makefile -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xbomber diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile index 1f42be1b5ea..cb39df357af 100644 --- a/games/xbreaky/Makefile +++ b/games/xbreaky/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xbreaky-0.0.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://xbreaky.sourceforge.net/ COMMENT= Breakout game for X11 USE_DIRS+= xdg-1.1 -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 0e0f20ffbc9..f02bcaeaebf 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -38,6 +38,7 @@ CFLAGS+= -D__BIG_ENDIAN__=1 .endif .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-extract: (cd ${WRKDIR}; ${GTAR} xzf linuxdoom-1.10.src.tgz) diff --git a/games/xevil/Makefile b/games/xevil/Makefile index 06021b89d09..24b7a05dab7 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xevilsrc2.02r2 PKGNAME= xevil-2.02 @@ -12,7 +12,6 @@ COMMENT= Side scrolling, bloody action game MAKEFILE= makefile -USE_X11= yes BUILD_TARGET= pkgsrc WRKSRC= ${WRKDIR} diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile index 568695d4e89..c76219253bc 100644 --- a/games/xfreecell/Makefile +++ b/games/xfreecell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xfreecell-1.0.5b CATEGORIES= games @@ -18,4 +18,5 @@ NO_CONFIGURE= YES MAKE_ENV+= GMAKE=${GMAKE:Q} +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 0467497e3fa..167e9b845bc 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xfrisk-1.2 @@ -12,7 +12,6 @@ COMMENT= X11 version of the classic Risk board game WRKSRC= ${WRKDIR}/XFrisk USE_TOOLS+= gmake -USE_X11= yes RESTRICTED= "Possible trademark infringement" NO_SRC_ON_CDROM=${RESTRICTED} diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 906f6c04350..445a9f9c77c 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xgalaga-2.0.34 PKGREVISION= 2 @@ -10,7 +10,6 @@ COMMENT= Very fast true-to-the-original port of galaga for X11 NO_SRC_ON_FTP= "already in MASTER_SITE_LOCAL" -USE_X11= YES GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile index e54229e6f9b..26f90c8af97 100644 --- a/games/xgospel/Makefile +++ b/games/xgospel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xgospel-1.12d @@ -11,7 +11,6 @@ HOMEPAGE= http://gailly.net/xgospel/ COMMENT= X11 based IGS client for online "go" playing GNU_CONFIGURE= yes -USE_X11= yes XAW_TYPE= 3d .include "../../mk/bsd.prefs.mk" diff --git a/games/xjump/Makefile b/games/xjump/Makefile index 66cd3615d99..5882cca6ec0 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xjump_2.7.5.orig PKGNAME= xjump-2.7.5 @@ -13,7 +13,6 @@ COMMENT= Jumping game for X WRKSRC= ${WRKDIR}/xjump-2.7.5.orig BUILD_TARGET= xjump -USE_X11= YES do-install: ${INSTALL} -g games -m 2755 ${WRKSRC}/xjump ${PREFIX}/bin/xjump diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile index af95f1b269d..d82dd2e2294 100644 --- a/games/xmahjongg/Makefile +++ b/games/xmahjongg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xmahjongg-3.6.1 @@ -9,8 +9,8 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.lcdf.org/~eddietwo/xmahjongg/ COMMENT= The Chinese game of Mah Jongg for X11 -USE_X11= YES GNU_CONFIGURE= YES USE_LANGUAGES= c c++ +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile index 0a4dc3c01f5..26ee00110e2 100644 --- a/games/xnibbles/Makefile +++ b/games/xnibbles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xnibbles-1.0BETA4 @@ -14,7 +14,6 @@ COMMENT= Winding snakes game for X11 WRKSRC= ${WRKDIR}/xnibbles USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= YES SUBST_CLASSES+= audio SUBST_STAGE.audio= pre-build diff --git a/games/xracer/Makefile b/games/xracer/Makefile index ed79821a0f2..0e8d04a3d10 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xracer-0.96.9 @@ -12,7 +12,6 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout BUILD_USES_MSGFMT= # defined -USE_X11= # defined USE_TOOLS+= gmake USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XRacer/.packlist @@ -41,5 +40,6 @@ pre-patch: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xrick/Makefile b/games/xrick/Makefile index 06521f11379..866a70599bc 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xrick-021212 @@ -19,7 +19,6 @@ NO_SRC_ON_FTP= ${RESTRICTED} USE_TOOLS+= gmake PKGSRC_USE_TOOLS+= gunzip -USE_X11= YES SUBST_CLASSES+= data SUBST_STAGE.data= post-patch diff --git a/games/xroach/Makefile b/games/xroach/Makefile index 1b3c68b89c2..bee740436a4 100644 --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/03/27 17:13:40 kristerw Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xroach @@ -13,6 +13,6 @@ COMMENT= Cockroaches hide under your windows DIST_SUBDIR= xroach-4.4 DECOMPRESS_CMD= ${CAT} MANCOMPRESSED_IF_MANZ= yes -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xroads/Makefile b/games/xroads/Makefile index a048a4ae6dd..02c89eee68f 100644 --- a/games/xroads/Makefile +++ b/games/xroads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/02/21 20:26:11 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xroads-v0.5 @@ -11,6 +11,6 @@ HOMEPAGE= http://apps.freshmeat.net/homepage/898367442/ COMMENT= Overhead view maze-based shoot 'em up game WRKSRC= ${WRKDIR}/xroads-v0.5 -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xsc/Makefile b/games/xsc/Makefile index 98be52e6437..02fa824f6c0 100644 --- a/games/xsc/Makefile +++ b/games/xsc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xsc-1.5 @@ -9,10 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.panix.com/~mbh/xsc/ COMMENT= Star Castle clone -USE_X11= yes GNU_CONFIGURE= yes USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xsc ${PREFIX}/bin/xsc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xsc diff --git a/games/xtris/Makefile b/games/xtris/Makefile index e2b77a59f24..76a9deea272 100644 --- a/games/xtris/Makefile +++ b/games/xtris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/31 21:47:34 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xtris-1.15 @@ -14,6 +14,8 @@ USE_X11BASE= yes .include "options.mk" +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xtris ${PREFIX}/bin/xtris ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xtbot ${PREFIX}/bin/xtbot diff --git a/games/xtux/Makefile b/games/xtux/Makefile index e14288caaf8..2e5f1ff67f6 100644 --- a/games/xtux/Makefile +++ b/games/xtux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xtux-arena-src-nov-15 PKGNAME= xtux-0.2000.11.15 @@ -11,7 +11,6 @@ HOMEPAGE= http://xtux.sourceforge.net/ COMMENT= 2D multi-player shootout using images from the Open Software scene WRKSRC= ${WRKDIR}/xtux -USE_X11= YES do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xtux diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 64d19232ae2..5b304f3c918 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xworm102 PKGNAME= xworm-1.02 @@ -10,7 +10,8 @@ COMMENT= Classic game with apples and hungry worm WRKSRC= ${WRKDIR}/XWorm BUILD_TARGET= bsd -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin diff --git a/games/xzip/Makefile b/games/xzip/Makefile index f67ec27aba1..1313ebf19d7 100644 --- a/games/xzip/Makefile +++ b/games/xzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xzip180 PKGNAME= xzip-1.8 @@ -14,4 +14,5 @@ WRKSRC= ${WRKDIR}/xzip USE_X11BASE= yes BUILD_TARGET= xzip +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/zoom/Makefile b/games/zoom/Makefile index a2755deb97c..927fb5baff1 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -18,7 +18,6 @@ COMMENT= Plays Infocom-compatible games, with graphics support USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= build |