Tue Oct 23 10:11:52 2012 UTC ()
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.


(wiz)
diff -r1.115 -r1.116 pkgsrc/graphics/cairo/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/libXext/buildlink3.mk
cvs diff -r1.115 -r1.116 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2012/10/23 07:58:26 1.115
+++ pkgsrc/graphics/cairo/Makefile 2012/10/23 10:11:52 1.116
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.115 2012/10/23 07:58:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.116 2012/10/23 10:11:52 wiz Exp $
2 2
3DISTNAME= cairo-1.12.6 3DISTNAME= cairo-1.12.6
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= http://cairographics.org/releases/ 5MASTER_SITES= http://cairographics.org/releases/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://cairographics.org/ 9HOMEPAGE= http://cairographics.org/
10COMMENT= Vector graphics library with cross-device output support 10COMMENT= Vector graphics library with cross-device output support
11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
12 12
13USE_LANGUAGES= c99 13USE_LANGUAGES= c99
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -42,16 +42,15 @@ TEST_TARGET= check @@ -42,16 +42,15 @@ TEST_TARGET= check
42.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} 42.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
43CONFIGURE_ENV+= ac_cv_type___uint128_t=no 43CONFIGURE_ENV+= ac_cv_type___uint128_t=no
44.endif 44.endif
45 45
46.include "../../devel/zlib/buildlink3.mk" 46.include "../../devel/zlib/buildlink3.mk"
47.include "../../fonts/fontconfig/buildlink3.mk" 47.include "../../fonts/fontconfig/buildlink3.mk"
48BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 48BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9
49.include "../../graphics/freetype2/buildlink3.mk" 49.include "../../graphics/freetype2/buildlink3.mk"
50.include "../../graphics/png/buildlink3.mk" 50.include "../../graphics/png/buildlink3.mk"
51# include? 51# include?
52#.include "../../print/libspectre/buildlink3.mk" 52#.include "../../print/libspectre/buildlink3.mk"
53BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0 53BUILDLINK_API_DEPENDS.pixman+= pixman>=0.22.0
54.include "../../x11/pixman/buildlink3.mk" 54.include "../../x11/pixman/buildlink3.mk"
55.include "../../x11/xextproto/buildlink3.mk" 
56.include "../../mk/pthread.buildlink3.mk" 55.include "../../mk/pthread.buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/libXext/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXext/buildlink3.mk 2010/04/10 21:09:21 1.8
+++ pkgsrc/x11/libXext/buildlink3.mk 2012/10/23 10:11:51 1.9
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: buildlink3.mk,v 1.8 2010/04/10 21:09:21 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2012/10/23 10:11:51 wiz Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc) 5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc)
6.include "../../mk/x11.buildlink3.mk" 6.include "../../mk/x11.buildlink3.mk"
7.else 7.else
8 8
9BUILDLINK_TREE+= libXext 9BUILDLINK_TREE+= libXext
10 10
11.if !defined(LIBXEXT_BUILDLINK3_MK) 11.if !defined(LIBXEXT_BUILDLINK3_MK)
12LIBXEXT_BUILDLINK3_MK:= 12LIBXEXT_BUILDLINK3_MK:=
13 13
14BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 14BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0
15BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext 15BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext
16 16
17.include "../../x11/libX11/buildlink3.mk" 17.include "../../x11/libX11/buildlink3.mk"
18# XXX don't include xextproto/bl3 here; packages checking for xext.pc must 18.include "../../x11/xextproto/buildlink3.mk"
19# include it theirselfes 
20.endif # LIBXEXT_BUILDLINK3_MK 19.endif # LIBXEXT_BUILDLINK3_MK
21 20
22BUILDLINK_TREE+= -libXext 21BUILDLINK_TREE+= -libXext
23 22
24.endif 23.endif