From e055dc7a405cdf7b24d2695ca2c2747de7750e54 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 23 Nov 2010 13:24:26 +0000
Subject: [PATCH] Add a new header file and a library with newer minor in
 shlib, to match NetBSD-current after last weekends xorg imports.

Remove Xmu files from xorg file list, they are in xorg.libXmu list.

Bump version to 0.61 and depend on it in bl3.mk.
---
 pkgtools/x11-links/Makefile             |  4 ++--
 pkgtools/x11-links/buildlink3.mk        |  4 ++--
 pkgtools/x11-links/files/xorg           | 24 +-----------------------
 pkgtools/x11-links/files/xorg.freetype2 |  3 ++-
 pkgtools/x11-links/files/xorg.libXmu    |  3 ++-
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 17171858b1a3..9b4c3cc27a1a 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.122 2010/09/14 19:40:15 tron Exp $
+# $NetBSD: Makefile,v 1.123 2010/11/23 13:24:26 wiz 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.
 
-DISTNAME=	x11-links-0.60
+DISTNAME=	x11-links-0.61
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 104195b28314..99dac659771e 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2010/09/14 19:40:15 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2010/11/23 13:24:26 wiz 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.60
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.61
 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 de7b7c28fa94..8ccbdee98b10 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.16 2010/09/14 08:55:42 tron Exp $
+# $NetBSD: xorg,v 1.17 2010/11/23 13:24:26 wiz 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
@@ -113,28 +113,6 @@ include/X11/Xaw/ViewportP.h
 include/X11/Xaw/XawImP.h
 include/X11/Xaw/XawInit.h
 include/X11/Xft/XftFreetype.h
-include/X11/Xmu/Atoms.h
-include/X11/Xmu/CharSet.h
-include/X11/Xmu/CloseHook.h
-include/X11/Xmu/Converters.h
-include/X11/Xmu/CurUtil.h
-include/X11/Xmu/CvtCache.h
-include/X11/Xmu/DisplayQue.h
-include/X11/Xmu/Drawing.h
-include/X11/Xmu/Editres.h
-include/X11/Xmu/EditresP.h
-include/X11/Xmu/Error.h
-include/X11/Xmu/ExtAgent.h
-include/X11/Xmu/Initer.h
-include/X11/Xmu/Lookup.h
-include/X11/Xmu/Misc.h
-include/X11/Xmu/StdCmap.h
-include/X11/Xmu/StdSel.h
-include/X11/Xmu/SysUtil.h
-include/X11/Xmu/WidgetNode.h
-include/X11/Xmu/WinUtil.h
-include/X11/Xmu/Xct.h
-include/X11/Xmu/Xmu.h
 include/X11/XprintAppUtil/xpapputil.h
 include/X11/XprintUtil/xprintutil.h
 include/X11/bitmaps/1x1
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index c7a9acf21430..88fc939884dc 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.6 2010/09/11 20:26:11 wiz Exp $
+# $NetBSD: xorg.freetype2,v 1.7 2010/11/23 13:24:26 wiz Exp $
 #
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
@@ -58,6 +58,7 @@ lib/libfreetype.so.6
 lib/libfreetype.so.6.3.17
 lib/libfreetype.so.7
 lib/libfreetype.so.7.1
+lib/libfreetype.so.7.2
 lib/libfreetype.so.17.0
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
diff --git a/pkgtools/x11-links/files/xorg.libXmu b/pkgtools/x11-links/files/xorg.libXmu
index a3b7ecd1f0cd..885613106259 100644
--- a/pkgtools/x11-links/files/xorg.libXmu
+++ b/pkgtools/x11-links/files/xorg.libXmu
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXmu,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXmu,v 1.4 2010/11/23 13:24:26 wiz Exp $
 #
 include/X11/Xmu/Atoms.h
 include/X11/Xmu/CharSet.h
@@ -18,6 +18,7 @@ include/X11/Xmu/Misc.h
 include/X11/Xmu/StdCmap.h
 include/X11/Xmu/StdSel.h
 include/X11/Xmu/SysUtil.h
+include/X11/Xmu/WhitePoint.h
 include/X11/Xmu/WidgetNode.h
 include/X11/Xmu/WinUtil.h
 include/X11/Xmu/Xct.h