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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44811dda8505
branches:  trunk
changeset: 468808:44811dda8505
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 16 23:39:36 2004 +0000

description:
Update pkgtools/x11-links to 0.21.  Changes from version 0.20 include
catching up to changes to xcursor, Xrender, render, Xrandr, and randrext
by including their buildlink3.mk files.

diffstat:

 doc/CHANGES                               |   3 +-
 pkgtools/x11-links/Makefile               |   4 +-
 pkgtools/x11-links/files/xfree            |  34 +------------------------------
 pkgtools/x11-links/files/xfree.Xrandr     |  14 ++++++++++++
 pkgtools/x11-links/files/xfree.Xrender    |   4 +--
 pkgtools/x11-links/files/xfree.fontconfig |  12 ++++++++++
 pkgtools/x11-links/files/xfree.randrext   |   4 +++
 pkgtools/x11-links/files/xfree.render     |   4 +++
 pkgtools/x11-links/files/xfree.xcursor    |  10 +++++++++
 pkgtools/x11-links/xfree.mk               |  14 ++++++++++-
 10 files changed, 62 insertions(+), 41 deletions(-)

diffs (233 lines):

diff -r 103137a3de7b -r 44811dda8505 doc/CHANGES
--- a/doc/CHANGES       Mon Feb 16 23:37:40 2004 +0000
+++ b/doc/CHANGES       Mon Feb 16 23:39:36 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4869 2004/02/16 23:37:40 jmmv Exp $
+$NetBSD: CHANGES,v 1.4870 2004/02/16 23:39:37 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -879,3 +879,4 @@
        Updated nsd to 2.0.0nb1 [itojun 2004-02-16]
        Updated gconf-editor to 2.4.0nb3 [jmmv 2004-02-16]
        Updated ggv to 2.4.1nb2 [jmmv 2004-02-16]
+       Updated x11-links to 0.21 [jlam 2004-02-16]
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Mon Feb 16 23:37:40 2004 +0000
+++ b/pkgtools/x11-links/Makefile       Mon Feb 16 23:39:36 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2004/02/10 23:00:05 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2004/02/16 23:39:36 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.20
+DISTNAME=      x11-links-0.21
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree
--- a/pkgtools/x11-links/files/xfree    Mon Feb 16 23:37:40 2004 +0000
+++ b/pkgtools/x11-links/files/xfree    Mon Feb 16 23:39:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xfree,v 1.6 2004/01/31 21:58:52 recht Exp $
+# $NetBSD: xfree,v 1.7 2004/02/16 23:39:36 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
@@ -147,7 +147,6 @@
 include/X11/Xaw/XawImP.h
 include/X11/Xaw/XawInit.h
 include/X11/Xcms.h
-include/X11/Xcursor/Xcursor.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
 include/X11/Xft/Xft.h
@@ -328,7 +327,6 @@
 include/X11/extensions/Xdbeproto.h
 include/X11/extensions/Xext.h
 include/X11/extensions/Xinerama.h
-include/X11/extensions/Xrandr.h
 include/X11/extensions/Xv.h
 include/X11/extensions/XvMC.h
 include/X11/extensions/XvMClib.h
@@ -354,8 +352,6 @@
 include/X11/extensions/multibufst.h
 include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
-include/X11/extensions/randr.h
-include/X11/extensions/randrproto.h
 include/X11/extensions/record.h
 include/X11/extensions/recordstr.h
 include/X11/extensions/saver.h
@@ -401,9 +397,6 @@
 include/X11/fonts/fsmasks.h
 include/X11/keysym.h
 include/X11/keysymdef.h
-include/fontconfig/fcfreetype.h
-include/fontconfig/fcprivate.h
-include/fontconfig/fontconfig.h
 include/xf86Optrec.h
 include/xf86Parser.h
 lib/libFS.a
@@ -473,13 +466,6 @@
 lib/libXaw.6.1.dylib
 lib/libXaw.7.dylib
 lib/libXaw.7.0.dylib
-lib/libXcursor.a
-lib/libXcursor.so
-lib/libXcursor.so.1
-lib/libXcursor.so.1.0
-lib/libXcursor.dylib
-lib/libXcursor.1.dylib
-lib/libXcursor.1.0.dylib
 lib/libXdmcp.a
 lib/libXdmcp.so
 lib/libXdmcp.so.6
@@ -559,17 +545,6 @@
 lib/libXp.dylib
 lib/libXp.6.dylib
 lib/libXp.6.2.dylib
-lib/libXrandr.a
-lib/libXrandr.so
-lib/libXrandr.so.1
-lib/libXrandr.so.1.0
-lib/libXrandr.so.2
-lib/libXrandr.so.2.0
-lib/libXrandr.dylib
-lib/libXrandr.1.dylib
-lib/libXrandr.1.0.dylib
-lib/libXrandr.2.dylib
-lib/libXrandr.2.0.dylib
 lib/libXss.a
 lib/libXss.so
 lib/libXss.so.1
@@ -636,13 +611,6 @@
 lib/libexpat.1.dylib
 lib/libexpat.1.0.dylib
 lib/libfntstubs.a
-lib/libfontconfig.a
-lib/libfontconfig.so
-lib/libfontconfig.so.1
-lib/libfontconfig.so.1.0
-lib/libfontconfig.dylib
-lib/libfontconfig.1.dylib
-lib/libfontconfig.1.0.dylib
 lib/libfontenc.a
 lib/libfontenc.so
 lib/libfontenc.so.1
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.Xrandr
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.Xrandr     Mon Feb 16 23:39:36 2004 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: xfree.Xrandr,v 1.1 2004/02/16 23:39:36 jlam Exp $
+#
+include/X11/extensions/Xrandr.h
+lib/libXrandr.a
+lib/libXrandr.so
+lib/libXrandr.so.1
+lib/libXrandr.so.1.0
+lib/libXrandr.so.2
+lib/libXrandr.so.2.0
+lib/libXrandr.dylib
+lib/libXrandr.1.dylib
+lib/libXrandr.1.0.dylib
+lib/libXrandr.2.dylib
+lib/libXrandr.2.0.dylib
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.Xrender
--- a/pkgtools/x11-links/files/xfree.Xrender    Mon Feb 16 23:37:40 2004 +0000
+++ b/pkgtools/x11-links/files/xfree.Xrender    Mon Feb 16 23:39:36 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: xfree.Xrender,v 1.3 2003/10/20 16:11:16 tron Exp $
+# $NetBSD: xfree.Xrender,v 1.4 2004/02/16 23:39:36 jlam Exp $
 #
 include/X11/extensions/Xrender.h
-include/X11/extensions/render.h
-include/X11/extensions/renderproto.h
 lib/libXrender.a
 lib/libXrender.so
 lib/libXrender.so.1
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.fontconfig
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.fontconfig Mon Feb 16 23:39:36 2004 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: xfree.fontconfig,v 1.1 2004/02/16 23:39:36 jlam Exp $
+#
+include/fontconfig/fcfreetype.h
+include/fontconfig/fcprivate.h
+include/fontconfig/fontconfig.h
+lib/libfontconfig.a
+lib/libfontconfig.so
+lib/libfontconfig.so.1
+lib/libfontconfig.so.1.0
+lib/libfontconfig.dylib
+lib/libfontconfig.1.dylib
+lib/libfontconfig.1.0.dylib
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.randrext
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.randrext   Mon Feb 16 23:39:36 2004 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: xfree.randrext,v 1.1 2004/02/16 23:39:36 jlam Exp $
+#
+include/X11/extensions/randr.h
+include/X11/extensions/randrproto.h
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.render
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.render     Mon Feb 16 23:39:36 2004 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: xfree.render,v 1.1 2004/02/16 23:39:36 jlam Exp $
+#
+include/X11/extensions/render.h
+include/X11/extensions/renderproto.h
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/files/xfree.xcursor
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.xcursor    Mon Feb 16 23:39:36 2004 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: xfree.xcursor,v 1.1 2004/02/16 23:39:36 jlam Exp $
+#
+include/X11/Xcursor/Xcursor.h
+lib/libXcursor.a
+lib/libXcursor.so
+lib/libXcursor.so.1
+lib/libXcursor.so.1.0
+lib/libXcursor.dylib
+lib/libXcursor.1.dylib
+lib/libXcursor.1.0.dylib
diff -r 103137a3de7b -r 44811dda8505 pkgtools/x11-links/xfree.mk
--- a/pkgtools/x11-links/xfree.mk       Mon Feb 16 23:37:40 2004 +0000
+++ b/pkgtools/x11-links/xfree.mk       Mon Feb 16 23:39:36 2004 +0000
@@ -1,8 +1,13 @@
-# $NetBSD: xfree.mk,v 1.4 2003/09/28 12:45:04 jlam Exp $
+# $NetBSD: xfree.mk,v 1.5 2004/02/16 23:39:36 jlam Exp $
 
 FILES_LIST=    ${FILESDIR}/xfree
 
-X11_MODULES=   MesaLib Xrender freetype2 glu xpm
+X11_MODULES=   MesaLib glu
+X11_MODULES+=  freetype2
+X11_MODULES+=  xpm
+X11_MODULES+=  Xrender fontconfig render
+X11_MODULES+=  Xrandr randrext
+X11_MODULES+=  xcursor
 
 # Check if any headers and libraries for ${X11_MODULES} found in
 # ${X11BASE} actually belong to the base XFree86 or not.
@@ -11,11 +16,16 @@
 BUILDLINK_CHECK_BUILTIN.${_module_}=   YES
 .endfor
 
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/render/buildlink3.mk"
+.include "../../x11/randrext/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
 
 .for _module_ in ${X11_MODULES}
 .  if !empty(BUILDLINK_IS_BUILTIN.${_module_}:M[yY][eE][sS])