Update to 0.93

* Adjust for recent NetBSD current X.org.

7 files changed, 16 insertions, 10 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index b4cc4bf2134..6083d95506e 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.161 2015/02/21 16:51:11 jmcneill Exp $
+# $NetBSD: Makefile,v 1.162 2015/03/12 14:46:09 ryoon 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.92
+PKGNAME=	x11-links-0.93
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 422a71a83f5..ac7e34c977d 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2015/02/21 16:51:11 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2015/03/12 14:46:09 ryoon 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.92
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.93
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 9a868554224..36332aa4d55 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.23 2014/05/03 21:31:10 ryoon Exp $
+# $NetBSD: xorg,v 1.24 2015/03/12 14:46:09 ryoon Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported Xorg (and some XFree) distributions, minus the set of files
@@ -387,6 +387,7 @@ lib/libXi.so.6
 lib/libXi.so.6.0
 lib/libXi.so.7
 lib/libXi.so.7.0
+lib/libXi.so.7.1
 lib/libXi.so.10.1
 lib/libXi.so.11.0
 lib/libXi.so.11.1
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index a7baebf6c03..7c0b6049fdf 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.16 2014/06/13 22:42:18 gdt Exp $
+# $NetBSD: xorg.freetype2,v 1.17 2015/03/12 14:46:09 ryoon Exp $
 #
 bin/freetype-config
 include/freetype2/config/ftconfig.h
@@ -110,6 +110,7 @@ lib/libfreetype.so
 lib/libfreetype.so.17
 lib/libfreetype.so.17.0
 lib/libfreetype.so.17.2.11
+lib/libfreetype.so.17.4.11
 lib/libfreetype.so.18.0
 lib/libfreetype.so.18.1
 lib/libfreetype.so.18.3
diff --git a/pkgtools/x11-links/files/xorg.glu b/pkgtools/x11-links/files/xorg.glu
index 95a865b2b43..182d8280eb5 100644
--- a/pkgtools/x11-links/files/xorg.glu
+++ b/pkgtools/x11-links/files/xorg.glu
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.glu,v 1.6 2014/05/03 21:31:10 ryoon Exp $
+# $NetBSD: xorg.glu,v 1.7 2015/03/12 14:46:09 ryoon Exp $
 #
 include/GL/glu.h
 include/GL/glu_mangle.h
@@ -9,6 +9,7 @@ lib/libGLU.so.1.0.3
 lib/libGLU.so.1.3
 lib/libGLU.so.2
 lib/libGLU.so.2.0
+lib/libGLU.so.2.1
 lib/libGLU.so.7.0
 lib/libGLU.so.9.0
 lib/libGLU.dylib
diff --git a/pkgtools/x11-links/files/xorg.libpciaccess b/pkgtools/x11-links/files/xorg.libpciaccess
index 5a1c223e892..852a816fe93 100644
--- a/pkgtools/x11-links/files/xorg.libpciaccess
+++ b/pkgtools/x11-links/files/xorg.libpciaccess
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libpciaccess,v 1.3 2014/05/08 02:31:50 obache Exp $
+# $NetBSD: xorg.libpciaccess,v 1.4 2015/03/12 14:46:09 ryoon Exp $
 #
 include/pciaccess.h
 lib/libpciaccess.a
@@ -8,5 +8,6 @@ lib/libpciaccess.so.0
 lib/libpciaccess.so.0.0
 lib/libpciaccess.so.0.1
 lib/libpciaccess.so.0.2
+lib/libpciaccess.so.0.3
 lib/libpciaccess.so.2.0
 lib/pkgconfig/pciaccess.pc
diff --git a/pkgtools/x11-links/files/xorg.libxcb b/pkgtools/x11-links/files/xorg.libxcb
index 0a4c8953439..beb19d6dedb 100644
--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.11 2015/02/21 17:31:44 jmcneill Exp $
+# $NetBSD: xorg.libxcb,v 1.12 2015/03/12 14:46:09 ryoon Exp $
 #
 include/xcb/bigreq.h
 include/xcb/composite.h
@@ -84,7 +84,6 @@ lib/libxcb-glx.so
 lib/libxcb-glx.so.0
 lib/libxcb-glx.so.0.0
 lib/libxcb-glx.so.0.1
-lib/libxcb-glx.so.0.1
 lib/libxcb-glx.so.0.2
 lib/libxcb-glx.so.1.0
 lib/libxcb-randr.0.1.0.dylib
@@ -170,6 +169,7 @@ lib/libxcb-sync.so.0
 lib/libxcb-sync.so.0.0
 lib/libxcb-sync.so.0.1
 lib/libxcb-sync.so.0.2
+lib/libxcb-sync.so.1
 lib/libxcb-sync.so.1.0
 lib/libxcb-wm.0.0.0.dylib
 lib/libxcb-wm.0.dylib
@@ -266,6 +266,8 @@ lib/libxcb.la
 lib/libxcb.so
 lib/libxcb.so.1
 lib/libxcb.so.1.1
+lib/libxcb.so.2
+lib/libxcb.so.2.0
 lib/libxcb.so.2.2
 lib/libxcb.so.2.3
 lib/libxcb.so.2.4