Thu Jun 18 21:48:52 2015 UTC ()
Look for native fixesproto.pc in ${X11BASE}/share/pkgconfig, fixing
detection and bulk build impossibilities on EL6 and clones.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/x11/fixesproto/buildlink3.mk
diff -r1.9 -r1.10 pkgsrc/x11/fixesproto/builtin.mk
cvs diff -r1.9 -r1.10 pkgsrc/x11/fixesproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/fixesproto/Attic/buildlink3.mk 2014/07/18 05:25:42 1.9
+++ pkgsrc/x11/fixesproto/Attic/buildlink3.mk 2015/06/18 21:48:52 1.10
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.9 2014/07/18 05:25:42 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && \ 5.if ${X11_TYPE} != "modular" && \
6 !exists(${X11BASE}/lib/pkgconfig/fixesproto.pc) && \ 6 !exists(${X11BASE}/lib/pkgconfig/fixesproto.pc) && \
7 !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc) 7 !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc) && \
 8 !exists(${X11BASE}/share/pkgconfig/fixesproto.pc)
8.include "../../x11/fixesproto4/buildlink3.mk" 9.include "../../x11/fixesproto4/buildlink3.mk"
9.else 10.else
10 11
11BUILDLINK_DEPMETHOD.fixesproto?= build 12BUILDLINK_DEPMETHOD.fixesproto?= build
12 13
13BUILDLINK_TREE+= fixesproto 14BUILDLINK_TREE+= fixesproto
14 15
15.if !defined(FIXESPROTO_BUILDLINK3_MK) 16.if !defined(FIXESPROTO_BUILDLINK3_MK)
16FIXESPROTO_BUILDLINK3_MK:= 17FIXESPROTO_BUILDLINK3_MK:=
17 18
18BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0.0 19BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0.0
19BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto 20BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto
20 21
cvs diff -r1.9 -r1.10 pkgsrc/x11/fixesproto/Attic/builtin.mk (expand / switch to unified diff)

--- pkgsrc/x11/fixesproto/Attic/builtin.mk 2014/07/21 09:12:03 1.9
+++ pkgsrc/x11/fixesproto/Attic/builtin.mk 2015/06/18 21:48:52 1.10
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: builtin.mk,v 1.9 2014/07/21 09:12:03 obache Exp $ 1# $NetBSD: builtin.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $
2 2
3BUILTIN_PKG:= fixesproto 3BUILTIN_PKG:= fixesproto
4PKGCONFIG_FILE.fixesproto= ${X11BASE}/lib/pkgconfig/fixesproto.pc 4PKGCONFIG_FILE.fixesproto= ${X11BASE}/lib/pkgconfig/fixesproto.pc
5PKGCONFIG_FILE.fixesproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc 5PKGCONFIG_FILE.fixesproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc
 6PKGCONFIG_FILE.fixesproto+= ${X11BASE}/share/pkgconfig/fixesproto.pc
6 7
7.include "../../mk/buildlink3/pkgconfig-builtin.mk" 8.include "../../mk/buildlink3/pkgconfig-builtin.mk"
8.include "../../mk/x11.builtin.mk" 9.include "../../mk/x11.builtin.mk"
9 10
10CHECK_BUILTIN.fixesproto?= no 11CHECK_BUILTIN.fixesproto?= no
11.if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO]) 12.if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO])
12 13
13# following so old pkg-config name fixesext.pc will be available 14# following so old pkg-config name fixesext.pc will be available
14# this is temporary and can be removed once not used 15# this is temporary and can be removed once not used
15BUILDLINK_TARGETS+= fixesext-symlink-pc 16BUILDLINK_TARGETS+= fixesext-symlink-pc
16 17
17fixesext-symlink-pc: 18fixesext-symlink-pc:
18 src=${FIND_FILES_fixesproto} \ 19 src=${FIND_FILES_fixesproto} \