Add XFree86 4.2.0 additions, bump version to 0.6:

include/X11/fonts/fontenc.h
include/X11/extensions/xtrapbits.h
include/X11/extensions/xtrapddmi.h
include/X11/extensions/xtrapdi.h
include/X11/extensions/xtrapemacros.h
include/X11/extensions/xtraplib.h
include/X11/extensions/xtraplibp.h
include/X11/extensions/xtrapproto.h
lib/libXrender.so.1.1
lib/libXTrap.a
lib/libXTrap.so
lib/libXTrap.so.6
lib/libXTrap.so.6.4
lib/libXinerama.so
lib/libXinerama.so.1
lib/libXinerama.so.1.0

OKed by jlam

3 files changed, 20 insertions, 3 deletions

diff --git a/pkgtools/x11-links/DESCR b/pkgtools/x11-links/DESCR
index 7a0636ca7e3..aa3bc897bad 100644
--- a/pkgtools/x11-links/DESCR
+++ b/pkgtools/x11-links/DESCR
@@ -6,3 +6,4 @@ are:
 	XFree86-3.3.x
 	XFree86-4.0.x
 	XFree86-4.1.0
+	XFree86-4.2.0
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index ded70f750ff..998b37ac292 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2002/01/01 18:32:51 abs Exp $
+# $NetBSD: Makefile,v 1.9 2002/01/27 10:32:31 markd Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in x11.buildlink.mk to the correct version,
 #	usually the most recent.
 
-DISTNAME=	x11-links-0.5
+DISTNAME=	x11-links-0.6
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink.mk b/pkgtools/x11-links/buildlink.mk
index b826514261c..622da9c391c 100644
--- a/pkgtools/x11-links/buildlink.mk
+++ b/pkgtools/x11-links/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/12/21 16:22:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/01/27 10:32:31 markd Exp $
 #
 # This Makefile fragment is included by packages that use X11.
 #
@@ -390,6 +390,13 @@ BUILDLINK_FILES.X11+=	include/X11/extensions/xf86mscstr.h
 BUILDLINK_FILES.X11+=	include/X11/extensions/xf86vmode.h
 BUILDLINK_FILES.X11+=	include/X11/extensions/xf86vmstr.h
 BUILDLINK_FILES.X11+=	include/X11/extensions/xtestext1.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtrapbits.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtrapddmi.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtrapdi.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtrapemacros.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtraplib.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtraplibp.h
+BUILDLINK_FILES.X11+=	include/X11/extensions/xtrapproto.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/FS.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/FSlib.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/FSproto.h
@@ -399,6 +406,7 @@ BUILDLINK_FILES.X11+=	include/X11/fonts/codeconv/xttcconv.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/codeconv/xttcconvP.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/codeconv/xttcommon.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/codeconv/xttversion.h
+BUILDLINK_FILES.X11+=	include/X11/fonts/fontenc.h
 BUILDLINK_FILES.X11+=	include/X11/fonts/fsmasks.h
 BUILDLINK_FILES.X11+=	include/X11/keysym.h
 BUILDLINK_FILES.X11+=	include/X11/keysymdef.h
@@ -426,6 +434,10 @@ BUILDLINK_FILES.X11+=	lib/libXIE.a
 BUILDLINK_FILES.X11+=	lib/libXIE.so
 BUILDLINK_FILES.X11+=	lib/libXIE.so.6
 BUILDLINK_FILES.X11+=	lib/libXIE.so.6.0
+BUILDLINK_FILES.X11+=	lib/libXTrap.a
+BUILDLINK_FILES.X11+=	lib/libXTrap.so
+BUILDLINK_FILES.X11+=	lib/libXTrap.so.6
+BUILDLINK_FILES.X11+=	lib/libXTrap.so.6.4
 BUILDLINK_FILES.X11+=	lib/libXau.a
 BUILDLINK_FILES.X11+=	lib/libXaw.a
 BUILDLINK_FILES.X11+=	lib/libXaw.so
@@ -455,6 +467,9 @@ BUILDLINK_FILES.X11+=	lib/libXi.so
 BUILDLINK_FILES.X11+=	lib/libXi.so.6
 BUILDLINK_FILES.X11+=	lib/libXi.so.6.0
 BUILDLINK_FILES.X11+=	lib/libXinerama.a
+BUILDLINK_FILES.X11+=	lib/libXinerama.so
+BUILDLINK_FILES.X11+=	lib/libXinerama.so.1
+BUILDLINK_FILES.X11+=	lib/libXinerama.so.1.0
 BUILDLINK_FILES.X11+=	lib/libXmu.a
 BUILDLINK_FILES.X11+=	lib/libXmu.so
 BUILDLINK_FILES.X11+=	lib/libXmu.so.6
@@ -476,6 +491,7 @@ BUILDLINK_FILES.X11+=	lib/libXrender.a
 BUILDLINK_FILES.X11+=	lib/libXrender.so
 BUILDLINK_FILES.X11+=	lib/libXrender.so.1
 BUILDLINK_FILES.X11+=	lib/libXrender.so.1.0
+BUILDLINK_FILES.X11+=	lib/libXrender.so.1.1
 BUILDLINK_FILES.X11+=	lib/libXss.a
 BUILDLINK_FILES.X11+=	lib/libXt.a
 BUILDLINK_FILES.X11+=	lib/libXt.so