Another day, another update (and probably not the last one):

Update the "x11-links" package to version 0.34:
- Add suport for "libICE", "libSM", "libXext", libXinerama", "libXrandr",
  "libXrender", "libXt" and "xcursor"
- Improve support for "Xfixes".

13 files changed, 146 insertions, 71 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index a667d078c97..bfddbb0b074 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.87 2007/12/16 19:05:52 tron Exp $
+# $NetBSD: Makefile,v 1.88 2007/12/17 18:20:19 tron 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.33
+DISTNAME=	x11-links-0.34
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index fbb389f5d94..84eae574f43 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/12/16 19:05:52 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/12/17 18:20:19 tron Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:=	x11-links ${BUILDLINK_PACKAGES}
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links
 
 .if !empty(X11_LINKS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.33
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.34
 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 50b40a6faf3..7b171b2ba2a 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.4 2007/12/16 19:05:52 tron Exp $
+# $NetBSD: xorg,v 1.5 2007/12/17 18:20:19 tron 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
@@ -31,22 +31,6 @@ include/DPS/dpsexcept.h
 include/DPS/dpsfriends.h
 include/DPS/dpsops.h
 include/DPS/psops.h
-include/X11/Composite.h
-include/X11/CompositeP.h
-include/X11/ConstrainP.h
-include/X11/Constraint.h
-include/X11/Core.h
-include/X11/CoreP.h
-include/X11/ICE/ICE.h
-include/X11/ICE/ICEconn.h
-include/X11/ICE/ICElib.h
-include/X11/ICE/ICEmsg.h
-include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEutil.h
-include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
-include/X11/Object.h
-include/X11/ObjectP.h
 include/X11/PEX5/PEX.h
 include/X11/PEX5/PEXlib.h
 include/X11/PEX5/PEXlibint.h
@@ -54,16 +38,6 @@ include/X11/PEX5/PEXproto.h
 include/X11/PEX5/PEXprotost.h
 include/X11/PM/PM.h
 include/X11/PM/PMproto.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/SM/SM.h
-include/X11/SM/SMlib.h
-include/X11/SM/SMproto.h
-include/X11/Shell.h
-include/X11/ShellP.h
-include/X11/StringDefs.h
-include/X11/Vendor.h
-include/X11/VendorP.h
 include/X11/X10.h
 include/X11/Xaw/AllWidgets.h
 include/X11/Xaw/AsciiSink.h
@@ -343,13 +317,6 @@ lib/libFS.a
 lib/libFS.so
 lib/libFS.so.6
 lib/libFS.so.6.0
-lib/libICE.6.3.dylib
-lib/libICE.6.dylib
-lib/libICE.a
-lib/libICE.dylib
-lib/libICE.so
-lib/libICE.so.6
-lib/libICE.so.6.3
 lib/libPEX5.6.0.dylib
 lib/libPEX5.6.dylib
 lib/libPEX5.a
@@ -357,13 +324,6 @@ lib/libPEX5.dylib
 lib/libPEX5.so
 lib/libPEX5.so.6
 lib/libPEX5.so.6.0
-lib/libSM.6.0.dylib
-lib/libSM.6.dylib
-lib/libSM.a
-lib/libSM.dylib
-lib/libSM.so
-lib/libSM.so.6
-lib/libSM.so.6.0
 lib/libXIE.6.0.dylib
 lib/libXIE.6.dylib
 lib/libXIE.a
@@ -398,15 +358,6 @@ lib/libXdamage.a
 lib/libXdamage.so.1.0
 lib/libXevie.a
 lib/libXevie.so.1.0
-lib/libXext.6.3.dylib
-lib/libXext.6.4.dylib
-lib/libXext.6.dylib
-lib/libXext.a
-lib/libXext.dylib
-lib/libXext.so
-lib/libXext.so.6
-lib/libXext.so.6.3
-lib/libXext.so.6.4
 lib/libXfont.1.3.dylib
 lib/libXfont.1.4.dylib
 lib/libXfont.1.dylib
@@ -437,13 +388,6 @@ lib/libXi.dylib
 lib/libXi.so
 lib/libXi.so.6
 lib/libXi.so.6.0
-lib/libXinerama.1.0.dylib
-lib/libXinerama.1.dylib
-lib/libXinerama.a
-lib/libXinerama.dylib
-lib/libXinerama.so
-lib/libXinerama.so.1
-lib/libXinerama.so.1.0
 lib/libXp.6.2.dylib
 lib/libXp.6.dylib
 lib/libXp.a
@@ -457,13 +401,6 @@ lib/libXss.a
 lib/libXss.so
 lib/libXss.so.1
 lib/libXss.so.1.0
-lib/libXt.6.0.dylib
-lib/libXt.6.dylib
-lib/libXt.a
-lib/libXt.dylib
-lib/libXt.so
-lib/libXt.so.6
-lib/libXt.so.6.0
 lib/libXtst.6.1.dylib
 lib/libXtst.6.dylib
 lib/libXtst.a
diff --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes
index 9a5d42b458d..06684e1e0da 100644
--- a/pkgtools/x11-links/files/xorg.Xfixes
+++ b/pkgtools/x11-links/files/xorg.Xfixes
@@ -1,7 +1,11 @@
-# $NetBSD: xorg.Xfixes,v 1.1 2005/07/25 20:50:25 reed Exp $
+# $NetBSD: xorg.Xfixes,v 1.2 2007/12/17 18:20:19 tron Exp $
 #
 include/X11/extensions/Xfixes.h
+lib/libXfixes.3.1.0.dylib
+lib/libXfixes.3.dylib
 lib/libXfixes.a
+lib/libXfixes.dylib
+lib/libXfixes.la
 lib/libXfixes.so
 lib/libXfixes.so.3
 lib/libXfixes.so.3.0
diff --git a/pkgtools/x11-links/files/xorg.libICE b/pkgtools/x11-links/files/xorg.libICE
new file mode 100644
index 00000000000..5c9457292c1
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libICE
@@ -0,0 +1,18 @@
+# $NetBSD: xorg.libICE,v 1.1 2007/12/17 18:20:19 tron Exp $
+#
+include/X11/ICE/ICE.h
+include/X11/ICE/ICEconn.h
+include/X11/ICE/ICElib.h
+include/X11/ICE/ICEmsg.h
+include/X11/ICE/ICEproto.h
+include/X11/ICE/ICEutil.h
+lib/libICE.6.3.0.dylib
+lib/libICE.6.3.dylib
+lib/libICE.6.dylib
+lib/libICE.a
+lib/libICE.dylib
+lib/libICE.la
+lib/libICE.so
+lib/libICE.so.6
+lib/libICE.so.6.3
+lib/pkgconfig/ice.pc
diff --git a/pkgtools/x11-links/files/xorg.libSM b/pkgtools/x11-links/files/xorg.libSM
new file mode 100644
index 00000000000..3594972d6f6
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libSM
@@ -0,0 +1,15 @@
+# $NetBSD: xorg.libSM,v 1.1 2007/12/17 18:20:20 tron Exp $
+#
+include/X11/SM/SM.h
+include/X11/SM/SMlib.h
+include/X11/SM/SMproto.h
+lib/libSM.6.0.0.dylib
+lib/libSM.6.0.dylib
+lib/libSM.6.dylib
+lib/libSM.a
+lib/libSM.dylib
+lib/libSM.la
+lib/libSM.so
+lib/libSM.so.6
+lib/libSM.so.6.0
+lib/pkgconfig/sm.pc
diff --git a/pkgtools/x11-links/files/xorg.libXext b/pkgtools/x11-links/files/xorg.libXext
new file mode 100644
index 00000000000..773b76efed4
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXext
@@ -0,0 +1,14 @@
+# $NetBSD: xorg.libXext,v 1.1 2007/12/17 18:20:20 tron Exp $
+#
+lib/libXext.6.3.dylib
+lib/libXext.6.4.0.dylib
+lib/libXext.6.4.dylib
+lib/libXext.6.dylib
+lib/libXext.a
+lib/libXext.dylib
+lib/libXext.la
+lib/libXext.so
+lib/libXext.so.6
+lib/libXext.so.6.3
+lib/libXext.so.6.4
+lib/pkgconfig/xext.pc
diff --git a/pkgtools/x11-links/files/xorg.libXinerama b/pkgtools/x11-links/files/xorg.libXinerama
new file mode 100644
index 00000000000..1b87d6735e4
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXinerama
@@ -0,0 +1,12 @@
+# $NetBSD: xorg.libXinerama,v 1.1 2007/12/17 18:20:20 tron Exp $
+#
+lib/libXinerama.1.0.0.dylib
+lib/libXinerama.1.0.dylib
+lib/libXinerama.1.dylib
+lib/libXinerama.a
+lib/libXinerama.dylib
+lib/libXinerama.la
+lib/libXinerama.so
+lib/libXinerama.so.1
+lib/libXinerama.so.1.0
+lib/pkgconfig/xinerama.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr
new file mode 100644
index 00000000000..7447859f95d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXrandr
@@ -0,0 +1,8 @@
+# $NetBSD: xorg.libXrandr,v 1.1 2007/12/17 18:20:20 tron Exp $
+#
+include/X11/extensions/Xrandr.h
+lib/libXrandr.2.0.0.dylib
+lib/libXrandr.2.dylib
+lib/libXrandr.dylib
+lib/libXrandr.la
+lib/pkgconfig/xrandr.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrender b/pkgtools/x11-links/files/xorg.libXrender
new file mode 100644
index 00000000000..8da8d985a95
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXrender
@@ -0,0 +1,8 @@
+# $NetBSD: xorg.libXrender,v 1.1 2007/12/17 18:20:20 tron Exp $
+#
+include/X11/extensions/Xrender.h
+lib/libXrender.1.3.0.dylib
+lib/libXrender.1.dylib
+lib/libXrender.dylib
+lib/libXrender.la
+lib/pkgconfig/xrender.pc
diff --git a/pkgtools/x11-links/files/xorg.libXt b/pkgtools/x11-links/files/xorg.libXt
new file mode 100644
index 00000000000..a5e97c4abc4
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXt
@@ -0,0 +1,46 @@
+# $NetBSD: xorg.libXt,v 1.1 2007/12/17 18:20:21 tron Exp $
+#
+bin/makestrs
+include/X11/CallbackI.h
+include/X11/Composite.h
+include/X11/CompositeP.h
+include/X11/ConstrainP.h
+include/X11/Constraint.h
+include/X11/ConvertI.h
+include/X11/Core.h
+include/X11/CoreP.h
+include/X11/CreateI.h
+include/X11/EventI.h
+include/X11/HookObjI.h
+include/X11/InitialI.h
+include/X11/Intrinsic.h
+include/X11/IntrinsicI.h
+include/X11/IntrinsicP.h
+include/X11/Object.h
+include/X11/ObjectP.h
+include/X11/PassivGraI.h
+include/X11/RectObj.h
+include/X11/RectObjP.h
+include/X11/ResConfigP.h
+include/X11/ResourceI.h
+include/X11/SelectionI.h
+include/X11/Shell.h
+include/X11/ShellI.h
+include/X11/ShellP.h
+include/X11/StringDefs.h
+include/X11/ThreadsI.h
+include/X11/TranslateI.h
+include/X11/VarargsI.h
+include/X11/Vendor.h
+include/X11/VendorP.h
+include/X11/Xtos.h
+lib/libXt.6.0.0.dylib
+lib/libXt.6.0.dylib
+lib/libXt.6.dylib
+lib/libXt.a
+lib/libXt.dylib
+lib/libXt.la
+lib/libXt.so
+lib/libXt.so.6
+lib/libXt.so.6.0
+lib/pkgconfig/xt.pc
diff --git a/pkgtools/x11-links/files/xorg.xcursor b/pkgtools/x11-links/files/xorg.xcursor
new file mode 100644
index 00000000000..20b47279ea6
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xcursor
@@ -0,0 +1,8 @@
+# $NetBSD: xorg.xcursor,v 1.1 2007/12/17 18:20:21 tron Exp $
+#
+include/X11/Xcursor/Xcursor.h
+lib/libXcursor.1.0.2.dylib
+lib/libXcursor.1.dylib
+lib/libXcursor.dylib
+lib/libXcursor.la
+lib/pkgconfig/xcursor.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 26863853efe..eff137f7582 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.7 2007/12/16 19:05:52 tron Exp $
+# $NetBSD: xorg.mk,v 1.8 2007/12/17 18:20:19 tron Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -14,15 +14,20 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"