Thu Apr 24 12:18:09 2014 UTC ()
Prevent to install pre-modular older Xfixes for native modular X.
* stop to use x11/Xfixes if builtin one is newer (xfixes.pc exists)
* add builtin libXfixes detection.

affect to NetBSD-5, builtin libXfixes is 4.0.3, prevent to install Xfixes 2.0.1,
if it is considerd that builtin Xfixes is not sufficient.


(obache)
diff -r1.3 -r1.4 pkgsrc/x11/libXfixes/buildlink3.mk
diff -r0 -r1.1 pkgsrc/x11/libXfixes/builtin.mk
cvs diff -r1.3 -r1.4 pkgsrc/x11/libXfixes/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXfixes/buildlink3.mk 2009/03/20 19:25:44 1.3
+++ pkgsrc/x11/libXfixes/buildlink3.mk 2014/04/24 12:18:09 1.4
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2014/04/24 12:18:09 obache 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/xfixes.pc) && \
 7 !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfixes.pc)
6.include "../../x11/Xfixes/buildlink3.mk" 8.include "../../x11/Xfixes/buildlink3.mk"
7.else 9.else
8 10
9BUILDLINK_TREE+= libXfixes 11BUILDLINK_TREE+= libXfixes
10 12
11.if !defined(LIBXFIXES_BUILDLINK3_MK) 13.if !defined(LIBXFIXES_BUILDLINK3_MK)
12LIBXFIXES_BUILDLINK3_MK:= 14LIBXFIXES_BUILDLINK3_MK:=
13 15
14BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1 16BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1
15BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes 17BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes
16 18
17.include "../../x11/fixesproto/buildlink3.mk" 19.include "../../x11/fixesproto/buildlink3.mk"
18.include "../../x11/libX11/buildlink3.mk" 20.include "../../x11/libX11/buildlink3.mk"
File Added: pkgsrc/x11/libXfixes/builtin.mk
# $NetBSD: builtin.mk,v 1.1 2014/04/24 12:18:09 obache Exp $

BUILTIN_PKG:=	libXfixes
PKGCONFIG_FILE.libXfixes=	${X11BASE}/lib/pkgconfig/xfixes.pc
PKGCONFIG_FILE.libXfixes+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfixes.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"