Search for pkgconfig files in lib${LIBABISUFFIX} and share directories

as appropriate.  This is required for X11_TYPE=native on Red Hat Linux.

57 files changed, 162 insertions, 83 deletions

diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk
index 1597118e222..83f909b573c 100644
--- a/fonts/libfontenc/builtin.mk
+++ b/fonts/libfontenc/builtin.mk
@@ -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 --git a/x11/bigreqsproto/builtin.mk b/x11/bigreqsproto/builtin.mk
index 28b30710cb8..ccc4bd13eea 100644
--- a/x11/bigreqsproto/builtin.mk
+++ b/x11/bigreqsproto/builtin.mk
@@ -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 --git a/x11/damageproto/builtin.mk b/x11/damageproto/builtin.mk
index b432ad7e388..37d5e6b6503 100644
--- a/x11/damageproto/builtin.mk
+++ b/x11/damageproto/builtin.mk
@@ -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 --git a/x11/dri2proto/builtin.mk b/x11/dri2proto/builtin.mk
index 757f0b4fb02..9e2b2c80915 100644
--- a/x11/dri2proto/builtin.mk
+++ b/x11/dri2proto/builtin.mk
@@ -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 --git a/x11/evieext/builtin.mk b/x11/evieext/builtin.mk
index 829eb087b40..8ad6c814a9a 100644
--- a/x11/evieext/builtin.mk
+++ b/x11/evieext/builtin.mk
@@ -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 --git a/x11/fontcacheproto/builtin.mk b/x11/fontcacheproto/builtin.mk
index f521f2d9771..ca836551fab 100644
--- a/x11/fontcacheproto/builtin.mk
+++ b/x11/fontcacheproto/builtin.mk
@@ -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 --git a/x11/fontsproto/builtin.mk b/x11/fontsproto/builtin.mk
index 2c98f63c37e..278aba5e3e8 100644
--- a/x11/fontsproto/builtin.mk
+++ b/x11/fontsproto/builtin.mk
@@ -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 --git a/x11/glproto/builtin.mk b/x11/glproto/builtin.mk
index 0c90f8624b5..ea5603e3c2d 100644
--- a/x11/glproto/builtin.mk
+++ b/x11/glproto/builtin.mk
@@ -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 --git a/x11/inputproto/builtin.mk b/x11/inputproto/builtin.mk
index d5c18d409c2..d2dd1d899d0 100644
--- a/x11/inputproto/builtin.mk
+++ b/x11/inputproto/builtin.mk
@@ -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 --git a/x11/libFS/builtin.mk b/x11/libFS/builtin.mk
index 03a6613b228..6826c68dae2 100644
--- a/x11/libFS/builtin.mk
+++ b/x11/libFS/builtin.mk
@@ -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 --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk
index 0b18af51f5a..c1d85a60124 100644
--- a/x11/libICE/buildlink3.mk
+++ b/x11/libICE/buildlink3.mk
@@ -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 --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk
index e0c06795326..8b6e4422c88 100644
--- a/x11/libSM/buildlink3.mk
+++ b/x11/libSM/buildlink3.mk
@@ -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 --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk
index 1171854e6bc..e0e35562fd0 100644
--- a/x11/libX11/buildlink3.mk
+++ b/x11/libX11/buildlink3.mk
@@ -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_API_DEPENDS.libX11+=	libX11>=1.1
 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 --git a/x11/libX11/builtin.mk b/x11/libX11/builtin.mk
index 130cfd6f46f..15dd1abebd9 100644
--- a/x11/libX11/builtin.mk
+++ b/x11/libX11/builtin.mk
@@ -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 @@ USE_BUILTIN.libX11!=							\
 .endif
 MAKEVARS+=	USE_BUILTIN.libX11
 
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXScrnSaver/builtin.mk b/x11/libXScrnSaver/builtin.mk
index e88b6670415..5aa6aaf122f 100644
--- a/x11/libXScrnSaver/builtin.mk
+++ b/x11/libXScrnSaver/builtin.mk
@@ -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 --git a/x11/libXTrap/builtin.mk b/x11/libXTrap/builtin.mk
index e15501836a0..0258601f2c2 100644
--- a/x11/libXTrap/builtin.mk
+++ b/x11/libXTrap/builtin.mk
@@ -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 --git a/x11/libXdamage/builtin.mk b/x11/libXdamage/builtin.mk
index 3d04b6891fa..dd06f9258a2 100644
--- a/x11/libXdamage/builtin.mk
+++ b/x11/libXdamage/builtin.mk
@@ -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 --git a/x11/libXevie/builtin.mk b/x11/libXevie/builtin.mk
index 08a6b502c87..212660c405d 100644
--- a/x11/libXevie/builtin.mk
+++ b/x11/libXevie/builtin.mk
@@ -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 --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk
index 316e7130099..b874cbe0b91 100644
--- a/x11/libXext/buildlink3.mk
+++ b/x11/libXext/buildlink3.mk
@@ -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 --git a/x11/libXext/builtin.mk b/x11/libXext/builtin.mk
index ebe607c5c6b..ef665f86958 100644
--- a/x11/libXext/builtin.mk
+++ b/x11/libXext/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.4 2008/10/06 18:59:33 tron Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=	libXext
-PKGCONFIG_FILE.libXext=	${X11BASE}/lib/pkgconfig/xext.pc
+PKGCONFIG_FILE.libXext=		${X11BASE}/lib/pkgconfig/xext.pc
+PKGCONFIG_FILE.libXext+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xext.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXfont/builtin.mk b/x11/libXfont/builtin.mk
index fc98a04a503..eb0ac8afc0e 100644
--- a/x11/libXfont/builtin.mk
+++ b/x11/libXfont/builtin.mk
@@ -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:=	libXfont
 PKGCONFIG_FILE.libXfont=	${X11BASE}/lib/pkgconfig/xfont.pc
+PKGCONFIG_FILE.libXfont+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfont.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk
index a462e195172..07a0ac9ea24 100644
--- a/x11/libXft/buildlink3.mk
+++ b/x11/libXft/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/xorg)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xft.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xft.pc)
 .include "../../fonts/Xft2/buildlink3.mk"
 .else
 
diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk
index c52bc15ca83..67178517f69 100644
--- a/x11/libXinerama/buildlink3.mk
+++ b/x11/libXinerama/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/10/23 10:24:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xinerama.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xinerama.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xinerama.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff --git a/x11/libXinerama/builtin.mk b/x11/libXinerama/builtin.mk
index 95e0a0e8b7b..ad2bbd25ceb 100644
--- a/x11/libXinerama/builtin.mk
+++ b/x11/libXinerama/builtin.mk
@@ -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:=	libXinerama
 PKGCONFIG_FILE.libXinerama=	${X11BASE}/lib/pkgconfig/xinerama.pc
+PKGCONFIG_FILE.libXinerama+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xinerama.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk
index 2a3b7eaaf3a..c1de050f377 100644
--- a/x11/libXmu/buildlink3.mk
+++ b/x11/libXmu/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 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/xmu.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xmu.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xmu.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff --git a/x11/libXprintUtil/builtin.mk b/x11/libXprintUtil/builtin.mk
index 0dc8d255ac7..8ebd8e81434 100644
--- a/x11/libXprintUtil/builtin.mk
+++ b/x11/libXprintUtil/builtin.mk
@@ -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:=	libXprintUtil
 PKGCONFIG_FILE.libXprintUtil=	${X11BASE}/lib/pkgconfig/xprintutil.pc
+PKGCONFIG_FILE.libXprintUtil+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xprintutil.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk
index d7b959e5b1c..2c4c61b7e7f 100644
--- a/x11/libXrandr/buildlink3.mk
+++ b/x11/libXrandr/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/03/10 11:05:52 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xrandr.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xrandr.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrandr.pc)
 .include "../../x11/liboldXrandr/buildlink3.mk"
 .else
 
diff --git a/x11/libXrandr/builtin.mk b/x11/libXrandr/builtin.mk
index c8c29d48e06..126f15fa7b7 100644
--- a/x11/libXrandr/builtin.mk
+++ b/x11/libXrandr/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.4 2014/02/06 05:34:48 obache Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=	libXrandr
 PKGCONFIG_FILE.libXrandr=	${X11BASE}/lib/pkgconfig/xrandr.pc
+PKGCONFIG_FILE.libXrandr+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrandr.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk
index 3bf41d30937..91bb91d249d 100644
--- a/x11/libXrender/buildlink3.mk
+++ b/x11/libXrender/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 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/xrender.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xrender.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrender.pc)
 .include "../../x11/Xrender/buildlink3.mk"
 .else
 
diff --git a/x11/libXrender/builtin.mk b/x11/libXrender/builtin.mk
index c9371345a79..611e80053b3 100644
--- a/x11/libXrender/builtin.mk
+++ b/x11/libXrender/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.3 2014/02/06 05:51:54 obache Exp $
+# $NetBSD: builtin.mk,v 1.4 2014/03/10 11:05:52 jperkin Exp $
 
 BUILTIN_PKG:=	libXrender
 PKGCONFIG_FILE.libXrender=	${X11BASE}/lib/pkgconfig/xrender.pc
+PKGCONFIG_FILE.libXrender+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrender.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXres/builtin.mk b/x11/libXres/builtin.mk
index d63015c45dd..4d2c7440eed 100644
--- a/x11/libXres/builtin.mk
+++ b/x11/libXres/builtin.mk
@@ -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:53 jperkin Exp $
 
 BUILTIN_PKG:=	libXres
-PKGCONFIG_FILE.libXres=	${X11BASE}/lib/pkgconfig/xres.pc \
-			${X11BASE}/lib/libXRes.so
+PKGCONFIG_FILE.libXres=		${X11BASE}/lib/pkgconfig/xres.pc
+PKGCONFIG_FILE.libXres+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xres.pc
+PKGCONFIG_FILE.libXres+=	${X11BASE}/lib/libXRes.so
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk
index be9ffc63396..df327c81e15 100644
--- a/x11/libXt/buildlink3.mk
+++ b/x11/libXt/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:53 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xt.pc)
+.if ${X11_TYPE} != "modular" && \
+    !exists(${X11BASE}/lib/pkgconfig/xt.pc) && \
+    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xt.pc)
 .include "../../mk/x11.buildlink3.mk"
 .else
 
diff --git a/x11/libXtst/builtin.mk b/x11/libXtst/builtin.mk
index cd8751dff82..eaea6aa3054 100644
--- a/x11/libXtst/builtin.mk
+++ b/x11/libXtst/builtin.mk
@@ -1,8 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2008/12/04 04:16:41 cube Exp $
+# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	libXtst
-PKGCONFIG_FILE.libXtst=	${X11BASE}/lib/pkgconfig/xtst.pc \
-				${X11BASE}/lib/libXtst.so
+PKGCONFIG_FILE.libXtst=		${X11BASE}/lib/pkgconfig/xtst.pc
+PKGCONFIG_FILE.libXtst+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtst.pc
+PKGCONFIG_FILE.libXtst+=	${X11BASE}/lib/libXtst.so
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXv/builtin.mk b/x11/libXv/builtin.mk
index e250d6ca2be..9fe7c78ff9c 100644
--- a/x11/libXv/builtin.mk
+++ b/x11/libXv/builtin.mk
@@ -1,8 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2008/10/29 21:14:01 cube Exp $
+# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	libXv
-PKGCONFIG_FILE.libXv=	${X11BASE}/lib/pkgconfig/xv.pc \
-				${X11BASE}/lib/libXv.so
+PKGCONFIG_FILE.libXv=	${X11BASE}/lib/pkgconfig/xv.pc
+PKGCONFIG_FILE.libXv+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xv.pc
+PKGCONFIG_FILE.libXv+=	${X11BASE}/lib/libXv.so
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libXvMC/builtin.mk b/x11/libXvMC/builtin.mk
index 1336d11d198..9a4cd5900a0 100644
--- a/x11/libXvMC/builtin.mk
+++ b/x11/libXvMC/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2011/01/19 17:50:48 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,6 +6,7 @@ BUILTIN_PKG:=	libXvMC
 
 BUILTIN_FIND_FILES_VAR:=	PC_LIBXVMC LIB_XVMCW
 BUILTIN_FIND_FILES.PC_LIBXVMC=	${X11BASE}/lib/pkgconfig/xvmc.pc
+BUILTIN_FIND_FILES.PC_LIBXVMC+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xvmc.pc
 .if ${_OPSYS_SHLIB_TYPE} == "dylib"
 BUILTIN_FIND_FILES.LIB_XVMCW=	${X11BASE}/lib/libXvMCW.dylib
 .else
diff --git a/x11/libdrm/builtin.mk b/x11/libdrm/builtin.mk
index ace98bb4e04..d9fe1b4f32e 100644
--- a/x11/libdrm/builtin.mk
+++ b/x11/libdrm/builtin.mk
@@ -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:53 jperkin Exp $
 
 BUILTIN_PKG:=	libdrm
 PKGCONFIG_FILE.libdrm=	${X11BASE}/lib/pkgconfig/libdrm.pc
+PKGCONFIG_FILE.libdrm+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/libdrm.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/libxcb/builtin.mk b/x11/libxcb/builtin.mk
index 2fdd80c6208..458d2da5dd7 100644
--- a/x11/libxcb/builtin.mk
+++ b/x11/libxcb/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2010/09/11 19:30:05 tron Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	libxcb
 PKGCONFIG_FILE.libxcb=	${X11BASE}/lib/pkgconfig/xcb.pc
+PKGCONFIG_FILE.libxcb+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/pixman/builtin.mk b/x11/pixman/builtin.mk
index 144232e5088..c1c7d76ac07 100644
--- a/x11/pixman/builtin.mk
+++ b/x11/pixman/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.6 2008/10/06 12:54:43 tron Exp $
+# $NetBSD: builtin.mk,v 1.7 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	pixman
 PKGCONFIG_FILE.pixman=	${X11BASE}/lib/pkgconfig/pixman-1.pc
+PKGCONFIG_FILE.pixman+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/pixman-1.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/printproto/builtin.mk b/x11/printproto/builtin.mk
index 4ad15004a24..9fcdb3732f9 100644
--- a/x11/printproto/builtin.mk
+++ b/x11/printproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	printproto
 PKGCONFIG_FILE.printproto=	${X11BASE}/lib/pkgconfig/printproto.pc
+PKGCONFIG_FILE.printproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/printproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/recordproto/builtin.mk b/x11/recordproto/builtin.mk
index dc36eed0d4d..2c29762dd1a 100644
--- a/x11/recordproto/builtin.mk
+++ b/x11/recordproto/builtin.mk
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	recordproto
 PKGCONFIG_FILE.recordproto=	${X11BASE}/lib/pkgconfig/recordproto.pc
+PKGCONFIG_FILE.recordproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/recordproto.pc
+PKGCONFIG_FILE.recordproto+=	${X11BASE}/share/pkgconfig/recordproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/resourceproto/builtin.mk b/x11/resourceproto/builtin.mk
index 8cb59bbdb8a..ecd7fc2d1df 100644
--- a/x11/resourceproto/builtin.mk
+++ b/x11/resourceproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	resourceproto
 PKGCONFIG_FILE.resourceproto=	${X11BASE}/lib/pkgconfig/resourceproto.pc
+PKGCONFIG_FILE.resourceproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/resourceproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/scrnsaverproto/builtin.mk b/x11/scrnsaverproto/builtin.mk
index 76750d749a7..015d98b9ab2 100644
--- a/x11/scrnsaverproto/builtin.mk
+++ b/x11/scrnsaverproto/builtin.mk
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	scrnsaverproto
 PKGCONFIG_FILE.scrnsaverproto=	${X11BASE}/lib/pkgconfig/scrnsaverproto.pc
+PKGCONFIG_FILE.scrnsaverproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/scrnsaverproto.pc
+PKGCONFIG_FILE.scrnsaverproto+=	${X11BASE}/share/pkgconfig/scrnsaverproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/trapproto/builtin.mk b/x11/trapproto/builtin.mk
index 37d18933559..683f032987f 100644
--- a/x11/trapproto/builtin.mk
+++ b/x11/trapproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	trapproto
 PKGCONFIG_FILE.trapproto=	${X11BASE}/lib/pkgconfig/trapproto.pc
+PKGCONFIG_FILE.trapproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/trapproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/videoproto/builtin.mk b/x11/videoproto/builtin.mk
index a0194209f76..8518c3f8f8e 100644
--- a/x11/videoproto/builtin.mk
+++ b/x11/videoproto/builtin.mk
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	videoproto
 PKGCONFIG_FILE.videoproto=	${X11BASE}/lib/pkgconfig/videoproto.pc
+PKGCONFIG_FILE.videoproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/videoproto.pc
+PKGCONFIG_FILE.videoproto+=	${X11BASE}/share/pkgconfig/videoproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xbitmaps/builtin.mk b/x11/xbitmaps/builtin.mk
index 00f0f8da304..4664e59ac2b 100644
--- a/x11/xbitmaps/builtin.mk
+++ b/x11/xbitmaps/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2013/04/18 13:22:06 obache Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	xbitmaps
 PKGCONFIG_FILE.xbitmaps=	${X11BASE}/lib/pkgconfig/xbitmaps.pc
+PKGCONFIG_FILE.xbitmaps+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xbitmaps.pc
 PKGCONFIG_FILE.xbitmaps+=	${X11BASE}/share/pkgconfig/xbitmaps.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/xcb-proto/builtin.mk b/x11/xcb-proto/builtin.mk
index d8b1c3ddabd..73687696657 100644
--- a/x11/xcb-proto/builtin.mk
+++ b/x11/xcb-proto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2013/04/18 13:22:06 obache Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
 BUILTIN_PKG:=	xcb-proto
 PKGCONFIG_FILE.xcb-proto=	${X11BASE}/lib/pkgconfig/xcb-proto.pc
+PKGCONFIG_FILE.xcb-proto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-proto.pc
 PKGCONFIG_FILE.xcb-proto+=	${X11BASE}/share/pkgconfig/xcb-proto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/xcb-util/builtin.mk b/x11/xcb-util/builtin.mk
index b90bf7403fc..e8d3fd3374f 100644
--- a/x11/xcb-util/builtin.mk
+++ b/x11/xcb-util/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2013/12/11 23:38:52 markd Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xcb-util
 PKGCONFIG_FILE.xcb-util=	${X11BASE}/lib/pkgconfig/xcb-atom.pc
+PKGCONFIG_FILE.xcb-util+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-atom.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xcmiscproto/builtin.mk b/x11/xcmiscproto/builtin.mk
index ba5d20155bd..d2c32d8075a 100644
--- a/x11/xcmiscproto/builtin.mk
+++ b/x11/xcmiscproto/builtin.mk
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xcmiscproto
 PKGCONFIG_FILE.xcmiscproto=	${X11BASE}/lib/pkgconfig/xcmiscproto.pc
+PKGCONFIG_FILE.xcmiscproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcmiscproto.pc
+PKGCONFIG_FILE.xcmiscproto+=	${X11BASE}/share/pkgconfig/xcmiscproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86bigfontproto/builtin.mk b/x11/xf86bigfontproto/builtin.mk
index 14e2ded0bae..00fe5b47ea4 100644
--- a/x11/xf86bigfontproto/builtin.mk
+++ b/x11/xf86bigfontproto/builtin.mk
@@ -1,7 +1,9 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xf86bigfontproto
 PKGCONFIG_FILE.xf86bigfontproto=	${X11BASE}/lib/pkgconfig/xf86bigfontproto.pc
+PKGCONFIG_FILE.xf86bigfontproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86bigfontproto.pc
+PKGCONFIG_FILE.xf86bigfontproto+=	${X11BASE}/share/pkgconfig/xf86bigfontproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86dgaproto/builtin.mk b/x11/xf86dgaproto/builtin.mk
index 4d30a9d16be..447c4b82c1a 100644
--- a/x11/xf86dgaproto/builtin.mk
+++ b/x11/xf86dgaproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xf86dgaproto
 PKGCONFIG_FILE.xf86dgaproto=	${X11BASE}/lib/pkgconfig/xf86dgaproto.pc
+PKGCONFIG_FILE.xf86dgaproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86dgaproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86driproto/builtin.mk b/x11/xf86driproto/builtin.mk
index 8dc998d3f74..62f507d5a43 100644
--- a/x11/xf86driproto/builtin.mk
+++ b/x11/xf86driproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xf86driproto
 PKGCONFIG_FILE.xf86driproto=	${X11BASE}/lib/pkgconfig/xf86driproto.pc
+PKGCONFIG_FILE.xf86driproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86driproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86miscproto/builtin.mk b/x11/xf86miscproto/builtin.mk
index a0a4c86c159..eb550c1d5e1 100644
--- a/x11/xf86miscproto/builtin.mk
+++ b/x11/xf86miscproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xf86miscproto
 PKGCONFIG_FILE.xf86miscproto=	${X11BASE}/lib/pkgconfig/xf86miscproto.pc
+PKGCONFIG_FILE.xf86miscproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86miscproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86vidmodeproto/builtin.mk b/x11/xf86vidmodeproto/builtin.mk
index 445cfcc3e5e..7d85e2e297e 100644
--- a/x11/xf86vidmodeproto/builtin.mk
+++ b/x11/xf86vidmodeproto/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xf86vidmodeproto
 PKGCONFIG_FILE.xf86vidmodeproto=	${X11BASE}/lib/pkgconfig/xf86vidmodeproto.pc
+PKGCONFIG_FILE.xf86vidmodeproto+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86vidmodeproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xineramaproto/builtin.mk b/x11/xineramaproto/builtin.mk
index 87a161e2368..2107a41b68d 100644
--- a/x11/xineramaproto/builtin.mk
+++ b/x11/xineramaproto/builtin.mk
@@ -1,9 +1,10 @@
-# $NetBSD: builtin.mk,v 1.4 2012/06/15 23:06:08 dholland Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xineramaproto
 
 BUILTIN_FIND_FILES_VAR:=		PC_XINERAMAPROTO
 BUILTIN_FIND_FILES.PC_XINERAMAPROTO=	${X11BASE}/lib/pkgconfig/xineramaproto.pc
+BUILTIN_FIND_FILES.PC_XINERAMAPROTO+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xineramaproto.pc
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/x11/xkeyboard-config/builtin.mk b/x11/xkeyboard-config/builtin.mk
index cb87ba63d42..8fbc678ee14 100644
--- a/x11/xkeyboard-config/builtin.mk
+++ b/x11/xkeyboard-config/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2013/04/18 13:22:06 obache Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=				xkeyboard-config
 PKGCONFIG_FILE.xkeyboard-config=	${X11BASE}/lib/pkgconfig/xkeyboard-config.pc
+PKGCONFIG_FILE.xkeyboard-config+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xkeyboard-config.pc
 PKGCONFIG_FILE.xkeyboard-config+=	${X11BASE}/share/pkgconfig/xkeyboard-config.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/xproxymanagementprotocol/builtin.mk b/x11/xproxymanagementprotocol/builtin.mk
index 70efc8c7ee2..649018842a7 100644
--- a/x11/xproxymanagementprotocol/builtin.mk
+++ b/x11/xproxymanagementprotocol/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xproxymanagementprotocol
 PKGCONFIG_FILE.xproxymanagementprotocol=	${X11BASE}/lib/pkgconfig/xproxymngproto.pc
+PKGCONFIG_FILE.xproxymanagementprotocol+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xproxymngproto.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"
diff --git a/x11/xtrans/builtin.mk b/x11/xtrans/builtin.mk
index a1d7daedd9d..4ed8fc5b079 100644
--- a/x11/xtrans/builtin.mk
+++ b/x11/xtrans/builtin.mk
@@ -1,7 +1,8 @@
-# $NetBSD: builtin.mk,v 1.3 2013/04/18 13:22:06 obache Exp $
+# $NetBSD: builtin.mk,v 1.4 2014/03/10 11:05:54 jperkin Exp $
 
 BUILTIN_PKG:=	xtrans
 PKGCONFIG_FILE.xtrans=	${X11BASE}/lib/pkgconfig/xtrans.pc
+PKGCONFIG_FILE.xtrans+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtrans.pc
 PKGCONFIG_FILE.xtrans+=	${X11BASE}/share/pkgconfig/xtrans.pc
 
 .include "../../mk/buildlink3/pkgconfig-builtin.mk"