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/at-spi | |
| 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/at-spi')
| -rw-r--r-- | devel/at-spi/Makefile | 3 | ||||
| -rw-r--r-- | devel/at-spi/buildlink3.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 9f4501e0751..adaf47274a5 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/10/17 16:55:49 drochner Exp $ +# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= at-spi-1.7.12 @@ -26,4 +26,5 @@ BUILDLINK_API_DEPENDS.atk+= atk>=1.12.0 .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk index 50f86fb0c29..3af23d706aa 100644 --- a/devel/at-spi/buildlink3.mk +++ b/devel/at-spi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2006/12/27 13:37:36 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+ @@ -22,5 +22,6 @@ BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |