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 /devel/libmatchbox | |
| 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 'devel/libmatchbox')
| -rw-r--r-- | devel/libmatchbox/Makefile | 5 | ||||
| -rw-r--r-- | devel/libmatchbox/buildlink3.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile index 39e26c6c133..c9e6442bbea 100644 --- a/devel/libmatchbox/Makefile +++ b/devel/libmatchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= libmatchbox-1.9 @@ -14,7 +14,10 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk index 0827a3b8548..9760d433243 100644 --- a/devel/libmatchbox/buildlink3.mk +++ b/devel/libmatchbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2006/12/27 13:37:36 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBMATCHBOX_BUILDLINK3_MK:= ${LIBMATCHBOX_BUILDLINK3_MK}+ @@ -18,7 +18,9 @@ BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox .endif # LIBMATCHBOX_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |