diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
| commit | a17239c066dcfcad39db4003a2b8d421fa1bc881 (patch) | |
| tree | 4bfa8b36ce531fe4f0f7472d5fdff888abf4b533 /games | |
| parent | 79fe9eff8ce0ebb615cb7a647fadec6607504307 (diff) | |
| download | pkgsrc-a17239c066dcfcad39db4003a2b8d421fa1bc881.tar.gz | |
Move per-package default XAW_TYPE setting above the inclusion of
bsd.prefs.mk so that it is actually used. Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.
Diffstat (limited to 'games')
| -rw-r--r-- | games/freeciv-client/Makefile | 8 | ||||
| -rw-r--r-- | games/xboard/Makefile | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index a58febb65f3..4bc0f95d3b5 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -8,7 +8,6 @@ DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share CONFLICTS= freeciv-client-gtk<=1.11.4 USE_X11= # defined -USE_XAW= # defined .include "../../mk/bsd.prefs.mk" @@ -18,9 +17,7 @@ CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --enable-client=xaw -XAW_TYPE=3d - -.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d") +.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") CONFIGURE_ARGS+= --with-xaw3d .endif @@ -32,4 +29,5 @@ do-install: .include "../../devel/zlib/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/xaw.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 51f4aee7f16..ed72279386e 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:34 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $ DISTNAME= xboard-4.2.3 CATEGORIES= games @@ -11,15 +11,12 @@ COMMENT= graphical frontend for GNU Chess, Crafty, ICS or e-mail chess USE_PERL5= # defined USE_X11= # defined -USE_XAW= # defined -USE_XPM= # defined INFO_FILES= xboard.info GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-xpm CONFIGURE_ARGS+= --enable-zippy # interface to ICS -CPPFLAGS+= -I${X11PREFIX}/include .include "../../mk/bsd.prefs.mk" @@ -27,4 +24,6 @@ CPPFLAGS+= -I${X11PREFIX}/include CONFIGURE_ARGS+= --with-Xaw3d .endif +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/xaw.buildlink.mk" .include "../../mk/bsd.pkg.mk" |