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 /x11/xkeycaps | |
| 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 'x11/xkeycaps')
| -rw-r--r-- | x11/xkeycaps/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile index 09c82cdf957..aea9a64c828 100644 --- a/x11/xkeycaps/Makefile +++ b/x11/xkeycaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:13 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:45 joerg Exp $ # DISTNAME= xkeycaps-2.46 @@ -21,4 +21,7 @@ pre-configure: ${CAT} Imakefile.old >>Imakefile .endif +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |