pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links x11-links-0.84: Add support for new...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/437fabdfad24
branches:  trunk
changeset: 631489:437fabdfad24
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 07 15:27:32 2014 +0000

description:
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.

diffstat:

 pkgtools/x11-links/Makefile                            |  10 ++++++++--
 pkgtools/x11-links/buildlink3.mk                       |   4 ++--
 pkgtools/x11-links/files/xorg.bigreqsproto             |   3 ++-
 pkgtools/x11-links/files/xorg.compositeproto           |   3 ++-
 pkgtools/x11-links/files/xorg.damageproto              |   3 ++-
 pkgtools/x11-links/files/xorg.evieext                  |   3 ++-
 pkgtools/x11-links/files/xorg.fixesproto               |   3 ++-
 pkgtools/x11-links/files/xorg.fontsproto               |   3 ++-
 pkgtools/x11-links/files/xorg.glproto                  |   3 ++-
 pkgtools/x11-links/files/xorg.inputproto               |   3 ++-
 pkgtools/x11-links/files/xorg.kbproto                  |   3 ++-
 pkgtools/x11-links/files/xorg.randrproto               |   3 ++-
 pkgtools/x11-links/files/xorg.recordproto              |   3 ++-
 pkgtools/x11-links/files/xorg.renderproto              |   3 ++-
 pkgtools/x11-links/files/xorg.resourceproto            |   3 ++-
 pkgtools/x11-links/files/xorg.scrnsaverproto           |   3 ++-
 pkgtools/x11-links/files/xorg.videoproto               |   3 ++-
 pkgtools/x11-links/files/xorg.xcmiscproto              |   3 ++-
 pkgtools/x11-links/files/xorg.xextproto                |   3 ++-
 pkgtools/x11-links/files/xorg.xf86bigfontproto         |   3 ++-
 pkgtools/x11-links/files/xorg.xf86dgaproto             |   3 ++-
 pkgtools/x11-links/files/xorg.xf86driproto             |   4 +++-
 pkgtools/x11-links/files/xorg.xf86miscproto            |   3 ++-
 pkgtools/x11-links/files/xorg.xf86vidmodeproto         |   3 ++-
 pkgtools/x11-links/files/xorg.xineramaproto            |   3 ++-
 pkgtools/x11-links/files/xorg.xproto                   |   3 ++-
 pkgtools/x11-links/files/xorg.xproxymanagementprotocol |   3 ++-
 27 files changed, 61 insertions(+), 29 deletions(-)

diffs (truncated from 345 to 300 lines):

diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/Makefile       Fri Mar 07 15:27:32 2014 +0000
@@ -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@localhost
@@ -56,6 +56,8 @@
        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 @@
 
 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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/buildlink3.mk  Fri Mar 07 15:27:32 2014 +0000
@@ -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 @@
 .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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.bigreqsproto
--- a/pkgtools/x11-links/files/xorg.bigreqsproto        Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto        Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.compositeproto
--- a/pkgtools/x11-links/files/xorg.compositeproto      Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.compositeproto      Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.damageproto
--- a/pkgtools/x11-links/files/xorg.damageproto Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.damageproto Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.evieext
--- a/pkgtools/x11-links/files/xorg.evieext     Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.evieext     Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.fixesproto
--- a/pkgtools/x11-links/files/xorg.fixesproto  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.fixesproto  Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.fontsproto
--- a/pkgtools/x11-links/files/xorg.fontsproto  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.fontsproto  Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.glproto
--- a/pkgtools/x11-links/files/xorg.glproto     Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.glproto     Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.inputproto
--- a/pkgtools/x11-links/files/xorg.inputproto  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.inputproto  Fri Mar 07 15:27:32 2014 +0000
@@ -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/XInput2.h
 include/X11/extensions/XIproto.h
 lib/pkgconfig/inputproto.pc
+share/pkgconfig/inputproto.pc
diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.kbproto
--- a/pkgtools/x11-links/files/xorg.kbproto     Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.kbproto     Fri Mar 07 15:27:32 2014 +0000
@@ -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/XKBsrv.h
 include/X11/extensions/XKBstr.h
 lib/pkgconfig/kbproto.pc
+share/pkgconfig/kbproto.pc
diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.randrproto
--- a/pkgtools/x11-links/files/xorg.randrproto  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.randrproto  Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.recordproto
--- a/pkgtools/x11-links/files/xorg.recordproto Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.recordproto Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.renderproto
--- a/pkgtools/x11-links/files/xorg.renderproto Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.renderproto Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.resourceproto
--- a/pkgtools/x11-links/files/xorg.resourceproto       Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.resourceproto       Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.scrnsaverproto
--- a/pkgtools/x11-links/files/xorg.scrnsaverproto      Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.scrnsaverproto      Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.videoproto
--- a/pkgtools/x11-links/files/xorg.videoproto  Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.videoproto  Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xcmiscproto
--- a/pkgtools/x11-links/files/xorg.xcmiscproto Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xcmiscproto Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xextproto
--- a/pkgtools/x11-links/files/xorg.xextproto   Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xextproto   Fri Mar 07 15:27:32 2014 +0000
@@ -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/xtestproto.h
 lib/pkgconfig/xextensions.pc
 lib/pkgconfig/xextproto.pc
+share/pkgconfig/xextproto.pc
diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xf86bigfontproto
--- a/pkgtools/x11-links/files/xorg.xf86bigfontproto    Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xf86bigfontproto    Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xf86dgaproto
--- a/pkgtools/x11-links/files/xorg.xf86dgaproto        Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto        Fri Mar 07 15:27:32 2014 +0000
@@ -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.5.0
 lib/pkgconfig/xf86dgaproto.pc
 lib/pkgconfig/xxf86dga.pc
+share/pkgconfig/xf86dgaproto.pc
diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xf86driproto
--- a/pkgtools/x11-links/files/xorg.xf86driproto        Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xf86driproto        Fri Mar 07 15:27:32 2014 +0000
@@ -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/dri2tokens.h
 lib/pkgconfig/dri2proto.pc
 lib/pkgconfig/xf86driproto.pc
+share/pkgconfig/dri2proto.pc
+share/pkgconfig/xf86driproto.pc
diff -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xf86miscproto
--- a/pkgtools/x11-links/files/xorg.xf86miscproto       Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xf86miscproto       Fri Mar 07 15:27:32 2014 +0000
@@ -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 -r daa695609b6f -r 437fabdfad24 pkgtools/x11-links/files/xorg.xf86vidmodeproto
--- a/pkgtools/x11-links/files/xorg.xf86vidmodeproto    Fri Mar 07 15:15:17 2014 +0000
+++ b/pkgtools/x11-links/files/xorg.xf86vidmodeproto    Fri Mar 07 15:27:32 2014 +0000



Home | Main Index | Thread Index | Old Index