[pkgsrc/trunk]: pkgsrc Update to x11-links-0.23: catch up with Xft2/buildlink...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46ee688ee7c7
branches:  trunk
changeset: 468896:46ee688ee7c7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 17 16:50:26 2004 +0000

description:
Update to x11-links-0.23: catch up with Xft2/buildlink3.mk changes.

diffstat:

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

diffs (110 lines):

diff -r 5cd4c1a50336 -r 46ee688ee7c7 doc/CHANGES
--- a/doc/CHANGES       Tue Feb 17 16:48:45 2004 +0000
+++ b/doc/CHANGES       Tue Feb 17 16:50:26 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4883 2004/02/17 15:36:07 minskim Exp $
+$NetBSD: CHANGES,v 1.4884 2004/02/17 16:51:20 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -894,3 +894,4 @@
        Updated elfsh to 0.51b3 [cube 2004-02-17]
        Updated qiv to qiv [snj 2004-02-17]
        Added chkrootkit-0.43 [minskim 2004-02-17]
+       Updated x11-links to 0.23 [jlam 2004-02-17]
diff -r 5cd4c1a50336 -r 46ee688ee7c7 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Tue Feb 17 16:48:45 2004 +0000
+++ b/pkgtools/x11-links/Makefile       Tue Feb 17 16:50:26 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2004/02/17 16:50:26 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.22
+DISTNAME=      x11-links-0.23
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 5cd4c1a50336 -r 46ee688ee7c7 pkgtools/x11-links/files/xfree
--- a/pkgtools/x11-links/files/xfree    Tue Feb 17 16:48:45 2004 +0000
+++ b/pkgtools/x11-links/files/xfree    Tue Feb 17 16:50:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xfree,v 1.8 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: xfree,v 1.9 2004/02/17 16:50:26 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
@@ -149,8 +149,6 @@
 include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
-include/X11/Xft/Xft.h
-include/X11/Xft/XftCompat.h
 include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
@@ -494,20 +492,13 @@
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 lib/libXfontcache.so.1.2
-lib/libXft.a
-lib/libXft.so
 lib/libXft.so.1
 lib/libXft.so.1.0
 lib/libXft.so.1.1
-lib/libXft.so.2
-lib/libXft.so.2.0
-lib/libXft.so.2.1
 lib/libXft.dylib
 lib/libXft.1.dylib
 lib/libXft.1.0.dylib
 lib/libXft.1.1.dylib
-lib/libXft.2.dylib
-lib/libXft.2.0.dylib
 lib/libXi.a
 lib/libXi.so
 lib/libXi.so.6
diff -r 5cd4c1a50336 -r 46ee688ee7c7 pkgtools/x11-links/files/xfree.Xft2
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.Xft2       Tue Feb 17 16:50:26 2004 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: xfree.Xft2,v 1.1 2004/02/17 16:50:26 jlam Exp $
+#
+include/X11/Xft/Xft.h
+include/X11/Xft/XftCompat.h
+lib/libXft.a
+lib/libXft.so
+lib/libXft.so.2
+lib/libXft.so.2.0
+lib/libXft.so.2.1
+lib/libXft.dylib
+lib/libXft.2.dylib
+lib/libXft.2.0.dylib
diff -r 5cd4c1a50336 -r 46ee688ee7c7 pkgtools/x11-links/xfree.mk
--- a/pkgtools/x11-links/xfree.mk       Tue Feb 17 16:48:45 2004 +0000
+++ b/pkgtools/x11-links/xfree.mk       Tue Feb 17 16:50:26 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: xfree.mk,v 1.6 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: xfree.mk,v 1.7 2004/02/17 16:50:26 jlam Exp $
 
 FILES_LIST=    ${FILESDIR}/xfree
 
 X11_MODULES=   MesaLib glu
 X11_MODULES+=  freetype2
 X11_MODULES+=  xpm
-X11_MODULES+=  Xrender expat fontconfig render
+X11_MODULES+=  Xft2 Xrender expat fontconfig render
 X11_MODULES+=  Xrandr randrext
 X11_MODULES+=  xcursor
 
@@ -16,6 +16,7 @@
 BUILDLINK_CHECK_BUILTIN.${_module_}=   YES
 .endfor
 
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"