From b4a03adcb9cec2ce48b1b29cfa5937773077dc5b Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 16 Feb 2004 23:39:36 +0000 Subject: 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. --- 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 +++++++++++-- 9 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 pkgtools/x11-links/files/xfree.Xrandr create mode 100644 pkgtools/x11-links/files/xfree.fontconfig create mode 100644 pkgtools/x11-links/files/xfree.randrext create mode 100644 pkgtools/x11-links/files/xfree.render create mode 100644 pkgtools/x11-links/files/xfree.xcursor (limited to 'pkgtools') diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 3ab6362c812..f5bfaa23053 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 --git a/pkgtools/x11-links/files/xfree b/pkgtools/x11-links/files/xfree index a867f6775e9..db566d8939e 100644 --- a/pkgtools/x11-links/files/xfree +++ b/pkgtools/x11-links/files/xfree @@ -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/ViewportP.h 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/Xdbe.h 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/multibuf.h 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/fontenc.h 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.dylib 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.so.6.2 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.dylib 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 --git a/pkgtools/x11-links/files/xfree.Xrandr b/pkgtools/x11-links/files/xfree.Xrandr new file mode 100644 index 00000000000..757126fdf67 --- /dev/null +++ b/pkgtools/x11-links/files/xfree.Xrandr @@ -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 --git a/pkgtools/x11-links/files/xfree.Xrender b/pkgtools/x11-links/files/xfree.Xrender index 3b3244d0ae8..d64e71e13c2 100644 --- a/pkgtools/x11-links/files/xfree.Xrender +++ b/pkgtools/x11-links/files/xfree.Xrender @@ -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 --git a/pkgtools/x11-links/files/xfree.fontconfig b/pkgtools/x11-links/files/xfree.fontconfig new file mode 100644 index 00000000000..dbddcb42b1e --- /dev/null +++ b/pkgtools/x11-links/files/xfree.fontconfig @@ -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 --git a/pkgtools/x11-links/files/xfree.randrext b/pkgtools/x11-links/files/xfree.randrext new file mode 100644 index 00000000000..20c28116da4 --- /dev/null +++ b/pkgtools/x11-links/files/xfree.randrext @@ -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 --git a/pkgtools/x11-links/files/xfree.render b/pkgtools/x11-links/files/xfree.render new file mode 100644 index 00000000000..e19fbebfa9d --- /dev/null +++ b/pkgtools/x11-links/files/xfree.render @@ -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 --git a/pkgtools/x11-links/files/xfree.xcursor b/pkgtools/x11-links/files/xfree.xcursor new file mode 100644 index 00000000000..c8c39ff0e26 --- /dev/null +++ b/pkgtools/x11-links/files/xfree.xcursor @@ -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 --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index 74fcdeeac6b..845efef6ec4 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -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 @@ X11_MODULES= MesaLib Xrender freetype2 glu xpm 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]) -- cgit v1.2.3