[pkgsrc/trunk]: pkgsrc Update pkgtools/x11-links to 0.22. Changes from versi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b02c9615f3d9
branches:  trunk
changeset: 468846:b02c9615f3d9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 17 08:26:25 2004 +0000

description:
Update pkgtools/x11-links to 0.22.  Changes from version 0.21 include
handling the built-in expat libraries and headers.

diffstat:

 doc/CHANGES                          |   3 ++-
 pkgtools/x11-links/Makefile          |   4 ++--
 pkgtools/x11-links/files/xfree       |  11 +----------
 pkgtools/x11-links/files/xfree.expat |  12 ++++++++++++
 pkgtools/x11-links/xfree.mk          |   5 +++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diffs (96 lines):

diff -r 92dfa411958c -r b02c9615f3d9 doc/CHANGES
--- a/doc/CHANGES       Tue Feb 17 08:24:30 2004 +0000
+++ b/doc/CHANGES       Tue Feb 17 08:26:25 2004 +0000
@@ -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 @@
        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 -r 92dfa411958c -r b02c9615f3d9 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Tue Feb 17 08:24:30 2004 +0000
+++ b/pkgtools/x11-links/Makefile       Tue Feb 17 08:26:25 2004 +0000
@@ -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 -r 92dfa411958c -r b02c9615f3d9 pkgtools/x11-links/files/xfree
--- a/pkgtools/x11-links/files/xfree    Tue Feb 17 08:24:30 2004 +0000
+++ b/pkgtools/x11-links/files/xfree    Tue Feb 17 08:26:25 2004 +0000
@@ -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.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 -r 92dfa411958c -r b02c9615f3d9 pkgtools/x11-links/files/xfree.expat
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.expat      Tue Feb 17 08:26:25 2004 +0000
@@ -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 -r 92dfa411958c -r b02c9615f3d9 pkgtools/x11-links/xfree.mk
--- a/pkgtools/x11-links/xfree.mk       Tue Feb 17 08:24:30 2004 +0000
+++ b/pkgtools/x11-links/xfree.mk       Tue Feb 17 08:26:25 2004 +0000
@@ -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 @@
 .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"