Update pkgtools/x11-links to 0.22. Changes from version 0.21 include

handling the built-in expat libraries and headers.

5 files changed, 20 insertions, 15 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index b4bda6c16ef..83035881cd7 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4878 2004/02/17 04:30:17 minskim Exp $
+$NetBSD: CHANGES,v 1.4879 2004/02/17 08:26:27 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -889,3 +889,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added p5-MIME-Types-1.12 [minskim 2004-02-17]
 	Added p5-Object-Realize-Later-0.15 [minskim 2004-02-17]
 	Added p5-Net-IP-1.20 [minskim 2004-02-17]
+	Updated x11-links to 0.22 [jlam 2004-02-17]
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index f5bfaa23053..8c3d11d0a4d 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2004/02/16 23:39:36 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2004/02/17 08:26:25 jlam Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in mk/buildlink[23]/bsd.buildlink[23].mk
 #	to the correct version, usually the most recent.
 
-DISTNAME=	x11-links-0.21
+DISTNAME=	x11-links-0.22
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/files/xfree b/pkgtools/x11-links/files/xfree
index db566d8939e..0c6ac481c2a 100644
--- a/pkgtools/x11-links/files/xfree
+++ b/pkgtools/x11-links/files/xfree
@@ -1,4 +1,4 @@
-# $NetBSD: xfree,v 1.7 2004/02/16 23:39:36 jlam Exp $
+# $NetBSD: xfree,v 1.8 2004/02/17 08:26:25 jlam Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported XFree distributions, minus the set of files representing
@@ -601,15 +601,6 @@ lib/libdpstk.so.1.0
 lib/libdpstk.dylib
 lib/libdpstk.1.dylib
 lib/libdpstk.1.0.dylib
-lib/libexpat.a
-lib/libexpat.so
-lib/libexpat.so.1
-lib/libexpat.so.1.0
-lib/libexpat.so.4
-lib/libexpat.so.4.0
-lib/libexpat.dylib
-lib/libexpat.1.dylib
-lib/libexpat.1.0.dylib
 lib/libfntstubs.a
 lib/libfontenc.a
 lib/libfontenc.so
diff --git a/pkgtools/x11-links/files/xfree.expat b/pkgtools/x11-links/files/xfree.expat
new file mode 100644
index 00000000000..4e6ba95d757
--- /dev/null
+++ b/pkgtools/x11-links/files/xfree.expat
@@ -0,0 +1,12 @@
+# $NetBSD: xfree.expat,v 1.1 2004/02/17 08:26:25 jlam Exp $
+#
+include/expat.h
+lib/libexpat.a
+lib/libexpat.so
+lib/libexpat.so.1
+lib/libexpat.so.1.0
+lib/libexpat.so.4
+lib/libexpat.so.4.0
+lib/libexpat.dylib
+lib/libexpat.1.dylib
+lib/libexpat.1.0.dylib
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index 845efef6ec4..d0369045f7c 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,11 +1,11 @@
-# $NetBSD: xfree.mk,v 1.5 2004/02/16 23:39:36 jlam Exp $
+# $NetBSD: xfree.mk,v 1.6 2004/02/17 08:26:25 jlam Exp $
 
 FILES_LIST=	${FILESDIR}/xfree
 
 X11_MODULES=	MesaLib glu
 X11_MODULES+=	freetype2
 X11_MODULES+=	xpm
-X11_MODULES+=	Xrender fontconfig render
+X11_MODULES+=	Xrender expat fontconfig render
 X11_MODULES+=	Xrandr randrext
 X11_MODULES+=	xcursor
 
@@ -21,6 +21,7 @@ BUILDLINK_CHECK_BUILTIN.${_module_}=	YES
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 .include "../../x11/render/buildlink3.mk"