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/xpat2 | |
| 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/xpat2')
| -rw-r--r-- | games/xpat2/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index babd4829746..bfdd73f4cd5 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xpat2-1.07 PKGREVISION= 1 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_X11BASE= YES USE_TOOLS+= imake -MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.xpm:Q} XMKMF=${XMKMF_CMD:Q} +MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.libXpm:Q} XMKMF=${XMKMF_CMD:Q} CONF_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE} MAKE_DIRS= /var/games @@ -23,5 +23,8 @@ post-install: ${CHOWN} ${GAMEOWN}.${GAMEGRP} ${PREFIX}/bin/xpat2 ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xpat2 +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |