diff options
| author | wiz <wiz@pkgsrc.org> | 2012-10-23 10:11:51 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-10-23 10:11:51 +0000 |
| commit | 69efe4eab57ba01a1854f74b9d460c7bcd3741e3 (patch) | |
| tree | 49b27e91e75e2e182400812271d5606a5d10fe90 | |
| parent | c4478a0e6e93bf963bb7478cff69fa5398d85b83 (diff) | |
| download | pkgsrc-69efe4eab57ba01a1854f74b9d460c7bcd3741e3.tar.gz | |
As drochner remarks, the problem with missing xextproto is, once again,
that libXext/bl3.mk doesn't include xextproto/bl3.mk.
Since the supposed gains for this are minimal and the annoyances are high,
do include xextproto/bl3.mk in libXext/bl3.mk.
| -rw-r--r-- | graphics/cairo/Makefile | 3 | ||||
| -rw-r--r-- | x11/libXext/buildlink3.mk | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 81a3b719700..905a7433d68 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.115 2012/10/23 07:58:26 wiz Exp $ +# $NetBSD: Makefile,v 1.116 2012/10/23 10:11:52 wiz Exp $ DISTNAME= cairo-1.12.6 CATEGORIES= graphics @@ -52,6 +52,5 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 #.include "../../print/libspectre/buildlink3.mk" BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index b8f33bfb114..316e7130099 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/04/10 21:09:21 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2012/10/23 10:11:51 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,8 +15,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext .include "../../x11/libX11/buildlink3.mk" -# XXX don't include xextproto/bl3 here; packages checking for xext.pc must -# include it theirselfes +.include "../../x11/xextproto/buildlink3.mk" .endif # LIBXEXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXext |