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 | 90e452c4cd09620859115e0d4e58a25bcc1e282a (patch) | |
tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /x11/xpmroot | |
parent | f0be9a3937d29cae297d06a13ca6a1c5faa979a3 (diff) | |
download | pkgsrc-90e452c4cd09620859115e0d4e58a25bcc1e282a.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/xpmroot')
-rw-r--r-- | x11/xpmroot/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 37920b73787..7fbc04700f7 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2006/12/15 20:33:06 joerg Exp $ +# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:46 joerg Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -32,5 +32,8 @@ do-install: ${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 \ ${PREFIX:Q}/${PKGMANDIR:Q}/man1 +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |