diff options
| author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
| commit | b28533fe59c3ed8a07d089eec0ddb72591404098 (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /games/xskat/Makefile | |
| parent | bf64c938460d5b59db13b14b1c0631ed2167b7e6 (diff) | |
| download | pkgsrc-b28533fe59c3ed8a07d089eec0ddb72591404098.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/xskat/Makefile')
| -rw-r--r-- | games/xskat/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/games/xskat/Makefile b/games/xskat/Makefile index a98c9432fe7..6e49cb034e6 100644 --- a/games/xskat/Makefile +++ b/games/xskat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:45 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xskat-3.4 PKGREVISION= 2 @@ -11,10 +11,13 @@ COMMENT= Play the card game Skat USE_IMAKE= yes -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if defined(DEFAULT_IRC_SERVER) MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER:Q} .else MAKE_ENV+= IRC_SERVER=irc.fu-berlin.de .endif + +.include "../../x11/libX11/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" |