Update to 0.85

* Support NetBSD current (6.99.38 at least)'s new native xorg

8 files changed, 84 insertions, 10 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index b2822fc9379..5b8391930c6 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.152 2014/03/07 15:27:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.153 2014/03/31 09:19:33 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.84
+PKGNAME=	x11-links-0.85
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 2286e980ba9..cd3368dd0bc 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.53 2014/03/07 15:27:32 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.54 2014/03/31 09:19:33 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.84
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.85
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig
index 67cf85340b7..cd80ca31c65 100644
--- a/pkgtools/x11-links/files/xorg.fontconfig
+++ b/pkgtools/x11-links/files/xorg.fontconfig
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fontconfig,v 1.8 2014/01/23 21:05:18 ryoon Exp $
+# $NetBSD: xorg.fontconfig,v 1.9 2014/03/31 09:19:33 ryoon Exp $
 #
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
@@ -15,6 +15,7 @@ lib/libfontconfig.so.1
 lib/libfontconfig.so.1.3
 lib/libfontconfig.so.2
 lib/libfontconfig.so.2.0
+lib/libfontconfig.so.2.2
 lib/libfontconfig.so.6.0
 lib/libfontconfig.so.7.0
 lib/libfontconfig.so.8.0
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index f1d397ea8e7..0e2c982a273 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,6 +1,12 @@
-# $NetBSD: xorg.freetype2,v 1.12 2014/01/23 21:05:18 ryoon Exp $
+# $NetBSD: xorg.freetype2,v 1.13 2014/03/31 09:19:33 ryoon Exp $
 #
 bin/freetype-config
+include/freetype2/config/ftconfig.h
+include/freetype2/config/ftheader.h
+include/freetype2/config/ftmodule.h
+include/freetype2/config/ftoption.h
+include/freetype2/config/ftstdlib.h
+include/freetype2/freetype.h
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
@@ -49,6 +55,49 @@ include/freetype2/freetype/ttnameid.h
 include/freetype2/freetype/tttables.h
 include/freetype2/freetype/tttags.h
 include/freetype2/freetype/ttunpat.h
+include/freetype2/ftadvanc.h
+include/freetype2/ftautoh.h
+include/freetype2/ftbbox.h
+include/freetype2/ftbdf.h
+include/freetype2/ftbitmap.h
+include/freetype2/ftbzip2.h
+include/freetype2/ftcache.h
+include/freetype2/ftcffdrv.h
+include/freetype2/ftchapters.h
+include/freetype2/ftcid.h
+include/freetype2/fterrdef.h
+include/freetype2/fterrors.h
+include/freetype2/ftgasp.h
+include/freetype2/ftglyph.h
+include/freetype2/ftgxval.h
+include/freetype2/ftgzip.h
+include/freetype2/ftimage.h
+include/freetype2/ftincrem.h
+include/freetype2/ftlcdfil.h
+include/freetype2/ftlist.h
+include/freetype2/ftlzw.h
+include/freetype2/ftmac.h
+include/freetype2/ftmm.h
+include/freetype2/ftmodapi.h
+include/freetype2/ftmoderr.h
+include/freetype2/ftotval.h
+include/freetype2/ftoutln.h
+include/freetype2/ftpfr.h
+include/freetype2/ftrender.h
+include/freetype2/ftsizes.h
+include/freetype2/ftsnames.h
+include/freetype2/ftstroke.h
+include/freetype2/ftsynth.h
+include/freetype2/ftsystem.h
+include/freetype2/fttrigon.h
+include/freetype2/fttypes.h
+include/freetype2/ftwinfnt.h
+include/freetype2/ftxf86.h
+include/freetype2/t1tables.h
+include/freetype2/ttnameid.h
+include/freetype2/tttables.h
+include/freetype2/tttags.h
+include/freetype2/ttunpat.h
 include/ft2build.h
 lib/libfreetype.6.3.16.dylib
 lib/libfreetype.6.dylib
@@ -62,7 +111,10 @@ lib/libfreetype.so.7
 lib/libfreetype.so.7.1
 lib/libfreetype.so.7.2
 lib/libfreetype.so.7.3
+lib/libfreetype.so.7.4
+lib/libfreetype.so.17
 lib/libfreetype.so.17.0
+lib/libfreetype.so.17.2.11
 lib/libfreetype.so.18.0
 lib/libfreetype.so.18.1
 lib/libfreetype.so.18.3
diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr
index ba1e051894b..f18f327b208 100644
--- a/pkgtools/x11-links/files/xorg.libXrandr
+++ b/pkgtools/x11-links/files/xorg.libXrandr
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXrandr,v 1.8 2014/01/23 21:05:18 ryoon Exp $
+# $NetBSD: xorg.libXrandr,v 1.9 2014/03/31 09:19:33 ryoon Exp $
 #
 include/X11/extensions/Xrandr.h
 lib/libXrandr.2.2.0.dylib
@@ -13,6 +13,7 @@ lib/libXrandr.so.2
 lib/libXrandr.so.2.1
 lib/libXrandr.so.3
 lib/libXrandr.so.3.0
+lib/libXrandr.so.3.1
 lib/libXrandr.so.6.1
 lib/libXrandr.so.6.2
 lib/pkgconfig/xrandr.pc
diff --git a/pkgtools/x11-links/files/xorg.libxcb b/pkgtools/x11-links/files/xorg.libxcb
index b5cb8fe6594..1009b43ed6c 100644
--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.7 2014/01/23 21:05:18 ryoon Exp $
+# $NetBSD: xorg.libxcb,v 1.8 2014/03/31 09:19:33 ryoon Exp $
 #
 include/xcb/bigreq.h
 include/xcb/composite.h
@@ -37,6 +37,7 @@ lib/libxcb-composite.la
 lib/libxcb-composite.so
 lib/libxcb-composite.so.0
 lib/libxcb-composite.so.0.0
+lib/libxcb-composite.so.0.1
 lib/libxcb-damage.0.0.0.dylib
 lib/libxcb-damage.0.dylib
 lib/libxcb-damage.a
@@ -45,6 +46,7 @@ lib/libxcb-damage.la
 lib/libxcb-damage.so
 lib/libxcb-damage.so.0
 lib/libxcb-damage.so.0.0
+lib/libxcb-damage.so.0.1
 lib/libxcb-dpms.0.0.0.dylib
 lib/libxcb-dpms.0.dylib
 lib/libxcb-dpms.a
@@ -53,6 +55,7 @@ lib/libxcb-dpms.la
 lib/libxcb-dpms.so
 lib/libxcb-dpms.so.0
 lib/libxcb-dpms.so.0.0
+lib/libxcb-dpms.so.0.1
 lib/libxcb-dri2.0.0.0.dylib
 lib/libxcb-dri2.0.dylib
 lib/libxcb-dri2.dylib
@@ -63,6 +66,10 @@ lib/libxcb-dri2.so.0
 lib/libxcb-dri2.so.0.0
 lib/libxcb-dri2.so.0.1
 lib/libxcb-dri2.so.0.2
+lib/libxcb-dri3.a
+lib/libxcb-dri3.so
+lib/libxcb-dri3.so.0
+lib/libxcb-dri3.so.0.1
 lib/libxcb-glx.0.0.0.dylib
 lib/libxcb-glx.0.dylib
 lib/libxcb-glx.a
@@ -83,6 +90,7 @@ lib/libxcb-randr.la
 lib/libxcb-randr.so
 lib/libxcb-randr.so.0
 lib/libxcb-randr.so.0.0
+lib/libxcb-randr.so.0.1
 lib/libxcb-randr.so.1.0
 lib/libxcb-randr.so.1.1
 lib/libxcb-record.0.0.0.dylib
@@ -120,6 +128,7 @@ lib/libxcb-screensaver.la
 lib/libxcb-screensaver.so
 lib/libxcb-screensaver.so.0
 lib/libxcb-screensaver.so.0.0
+lib/libxcb-screensaver.so.0.1
 lib/libxcb-shape.0.0.0.dylib
 lib/libxcb-shape.0.dylib
 lib/libxcb-shape.a
@@ -128,6 +137,7 @@ lib/libxcb-shape.la
 lib/libxcb-shape.so
 lib/libxcb-shape.so.0
 lib/libxcb-shape.so.0.0
+lib/libxcb-shape.so.0.1
 lib/libxcb-shm.0.0.0.dylib
 lib/libxcb-shm.0.dylib
 lib/libxcb-shm.a
@@ -136,6 +146,7 @@ lib/libxcb-shm.la
 lib/libxcb-shm.so
 lib/libxcb-shm.so.0
 lib/libxcb-shm.so.0.0
+lib/libxcb-shm.so.0.1
 lib/libxcb-sync.0.0.0.dylib
 lib/libxcb-sync.0.dylib
 lib/libxcb-sync.a
@@ -157,6 +168,7 @@ lib/libxcb-xevie.la
 lib/libxcb-xevie.so
 lib/libxcb-xevie.so.0
 lib/libxcb-xevie.so.0.0
+lib/libxcb-xevie.so.0.1
 lib/libxcb-xf86dri.0.0.0.dylib
 lib/libxcb-xf86dri.0.dylib
 lib/libxcb-xf86dri.a
@@ -165,6 +177,7 @@ lib/libxcb-xf86dri.la
 lib/libxcb-xf86dri.so
 lib/libxcb-xf86dri.so.0
 lib/libxcb-xf86dri.so.0.0
+lib/libxcb-xf86dri.so.0.1
 lib/libxcb-xf86dri.so.1.0
 lib/libxcb-xf86dri.so.1.1
 lib/libxcb-xf86dri.so.1.2
@@ -200,6 +213,7 @@ lib/libxcb-xtest.la
 lib/libxcb-xtest.so
 lib/libxcb-xtest.so.0
 lib/libxcb-xtest.so.0.0
+lib/libxcb-xtest.so.0.1
 lib/libxcb-xv.0.0.0.dylib
 lib/libxcb-xv.0.dylib
 lib/libxcb-xv.a
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index 4117ec0a20a..85ee9b87b16 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.pixman,v 1.10 2014/01/23 21:05:18 ryoon Exp $
+# $NetBSD: xorg.pixman,v 1.11 2014/03/31 09:19:33 ryoon Exp $
 #
 include/pixman-1/pixman.h
 include/pixman-1/pixman-version.h
@@ -16,6 +16,7 @@ lib/libpixman-1.so.1.0
 lib/libpixman-1.so.2
 lib/libpixman-1.so.2.0
 lib/libpixman-1.so.2.1
+lib/libpixman-1.so.2.2
 lib/libpixman-1.so.15.0
 lib/libpixman-1.so.22.2
 lib/libpixman-1.so.24.4
diff --git a/pkgtools/x11-links/files/xorg.xcb-util b/pkgtools/x11-links/files/xorg.xcb-util
index a7555575d8c..a77492b1795 100644
--- a/pkgtools/x11-links/files/xorg.xcb-util
+++ b/pkgtools/x11-links/files/xorg.xcb-util
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xcb-util,v 1.4 2014/02/08 17:08:33 jperkin Exp $
+# $NetBSD: xorg.xcb-util,v 1.5 2014/03/31 09:19:33 ryoon Exp $
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
 include/xcb/xcb_bitops.h
@@ -60,6 +60,10 @@ lib/libxcb-keysyms.la
 lib/libxcb-keysyms.so
 lib/libxcb-keysyms.so.1
 lib/libxcb-keysyms.so.1.0
+lib/libxcb-present.a
+lib/libxcb-present.so
+lib/libxcb-present.so.0
+lib/libxcb-present.so.0.1
 lib/libxcb-property.1.0.0.dylib
 lib/libxcb-property.1.dylib
 lib/libxcb-property.a
@@ -93,6 +97,7 @@ lib/pkgconfig/xcb-event.pc
 lib/pkgconfig/xcb-icccm.pc
 lib/pkgconfig/xcb-image.pc
 lib/pkgconfig/xcb-keysyms.pc
+lib/pkgconfig/xcb-present.pc
 lib/pkgconfig/xcb-property.pc
 lib/pkgconfig/xcb-renderutil.pc
 lib/pkgconfig/xcb-reply.pc