pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Search for pkgconfig files in lib${LIBABISUFFIX} and s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5d3ca486cfa
branches:  trunk
changeset: 631556:c5d3ca486cfa
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Mar 10 11:05:51 2014 +0000

description:
Search for pkgconfig files in lib${LIBABISUFFIX} and share directories
as appropriate.  This is required for X11_TYPE=native on Red Hat Linux.

diffstat:

 fonts/libfontenc/builtin.mk             |   3 ++-
 x11/bigreqsproto/builtin.mk             |   4 +++-
 x11/damageproto/builtin.mk              |   4 +++-
 x11/dri2proto/builtin.mk                |   3 ++-
 x11/evieext/builtin.mk                  |   5 +++--
 x11/fontcacheproto/builtin.mk           |   3 ++-
 x11/fontsproto/builtin.mk               |   3 ++-
 x11/glproto/builtin.mk                  |   5 +++--
 x11/inputproto/builtin.mk               |   4 +++-
 x11/libFS/builtin.mk                    |   3 ++-
 x11/libICE/buildlink3.mk                |   6 ++++--
 x11/libSM/buildlink3.mk                 |   6 ++++--
 x11/libX11/buildlink3.mk                |  14 +++++++++-----
 x11/libX11/builtin.mk                   |   5 ++++-
 x11/libXScrnSaver/builtin.mk            |   7 ++++---
 x11/libXTrap/builtin.mk                 |   3 ++-
 x11/libXdamage/builtin.mk               |   7 ++++---
 x11/libXevie/builtin.mk                 |   3 ++-
 x11/libXext/buildlink3.mk               |   6 ++++--
 x11/libXext/builtin.mk                  |   5 +++--
 x11/libXfont/builtin.mk                 |   3 ++-
 x11/libXft/buildlink3.mk                |   6 ++++--
 x11/libXinerama/buildlink3.mk           |   6 ++++--
 x11/libXinerama/builtin.mk              |   3 ++-
 x11/libXmu/buildlink3.mk                |   6 ++++--
 x11/libXprintUtil/builtin.mk            |   3 ++-
 x11/libXrandr/buildlink3.mk             |   6 ++++--
 x11/libXrandr/builtin.mk                |   3 ++-
 x11/libXrender/buildlink3.mk            |   6 ++++--
 x11/libXrender/builtin.mk               |   3 ++-
 x11/libXres/builtin.mk                  |   7 ++++---
 x11/libXt/buildlink3.mk                 |   6 ++++--
 x11/libXtst/builtin.mk                  |   7 ++++---
 x11/libXv/builtin.mk                    |   7 ++++---
 x11/libXvMC/builtin.mk                  |   3 ++-
 x11/libdrm/builtin.mk                   |   3 ++-
 x11/libxcb/builtin.mk                   |   3 ++-
 x11/pixman/builtin.mk                   |   3 ++-
 x11/printproto/builtin.mk               |   3 ++-
 x11/recordproto/builtin.mk              |   4 +++-
 x11/resourceproto/builtin.mk            |   3 ++-
 x11/scrnsaverproto/builtin.mk           |   4 +++-
 x11/trapproto/builtin.mk                |   3 ++-
 x11/videoproto/builtin.mk               |   4 +++-
 x11/xbitmaps/builtin.mk                 |   3 ++-
 x11/xcb-proto/builtin.mk                |   3 ++-
 x11/xcb-util/builtin.mk                 |   3 ++-
 x11/xcmiscproto/builtin.mk              |   4 +++-
 x11/xf86bigfontproto/builtin.mk         |   4 +++-
 x11/xf86dgaproto/builtin.mk             |   3 ++-
 x11/xf86driproto/builtin.mk             |   3 ++-
 x11/xf86miscproto/builtin.mk            |   3 ++-
 x11/xf86vidmodeproto/builtin.mk         |   3 ++-
 x11/xineramaproto/builtin.mk            |   3 ++-
 x11/xkeyboard-config/builtin.mk         |   3 ++-
 x11/xproxymanagementprotocol/builtin.mk |   3 ++-
 x11/xtrans/builtin.mk                   |   3 ++-
 57 files changed, 162 insertions(+), 83 deletions(-)

diffs (truncated from 831 to 300 lines):

diff -r d70c3d26a7f6 -r c5d3ca486cfa fonts/libfontenc/builtin.mk
--- a/fonts/libfontenc/builtin.mk       Mon Mar 10 09:15:15 2014 +0000
+++ b/fonts/libfontenc/builtin.mk       Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  libfontenc
 PKGCONFIG_FILE.libfontenc=     ${X11BASE}/lib/pkgconfig/fontenc.pc
+PKGCONFIG_FILE.libfontenc+=    ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fontenc.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/bigreqsproto/builtin.mk
--- a/x11/bigreqsproto/builtin.mk       Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/bigreqsproto/builtin.mk       Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  bigreqsproto
 PKGCONFIG_FILE.bigreqsproto=   ${X11BASE}/lib/pkgconfig/bigreqsproto.pc
+PKGCONFIG_FILE.bigreqsproto+=  ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/bigreqsproto.pc
+PKGCONFIG_FILE.bigreqsproto+=  ${X11BASE}/share/pkgconfig/bigreqsproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/damageproto/builtin.mk
--- a/x11/damageproto/builtin.mk        Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/damageproto/builtin.mk        Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  damageproto
 PKGCONFIG_FILE.damageproto=    ${X11BASE}/lib/pkgconfig/damageproto.pc
+PKGCONFIG_FILE.damageproto+=   ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/damageproto.pc
+PKGCONFIG_FILE.damageproto+=   ${X11BASE}/share/pkgconfig/damageproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/dri2proto/builtin.mk
--- a/x11/dri2proto/builtin.mk  Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/dri2proto/builtin.mk  Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2009/05/19 06:34:41 hasso Exp $
+# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  dri2proto
 PKGCONFIG_FILE.dri2proto=      ${X11BASE}/lib/pkgconfig/dri2proto.pc
+PKGCONFIG_FILE.dri2proto+=     ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/dri2proto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/evieext/builtin.mk
--- a/x11/evieext/builtin.mk    Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/evieext/builtin.mk    Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  evieext
-PKGCONFIG_FILE.evieext=        ${X11BASE}/lib/pkgconfig/evieproto.pc
+PKGCONFIG_FILE.evieext=                ${X11BASE}/lib/pkgconfig/evieproto.pc
+PKGCONFIG_FILE.evieext+=       ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/evieproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/fontcacheproto/builtin.mk
--- a/x11/fontcacheproto/builtin.mk     Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/fontcacheproto/builtin.mk     Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  fontcacheproto
 PKGCONFIG_FILE.fontcacheproto= ${X11BASE}/lib/pkgconfig/fontcacheproto.pc
+PKGCONFIG_FILE.fontcacheproto+=        ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fontcacheproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/fontsproto/builtin.mk
--- a/x11/fontsproto/builtin.mk Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/fontsproto/builtin.mk Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  fontsproto
 PKGCONFIG_FILE.fontsproto=     ${X11BASE}/lib/pkgconfig/fontsproto.pc
+PKGCONFIG_FILE.fontsproto+=    ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fontsproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/glproto/builtin.mk
--- a/x11/glproto/builtin.mk    Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/glproto/builtin.mk    Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
 
 BUILTIN_PKG:=  glproto
-PKGCONFIG_FILE.glproto=        ${X11BASE}/lib/pkgconfig/glproto.pc
+PKGCONFIG_FILE.glproto=                ${X11BASE}/lib/pkgconfig/glproto.pc
+PKGCONFIG_FILE.glproto+=       ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/glproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/inputproto/builtin.mk
--- a/x11/inputproto/builtin.mk Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/inputproto/builtin.mk Mon Mar 10 11:05:51 2014 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: builtin.mk,v 1.4 2012/06/15 23:06:03 dholland Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  inputproto
 
 BUILTIN_FIND_FILES_VAR:=               PC_INPUTPROTO
 BUILTIN_FIND_FILES.PC_INPUTPROTO=      ${X11BASE}/lib/pkgconfig/inputproto.pc
+BUILTIN_FIND_FILES.PC_INPUTPROTO+=     ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/inputproto.pc
+BUILTIN_FIND_FILES.PC_INPUTPROTO+=     ${X11BASE}/share/pkgconfig/inputproto.pc
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libFS/builtin.mk
--- a/x11/libFS/builtin.mk      Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libFS/builtin.mk      Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libFS
 PKGCONFIG_FILE.libFS=  ${X11BASE}/lib/pkgconfig/libfs.pc
+PKGCONFIG_FILE.libFS+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/libfs.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libICE/buildlink3.mk
--- a/x11/libICE/buildlink3.mk  Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libICE/buildlink3.mk  Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/ice.pc)
+.if ${X11_TYPE} != "modular"  && \
+    !exists(${X11BASE}/lib/pkgconfig/ice.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/ice.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libSM/buildlink3.mk
--- a/x11/libSM/buildlink3.mk   Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libSM/buildlink3.mk   Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/sm.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/sm.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/sm.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libX11/buildlink3.mk
--- a/x11/libX11/buildlink3.mk  Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libX11/buildlink3.mk  Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/09/11 18:47:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/x11.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/x11.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
@@ -15,14 +17,16 @@
 BUILDLINK_ABI_DEPENDS.libX11+= libX11>=0.99
 BUILDLINK_PKGSRCDIR.libX11?=   ../../x11/libX11
 
-X11_LDFLAGS+=  ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
-X11_LDFLAGS+=  -L${BUILDLINK_PREFIX.libX11}/lib
+X11_LDFLAGS+=  ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX}
+X11_LDFLAGS+=  -L${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX}
 
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/pkgconfig/xcb.pc)
+.if ${X11_TYPE} == "modular" || \
+    exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \
+    exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc)
 .include "../../x11/libxcb/buildlink3.mk"
 .endif
 
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libX11/builtin.mk
--- a/x11/libX11/builtin.mk     Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libX11/builtin.mk     Mon Mar 10 11:05:51 2014 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libX11
+PKGCONFIG_FILE.libX11=         ${X11BASE}/lib/pkgconfig/x11.pc
+PKGCONFIG_FILE.libX11+=                ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc
 
 BUILTIN_FIND_FILES_VAR:=       H_XLIB
 BUILTIN_FIND_FILES.H_XLIB=     ${X11BASE}/include/X11/Xlib.h
@@ -48,4 +50,5 @@
 .endif
 MAKEVARS+=     USE_BUILTIN.libX11
 
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXScrnSaver/builtin.mk
--- a/x11/libXScrnSaver/builtin.mk      Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libXScrnSaver/builtin.mk      Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libXScrnSaver
-PKGCONFIG_FILE.libXScrnSaver=  ${X11BASE}/lib/pkgconfig/xscrnsaver.pc \
-                               ${X11BASE}/lib/libXss.so
+PKGCONFIG_FILE.libXScrnSaver=  ${X11BASE}/lib/pkgconfig/xscrnsaver.pc
+PKGCONFIG_FILE.libXScrnSaver+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xscrnsaver.pc
+PKGCONFIG_FILE.libXScrnSaver+= ${X11BASE}/lib/libXss.so
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXTrap/builtin.mk
--- a/x11/libXTrap/builtin.mk   Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libXTrap/builtin.mk   Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libXTrap
 PKGCONFIG_FILE.libXTrap=       ${X11BASE}/lib/pkgconfig/xtrap.pc
+PKGCONFIG_FILE.libXTrap+=      ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtrap.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXdamage/builtin.mk
--- a/x11/libXdamage/builtin.mk Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libXdamage/builtin.mk Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libXdamage
-PKGCONFIG_FILE.libXdamage=     ${X11BASE}/lib/pkgconfig/xdamage.pc \
-                               ${X11BASE}/lib/libXdamage.so
+PKGCONFIG_FILE.libXdamage=     ${X11BASE}/lib/pkgconfig/xdamage.pc
+PKGCONFIG_FILE.libXdamage+=    ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xdamage.pc
+PKGCONFIG_FILE.libXdamage+=    ${X11BASE}/lib/libXdamage.so
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXevie/builtin.mk
--- a/x11/libXevie/builtin.mk   Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libXevie/builtin.mk   Mon Mar 10 11:05:51 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=  libXevie
 PKGCONFIG_FILE.libXevie=       ${X11BASE}/lib/pkgconfig/xevie.pc
+PKGCONFIG_FILE.libXevie+=      ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xevie.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXext/buildlink3.mk
--- a/x11/libXext/buildlink3.mk Mon Mar 10 09:15:15 2014 +0000
+++ b/x11/libXext/buildlink3.mk Mon Mar 10 11:05:51 2014 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/10/23 10:11:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xext.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xext.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff -r d70c3d26a7f6 -r c5d3ca486cfa x11/libXext/builtin.mk
--- a/x11/libXext/builtin.mk    Mon Mar 10 09:15:15 2014 +0000



Home | Main Index | Thread Index | Old Index