diff options
| author | obache <obache> | 2014-04-24 12:18:09 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-04-24 12:18:09 +0000 |
| commit | df4de62117a0d89bcd31b8732c06cd838b34e4a7 (patch) | |
| tree | 42277aa020835c158739c0ccbc7a500e22774bdd /x11 | |
| parent | e06b8d6faab20502144907d6427ee6c690c11bae (diff) | |
| download | pkgsrc-df4de62117a0d89bcd31b8732c06cd838b34e4a7.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXfixes/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/libXfixes/builtin.mk | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk index 80a1ec29f84..7995f8e8321 100644 --- a/x11/libXfixes/buildlink3.mk +++ b/x11/libXfixes/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2014/04/24 12:18:09 obache Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} != "modular" +.if ${X11_TYPE} != "modular" && \ + !exists(${X11BASE}/lib/pkgconfig/xfixes.pc) && \ + !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfixes.pc) .include "../../x11/Xfixes/buildlink3.mk" .else diff --git a/x11/libXfixes/builtin.mk b/x11/libXfixes/builtin.mk new file mode 100644 index 00000000000..dc2043ea1c5 --- /dev/null +++ b/x11/libXfixes/builtin.mk @@ -0,0 +1,8 @@ +# $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" |