diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-09-21 17:38:52 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-09-21 17:38:52 +0000 |
commit | f620d0c75b97190ee7d5c75ceebf89560e3e14c1 (patch) | |
tree | cbb27fea780cd24c28951d2e98105643d59fb19a /x11 | |
parent | 8b3c1cb0fdfe1b4d19fb3ad202cd9c02decb918f (diff) | |
download | pkgsrc-f620d0c75b97190ee7d5c75ceebf89560e3e14c1.tar.gz |
Update X.org packages to 6.8.1.
To see the changes about this release, please review the "RELNOTES" file,
which is available via www or in the distribution tarballs.
These packages were tested on:
* NetBSD 2.0/-current
* Bluewall GNU/Linux
* Slackware 10 GNU/Linux
I'm currently testing them on FreeBSD 5.3BETA4.
Diffstat (limited to 'x11')
32 files changed, 1143 insertions, 1207 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index afc02c17b67..e7e3c9ddb64 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2004/07/30 08:31:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2004/09/21 17:38:53 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src2.tar.gz \ - X11R6.7.0-src3.tar.gz +DISTFILES= X11R${XORG_VER}-src1.tar.gz \ + X11R${XORG_VER}-src2.tar.gz \ + X11R${XORG_VER}-src3.tar.gz MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ diff --git a/x11/xorg-clients/PLIST b/x11/xorg-clients/PLIST index 3114bfd61a6..f6c6feb1cbc 100644 --- a/x11/xorg-clients/PLIST +++ b/x11/xorg-clients/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 04:52:04 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ${X11ROOT_PREFIX}/bin/Xmark ${X11ROOT_PREFIX}/bin/appres ${X11ROOT_PREFIX}/bin/atobm @@ -56,6 +56,7 @@ ${X11ROOT_PREFIX}/bin/xcutsel ${X11ROOT_PREFIX}/bin/xditview ${X11ROOT_PREFIX}/bin/xdm ${X11ROOT_PREFIX}/bin/xdpyinfo +${X11ROOT_PREFIX}/bin/xdriinfo ${X11ROOT_PREFIX}/bin/xedit ${X11ROOT_PREFIX}/bin/xev ${X11ROOT_PREFIX}/bin/xeyes @@ -85,6 +86,7 @@ ${X11ROOT_PREFIX}/bin/xman ${X11ROOT_PREFIX}/bin/xmessage ${X11ROOT_PREFIX}/bin/xmh ${X11ROOT_PREFIX}/bin/xmodmap +${X11ROOT_PREFIX}/bin/xmore ${X11ROOT_PREFIX}/bin/xon ${X11ROOT_PREFIX}/bin/xprop ${X11ROOT_PREFIX}/bin/xrandr @@ -109,6 +111,11 @@ ${X11ROOT_PREFIX}/bin/xvinfo ${X11ROOT_PREFIX}/bin/xwd ${X11ROOT_PREFIX}/bin/xwininfo ${X11ROOT_PREFIX}/bin/xwud +${X11ROOT_PREFIX}/bin/xphelloworld +${X11ROOT_PREFIX}/bin/xplsprinters +${X11ROOT_PREFIX}/bin/xprehashprinterlist +${X11ROOT_PREFIX}/bin/xpsimplehelloworld +${X11ROOT_PREFIX}/bin/xpxthelloworld ${X11ROOT_PREFIX}/include/X11/PM/PM.h ${X11ROOT_PREFIX}/include/X11/PM/PMproto.h ${X11ROOT_PREFIX}/include/X11/bitmaps/Dashes @@ -504,6 +511,7 @@ ${X11ROOT_PREFIX}/lib/X11/xkb/rules/sgi.lst ${X11ROOT_PREFIX}/lib/X11/xkb/rules/sun ${X11ROOT_PREFIX}/lib/X11/xkb/rules/sun.lst ${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86 +${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86.lst ${X11ROOT_PREFIX}/lib/X11/xkb/rules/xorg ${X11ROOT_PREFIX}/lib/X11/xkb/rules/xorg-it.lst ${X11ROOT_PREFIX}/lib/X11/xkb/rules/xorg.lst @@ -847,6 +855,13 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/xvinfo.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/xwd.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/xwininfo.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/xwud.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xmore.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xdriinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xphelloworld.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xplsprinters.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xprehashprinterlist.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xpsimplehelloworld.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xpxthelloworld.${MAN_SUFFIX} @dirrm ${X11ROOT_PREFIX}/lib/X11/xsm @dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/types @dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68 diff --git a/x11/xorg-clients/files/host.def b/x11/xorg-clients/files/host.def index 0cde474f654..f32b804d3f8 100644 --- a/x11/xorg-clients/files/host.def +++ b/x11/xorg-clients/files/host.def @@ -1,10 +1,14 @@ -/* $NetBSD: host.def,v 1.2 2004/07/30 23:20:06 xtraeme Exp $ */ +/* $NetBSD: host.def,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO #define MakeCmd @MAKE@ + +#ifndef LinuxArchitecture #define HasGnuMake NO +#endif + #define ImakeCmd @IMAKE@ #define RmanCmd @RMAN@ #define HtmlIndexCmd @MKHTMLINDEX@ diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile index b58cc8a6981..9cc0726454a 100644 --- a/x11/xorg-imake/Makefile +++ b/x11/xorg-imake/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2004/08/04 06:49:41 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2004/09/21 17:38:53 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz +DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ @@ -55,8 +54,8 @@ pre-configure: .undef F @( \ ${ECHO} "#define XORG_VERSION_MAJOR 6"; \ - ${ECHO} "#define XORG_VERSION_MINOR 7"; \ - ${ECHO} "#define XORG_VERSION_PATCH 0"; \ + ${ECHO} "#define XORG_VERSION_MINOR 8"; \ + ${ECHO} "#define XORG_VERSION_PATCH 1"; \ ${ECHO} "#define XORG_VERSION_SNAP 0"; \ ) > ${WRKSRC}/config/cf/version.def diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo index 8c880c043ef..a76847f4b99 100644 --- a/x11/xorg-imake/distinfo +++ b/x11/xorg-imake/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ -SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b -Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes -SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451 -Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes +SHA1 (X11R6.8.1-src1.tar.gz) = 78d64a5ea4440699eefb6c7bf76f7b6ce3f2fb15 +Size (X11R6.8.1-src1.tar.gz) = 30573498 bytes +SHA1 (X11R6.8.1-src3.tar.gz) = 8efe7a7b731eb5ea8aeaea63c4985d28b3514d16 +Size (X11R6.8.1-src3.tar.gz) = 10019766 bytes SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee -SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad diff --git a/x11/xorg-imake/patches/patch-ad b/x11/xorg-imake/patches/patch-ad deleted file mode 100644 index 78c5e12abf3..00000000000 --- a/x11/xorg-imake/patches/patch-ad +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ - ---- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 -+++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 -@@ -190,11 +190,11 @@ - # define CcCmd $(CLIENTENVSETUP) cc - # define CplusplusCmd $(CLIENTENVSETUP) c++ - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - #endif - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -207,7 +207,7 @@ - #else - #define NoSystemWarn - #endif --#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ -+#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ - GccWarningOptions - #endif - #endif -@@ -439,18 +439,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - - #ifndef PreIncDir - # define PreIncDir /usr/include -@@ -476,7 +466,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 10295c66b09..5db157fa89d 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2004/09/16 19:36:10 minskim Exp $ +# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:53 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src2.tar.gz \ - X11R6.7.0-src3.tar.gz +DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \ + X11R${XORG_VER}-src3.tar.gz MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ diff --git a/x11/xorg-libs/PLIST.Linux b/x11/xorg-libs/PLIST.Linux index f63aefaa230..143df65d83a 100644 --- a/x11/xorg-libs/PLIST.Linux +++ b/x11/xorg-libs/PLIST.Linux @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $ +@comment $NetBSD: PLIST.Linux,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ${X11ROOT_PREFIX}/lib/libFS.so ${X11ROOT_PREFIX}/lib/libFS.so.6 ${X11ROOT_PREFIX}/lib/libFS.so.6.0 ${X11ROOT_PREFIX}/lib/libGL.so ${X11ROOT_PREFIX}/lib/libGL.so.1 ${X11ROOT_PREFIX}/lib/libGL.so.1.2 +${X11ROOT_PREFIX}/lib/libGLU.a ${X11ROOT_PREFIX}/lib/libGLU.so ${X11ROOT_PREFIX}/lib/libGLU.so.1 ${X11ROOT_PREFIX}/lib/libGLU.so.1.3 @@ -30,9 +31,6 @@ ${X11ROOT_PREFIX}/lib/libX11.so.6.2 ${X11ROOT_PREFIX}/lib/libXRes.so ${X11ROOT_PREFIX}/lib/libXRes.so.1 ${X11ROOT_PREFIX}/lib/libXRes.so.1.0 -${X11ROOT_PREFIX}/lib/libXThrStub.so -${X11ROOT_PREFIX}/lib/libXThrStub.so.6 -${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1 ${X11ROOT_PREFIX}/lib/libXTrap.so ${X11ROOT_PREFIX}/lib/libXTrap.so.6 ${X11ROOT_PREFIX}/lib/libXTrap.so.6.4 @@ -42,23 +40,34 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.6 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1 ${X11ROOT_PREFIX}/lib/libXaw.so.7 ${X11ROOT_PREFIX}/lib/libXaw.so.7.0 +${X11ROOT_PREFIX}/lib/libXaw.so.8 +${X11ROOT_PREFIX}/lib/libXaw.so.8.0 ${X11ROOT_PREFIX}/lib/libXdmcp.a ${X11ROOT_PREFIX}/lib/libXext.so ${X11ROOT_PREFIX}/lib/libXext.so.6 ${X11ROOT_PREFIX}/lib/libXext.so.6.4 ${X11ROOT_PREFIX}/lib/libXfont.a -${X11ROOT_PREFIX}/lib/libXfont.so -${X11ROOT_PREFIX}/lib/libXfont.so.1 -${X11ROOT_PREFIX}/lib/libXfont.so.1.5 -${X11ROOT_PREFIX}/lib/libXfontcache.so -${X11ROOT_PREFIX}/lib/libXfontcache.so.1 -${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2 ${X11ROOT_PREFIX}/lib/libXi.so ${X11ROOT_PREFIX}/lib/libXi.so.6 ${X11ROOT_PREFIX}/lib/libXi.so.6.0 ${X11ROOT_PREFIX}/lib/libXinerama.so ${X11ROOT_PREFIX}/lib/libXinerama.so.1 ${X11ROOT_PREFIX}/lib/libXinerama.so.1.0 +${X11ROOT_PREFIX}/lib/libXcomposite.so +${X11ROOT_PREFIX}/lib/libXcomposite.so.1 +${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0 +${X11ROOT_PREFIX}/lib/libXdamage.so +${X11ROOT_PREFIX}/lib/libXdamage.so.1 +${X11ROOT_PREFIX}/lib/libXdamage.so.1.0 +${X11ROOT_PREFIX}/lib/libXevie.so +${X11ROOT_PREFIX}/lib/libXevie.so.1 +${X11ROOT_PREFIX}/lib/libXevie.so.1.0 +${X11ROOT_PREFIX}/lib/libXfixes.so +${X11ROOT_PREFIX}/lib/libXfixes.so.3 +${X11ROOT_PREFIX}/lib/libXfixes.so.3.0 +${X11ROOT_PREFIX}/lib/libXprintAppUtil.a +${X11ROOT_PREFIX}/lib/libXprintUtil.a +${X11ROOT_PREFIX}/lib/libdmx.a ${X11ROOT_PREFIX}/lib/libXmu.so ${X11ROOT_PREFIX}/lib/libXmu.so.6 ${X11ROOT_PREFIX}/lib/libXmu.so.6.2 @@ -120,3 +129,5 @@ ${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0 ${X11ROOT_PREFIX}/lib/libxkbui.so ${X11ROOT_PREFIX}/lib/libxkbui.so.1 ${X11ROOT_PREFIX}/lib/libxkbui.so.1.0 +${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h +${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h diff --git a/x11/xorg-libs/PLIST.NetBSD b/x11/xorg-libs/PLIST.NetBSD index 9817ceac7e4..0813de70399 100644 --- a/x11/xorg-libs/PLIST.NetBSD +++ b/x11/xorg-libs/PLIST.NetBSD @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $ +@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ${X11ROOT_PREFIX}/lib/libFS.a ${X11ROOT_PREFIX}/lib/libFS.so ${X11ROOT_PREFIX}/lib/libFS.so.6 @@ -35,9 +35,6 @@ ${X11ROOT_PREFIX}/lib/libXRes.a ${X11ROOT_PREFIX}/lib/libXRes.so ${X11ROOT_PREFIX}/lib/libXRes.so.1 ${X11ROOT_PREFIX}/lib/libXRes.so.1.0 -${X11ROOT_PREFIX}/lib/libXThrStub.so -${X11ROOT_PREFIX}/lib/libXThrStub.so.6 -${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1 ${X11ROOT_PREFIX}/lib/libXTrap.a ${X11ROOT_PREFIX}/lib/libXTrap.so ${X11ROOT_PREFIX}/lib/libXTrap.so.6 @@ -49,6 +46,26 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.6 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1 ${X11ROOT_PREFIX}/lib/libXaw.so.7 ${X11ROOT_PREFIX}/lib/libXaw.so.7.0 +${X11ROOT_PREFIX}/lib/libXaw.so.8 +${X11ROOT_PREFIX}/lib/libXaw.so.8.0 +${X11ROOT_PREFIX}/lib/libXcomposite.a +${X11ROOT_PREFIX}/lib/libXcomposite.so +${X11ROOT_PREFIX}/lib/libXcomposite.so.1 +${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0 +${X11ROOT_PREFIX}/lib/libXdamage.a +${X11ROOT_PREFIX}/lib/libXdamage.so +${X11ROOT_PREFIX}/lib/libXdamage.so.1 +${X11ROOT_PREFIX}/lib/libXdamage.so.1.0 +${X11ROOT_PREFIX}/lib/libXevie.a +${X11ROOT_PREFIX}/lib/libXevie.so +${X11ROOT_PREFIX}/lib/libXevie.so.1 +${X11ROOT_PREFIX}/lib/libXevie.so.1.0 +${X11ROOT_PREFIX}/lib/libXfixes.a +${X11ROOT_PREFIX}/lib/libXfixes.so +${X11ROOT_PREFIX}/lib/libXfixes.so.3 +${X11ROOT_PREFIX}/lib/libXfixes.so.3.0 +${X11ROOT_PREFIX}/lib/libXprintAppUtil.a +${X11ROOT_PREFIX}/lib/libXprintUtil.a ${X11ROOT_PREFIX}/lib/libXdmcp.a ${X11ROOT_PREFIX}/lib/libXext.a ${X11ROOT_PREFIX}/lib/libXext.so @@ -58,10 +75,6 @@ ${X11ROOT_PREFIX}/lib/libXfont.a ${X11ROOT_PREFIX}/lib/libXfont.so ${X11ROOT_PREFIX}/lib/libXfont.so.1 ${X11ROOT_PREFIX}/lib/libXfont.so.1.5 -${X11ROOT_PREFIX}/lib/libXfontcache.a -${X11ROOT_PREFIX}/lib/libXfontcache.so -${X11ROOT_PREFIX}/lib/libXfontcache.so.1 -${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2 ${X11ROOT_PREFIX}/lib/libXi.a ${X11ROOT_PREFIX}/lib/libXi.so ${X11ROOT_PREFIX}/lib/libXi.so.6 diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common index b0a40d309fb..7fcc7f22ab8 100644 --- a/x11/xorg-libs/PLIST.common +++ b/x11/xorg-libs/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.2 2004/08/11 15:40:49 recht Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ ${X11ROOT_PREFIX}/include/DPS/ColorSB.h ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h @@ -111,6 +111,8 @@ ${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h ${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h ${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h ${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h +${X11ROOT_PREFIX}/include/X11/Xaw/Print.h +${X11ROOT_PREFIX}/include/X11/Xaw/PrintSP.h ${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h ${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h ${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h @@ -179,6 +181,8 @@ ${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h ${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h ${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h ${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h +${X11ROOT_PREFIX}/include/X11/XprintAppUtil/xpapputil.h +${X11ROOT_PREFIX}/include/X11/XprintUtil/xprintutil.h ${X11ROOT_PREFIX}/include/X11/Xos.h ${X11ROOT_PREFIX}/include/X11/Xos_r.h ${X11ROOT_PREFIX}/include/X11/Xosdefs.h @@ -262,6 +266,19 @@ ${X11ROOT_PREFIX}/include/X11/cursorfont.h ${X11ROOT_PREFIX}/include/X11/extensions/MITMisc.h ${X11ROOT_PREFIX}/include/X11/extensions/Print.h ${X11ROOT_PREFIX}/include/X11/extensions/Printstr.h +${X11ROOT_PREFIX}/include/X11/extensions/Xcomposite.h +${X11ROOT_PREFIX}/include/X11/extensions/Xdamage.h +${X11ROOT_PREFIX}/include/X11/extensions/Xevie.h +${X11ROOT_PREFIX}/include/X11/extensions/Xeviestr.h +${X11ROOT_PREFIX}/include/X11/extensions/composite.h +${X11ROOT_PREFIX}/include/X11/extensions/compositeproto.h +${X11ROOT_PREFIX}/include/X11/extensions/damage.h +${X11ROOT_PREFIX}/include/X11/extensions/damageproto.h +${X11ROOT_PREFIX}/include/X11/extensions/damagewire.h +${X11ROOT_PREFIX}/include/X11/extensions/xevieplaceholder.h +${X11ROOT_PREFIX}/include/X11/extensions/xfixesproto.h +${X11ROOT_PREFIX}/include/X11/extensions/xfixeswire.h +${X11ROOT_PREFIX}/include/X11/extensions/Xfixes.h ${X11ROOT_PREFIX}/include/X11/extensions/XEVI.h ${X11ROOT_PREFIX}/include/X11/extensions/XEVIstr.h ${X11ROOT_PREFIX}/include/X11/extensions/XI.h @@ -303,9 +320,6 @@ ${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h ${X11ROOT_PREFIX}/include/X11/extensions/dpms.h ${X11ROOT_PREFIX}/include/X11/extensions/dpmsstr.h ${X11ROOT_PREFIX}/include/X11/extensions/extutil.h -${X11ROOT_PREFIX}/include/X11/extensions/fontcache.h -${X11ROOT_PREFIX}/include/X11/extensions/fontcacheP.h -${X11ROOT_PREFIX}/include/X11/extensions/fontcachstr.h ${X11ROOT_PREFIX}/include/X11/extensions/lbxbuf.h ${X11ROOT_PREFIX}/include/X11/extensions/lbxbufstr.h ${X11ROOT_PREFIX}/include/X11/extensions/lbxdeltastr.h @@ -359,12 +373,6 @@ ${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h ${X11ROOT_PREFIX}/include/X11/fonts/FS.h ${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h ${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/cconvversion.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcap.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconv.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconvP.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcommon.h -${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttversion.h ${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h ${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h ${X11ROOT_PREFIX}/include/X11/keysym.h @@ -372,6 +380,10 @@ ${X11ROOT_PREFIX}/include/X11/keysymdef.h ${X11ROOT_PREFIX}/include/X11/xpm.h ${X11ROOT_PREFIX}/include/xf86Optrec.h ${X11ROOT_PREFIX}/include/xf86Parser.h +${X11ROOT_PREFIX}/lib/pkgconfig/xcomposite.pc +${X11ROOT_PREFIX}/lib/pkgconfig/xdamage.pc +${X11ROOT_PREFIX}/lib/pkgconfig/xevie.pc +${X11ROOT_PREFIX}/lib/pkgconfig/xfixes.pc ${X11ROOT_PREFIX}/lib/X11/XErrorDB ${X11ROOT_PREFIX}/lib/X11/XKeysymDB ${X11ROOT_PREFIX}/lib/X11/Xcms.txt @@ -519,11 +531,8 @@ ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE -${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheChangeCacheSettings.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheSettings.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheStatistics.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryExtension.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xevie.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfixes.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX} @@ -562,5 +571,4 @@ ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSetAttributes.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfontcache.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX} diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end index f9a57aa6ddf..eda53d76537 100644 --- a/x11/xorg-libs/PLIST.common_end +++ b/x11/xorg-libs/PLIST.common_end @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2004/07/29 04:50:53 xtraeme Exp $ +@comment $NetBSD: PLIST.common_end,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ +@dirrm ${X11ROOT_PREFIX}/lib/pkgconfig @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW @@ -54,9 +55,10 @@ @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C @dirrm ${X11ROOT_PREFIX}/lib/X11/locale -@dirrm ${X11ROOT_PREFIX}/include/X11/fonts/codeconv @dirrm ${X11ROOT_PREFIX}/include/X11/fonts @dirrm ${X11ROOT_PREFIX}/include/X11/extensions +@dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil +@dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil @dirrm ${X11ROOT_PREFIX}/include/X11/Xmu @dirrm ${X11ROOT_PREFIX}/include/X11/Xaw @dirrm ${X11ROOT_PREFIX}/include/X11/SM diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk index 1f1e4db95df..ee2dc996401 100644 --- a/x11/xorg-libs/buildlink3.mk +++ b/x11/xorg-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/09/16 19:36:10 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 17:38:53 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+ @@ -18,8 +18,7 @@ BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES} .if !empty(XORG_LIBS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.7.0 -BUILDLINK_RECOMMENDED.xorg-libs+= xorg-libs>=6.7.0nb2 +BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.8.1 BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 24552b88dcc..cd842358275 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,25 +1,17 @@ -$NetBSD: distinfo,v 1.2 2004/09/16 19:36:10 minskim Exp $ +$NetBSD: distinfo,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ -SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b -Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes -SHA1 (X11R6.7.0-src2.tar.gz) = c043966761e84ce0a63c351f12291228fbf07d03 -Size (X11R6.7.0-src2.tar.gz) = 5739983 bytes -SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451 -Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes -SHA1 (patch-aa) = b890d02e360df4ea43df808f4a128d465b4f607c -SHA1 (patch-ab) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c +SHA1 (X11R6.8.1-src1.tar.gz) = 78d64a5ea4440699eefb6c7bf76f7b6ce3f2fb15 +Size (X11R6.8.1-src1.tar.gz) = 30573498 bytes +SHA1 (X11R6.8.1-src2.tar.gz) = 1fb1d8a47f4b0873d358f8dded21a92ec1d91995 +Size (X11R6.8.1-src2.tar.gz) = 5810902 bytes +SHA1 (X11R6.8.1-src3.tar.gz) = 8efe7a7b731eb5ea8aeaea63c4985d28b3514d16 +Size (X11R6.8.1-src3.tar.gz) = 10019766 bytes +SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1 SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee -SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d -SHA1 (patch-af) = 30618658577dd37b31191197cd2c156ff72e0d90 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e -SHA1 (patch-aj) = db9c5c632af1bc1398ba3761ee9ed2a2470a0a76 -SHA1 (patch-ak) = faefb423f2fd8d996a94a4828d9a637d47249d42 -SHA1 (patch-al) = 65a0e16cae97ad0970ef9e4eee2aaade3fea7b98 -SHA1 (patch-am) = b52649d74b8c6f0d946728c1d706c03860bbedf6 -SHA1 (patch-an) = b47bec52f41d846df82c6dfd9d7dadb12e630334 -SHA1 (patch-ao) = 9d6a0406f9a872063bdd2c6960585c61ddd4ee86 -SHA1 (patch-ap) = c5e1789afa5eeda9be795d78eca6a0c1692fff9a -SHA1 (patch-aq) = 1eb268c329b33ad9822d752638a8bde62dca4d92 +SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1 +SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22 +SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87 diff --git a/x11/xorg-libs/files/Wraphelp.c b/x11/xorg-libs/files/Wraphelp.c deleted file mode 100755 index 6231cc534d8..00000000000 --- a/x11/xorg-libs/files/Wraphelp.c +++ /dev/null @@ -1,409 +0,0 @@ -/* $NetBSD: Wraphelp.c,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */ - -/* Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - */ - -/* - * This program implements the - * Proposed Federal Information Processing - * Data Encryption Standard. - * See Federal Register, March 17, 1975 (40FR12134) - */ - -/* - * Initial permutation, - */ -static char IP[] = { - 58,50,42,34,26,18,10, 2, - 60,52,44,36,28,20,12, 4, - 62,54,46,38,30,22,14, 6, - 64,56,48,40,32,24,16, 8, - 57,49,41,33,25,17, 9, 1, - 59,51,43,35,27,19,11, 3, - 61,53,45,37,29,21,13, 5, - 63,55,47,39,31,23,15, 7, -}; - -/* - * Final permutation, FP = IP^(-1) - */ -static char FP[] = { - 40, 8,48,16,56,24,64,32, - 39, 7,47,15,55,23,63,31, - 38, 6,46,14,54,22,62,30, - 37, 5,45,13,53,21,61,29, - 36, 4,44,12,52,20,60,28, - 35, 3,43,11,51,19,59,27, - 34, 2,42,10,50,18,58,26, - 33, 1,41, 9,49,17,57,25, -}; - -/* - * Permuted-choice 1 from the key bits - * to yield C and D. - * Note that bits 8,16... are left out: - * They are intended for a parity check. - */ -static char PC1_C[] = { - 57,49,41,33,25,17, 9, - 1,58,50,42,34,26,18, - 10, 2,59,51,43,35,27, - 19,11, 3,60,52,44,36, -}; - -static char PC1_D[] = { - 63,55,47,39,31,23,15, - 7,62,54,46,38,30,22, - 14, 6,61,53,45,37,29, - 21,13, 5,28,20,12, 4, -}; - -/* - * Sequence of shifts used for the key schedule. -*/ -static char shifts[] = { - 1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1, -}; - -/* - * Permuted-choice 2, to pick out the bits from - * the CD array that generate the key schedule. - */ -static char PC2_C[] = { - 14,17,11,24, 1, 5, - 3,28,15, 6,21,10, - 23,19,12, 4,26, 8, - 16, 7,27,20,13, 2, -}; - -static char PC2_D[] = { - 41,52,31,37,47,55, - 30,40,51,45,33,48, - 44,49,39,56,34,53, - 46,42,50,36,29,32, -}; - -/* - * The C and D arrays used to calculate the key schedule. - */ - -static char C[28]; -static char D[28]; - -/* - * The key schedule. - * Generated from the key. - */ -static char KS[16][48]; - -/* - * The E bit-selection table. - */ -static char E[48]; -static char e[] = { - 32, 1, 2, 3, 4, 5, - 4, 5, 6, 7, 8, 9, - 8, 9,10,11,12,13, - 12,13,14,15,16,17, - 16,17,18,19,20,21, - 20,21,22,23,24,25, - 24,25,26,27,28,29, - 28,29,30,31,32, 1, -}; - -/* - * Set up the key schedule from the key. - */ - -static -setkey(key) -char *key; -{ - int i, j, k; - int t; - char *ptr; - - /* - * First, generate C and D by permuting - * the key. The low order bit of each - * 8-bit char is not used, so C and D are only 28 - * bits apiece. - */ - for (i=0; i<28; i++) { - C[i] = key[PC1_C[i]-1]; - D[i] = key[PC1_D[i]-1]; - } - /* - * To generate Ki, rotate C and D according - * to schedule and pick up a permutation - * using PC2. - */ - for (i=0; i<16; i++) { - /* - * rotate. - */ - for (k=0; k<shifts[i]; k++) { - t = C[0]; - ptr = C; - for (j=0; j<28-1; j++) - { - *ptr = ptr[1]; - ptr++; - } - C[27] = t; - t = D[0]; - ptr = D; - for (j=0; j<28-1; j++) - { - *ptr = ptr[1]; - ptr++; - } - D[27] = t; - } - /* - * get Ki. Note C and D are concatenated. - */ - ptr = &KS[i][0]; - for (j=0; j<24; j++) { - ptr[j] = C[PC2_C[j]-1]; - ptr[j+24] = D[PC2_D[j]-28-1]; - } - } - - for(i=0;i<48;i++) - E[i] = e[i]; -} - -/* - * The 8 selection functions. - * For some reason, they give a 0-origin - * index, unlike everything else. - */ -static char S[8][64] = { - 14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7, - 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8, - 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0, - 15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13, - - 15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10, - 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5, - 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15, - 13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9, - - 10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1, - 13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7, - 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12, - - 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15, - 13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9, - 10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4, - 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14, - - 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9, - 14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6, - 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14, - 11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3, - - 12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11, - 10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8, - 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6, - 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13, - - 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1, - 13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6, - 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2, - 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12, - - 13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7, - 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2, - 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8, - 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11, -}; - -/* - * P is a permutation on the selected combination - * of the current L and key. - */ -static char P[] = { - 16, 7,20,21, - 29,12,28,17, - 1,15,23,26, - 5,18,31,10, - 2, 8,24,14, - 32,27, 3, 9, - 19,13,30, 6, - 22,11, 4,25, -}; - -/* - * The current block, divided into 2 halves. - */ - -static char L[64]; -#define R (L + 32) -static char tempL[32]; -static char f[32]; - -/* - * The combination of the key and the input, before selection. - */ -static char preS[48]; - -/* - * The payoff: encrypt a block. - */ - -static -encrypt (block, edflag) -char *block; -{ - int i, ii; - register t, j, k; - - /* - * First, permute the bits in the input - */ - for (j=0; j<64; j++) - L[j] = block[IP[j]-1]; - /* - * Perform an encryption operation 16 times. - */ - for (ii=0; ii<16; ii++) { -/* print_bits ("L R", L); */ - /* - * Set direction - */ - if (edflag) - i = 15-ii; - else - i = ii; - /* - * Save the R array, - * which will be the new L. - */ - for (j=0; j<32; j++) - tempL[j] = R[j]; - /* - * Expand R to 48 bits using the E selector; - * exclusive-or with the current key bits. - */ - for (j=0; j<48; j++) - preS[j] = R[E[j]-1] ^ KS[i][j]; - /* - * The pre-select bits are now considered - * in 8 groups of 6 bits each. - * The 8 selection functions map these - * 6-bit quantities into 4-bit quantities - * and the results permuted - * to make an f(R, K). - * The indexing into the selection functions - * is peculiar; it could be simplified by - * rewriting the tables. - */ - for (j=0; j<8; j++) { - t = 6*j; - k = S[j][(preS[t+0]<<5)+ - (preS[t+1]<<3)+ - (preS[t+2]<<2)+ - (preS[t+3]<<1)+ - (preS[t+4]<<0)+ - (preS[t+5]<<4)]; - t = 4*j; - f[t+0] = (k>>3)&01; - f[t+1] = (k>>2)&01; - f[t+2] = (k>>1)&01; - f[t+3] = (k>>0)&01; - } - /* - * The new R is L ^ f(R, K). - * The f here has to be permuted first, though. - */ - for (j=0; j<32; j++) - R[j] = L[j] ^ f[P[j]-1]; - /* - * Finally, the new L (the original R) - * is copied back. - */ - for (j=0; j<32; j++) - L[j] = tempL[j]; - } - /* - * The output L and R are reversed. - */ - for (j=0; j<32; j++) { - t = L[j]; - L[j] = R[j]; - R[j] = t; - } - /* - * The final output - * gets the inverse permutation of the very original. - */ - for (j=0; j<64; j++) - block[j] = L[FP[j]-1]; -} - -static -bytes_to_bits (bytes, bits) - unsigned char *bytes; - char *bits; -{ - int bit, byte, value; - - for (byte = 0; byte < 8; byte++) - { - value = *bytes++; - for (bit = 0; bit < 8; bit++) - *bits++ = (value >> (7-bit)) & 1; - } -} - -static -bits_to_bytes (bits, bytes) - char *bits; - unsigned char *bytes; -{ - int bit, byte, value; - - for (byte = 0; byte < 8; byte++) - { - value = 0; - for (bit = 0; bit < 8; bit++) - value |= *bits++ << (7-bit); - *bytes++ = value; - } -} - -/* - * Interface compatible with Kerberos DES implementation - */ - -# include "Wrap.h" - -/*ARGSUSED*/ -_XdmcpAuthSetup (key, schedule) - auth_cblock key; - auth_wrapper_schedule schedule; -{ - char expand_key[64]; - - bytes_to_bits ((unsigned char *) key, expand_key); - setkey (expand_key); -} - -/*ARGSUSED*/ -_XdmcpAuthDoIt (input, output, schedule, edflag) - auth_cblock input, output; - auth_wrapper_schedule schedule; - int edflag; -{ - char expand_input[64]; - - bytes_to_bits ((unsigned char *) input, expand_input); - encrypt (expand_input, !edflag); - bits_to_bytes (expand_input, (unsigned char *) output); -} diff --git a/x11/xorg-libs/files/host.def b/x11/xorg-libs/files/host.def index 037a2a189d9..cb858e84dc6 100644 --- a/x11/xorg-libs/files/host.def +++ b/x11/xorg-libs/files/host.def @@ -1,9 +1,15 @@ -/* $NetBSD: host.def,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */ +/* $NetBSD: host.def,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define MakeCmd @MAKE@ + +/* To avoid stupid warnings on Linux */ + +#ifndef LinuxArchitecture #define HasGnuMake NO +#endif + #define ImakeCmd @IMAKE@ #define RmanCmd @RMAN@ #define HtmlIndexCmd @MKHTMLINDEX@ @@ -56,7 +62,6 @@ #define BuildFreetype2Library NO #define BuildFontconfigLibrary NO #define BuildXftLibrary NO -#define BuildXft1Library NO #define BuildRandRLibrary NO #define HasFreetype2 YES diff --git a/x11/xorg-libs/patches/patch-aa b/x11/xorg-libs/patches/patch-aa index 10dadac71f1..bf120249ea2 100644 --- a/x11/xorg-libs/patches/patch-aa +++ b/x11/xorg-libs/patches/patch-aa @@ -1,23 +1,28 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ---- config/cf/Library.tmpl.orig 2004-07-29 01:38:38.000000000 +0200 -+++ config/cf/Library.tmpl 2004-07-29 01:39:33.000000000 +0200 -@@ -389,6 +389,10 @@ +--- config/cf/Library.tmpl.orig 2004-09-10 07:47:27.000000000 +0200 ++++ config/cf/Library.tmpl 2004-09-10 07:48:58.000000000 +0200 +@@ -389,8 +389,10 @@ */ #ifndef MakeStringsDependency +-# ifndef UseInstalled +-# define MakeStringsDependency @@\ +#if defined(UseInstalled) || defined(UseInstalledPrograms) +#define MakeStringsDependency @@\ +MAKESTRS = @MAKESTRS@ +#else - # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -398,6 +402,7 @@ + @@\ +@@ -398,9 +400,7 @@ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ @@\ includes:: HostProgramTargetName($(MAKESTRS)) - #endif +-# else +-# define MakeStringsDependency /**/ +-# endif +#endif + #endif #ifndef ToolkitMakeStrings - # if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency diff --git a/x11/xorg-libs/patches/patch-ab b/x11/xorg-libs/patches/patch-ab deleted file mode 100644 index c022b4119a2..00000000000 --- a/x11/xorg-libs/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $ - ---- programs/Xserver/dix/main.c.orig 2003-07-07 01:39:11.000000000 +0000 -+++ programs/Xserver/dix/main.c 2003-07-07 01:43:07.000000000 +0000 -@@ -505,7 +505,7 @@ - /* Leave off the ridBase and ridMask, these must be sent with - connection */ - -- setup.release = VENDOR_RELEASE; -+ setup.release = NULL; - /* - * per-server image and bitmap parameters are defined in Xmd.h - */ diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad deleted file mode 100644 index cc769423f6d..00000000000 --- a/x11/xorg-libs/patches/patch-ad +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ - ---- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 -+++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 -@@ -190,11 +190,11 @@ - # define CcCmd $(CLIENTENVSETUP) cc - # define CplusplusCmd $(CLIENTENVSETUP) c++ - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - #endif - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -207,7 +207,7 @@ - #else - #define NoSystemWarn - #endif --#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ -+#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ - GccWarningOptions - #endif - #endif -@@ -439,18 +439,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - - #ifndef PreIncDir - # define PreIncDir /usr/include -@@ -476,7 +466,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/xorg-libs/patches/patch-af b/x11/xorg-libs/patches/patch-af deleted file mode 100644 index ac0432fe498..00000000000 --- a/x11/xorg-libs/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ - -http://www.mail-archive.com/devel@xfree86.org/msg04688.html - ---- ./lib/XvMC/hw/i810/Imakefile.orig 2002-10-30 10:42:57.000000000 -0800 -+++ ./lib/XvMC/hw/i810/Imakefile -@@ -20,7 +20,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL - DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0 - INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \ - -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \ -- -I$(XF86DRIVERSRC)/i810 -+ -I$(XF86DRIVERSRC)/i810 -I$(XF86OSSRC)/shared/drm/kernel - SRCS = I810XvMC.c - OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o - LINTLIBS = $(LINTXLIB) diff --git a/x11/xorg-libs/patches/patch-aj b/x11/xorg-libs/patches/patch-aj index 26db6bbdc50..49e42ec442a 100644 --- a/x11/xorg-libs/patches/patch-aj +++ b/x11/xorg-libs/patches/patch-aj @@ -1,53 +1,13 @@ -$NetBSD: patch-aj,v 1.1 2004/09/16 19:36:10 minskim Exp $ +$NetBSD: patch-aj,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ---- extras/Xpm/lib/create.c.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/create.c -@@ -816,6 +816,9 @@ XpmCreateImageFromXpmImage(display, imag - - ErrorStatus = XpmSuccess; - -+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return (XpmNoMemory); -+ - /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -988,6 +991,8 @@ CreateXImage(display, visual, depth, for - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ return XpmNoMemory; - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -2055,6 +2060,9 @@ xpmParseDataAndCreate(display, data, ima - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -+ if (ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return XpmNoMemory; -+ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2309,7 +2317,8 @@ ParseAndPutPixels( - } - obm = SelectObject(*dc, image->bitmap); +--- programs/x11perf/Imakefile.orig 2004-09-10 09:44:07.000000000 +0200 ++++ programs/x11perf/Imakefile 2004-09-10 09:44:19.000000000 +0200 +@@ -12,7 +12,7 @@ + #if HasShm + SHMDEFS = -DMITSHM #endif -- -+ if (ncolors > 256) -+ return (XpmFileInvalid); - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -2415,6 +2424,9 @@ if (cidx[f]) XpmFree(cidx[f]);} - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; +-#if BuildRenderLibrary ++#if 0 + XRENDERDEFS = -DXRENDER + XRENDERDEPS = $(DEPXRENDERLIB) + XRENDERLIBS = $(XRENDERLIB) diff --git a/x11/xorg-libs/patches/patch-ak b/x11/xorg-libs/patches/patch-ak index 4bdaef1a838..391c16fd8ae 100644 --- a/x11/xorg-libs/patches/patch-ak +++ b/x11/xorg-libs/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.1 2004/09/16 19:36:10 minskim Exp $ +$NetBSD: patch-ak,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ---- extras/Xpm/lib/data.c.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/data.c -@@ -375,7 +375,7 @@ xpmGetCmt(data, cmt) - { - if (!data->type) - *cmt = NULL; -- else if (data->CommentLength) { -+ else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(data->CommentLength + 1); - strncpy(*cmt, data->Comment, data->CommentLength); - (*cmt)[data->CommentLength] = '\0'; +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2004-09-14 10:59:24.000000000 +0200 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-09-14 11:00:01.000000000 +0200 +@@ -128,7 +128,7 @@ + #endif + + LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ +- $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ ++ $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \ + $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \ + $(XLIB) $(CURSESLIB) RegexLibrary -lm + diff --git a/x11/xorg-libs/patches/patch-al b/x11/xorg-libs/patches/patch-al index aeaf66d48bd..84f9a08769d 100644 --- a/x11/xorg-libs/patches/patch-al +++ b/x11/xorg-libs/patches/patch-al @@ -1,31 +1,25 @@ -$NetBSD: patch-al,v 1.1 2004/09/16 19:36:10 minskim Exp $ +$NetBSD: patch-al,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ ---- extras/Xpm/lib/hashtab.c.orig 2003-11-14 10:48:24.000000000 -0600 -+++ extras/Xpm/lib/hashtab.c -@@ -135,7 +135,7 @@ HashTableGrows(table) - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; - int oldSize = size; -@@ -144,6 +144,8 @@ HashTableGrows(table) - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -+ if (size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -@@ -204,6 +206,8 @@ xpmHashTableInit(table) - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -+ if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); +Workaround to make this build on Linux, I think the error is related +to buildlink. + +--- programs/Xserver/hw/dmx/dmxinit.c.orig 2004-09-16 15:20:43.000000000 +0200 ++++ programs/Xserver/hw/dmx/dmxinit.c 2004-09-16 15:21:21.000000000 +0200 +@@ -573,7 +573,7 @@ + #endif + + if (dmxGeneration != serverGeneration) { +- int vendrel = VENDOR_RELEASE; ++ int vendrel = NULL; + int major, minor, year, month, day; + + dmxGeneration = serverGeneration; +@@ -595,7 +595,7 @@ + dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d (%s)\n", + major, minor, year, month, day, VENDOR_STRING); + +- SetVendorRelease(VENDOR_RELEASE); ++ SetVendorRelease(NULL); + SetVendorString(VENDOR_STRING); + + if (dmxGeneration == 1) { diff --git a/x11/xorg-libs/patches/patch-am b/x11/xorg-libs/patches/patch-am deleted file mode 100644 index abc71ee7358..00000000000 --- a/x11/xorg-libs/patches/patch-am +++ /dev/null @@ -1,179 +0,0 @@ -$NetBSD: patch-am,v 1.1 2004/09/16 19:36:10 minskim Exp $ - ---- extras/Xpm/lib/parse.c.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/parse.c -@@ -44,6 +44,24 @@ - #include <ctype.h> - #include <string.h> - -+#ifdef HAS_STRLCAT -+# define STRLCAT(dst, src, dstsize) { \ -+ if (strlcat(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+#else -+# define STRLCAT(dst, src, dstsize) { \ -+ if ((strlen(dst) + strlen(src)) < (dstsize)) \ -+ strcat(dst, src); \ -+ else return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlen(src) < (dstsize)) \ -+ strcpy(dst, src); \ -+ else return (XpmFileInvalid); } -+#endif -+ - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, - unsigned int cpp, XpmColor *colorTable, -@@ -66,7 +84,7 @@ xpmParseValues(data, width, height, ncol - unsigned int *extensions; - { - unsigned int l; -- char buf[BUFSIZ]; -+ char buf[BUFSIZ + 1]; - - if (!data->format) { /* XPM 2 or 3 */ - -@@ -175,10 +193,10 @@ xpmParseColors(data, ncolors, cpp, color - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key = 0, l, a, b; -+ unsigned int key = 0, l, a, b, len; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1]; - char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; - XpmColor *color; -@@ -186,6 +204,8 @@ xpmParseColors(data, ncolors, cpp, color - char **defaults; - int ErrorStatus; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -197,6 +217,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -234,13 +258,14 @@ xpmParseColors(data, ncolors, cpp, color - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -251,9 +276,9 @@ xpmParseColors(data, ncolors, cpp, color - return (XpmFileInvalid); - } - if (!lastwaskey) -- strcat(curbuf, " "); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf);/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ - lastwaskey = 0; - } - } -@@ -261,12 +286,13 @@ xpmParseColors(data, ncolors, cpp, color - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -279,6 +305,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -307,16 +337,17 @@ xpmParseColors(data, ncolors, cpp, color - *curbuf = '\0'; /* init curbuf */ - while ((l = xpmNextWord(data, buf, BUFSIZ))) { - if (*curbuf != '\0') -- strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - } -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -341,6 +372,9 @@ ParsePixels(data, width, height, ncolors - unsigned int *iptr, *iptr2; - unsigned int a, x, y; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); - #else -@@ -364,6 +398,9 @@ ParsePixels(data, width, height, ncolors - { - unsigned short colidx[256]; - -+ if (ncolors > 256) -+ return (XpmFileInvalid); -+ - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -442,6 +479,9 @@ if (cidx[f]) XpmFree(cidx[f]);} - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; diff --git a/x11/xorg-libs/patches/patch-an b/x11/xorg-libs/patches/patch-an deleted file mode 100644 index e0007f30609..00000000000 --- a/x11/xorg-libs/patches/patch-an +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-an,v 1.1 2004/09/16 19:36:10 minskim Exp $ - ---- extras/Xpm/lib/scan.c.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/scan.c -@@ -107,7 +107,8 @@ LFUNC(MSWGetImagePixels, int, (Display * - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -+ unsigned int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -232,11 +233,17 @@ XpmCreateXpmImageFromImage(display, imag - else - cpp = 0; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -+ if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -302,6 +309,8 @@ XpmCreateXpmImageFromImage(display, imag - * color - */ - -+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) - RETURN(XpmNoMemory); -@@ -360,6 +369,8 @@ ScanTransparentColor(color, cpp, attribu - - /* first get a character string */ - a = 0; -+ if (cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); - *s++ = printable[c = a % MAXPRINTABLE]; -@@ -407,7 +418,7 @@ static int - ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) - Display *display; - XpmColor *colors; -- int ncolors; -+ unsigned int ncolors; - Pixel *pixels; - unsigned int mask; - unsigned int cpp; -@@ -451,6 +462,8 @@ ScanOtherColors(display, colors, ncolors - } - - /* first get character strings and rgb values */ -+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); diff --git a/x11/xorg-libs/patches/patch-ao b/x11/xorg-libs/patches/patch-ao deleted file mode 100644 index 9fa35c79448..00000000000 --- a/x11/xorg-libs/patches/patch-ao +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2004/09/16 19:36:10 minskim Exp $ - ---- extras/Xpm/lib/Attrib.c.orig 2003-11-14 10:48:24.000000000 -0600 -+++ extras/Xpm/lib/Attrib.c -@@ -35,7 +35,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -46,12 +46,15 @@ LFUNC(FreeOldColorTable, void, (XpmColor - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; -+ - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { - *oldct = NULL; diff --git a/x11/xorg-libs/patches/patch-ap b/x11/xorg-libs/patches/patch-ap deleted file mode 100644 index 60569192079..00000000000 --- a/x11/xorg-libs/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2004/09/16 19:36:10 minskim Exp $ - ---- extras/Xpm/lib/CrDatFrI.c.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/CrDatFrI.c -@@ -124,6 +124,8 @@ XpmCreateDataFromXpmImage(data_return, i - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -+ if (header_size >= SIZE_MAX / sizeof(char *)) -+ return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); diff --git a/x11/xorg-libs/patches/patch-aq b/x11/xorg-libs/patches/patch-aq deleted file mode 100644 index 1c6c8e1cb57..00000000000 --- a/x11/xorg-libs/patches/patch-aq +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2004/09/16 19:36:10 minskim Exp $ - ---- extras/Xpm/lib/XpmI.h.orig 2004-03-04 11:46:10.000000000 -0600 -+++ extras/Xpm/lib/XpmI.h -@@ -86,6 +86,18 @@ extern FILE *popen(); - boundCheckingCalloc((long)(nelem),(long) (elsize)) - #endif - -+#if defined(SCO) || defined(__USLC__) -+#include <stdint.h> /* For SIZE_MAX */ -+#endif -+#include <limits.h> -+#ifndef SIZE_MAX -+# ifdef ULONG_MAX -+# define SIZE_MAX ULONG_MAX -+# else -+# define SIZE_MAX UINT_MAX -+# endif -+#endif -+ - #define XPMMAXCMTLEN BUFSIZ - typedef struct { - unsigned int type; -@@ -187,9 +199,9 @@ typedef struct _xpmHashAtom { - } *xpmHashAtom; - - typedef struct { -- int size; -- int limit; -- int used; -+ unsigned int size; -+ unsigned int limit; -+ unsigned int used; - xpmHashAtom *atomTable; - } xpmHashTable; - diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index c30f74979ab..c96ee381b43 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2004/08/11 15:36:36 recht Exp $ +# $NetBSD: Makefile,v 1.7 2004/09/21 17:38:53 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz +DISTFILES= X11R${XORG_VER}-src1.tar.gz \ + X11R${XORG_VER}-src2.tar.gz \ + X11R${XORG_VER}-src3.tar.gz MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ @@ -19,8 +20,8 @@ PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau \ programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font/FreeType lib/font/X-TrueType \ - lib/font/Speedo lib/font/Type1 \ +XINSTALL_DIRS= lib/font/FreeType \ + lib/font/Type1 \ lib/font/bitmap programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver @@ -50,6 +51,10 @@ USE_PERL5= build # Yeah, we need this :-) post-install: ${CHMOD} a+r ${X11ROOT}/bin/Xorg +.if ${OPSYS} == "Linux" +. include "../../x11/Xrender/buildlink3.mk" +.endif + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/xorg/Makefile.common" diff --git a/x11/xorg-server/PLIST.Linux b/x11/xorg-server/PLIST.Linux index 7be2eed9eb7..6c7e123ab53 100644 --- a/x11/xorg-server/PLIST.Linux +++ b/x11/xorg-server/PLIST.Linux @@ -1,96 +1,25 @@ -@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/07/29 04:52:40 xtraeme Exp $ +@comment $NetBSD: PLIST.Linux,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/fonts +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/fonts +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/fonts +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/model-config +${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o +${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a ${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o ${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o ${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o ${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a ${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a ${X11ROOT_PREFIX}/lib/modules/linux/libint10.a -${X11ROOT_PREFIX}/man/man4/aiptek.4 -${X11ROOT_PREFIX}/man/man4/ur98.4 -${X11ROOT_PREFIX}/man/man4/v4l.4 -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drmP.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_agpsupport.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_auth.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_bufs.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_context.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_dma.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drawable.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_fops.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_init.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_ioctl.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_irq.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_lock.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory_debug.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_os_linux.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_proc.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_sarea.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_scatter.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_stub.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_vm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_context.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lists.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lock.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_old_dma.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_dma.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/i810.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_dma.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_dma.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_irq.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/ati_pcigart.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_cce.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_irq.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_state.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_cp.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_irq.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_mem.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_state.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_mm.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drm.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_ucode.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_dma.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_irq.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_state.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_warp.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx.h -${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx_drv.c -${X11ROOT_PREFIX}/src/linux/drm/kernel/Config.in -${X11ROOT_PREFIX}/src/linux/drm/kernel/Kconfig -${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.linux -${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.kernel -${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile -@dirrm ${X11ROOT_PREFIX}/src/linux/drm/kernel -@dirrm ${X11ROOT_PREFIX}/src/linux/drm -@dirrm ${X11ROOT_PREFIX}/src/linux -@dirrm ${X11ROOT_PREFIX}/src +${X11ROOT_PREFIX}/${KERNMAN_DIR}/aiptek.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/ur98.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX} +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS +@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers/linux +@dirrm ${X11ROOT_PREFIX}/lib/modules/input/linux @dirrm ${X11ROOT_PREFIX}/lib/modules/linux diff --git a/x11/xorg-server/PLIST.common b/x11/xorg-server/PLIST.common index f83cd063bc8..11112376d53 100644 --- a/x11/xorg-server/PLIST.common +++ b/x11/xorg-server/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.2 2004/08/11 15:36:36 recht Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ ${X11ROOT_PREFIX}/bin/X ${X11ROOT_PREFIX}/bin/XFree86 ${X11ROOT_PREFIX}/bin/Xnest @@ -21,6 +21,7 @@ ${X11ROOT_PREFIX}/bin/pcitweak ${X11ROOT_PREFIX}/bin/scanpci ${X11ROOT_PREFIX}/bin/xorgcfg ${X11ROOT_PREFIX}/bin/xorgconfig +${X11ROOT_PREFIX}/etc/init.d/xprint ${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm ${X11ROOT_PREFIX}/include/X11/bitmaps/down.xbm ${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard.xbm @@ -40,19 +41,23 @@ ${X11ROOT_PREFIX}/include/X11/pixmaps/monitor.xpm ${X11ROOT_PREFIX}/include/X11/pixmaps/mouse.xpm ${X11ROOT_PREFIX}/lib/X11/Cards ${X11ROOT_PREFIX}/lib/X11/Options -${X11ROOT_PREFIX}/lib/X11/XF86Config.98 -${X11ROOT_PREFIX}/lib/X11/XF86Config.eg -${X11ROOT_PREFIX}/lib/X11/XF86Config.indy ${X11ROOT_PREFIX}/lib/X11/app-defaults/XOrgCfg ${X11ROOT_PREFIX}/lib/X11/doc/BUILD ${X11ROOT_PREFIX}/lib/X11/doc/BugReport ${X11ROOT_PREFIX}/lib/X11/doc/DESIGN ${X11ROOT_PREFIX}/lib/X11/doc/Install ${X11ROOT_PREFIX}/lib/X11/doc/LICENSE +${X11ROOT_PREFIX}/lib/X11/doc/OS2.Notes ${X11ROOT_PREFIX}/lib/X11/doc/README ${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga +${X11ROOT_PREFIX}/lib/X11/doc/README.Darwin ${X11ROOT_PREFIX}/lib/X11/doc/README.I128 +${X11ROOT_PREFIX}/lib/X11/doc/README.LynxOS +${X11ROOT_PREFIX}/lib/X11/doc/README.NetBSD +${X11ROOT_PREFIX}/lib/X11/doc/README.OpenBSD +${X11ROOT_PREFIX}/lib/X11/doc/README.SCO ${X11ROOT_PREFIX}/lib/X11/doc/README.SiS +${X11ROOT_PREFIX}/lib/X11/doc/README.Solaris ${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Config ${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Enhancing ${X11ROOT_PREFIX}/lib/X11/doc/README.apm @@ -76,39 +81,872 @@ ${X11ROOT_PREFIX}/lib/X11/etc/Xinstall.sh ${X11ROOT_PREFIX}/lib/X11/etc/xmodmap.std ${X11ROOT_PREFIX}/lib/X11/getconfig/cfg.sample ${X11ROOT_PREFIX}/lib/X11/getconfig/xorg.cfg +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/Xprinters +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes/document +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes/job +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes/printer +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config/raster/pcl +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config/raster/postscript +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-DemiItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Light.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-LightItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Symbol.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00054.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00055.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00056.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00057.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00058.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00059.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00060.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00061.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00062.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00063.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00064.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00065.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00066.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00067.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00068.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00069.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00070.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00071.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00072.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00073.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00074.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00075.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00076.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00077.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00079.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00080.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00081.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00082.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00083.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00084.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00085.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00086.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00087.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00088.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00089.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00090.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00091.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00092.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00093.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00094.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/README +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.alias +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-DemiItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Light.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-LightItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Symbol.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00053.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00054.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00055.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00056.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00057.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00058.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00059.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00060.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00061.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00062.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00063.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00064.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00065.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00066.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00067.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00068.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00069.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00070.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00071.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00072.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00073.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00074.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00075.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00076.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00077.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00079.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00080.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00081.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00082.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00083.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00084.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00085.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00086.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00087.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00088.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00089.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00090.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00091.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00092.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00093.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00094.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/README +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Courier.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Light.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Symbol.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir/fonts +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Symbol.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf +${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/model-config +${X11ROOT_PREFIX}/lib/X11/xserver/POSIX +${X11ROOT_PREFIX}/lib/X11/xserver/README ${X11ROOT_PREFIX}/lib/X11/xserver/SecurityPolicy -${X11ROOT_PREFIX}/lib/modules/codeconv/libARABIC.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libARMSCII8.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5HKSCS.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libDOSENCODING.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libGB18030.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libGB2312.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libGBK.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libGEORGIAN.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_1.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_10.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_11.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_13.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_14.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_15.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_2.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_3.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_4.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_5.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_6.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_7.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_8.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_9.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0201.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0208.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0212.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libKOI8.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libKSC5601.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libKSCJOHAB.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libMULEENCODING.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libTCVN.a -${X11ROOT_PREFIX}/lib/modules/codeconv/libVISCII.a +${X11ROOT_PREFIX}/lib/X11/xserver/af_ZA +${X11ROOT_PREFIX}/lib/X11/xserver/af_ZA.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/ar +${X11ROOT_PREFIX}/lib/X11/xserver/ar_AE +${X11ROOT_PREFIX}/lib/X11/xserver/ar_AE.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_AE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_BH +${X11ROOT_PREFIX}/lib/X11/xserver/ar_BH.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_BH.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_DZ +${X11ROOT_PREFIX}/lib/X11/xserver/ar_DZ.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_DZ.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_EG +${X11ROOT_PREFIX}/lib/X11/xserver/ar_EG.ISO8859-6 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_EG.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_EG.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_EG.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_IQ +${X11ROOT_PREFIX}/lib/X11/xserver/ar_IQ.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_IQ.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_JO +${X11ROOT_PREFIX}/lib/X11/xserver/ar_JO.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_JO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_KW +${X11ROOT_PREFIX}/lib/X11/xserver/ar_KW.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_KW.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LB +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LB.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LB.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LY +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LY.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_LY.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_MA +${X11ROOT_PREFIX}/lib/X11/xserver/ar_MA.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_MA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_OM +${X11ROOT_PREFIX}/lib/X11/xserver/ar_OM.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_OM.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_QA +${X11ROOT_PREFIX}/lib/X11/xserver/ar_QA.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_QA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SA +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SA.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SD +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SD.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SD.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SY +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SY.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_SY.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_TN +${X11ROOT_PREFIX}/lib/X11/xserver/ar_TN.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_TN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_YE +${X11ROOT_PREFIX}/lib/X11/xserver/ar_YE.iso88596 +${X11ROOT_PREFIX}/lib/X11/xserver/ar_YE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/be_BY +${X11ROOT_PREFIX}/lib/X11/xserver/be_BY.cp1251 +${X11ROOT_PREFIX}/lib/X11/xserver/be_BY.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG +${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.cp1251 +${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/bokmal +${X11ROOT_PREFIX}/lib/X11/xserver/br_FR +${X11ROOT_PREFIX}/lib/X11/xserver/br_FR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA +${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/ca +${X11ROOT_PREFIX}/lib/X11/xserver/ca.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/ca.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ca_ES@euro +${X11ROOT_PREFIX}/lib/X11/xserver/catalan +${X11ROOT_PREFIX}/lib/X11/xserver/croatian +${X11ROOT_PREFIX}/lib/X11/xserver/cs_CZ +${X11ROOT_PREFIX}/lib/X11/xserver/cs_CZ.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/cs_CZ.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/cs_CZ.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/cy_GB +${X11ROOT_PREFIX}/lib/X11/xserver/cy_GB.iso885914 +${X11ROOT_PREFIX}/lib/X11/xserver/cz +${X11ROOT_PREFIX}/lib/X11/xserver/cz.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/czech +${X11ROOT_PREFIX}/lib/X11/xserver/da +${X11ROOT_PREFIX}/lib/X11/xserver/da.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/da.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK.iso885915 +${X11ROOT_PREFIX}/lib/X11/xserver/da_DK.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/danish +${X11ROOT_PREFIX}/lib/X11/xserver/dansk +${X11ROOT_PREFIX}/lib/X11/xserver/de +${X11ROOT_PREFIX}/lib/X11/xserver/de.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/de.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/de.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_AT@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_BE +${X11ROOT_PREFIX}/lib/X11/xserver/de_BE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/de_BE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_BE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_CH +${X11ROOT_PREFIX}/lib/X11/xserver/de_CH.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/de_CH.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/de_CH.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_DE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_LU +${X11ROOT_PREFIX}/lib/X11/xserver/de_LU.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/de_LU.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/de_LU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/de_LU@euro +${X11ROOT_PREFIX}/lib/X11/xserver/deutsch +${X11ROOT_PREFIX}/lib/X11/xserver/el_GR +${X11ROOT_PREFIX}/lib/X11/xserver/el_GR.ISO8859-7 +${X11ROOT_PREFIX}/lib/X11/xserver/el_GR.ISO8859-7@euro +${X11ROOT_PREFIX}/lib/X11/xserver/el_GR.iso88597 +${X11ROOT_PREFIX}/lib/X11/xserver/el_GR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_AU +${X11ROOT_PREFIX}/lib/X11/xserver/en_AU.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_AU.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_AU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_BW +${X11ROOT_PREFIX}/lib/X11/xserver/en_BW.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_CA +${X11ROOT_PREFIX}/lib/X11/xserver/en_CA.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_CA.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_CA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_DK +${X11ROOT_PREFIX}/lib/X11/xserver/en_DK.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB.iso885915 +${X11ROOT_PREFIX}/lib/X11/xserver/en_GB.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_HK +${X11ROOT_PREFIX}/lib/X11/xserver/en_HK.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_IE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/en_IN +${X11ROOT_PREFIX}/lib/X11/xserver/en_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_NZ +${X11ROOT_PREFIX}/lib/X11/xserver/en_NZ.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_NZ.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_NZ.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_PH +${X11ROOT_PREFIX}/lib/X11/xserver/en_PH.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_SG +${X11ROOT_PREFIX}/lib/X11/xserver/en_SG.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.iso885915 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/Xprinters +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes/document +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes/job +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes/printer +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/ddx-config +${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/models +${X11ROOT_PREFIX}/lib/X11/xserver/en_ZA +${X11ROOT_PREFIX}/lib/X11/xserver/en_ZA.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/en_ZA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/en_ZW +${X11ROOT_PREFIX}/lib/X11/xserver/en_ZW.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_AR +${X11ROOT_PREFIX}/lib/X11/xserver/es_AR.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_AR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_AR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_BO +${X11ROOT_PREFIX}/lib/X11/xserver/es_BO.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_BO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_BO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CL +${X11ROOT_PREFIX}/lib/X11/xserver/es_CL.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CL.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CO +${X11ROOT_PREFIX}/lib/X11/xserver/es_CO.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CR +${X11ROOT_PREFIX}/lib/X11/xserver/es_CR.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_CR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_DO +${X11ROOT_PREFIX}/lib/X11/xserver/es_DO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_DO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_EC +${X11ROOT_PREFIX}/lib/X11/xserver/es_EC.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_EC.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_EC.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_ES@euro +${X11ROOT_PREFIX}/lib/X11/xserver/es_GT +${X11ROOT_PREFIX}/lib/X11/xserver/es_GT.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_GT.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_GT.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_HN +${X11ROOT_PREFIX}/lib/X11/xserver/es_HN.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_HN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_MX +${X11ROOT_PREFIX}/lib/X11/xserver/es_MX.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_MX.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_MX.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_NI +${X11ROOT_PREFIX}/lib/X11/xserver/es_NI.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_NI.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_NI.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PA +${X11ROOT_PREFIX}/lib/X11/xserver/es_PA.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PA.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PE +${X11ROOT_PREFIX}/lib/X11/xserver/es_PE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PR +${X11ROOT_PREFIX}/lib/X11/xserver/es_PR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PY +${X11ROOT_PREFIX}/lib/X11/xserver/es_PY.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PY.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_PY.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_SV +${X11ROOT_PREFIX}/lib/X11/xserver/es_SV.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_SV.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_SV.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_US +${X11ROOT_PREFIX}/lib/X11/xserver/es_US.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_UY +${X11ROOT_PREFIX}/lib/X11/xserver/es_UY.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_UY.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_UY.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/es_VE +${X11ROOT_PREFIX}/lib/X11/xserver/es_VE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/es_VE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/es_VE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/et_EE +${X11ROOT_PREFIX}/lib/X11/xserver/et_EE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/et_EE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/et_EE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/eu_ES +${X11ROOT_PREFIX}/lib/X11/xserver/eu_ES.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/eu_ES.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/eu_ES@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fa_IR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fi_FI@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fo_FO +${X11ROOT_PREFIX}/lib/X11/xserver/fo_FO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fo_FO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_BE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CA +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CA.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CA.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CH +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CH.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CH.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_CH.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_FR@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fr_LU +${X11ROOT_PREFIX}/lib/X11/xserver/fr_LU.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_LU.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/fr_LU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/fr_LU@euro +${X11ROOT_PREFIX}/lib/X11/xserver/ga_IE +${X11ROOT_PREFIX}/lib/X11/xserver/ga_IE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/ga_IE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/ga_IE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ga_IE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES +${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES@euro +${X11ROOT_PREFIX}/lib/X11/xserver/gv_GB +${X11ROOT_PREFIX}/lib/X11/xserver/gv_GB.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/he +${X11ROOT_PREFIX}/lib/X11/xserver/he_IL +${X11ROOT_PREFIX}/lib/X11/xserver/he_IL.ISO8859-8 +${X11ROOT_PREFIX}/lib/X11/xserver/he_IL.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/he_IL.iso88598 +${X11ROOT_PREFIX}/lib/X11/xserver/he_IL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/hebrew +${X11ROOT_PREFIX}/lib/X11/xserver/hi_IN.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/hi_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/hr_HR +${X11ROOT_PREFIX}/lib/X11/xserver/hr_HR.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/hr_HR.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/hr_HR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/hu_HU +${X11ROOT_PREFIX}/lib/X11/xserver/hu_HU.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/hu_HU.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/hu_HU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/id_ID +${X11ROOT_PREFIX}/lib/X11/xserver/id_ID.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/id_ID.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/is_IS +${X11ROOT_PREFIX}/lib/X11/xserver/is_IS.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/is_IS.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/is_IS.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/it +${X11ROOT_PREFIX}/lib/X11/xserver/it.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/it.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/it.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/it_CH +${X11ROOT_PREFIX}/lib/X11/xserver/it_CH.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/it_CH.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/it_IT@euro +${X11ROOT_PREFIX}/lib/X11/xserver/italian +${X11ROOT_PREFIX}/lib/X11/xserver/iw_IL +${X11ROOT_PREFIX}/lib/X11/xserver/iw_IL.iso88598 +${X11ROOT_PREFIX}/lib/X11/xserver/ja +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.EUC +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.PCK +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.eucJP +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.eucjp +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.sjis +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.ujis +${X11ROOT_PREFIX}/lib/X11/xserver/ja_JP.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/japan +${X11ROOT_PREFIX}/lib/X11/xserver/japanese +${X11ROOT_PREFIX}/lib/X11/xserver/japanese.euc +${X11ROOT_PREFIX}/lib/X11/xserver/japanese.sjis +${X11ROOT_PREFIX}/lib/X11/xserver/ka_GE +${X11ROOT_PREFIX}/lib/X11/xserver/ka_GE.georgianps +${X11ROOT_PREFIX}/lib/X11/xserver/kl_GL +${X11ROOT_PREFIX}/lib/X11/xserver/kl_GL.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/kl_GL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ko +${X11ROOT_PREFIX}/lib/X11/xserver/ko.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.EUC +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.EUC@dict +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.UTF-8@dict +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.euckr +${X11ROOT_PREFIX}/lib/X11/xserver/ko_KR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/korean +${X11ROOT_PREFIX}/lib/X11/xserver/korean.euc +${X11ROOT_PREFIX}/lib/X11/xserver/kw_GB +${X11ROOT_PREFIX}/lib/X11/xserver/kw_GB.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/lithuanian +${X11ROOT_PREFIX}/lib/X11/xserver/lt +${X11ROOT_PREFIX}/lib/X11/xserver/lt.ISO8859-13 +${X11ROOT_PREFIX}/lib/X11/xserver/lt_LT +${X11ROOT_PREFIX}/lib/X11/xserver/lt_LT.ISO8859-13 +${X11ROOT_PREFIX}/lib/X11/xserver/lt_LT.iso885913 +${X11ROOT_PREFIX}/lib/X11/xserver/lt_LT.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/lv +${X11ROOT_PREFIX}/lib/X11/xserver/lv.ISO8859-13 +${X11ROOT_PREFIX}/lib/X11/xserver/lv_LV +${X11ROOT_PREFIX}/lib/X11/xserver/lv_LV.ISO8859-13 +${X11ROOT_PREFIX}/lib/X11/xserver/lv_LV.iso885913 +${X11ROOT_PREFIX}/lib/X11/xserver/lv_LV.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/mi_NZ +${X11ROOT_PREFIX}/lib/X11/xserver/mi_NZ.iso885913 +${X11ROOT_PREFIX}/lib/X11/xserver/mk_MK +${X11ROOT_PREFIX}/lib/X11/xserver/mk_MK.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/mk_MK.iso88595 +${X11ROOT_PREFIX}/lib/X11/xserver/mk_MK.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/mr_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ms_MY +${X11ROOT_PREFIX}/lib/X11/xserver/ms_MY.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/mt_MT +${X11ROOT_PREFIX}/lib/X11/xserver/mt_MT.iso88593 +${X11ROOT_PREFIX}/lib/X11/xserver/nb_NO +${X11ROOT_PREFIX}/lib/X11/xserver/nb_NO.ISO-8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/nl +${X11ROOT_PREFIX}/lib/X11/xserver/nl.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/nl.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_BE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/nl_NL@euro +${X11ROOT_PREFIX}/lib/X11/xserver/nn_NO +${X11ROOT_PREFIX}/lib/X11/xserver/nn_NO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/no +${X11ROOT_PREFIX}/lib/X11/xserver/no.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/no_NO +${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.ISO8859-1@bokmal +${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.ISO8859-1@nynorsk +${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/norwegian +${X11ROOT_PREFIX}/lib/X11/xserver/oc_FR +${X11ROOT_PREFIX}/lib/X11/xserver/oc_FR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL +${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/polish +${X11ROOT_PREFIX}/lib/X11/xserver/portuguese +${X11ROOT_PREFIX}/lib/X11/xserver/pt +${X11ROOT_PREFIX}/lib/X11/xserver/pt.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/pt.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR +${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT@euro +${X11ROOT_PREFIX}/lib/X11/xserver/ro_RO +${X11ROOT_PREFIX}/lib/X11/xserver/ro_RO.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/ro_RO.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/ro_RO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/romanian +${X11ROOT_PREFIX}/lib/X11/xserver/ru +${X11ROOT_PREFIX}/lib/X11/xserver/ru.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/ru.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ru.ansi1251 +${X11ROOT_PREFIX}/lib/X11/xserver/ru.koi8-r +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.ANSI1251 +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.KOI8-R +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.iso88595 +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.koi8r +${X11ROOT_PREFIX}/lib/X11/xserver/ru_RU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ru_SU +${X11ROOT_PREFIX}/lib/X11/xserver/ru_UA +${X11ROOT_PREFIX}/lib/X11/xserver/ru_UA.koi8u +${X11ROOT_PREFIX}/lib/X11/xserver/russian +${X11ROOT_PREFIX}/lib/X11/xserver/se_NO +${X11ROOT_PREFIX}/lib/X11/xserver/se_NO.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sh +${X11ROOT_PREFIX}/lib/X11/xserver/sh.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/sh_BA.ISO8859-2@bosnia +${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU +${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sk +${X11ROOT_PREFIX}/lib/X11/xserver/sk.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/sk_SK +${X11ROOT_PREFIX}/lib/X11/xserver/sk_SK.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/sk_SK.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/sk_SK.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sl_SI +${X11ROOT_PREFIX}/lib/X11/xserver/sl_SI.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/sl_SI.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/sl_SI.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/slovak +${X11ROOT_PREFIX}/lib/X11/xserver/slovene +${X11ROOT_PREFIX}/lib/X11/xserver/slovenian +${X11ROOT_PREFIX}/lib/X11/xserver/spanish +${X11ROOT_PREFIX}/lib/X11/xserver/sq_AL +${X11ROOT_PREFIX}/lib/X11/xserver/sq_AL.ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/xserver/sq_AL.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/sq_AL.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sr_SP +${X11ROOT_PREFIX}/lib/X11/xserver/sr_SP.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.iso88592 +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.iso88595@cyrillic +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU@cyrillic +${X11ROOT_PREFIX}/lib/X11/xserver/su +${X11ROOT_PREFIX}/lib/X11/xserver/su.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/sv +${X11ROOT_PREFIX}/lib/X11/xserver/sv.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/sv.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/sv.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_FI +${X11ROOT_PREFIX}/lib/X11/xserver/sv_FI.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_FI.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/sv_FI.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_FI@euro +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.iso885915 +${X11ROOT_PREFIX}/lib/X11/xserver/sv_SE.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/swedish +${X11ROOT_PREFIX}/lib/X11/xserver/ta_IN +${X11ROOT_PREFIX}/lib/X11/xserver/ta_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/te_IN +${X11ROOT_PREFIX}/lib/X11/xserver/te_IN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/tg_TJ +${X11ROOT_PREFIX}/lib/X11/xserver/tg_TJ.koi8t +${X11ROOT_PREFIX}/lib/X11/xserver/th +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.ISO8859-11 +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.TIS620 +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.tis620 +${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/thai +${X11ROOT_PREFIX}/lib/X11/xserver/tl_PH +${X11ROOT_PREFIX}/lib/X11/xserver/tl_PH.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/tr +${X11ROOT_PREFIX}/lib/X11/xserver/tr.ISO8859-9 +${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR +${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.ISO8859-9 +${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.iso88599 +${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/turkish +${X11ROOT_PREFIX}/lib/X11/xserver/uk_UA +${X11ROOT_PREFIX}/lib/X11/xserver/uk_UA.koi8u +${X11ROOT_PREFIX}/lib/X11/xserver/uk_UA.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/ur_PK +${X11ROOT_PREFIX}/lib/X11/xserver/ur_PK.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/uz_UZ +${X11ROOT_PREFIX}/lib/X11/xserver/uz_UZ.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN +${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN.tcvn +${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE +${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE.iso88591 +${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE.iso885915@euro +${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE@euro +${X11ROOT_PREFIX}/lib/X11/xserver/yi_US +${X11ROOT_PREFIX}/lib/X11/xserver/yi_US.cp1255 +${X11ROOT_PREFIX}/lib/X11/xserver/zh +${X11ROOT_PREFIX}/lib/X11/xserver/zh.GBK +${X11ROOT_PREFIX}/lib/X11/xserver/zh.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.EUC +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.EUC@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.EUC@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.EUC@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GB18030 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GB18030@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GB18030@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GB18030@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GBK +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GBK@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GBK@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.GBK@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.UTF-8@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.UTF-8@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.UTF-8@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.gb18030 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.gb2312 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.gbk +${X11ROOT_PREFIX}/lib/X11/xserver/zh_CN.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.BIG5HK +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.BIG5HK@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.BIG5HK@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.UTF-8@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.UTF-8@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.big5hkscs +${X11ROOT_PREFIX}/lib/X11/xserver/zh_HK.utf8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.BIG5 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.BIG5@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.BIG5@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.BIG5@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.BIG5@zhuyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.EUC +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.EUC@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.EUC@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.EUC@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.EUC@zhuyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@pinyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@radical +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@stroke +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@zhuyin +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.big5 +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.euctw +${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.utf8 ${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o @@ -119,7 +957,6 @@ ${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o ${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o @@ -149,16 +986,13 @@ ${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o ${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o ${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a ${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a -${LIBDRI}${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a ${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.a ${X11ROOT_PREFIX}/lib/modules/extensions/libglx.a ${X11ROOT_PREFIX}/lib/modules/extensions/librecord.a ${X11ROOT_PREFIX}/lib/modules/extensions/libxtrap.a ${X11ROOT_PREFIX}/lib/modules/fonts/libbitmap.a -${X11ROOT_PREFIX}/lib/modules/fonts/libspeedo.a ${X11ROOT_PREFIX}/lib/modules/fonts/libfreetype.so ${X11ROOT_PREFIX}/lib/modules/fonts/libtype1.a -${X11ROOT_PREFIX}/lib/modules/fonts/libxtt.a ${X11ROOT_PREFIX}/lib/modules/input/acecad_drv.o ${X11ROOT_PREFIX}/lib/modules/input/calcomp_drv.o ${X11ROOT_PREFIX}/lib/modules/input/citron_drv.o @@ -170,6 +1004,7 @@ ${X11ROOT_PREFIX}/lib/modules/input/fpit_drv.o ${X11ROOT_PREFIX}/lib/modules/input/hyperpen_drv.o ${X11ROOT_PREFIX}/lib/modules/input/js_x_drv.o ${X11ROOT_PREFIX}/lib/modules/input/kbd_drv.o +${X11ROOT_PREFIX}/lib/modules/input/keyboard_drv.o ${X11ROOT_PREFIX}/lib/modules/input/magellan_drv.o ${X11ROOT_PREFIX}/lib/modules/input/microtouch_drv.o ${X11ROOT_PREFIX}/lib/modules/input/mouse_drv.o @@ -186,6 +1021,8 @@ ${X11ROOT_PREFIX}/lib/modules/libcfb.a ${X11ROOT_PREFIX}/lib/modules/libcfb16.a ${X11ROOT_PREFIX}/lib/modules/libcfb24.a ${X11ROOT_PREFIX}/lib/modules/libcfb32.a +${X11ROOT_PREFIX}/lib/modules/libcw.a +${X11ROOT_PREFIX}/lib/modules/libdamage.a ${X11ROOT_PREFIX}/lib/modules/libddc.a ${X11ROOT_PREFIX}/lib/modules/libfb.a ${X11ROOT_PREFIX}/lib/modules/libi2c.a @@ -208,8 +1045,8 @@ ${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.a ${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.a ${X11ROOT_PREFIX}/lib/modules/v10002d.uc ${X11ROOT_PREFIX}/lib/modules/v20002d.uc -${X11ROOT_PREFIX}/${MAN_DIR}/Xorg.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/Xnest.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/Xorg.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/Xserver.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/Xvfb.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/getconfig.${MAN_SUFFIX} @@ -248,7 +1085,6 @@ ${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/dmc.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/dynapro.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/elographics.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdev.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX} @@ -288,12 +1124,4 @@ ${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX} ${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX} -@dirrm ${X11ROOT_PREFIX}/lib/modules/input -@dirrm ${X11ROOT_PREFIX}/lib/modules/fonts -@dirrm ${X11ROOT_PREFIX}/lib/modules/extensions -@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers -@dirrm ${X11ROOT_PREFIX}/lib/modules/codeconv -@dirrm ${X11ROOT_PREFIX}/lib/modules -@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver -@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig -@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps +${X11ROOT_PREFIX}/${MISCMAN_DIR}/Xprint.${MISCMAN_SUFFIX} diff --git a/x11/xorg-server/PLIST.common_end b/x11/xorg-server/PLIST.common_end new file mode 100644 index 00000000000..d2a11524493 --- /dev/null +++ b/x11/xorg-server/PLIST.common_end @@ -0,0 +1,32 @@ +@comment $NetBSD: PLIST.common_end,v 1.1 2004/09/21 17:38:53 xtraeme Exp $ +@dirrm ${X11ROOT_PREFIX}/lib/modules/input +@dirrm ${X11ROOT_PREFIX}/lib/modules/fonts +@dirrm ${X11ROOT_PREFIX}/lib/modules/extensions +@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers +@dirrm ${X11ROOT_PREFIX}/lib/modules +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2 +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config/raster +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver +@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig +@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps +@dirrm ${X11ROOT_PREFIX}/etc/init.d diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def index 6465593d6b1..6d07c31bd97 100644 --- a/x11/xorg-server/files/host.def +++ b/x11/xorg-server/files/host.def @@ -1,13 +1,17 @@ -/* $NetBSD: host.def,v 1.4 2004/08/27 06:29:11 jlam Exp $ */ +/* $NetBSD: host.def,v 1.5 2004/09/21 17:38:53 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO /* Workaround */ -#define XorgVersion 670 +#define XorgVersion 681 #define MakeCmd @MAKE@ + +#ifndef LinuxArchitecture #define HasGnuMake NO +#endif + #define ImakeCmd @IMAKE@ #define RmanCmd @RMAN@ #define HtmlIndexCmd @MKHTMLINDEX@ @@ -27,6 +31,17 @@ #define BuildXFree86ConfigTools YES #define UseInstalledPrograms YES +#ifndef LinuxArchitecture +#define HasNcurses NO +#define BuildGISWxprintglue NO +#define BuildGISWxprint NO +#define BuildDebianXprintPackage NO +#endif + +#ifndef OpenBSDArchitecture +#define ProPoliceSupport NO +#endif + #define BuildFontCache YES #define BuiltFontLib NO |