diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
| commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /games/maelstrom-x11 | |
| parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
| download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz | |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'games/maelstrom-x11')
| -rw-r--r-- | games/maelstrom-x11/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile index 2fee0fda299..c0d5dc33203 100644 --- a/games/maelstrom-x11/Makefile +++ b/games/maelstrom-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:36 joerg Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-x11-2.0.6 @@ -24,7 +24,7 @@ EXTRACT_ONLY= ${DISTNAME} WRKSRC= ${WRKDIR}/Maelstrom USE_LANGUAGES= c c++ USE_X11BASE= YES -MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.xpm} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm} MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} MAKE_ENV+= GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE} MAKE_ENV+= VARBASE=${VARBASE} @@ -43,6 +43,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom ${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |