x11-links-0.84: Add support for newer Red Hat Linux.

Newer RHEL distributions have pkgconfig files split across three locations,
so add support for both share/pkgconfig and lib${LIBABISUFFIX}/pkgconfig if
LIBABISUFFIX is defined.

27 files changed, 61 insertions, 29 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 99e085f0559..b2822fc9379 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.151 2014/03/03 02:18:41 obache Exp $
+# $NetBSD: Makefile,v 1.152 2014/03/07 15:27:32 jperkin Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-PKGNAME=	x11-links-0.83
+PKGNAME=	x11-links-0.84
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -56,6 +56,8 @@ PKG_FAIL_REASON+=	"pkgsrc installations is not supported!"
        exists(${X11BASE}/lib/X11/config/version.def)) || \
       exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \
       exists(${X11BASE}/lib/pkgconfig/x11.pc) || \
+      exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xorg-server.pc) || \
+      exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc) || \
       exists(${X11BASE}/bin/Xquartz)
 .  include "xorg.mk"
 .else
@@ -68,6 +70,10 @@ X11_LINKS_DIR=		${PREFIX}/${X11_LINKS_SUBDIR}
 
 FILES_LIST_CMD=	${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
 
+.if ${OPSYS} == "Linux" && !empty(LIBABISUFFIX)
+FILES_LIST_CMD+=	| awk '{print;} /^lib\// { sub(/^lib\//, "lib${LIBABISUFFIX}/"); print; }'
+.endif
+
 CREATE_X11LINK?=	${LN} -fs $$src $$dest
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index a019f86b758..2286e980ba9 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2014/02/21 17:45:08 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2014/03/07 15:27:32 jperkin Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.83
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.84
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg.bigreqsproto b/pkgtools/x11-links/files/xorg.bigreqsproto
index d9921f56ab4..fd866c8b52a 100644
--- a/pkgtools/x11-links/files/xorg.bigreqsproto
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.bigreqsproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.bigreqsproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/bigreqsproto.h
 include/X11/extensions/bigreqstr.h
 lib/pkgconfig/bigreqsproto.pc
+share/pkgconfig/bigreqsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.compositeproto b/pkgtools/x11-links/files/xorg.compositeproto
index 367b5d77a3a..471083ff448 100644
--- a/pkgtools/x11-links/files/xorg.compositeproto
+++ b/pkgtools/x11-links/files/xorg.compositeproto
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.compositeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.compositeproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 include/X11/extensions/composite.h
 include/X11/extensions/compositeproto.h
 lib/pkgconfig/compositeext.pc
 lib/pkgconfig/compositeproto.pc
+share/pkgconfig/compositeproto.pc
diff --git a/pkgtools/x11-links/files/xorg.damageproto b/pkgtools/x11-links/files/xorg.damageproto
index 7177ea6e26b..659ef9f39a5 100644
--- a/pkgtools/x11-links/files/xorg.damageproto
+++ b/pkgtools/x11-links/files/xorg.damageproto
@@ -1,3 +1,4 @@
-# $NetBSD: xorg.damageproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.damageproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 lib/pkgconfig/damageproto.pc
+share/pkgconfig/damageproto.pc
diff --git a/pkgtools/x11-links/files/xorg.evieext b/pkgtools/x11-links/files/xorg.evieext
index 54278069fb8..8af4b007e6d 100644
--- a/pkgtools/x11-links/files/xorg.evieext
+++ b/pkgtools/x11-links/files/xorg.evieext
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.evieext,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.evieext,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/Xeviestr.h
 include/X11/extensions/evieproto.h
 lib/pkgconfig/evieproto.pc
+share/pkgconfig/evieproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fixesproto b/pkgtools/x11-links/files/xorg.fixesproto
index 415822c5b23..2d7475a3eb3 100644
--- a/pkgtools/x11-links/files/xorg.fixesproto
+++ b/pkgtools/x11-links/files/xorg.fixesproto
@@ -1,4 +1,5 @@
-# $NetBSD: xorg.fixesproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.fixesproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 include/X11/extensions/xfixesproto.h
 include/X11/extensions/xfixeswire.h
 lib/pkgconfig/fixesproto.pc
+share/pkgconfig/fixesproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fontsproto b/pkgtools/x11-links/files/xorg.fontsproto
index 9f2eceec030..a8d50e21a49 100644
--- a/pkgtools/x11-links/files/xorg.fontsproto
+++ b/pkgtools/x11-links/files/xorg.fontsproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.fontsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.fontsproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/fonts/font.h
 include/X11/fonts/fontproto.h
 include/X11/fonts/fontstruct.h
 lib/pkgconfig/fontsproto.pc
+share/pkgconfig/fontsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.glproto b/pkgtools/x11-links/files/xorg.glproto
index 73cd4eb3677..d88f4fc9210 100644
--- a/pkgtools/x11-links/files/xorg.glproto
+++ b/pkgtools/x11-links/files/xorg.glproto
@@ -1,7 +1,8 @@
-# $NetBSD: xorg.glproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.glproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 include/GL/glxint.h
 include/GL/glxmd.h
 include/GL/glxproto.h
 include/GL/glxtokens.h
 lib/pkgconfig/glproto.pc
+share/pkgconfig/glproto.pc
diff --git a/pkgtools/x11-links/files/xorg.inputproto b/pkgtools/x11-links/files/xorg.inputproto
index 5e4d03b759d..f0df1dd836f 100644
--- a/pkgtools/x11-links/files/xorg.inputproto
+++ b/pkgtools/x11-links/files/xorg.inputproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.inputproto,v 1.2 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.inputproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/XI.h
 include/X11/extensions/XI2.h
@@ -7,3 +7,4 @@ include/X11/extensions/XInput.h
 include/X11/extensions/XInput2.h
 include/X11/extensions/XIproto.h
 lib/pkgconfig/inputproto.pc
+share/pkgconfig/inputproto.pc
diff --git a/pkgtools/x11-links/files/xorg.kbproto b/pkgtools/x11-links/files/xorg.kbproto
index 0541b10df16..bbbbe08cebe 100644
--- a/pkgtools/x11-links/files/xorg.kbproto
+++ b/pkgtools/x11-links/files/xorg.kbproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.kbproto,v 1.1 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.kbproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/XKB.h
 include/X11/extensions/XKBgeom.h
@@ -6,3 +6,4 @@ include/X11/extensions/XKBproto.h
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
 lib/pkgconfig/kbproto.pc
+share/pkgconfig/kbproto.pc
diff --git a/pkgtools/x11-links/files/xorg.randrproto b/pkgtools/x11-links/files/xorg.randrproto
index 3349ec1b421..985567604fc 100644
--- a/pkgtools/x11-links/files/xorg.randrproto
+++ b/pkgtools/x11-links/files/xorg.randrproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.randrproto,v 1.1 2008/01/05 16:08:53 tron Exp $
+# $NetBSD: xorg.randrproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/randr.h
 include/X11/extensions/randrproto.h
 lib/pkgconfig/randrproto.pc
 share/doc/randrproto/randrproto.txt
+share/pkgconfig/randrproto.pc
diff --git a/pkgtools/x11-links/files/xorg.recordproto b/pkgtools/x11-links/files/xorg.recordproto
index faf1834da93..794eb0fc10a 100644
--- a/pkgtools/x11-links/files/xorg.recordproto
+++ b/pkgtools/x11-links/files/xorg.recordproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.recordproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.recordproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/recordconst.h
 include/X11/extensions/recordproto.h
 include/X11/extensions/recordstr.h
 lib/pkgconfig/recordproto.pc
+share/pkgconfig/recordproto.pc
diff --git a/pkgtools/x11-links/files/xorg.renderproto b/pkgtools/x11-links/files/xorg.renderproto
index 2908bb67714..3276a3ddf50 100644
--- a/pkgtools/x11-links/files/xorg.renderproto
+++ b/pkgtools/x11-links/files/xorg.renderproto
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.renderproto,v 1.1 2007/12/15 17:53:41 tron Exp $
+# $NetBSD: xorg.renderproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/render.h
 include/X11/extensions/renderproto.h
 lib/pkgconfig/renderproto.pc
+share/pkgconfig/renderproto.pc
diff --git a/pkgtools/x11-links/files/xorg.resourceproto b/pkgtools/x11-links/files/xorg.resourceproto
index c66d09c6dad..4f1c33e4718 100644
--- a/pkgtools/x11-links/files/xorg.resourceproto
+++ b/pkgtools/x11-links/files/xorg.resourceproto
@@ -1,3 +1,4 @@
-# $NetBSD: xorg.resourceproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.resourceproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 lib/pkgconfig/resourceproto.pc
+share/pkgconfig/resourceproto.pc
diff --git a/pkgtools/x11-links/files/xorg.scrnsaverproto b/pkgtools/x11-links/files/xorg.scrnsaverproto
index bd6bb60c34f..820aaeccfcd 100644
--- a/pkgtools/x11-links/files/xorg.scrnsaverproto
+++ b/pkgtools/x11-links/files/xorg.scrnsaverproto
@@ -1,3 +1,4 @@
-# $NetBSD: xorg.scrnsaverproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.scrnsaverproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 lib/pkgconfig/scrnsaverproto.pc
+share/pkgconfig/scrnsaverproto.pc
diff --git a/pkgtools/x11-links/files/xorg.videoproto b/pkgtools/x11-links/files/xorg.videoproto
index 5e43bfc970e..7900a2fec9c 100644
--- a/pkgtools/x11-links/files/xorg.videoproto
+++ b/pkgtools/x11-links/files/xorg.videoproto
@@ -1,4 +1,5 @@
-# $NetBSD: xorg.videoproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.videoproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/vldXvMC.h
 lib/pkgconfig/videoproto.pc
+share/pkgconfig/videoproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcmiscproto b/pkgtools/x11-links/files/xorg.xcmiscproto
index 505bc5a119a..949dc62733d 100644
--- a/pkgtools/x11-links/files/xorg.xcmiscproto
+++ b/pkgtools/x11-links/files/xorg.xcmiscproto
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.xcmiscproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xcmiscproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/xcmiscproto.h
 include/X11/extensions/xcmiscstr.h
 lib/pkgconfig/xcmiscproto.pc
+share/pkgconfig/xcmiscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xextproto b/pkgtools/x11-links/files/xorg.xextproto
index d324452199f..e860b80df2b 100644
--- a/pkgtools/x11-links/files/xorg.xextproto
+++ b/pkgtools/x11-links/files/xorg.xextproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xextproto,v 1.4 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xextproto,v 1.5 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/EVI.h
 include/X11/extensions/EVIproto.h
@@ -64,3 +64,4 @@ include/X11/extensions/xtestext1proto.h
 include/X11/extensions/xtestproto.h
 lib/pkgconfig/xextensions.pc
 lib/pkgconfig/xextproto.pc
+share/pkgconfig/xextproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86bigfontproto b/pkgtools/x11-links/files/xorg.xf86bigfontproto
index 0694e89f287..14ceb47ae07 100644
--- a/pkgtools/x11-links/files/xorg.xf86bigfontproto
+++ b/pkgtools/x11-links/files/xorg.xf86bigfontproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.xf86bigfontproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xf86bigfontproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/xf86bigfont.h
 include/X11/extensions/xf86bigfproto.h
 include/X11/extensions/xf86bigfstr.h
 lib/pkgconfig/xf86bigfontproto.pc
+share/pkgconfig/xf86bigfontproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86dgaproto b/pkgtools/x11-links/files/xorg.xf86dgaproto
index fb6360194a9..69ada14fc21 100644
--- a/pkgtools/x11-links/files/xorg.xf86dgaproto
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xf86dgaproto,v 1.4 2012/04/08 05:55:48 obache Exp $
+# $NetBSD: xorg.xf86dgaproto,v 1.5 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/Xxf86dga.h
 include/X11/extensions/xf86dga.h
@@ -20,3 +20,4 @@ lib/libXxf86dga.so.2.0
 lib/libXxf86dga.so.5.0
 lib/pkgconfig/xf86dgaproto.pc
 lib/pkgconfig/xxf86dga.pc
+share/pkgconfig/xf86dgaproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86driproto b/pkgtools/x11-links/files/xorg.xf86driproto
index cd22bbf5f01..6e7a5147cf1 100644
--- a/pkgtools/x11-links/files/xorg.xf86driproto
+++ b/pkgtools/x11-links/files/xorg.xf86driproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xf86driproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xf86driproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/dri/xf86dri.h
 include/X11/dri/xf86driproto.h
@@ -7,3 +7,5 @@ include/X11/extensions/dri2proto.h
 include/X11/extensions/dri2tokens.h
 lib/pkgconfig/dri2proto.pc
 lib/pkgconfig/xf86driproto.pc
+share/pkgconfig/dri2proto.pc
+share/pkgconfig/xf86driproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86miscproto b/pkgtools/x11-links/files/xorg.xf86miscproto
index 6806c154a7d..e0f7a480054 100644
--- a/pkgtools/x11-links/files/xorg.xf86miscproto
+++ b/pkgtools/x11-links/files/xorg.xf86miscproto
@@ -1,3 +1,4 @@
-# $NetBSD: xorg.xf86miscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xf86miscproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 lib/pkgconfig/xf86miscproto.pc
+share/pkgconfig/xf86miscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86vidmodeproto b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
index 2e7f255fbd3..564f92f4faf 100644
--- a/pkgtools/x11-links/files/xorg.xf86vidmodeproto
+++ b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
@@ -1,7 +1,8 @@
-# $NetBSD: xorg.xf86vidmodeproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xf86vidmodeproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/xf86vm.h
 include/X11/extensions/xf86vmstr.h
 include/X11/extensions/xf86vmproto.h
 lib/pkgconfig/xf86vidmode.pc
 lib/pkgconfig/xf86vidmodeproto.pc
+share/pkgconfig/xf86vidmodeproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xineramaproto b/pkgtools/x11-links/files/xorg.xineramaproto
index 1f7f91b279a..db34e8aac42 100644
--- a/pkgtools/x11-links/files/xorg.xineramaproto
+++ b/pkgtools/x11-links/files/xorg.xineramaproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.xineramaproto,v 1.1 2008/01/05 16:08:53 tron Exp $
+# $NetBSD: xorg.xineramaproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
 #
 include/X11/extensions/Xinerama.h
 include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
 lib/pkgconfig/xineramaproto.pc
+share/pkgconfig/xineramaproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xproto b/pkgtools/x11-links/files/xorg.xproto
index 456de1fca14..a817ff3c674 100644
--- a/pkgtools/x11-links/files/xorg.xproto
+++ b/pkgtools/x11-links/files/xorg.xproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xproto,v 1.1 2007/12/15 17:53:41 tron Exp $
+# $NetBSD: xorg.xproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
 include/X11/DECkeysym.h
 include/X11/HPkeysym.h
 include/X11/Sunkeysym.h
@@ -26,3 +26,4 @@ include/X11/ap_keysym.h
 include/X11/keysym.h
 include/X11/keysymdef.h
 lib/pkgconfig/xproto.pc
+share/pkgconfig/xproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xproxymanagementprotocol b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
index 4bdd0d1b31d..dc4503f7afd 100644
--- a/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
+++ b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
@@ -1,3 +1,4 @@
-# $NetBSD: xorg.xproxymanagementprotocol,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xproxymanagementprotocol,v 1.3 2014/03/07 15:27:32 jperkin Exp $
 #
 lib/pkgconfig/xproxymngproto.pc
+share/pkgconfig/xproxymngproto.pc