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/x2x/Makefile | |
| 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/x2x/Makefile')
| -rw-r--r-- | x11/x2x/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile index 9fe31ee1e68..36039d79519 100644 --- a/x11/x2x/Makefile +++ b/x11/x2x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:12 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:43 joerg Exp $ DISTNAME= x2x-1.27 PKGREVISION= 2 @@ -14,4 +14,6 @@ USE_IMAKE= yes post-configure: (cd ${WRKSRC}; ${LN} -s x2x.1 x2x.man) +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |