diff options
| author | bjs <bjs@pkgsrc.org> | 2008-09-18 20:56:01 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2008-09-18 20:56:01 +0000 |
| commit | f31c9889c5dff517472f26e11a7ecc1508c39e58 (patch) | |
| tree | bfbfde19b08749f2e15a3ff758d99f6fedf073e6 /x11/modular-xorg-server | |
| parent | 521526fa25a13fae7c33b40f24f1f0144f517919 (diff) | |
| download | pkgsrc-f31c9889c5dff517472f26e11a7ecc1508c39e58.tar.gz | |
Welcome to modular-xorg-server-1.4.2.
This long-overdue update brings many improvements:
- Many improvements to EXA
- Input Hotplugging via HAL or dbus (not enabled yet)
- Support for RandR 1.2. Users using a dual-head configuration are
encouraged to see <http://www.x.org/wiki/Projects/XRandR> for more
information.
- The server now uses the same version of Mesa we have in pkgsrc;
this likely will result in more reliable OpenGL/DRI operation.
I realize that this server is still not the latest release (1.5.0);
upgrading to that version will require an involved mesa update,
libpciaccess, etc. I hope that by the next quarter, that work will be done.
Please file a problem report and/or contact us via the usual means
(mailing lists, etc.) should you encounter any issues.
Diffstat (limited to 'x11/modular-xorg-server')
38 files changed, 233 insertions, 2159 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index b95a381cc08..c1da332501b 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,50 +1,96 @@ -# $NetBSD: Makefile,v 1.31 2008/07/13 12:37:29 tonnerre Exp $ +# $NetBSD: Makefile,v 1.32 2008/09/18 20:56:01 bjs Exp $ +# -DISTNAME= xorg-server-1.3.0.0 +DISTNAME= xorg-server-1.4.2 PKGNAME= modular-${DISTNAME} -PKGREVISION= 10 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 -SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} -PKG_DESTDIR_SUPPORT= user-destdir +PATCHFILES+= xorg-server-1.4.2-20080917.patch.gz +PATCH_SITES+= ${MASTER_SITE_LOCAL} -MAINTAINER= joerg@NetBSD.org +MAINTAINER= bjs@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Xorg X11 Server from modular X.org X11 +COMMENT= Modular X11 server from modular X.org + +PKG_DESTDIR_SUPPORT= user-destdir +SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= autoconf automake autoreconf gm4 gmake pkg-config -USE_LIBTOOL= YES -GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE+= xorg-server.pc.in -USE_TOOLS+= pkg-config -USE_TOOLS+= gmake -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +SHLIBTOOL_OVERRIDE= # empty + +BUILD_DEFS+= VARBASE +BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR + +OWN_DIRS+= ${XKB_OUTPUT_DIR} +XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config + +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} + +BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros + +DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp +DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config + +.include "../../mk/bsd.prefs.mk" + +CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q} +CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation" +CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc" +.if ${OPSYS} == "NetBSD" +CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" +CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" +.endif +CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} +CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/" + CONFIGURE_ARGS+= --enable-dri -# doesn't compile against printproto-1.0.4; enable again if newer version -# does support it. -CONFIGURE_ARGS+= --disable-xprint -PLIST_VARS+= xprint +CONFIGURE_ARGS+= --enable-xorg -CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 +CONFIGURE_ARGS+= --disable-config-hal +CONFIGURE_ARGS+= --disable-dmx +CONFIGURE_ARGS+= --disable-xprint +CONFIGURE_ARGS+= --disable-xwin +CONFIGURE_ARGS+= --disable-xephyr +CONFIGURE_ARGS+= --disable-kdrive +CONFIGURE_ARGS+= --disable-kdrive-vesa +CONFIGURE_ARGS+= --disable-xfake +CONFIGURE_ARGS+= --disable-xsdl +CONFIGURE_ARGS+= --disable-xfbdev +CONFIGURE_ARGS+= --disable-kbd_mode # deprecated +CONFIGURE_ARGS+= --disable-xorgcfg # deprecated -BUILD_DEFS+= VARBASE +CONFIGURE_ARGS+= --with-int10=x86emu -# -wip -#DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config -DEPENDS+= xkbdata-[0-9]*:../../x11/xkbdata +CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 +BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 +BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 +BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.4.4 BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.1 +BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 +BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 +BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 post-extract: dri-post-extract ${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common + ${RM} -f ${WRKSRC}/Mesa-${MESA_VERSION}/docs/README.MINGW32.orig -.include "options.mk" +pre-configure: + cd ${WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} autoreconf -v --install -.include "../../mk/curses.buildlink3.mk" +.include "options.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" .include "../../x11/bigreqsproto/buildlink3.mk" @@ -67,6 +113,7 @@ post-extract: dri-post-extract .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" .include "../../x11/libxkbui/buildlink3.mk" +.include "../../x11/pixman/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/recordproto/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 0df2ac19ddf..e8d101b0177 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.8 2008/04/21 22:18:52 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/09/18 20:56:01 bjs Exp $ bin/X bin/Xnest bin/Xorg -${PLIST.xprint}bin/Xprt bin/Xvfb bin/cvt bin/gtf @@ -15,26 +14,7 @@ bin/outl bin/outw bin/pcitweak bin/scanpci -bin/xorgcfg bin/xorgconfig -${PLIST.xprint}etc/X11/Xsession.d/92xprint-xpserverlist -include/X11/bitmaps/card.xbm -include/X11/bitmaps/down.xbm -include/X11/bitmaps/keyboard.xbm -include/X11/bitmaps/left.xbm -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm -include/X11/bitmaps/right.xbm -include/X11/bitmaps/shorter.xbm -include/X11/bitmaps/taller.xbm -include/X11/bitmaps/up.xbm -include/X11/bitmaps/wider.xbm -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -include/X11/pixmaps/monitor.xpm -include/X11/pixmaps/mouse.xpm include/xorg/BT.h include/xorg/IBM.h include/xorg/TI.h @@ -89,6 +69,7 @@ include/xorg/gc.h include/xorg/gcstruct.h include/xorg/globals.h include/xorg/glyphstr.h +include/xorg/hotplug.h include/xorg/i2c_def.h include/xorg/input.h include/xorg/inputstr.h @@ -145,8 +126,8 @@ include/xorg/uda1380.h include/xorg/validate.h include/xorg/vbe.h include/xorg/vbeModes.h -include/xorg/vdif.h include/xorg/vgaHW.h +include/xorg/wfbrename.h include/xorg/window.h include/xorg/windowstr.h include/xorg/xaa.h @@ -159,10 +140,8 @@ include/xorg/xf86.h include/xorg/xf86Crtc.h include/xorg/xf86Cursor.h include/xorg/xf86DDC.h -include/xorg/xf86Keymap.h include/xorg/xf86Modes.h include/xorg/xf86Module.h -include/xorg/xf86OSKbd.h include/xorg/xf86OSmouse.h include/xorg/xf86Opt.h include/xorg/xf86Optrec.h @@ -192,897 +171,13 @@ include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h include/xorg/xisb.h +include/xorg/xkbsrv.h include/xorg/xorg-server.h include/xorg/xorgVersion.h include/xorg/xvdix.h include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options -lib/X11/app-defaults/XOrgCfg -${PLIST.xprint}lib/X11/xserver/C/print/Xprinters -${PLIST.xprint}lib/X11/xserver/C/print/Xprinters.ghostscript -${PLIST.xprint}lib/X11/xserver/C/print/attributes/document -${PLIST.xprint}lib/X11/xserver/C/print/attributes/job -${PLIST.xprint}lib/X11/xserver/C/print/attributes/printer -${PLIST.xprint}lib/X11/xserver/C/print/ddx-config/raster/pcl -${PLIST.xprint}lib/X11/xserver/C/print/ddx-config/raster/postscript -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCentSchlbk-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCentSchlbk-BoldItal.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCentSchlbk-Ital.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCentSchlbk-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-DemiItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Light.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-LightItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Symbol.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/CANONC3200-PS/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/GSdefault/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00054.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00055.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00056.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00057.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00058.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00059.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00060.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00061.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00062.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00063.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00064.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00065.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00066.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00067.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00068.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00069.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00070.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00071.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00072.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00073.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00074.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00075.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00076.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00077.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00079.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00080.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00081.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00082.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00083.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00084.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00085.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00086.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00087.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00088.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00089.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00090.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00091.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00092.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00093.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00094.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/README -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.alias -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPDJ1600C/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCentSchlbk-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCentSchlbk-BoldItal.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCentSchlbk-Ital.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCentSchlbk-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-DemiItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Light.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-LightItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Symbol.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00053.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00054.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00055.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00056.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00057.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00058.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00059.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00060.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00061.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00062.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00063.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00064.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00065.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00066.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00067.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00068.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00069.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00070.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00071.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00072.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00073.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00074.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00075.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00076.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00077.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00079.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00080.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00081.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00082.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00083.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00084.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00085.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00086.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00087.pmf -${PLIST.xprint}${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00088.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00089.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00090.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00091.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00092.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00093.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00094.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/README -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/HPLJ4family/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Courier.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/NewCentSchlbk-Ital.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/NewCentSchlbk-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Light.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Symbol.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/PSdefault/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/PSspooldir/model-config -${PLIST.xprint}lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Symbol.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf -${PLIST.xprint}lib/X11/xserver/C/print/models/SPSPARC2/model-config -${PLIST.xprint}lib/X11/xserver/POSIX -${PLIST.xprint}lib/X11/xserver/README -${PLIST.xprint}lib/X11/xserver/af_ZA -${PLIST.xprint}lib/X11/xserver/af_ZA.iso88591 -${PLIST.xprint}lib/X11/xserver/ar -${PLIST.xprint}lib/X11/xserver/ar_AE -${PLIST.xprint}lib/X11/xserver/ar_AE.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_AE.utf8 -${PLIST.xprint}lib/X11/xserver/ar_BH -${PLIST.xprint}lib/X11/xserver/ar_BH.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_BH.utf8 -${PLIST.xprint}lib/X11/xserver/ar_DZ -${PLIST.xprint}lib/X11/xserver/ar_DZ.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_DZ.utf8 -${PLIST.xprint}lib/X11/xserver/ar_EG -${PLIST.xprint}lib/X11/xserver/ar_EG.ISO8859-6 -${PLIST.xprint}lib/X11/xserver/ar_EG.UTF-8 -${PLIST.xprint}lib/X11/xserver/ar_EG.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_EG.utf8 -${PLIST.xprint}lib/X11/xserver/ar_IN.utf8 -${PLIST.xprint}lib/X11/xserver/ar_IQ -${PLIST.xprint}lib/X11/xserver/ar_IQ.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_IQ.utf8 -${PLIST.xprint}lib/X11/xserver/ar_JO -${PLIST.xprint}lib/X11/xserver/ar_JO.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_JO.utf8 -${PLIST.xprint}lib/X11/xserver/ar_KW -${PLIST.xprint}lib/X11/xserver/ar_KW.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_KW.utf8 -${PLIST.xprint}lib/X11/xserver/ar_LB -${PLIST.xprint}lib/X11/xserver/ar_LB.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_LB.utf8 -${PLIST.xprint}lib/X11/xserver/ar_LY -${PLIST.xprint}lib/X11/xserver/ar_LY.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_LY.utf8 -${PLIST.xprint}lib/X11/xserver/ar_MA -${PLIST.xprint}lib/X11/xserver/ar_MA.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_MA.utf8 -${PLIST.xprint}lib/X11/xserver/ar_OM -${PLIST.xprint}lib/X11/xserver/ar_OM.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_OM.utf8 -${PLIST.xprint}lib/X11/xserver/ar_QA -${PLIST.xprint}lib/X11/xserver/ar_QA.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_QA.utf8 -${PLIST.xprint}lib/X11/xserver/ar_SA -${PLIST.xprint}lib/X11/xserver/ar_SA.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_SA.utf8 -${PLIST.xprint}lib/X11/xserver/ar_SD -${PLIST.xprint}lib/X11/xserver/ar_SD.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_SD.utf8 -${PLIST.xprint}lib/X11/xserver/ar_SY -${PLIST.xprint}lib/X11/xserver/ar_SY.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_SY.utf8 -${PLIST.xprint}lib/X11/xserver/ar_TN -${PLIST.xprint}lib/X11/xserver/ar_TN.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_TN.utf8 -${PLIST.xprint}lib/X11/xserver/ar_YE -${PLIST.xprint}lib/X11/xserver/ar_YE.iso88596 -${PLIST.xprint}lib/X11/xserver/ar_YE.utf8 -${PLIST.xprint}lib/X11/xserver/be_BY -${PLIST.xprint}lib/X11/xserver/be_BY.cp1251 -${PLIST.xprint}lib/X11/xserver/be_BY.utf8 -${PLIST.xprint}lib/X11/xserver/bg_BG -${PLIST.xprint}lib/X11/xserver/bg_BG.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/bg_BG.cp1251 -${PLIST.xprint}lib/X11/xserver/bg_BG.utf8 -${PLIST.xprint}lib/X11/xserver/bn_IN.UTF-8 -${PLIST.xprint}lib/X11/xserver/bn_IN.utf8 -${PLIST.xprint}lib/X11/xserver/bokmal -${PLIST.xprint}lib/X11/xserver/br_FR -${PLIST.xprint}lib/X11/xserver/br_FR.iso88591 -${PLIST.xprint}lib/X11/xserver/bs -${PLIST.xprint}lib/X11/xserver/bs_BA -${PLIST.xprint}lib/X11/xserver/bs_BA.ISO-8859-2 -${PLIST.xprint}lib/X11/xserver/bs_BA.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/bs_BA.ISO_8859-2 -${PLIST.xprint}lib/X11/xserver/bs_BA.UTF-8 -${PLIST.xprint}lib/X11/xserver/bs_BA.iso88592 -${PLIST.xprint}lib/X11/xserver/ca -${PLIST.xprint}lib/X11/xserver/ca.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/ca.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/ca_ES -${PLIST.xprint}lib/X11/xserver/ca_ES.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/ca_ES.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/ca_ES.iso88591 -${PLIST.xprint}lib/X11/xserver/ca_ES.iso885915@euro -${PLIST.xprint}lib/X11/xserver/ca_ES.utf8 -${PLIST.xprint}lib/X11/xserver/ca_ES@euro -${PLIST.xprint}lib/X11/xserver/catalan -${PLIST.xprint}lib/X11/xserver/croatian -${PLIST.xprint}lib/X11/xserver/cs_CZ -${PLIST.xprint}lib/X11/xserver/cs_CZ.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/cs_CZ.iso88592 -${PLIST.xprint}lib/X11/xserver/cs_CZ.utf8 -${PLIST.xprint}lib/X11/xserver/cy_GB -${PLIST.xprint}lib/X11/xserver/cy_GB.iso885914 -${PLIST.xprint}lib/X11/xserver/cz -${PLIST.xprint}lib/X11/xserver/cz.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/czech -${PLIST.xprint}lib/X11/xserver/da -${PLIST.xprint}lib/X11/xserver/da.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/da.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/da_DK -${PLIST.xprint}lib/X11/xserver/da_DK.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/da_DK.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/da_DK.iso88591 -${PLIST.xprint}lib/X11/xserver/da_DK.iso885915 -${PLIST.xprint}lib/X11/xserver/da_DK.utf8 -${PLIST.xprint}lib/X11/xserver/danish -${PLIST.xprint}lib/X11/xserver/dansk -${PLIST.xprint}lib/X11/xserver/de -${PLIST.xprint}lib/X11/xserver/de.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/de.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/de.UTF-8 -${PLIST.xprint}lib/X11/xserver/de_AT -${PLIST.xprint}lib/X11/xserver/de_AT.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/de_AT.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/de_AT.iso88591 -${PLIST.xprint}lib/X11/xserver/de_AT.iso885915@euro -${PLIST.xprint}lib/X11/xserver/de_AT.utf8 -${PLIST.xprint}lib/X11/xserver/de_AT@euro -${PLIST.xprint}lib/X11/xserver/de_BE -${PLIST.xprint}lib/X11/xserver/de_BE.iso88591 -${PLIST.xprint}lib/X11/xserver/de_BE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/de_BE@euro -${PLIST.xprint}lib/X11/xserver/de_CH -${PLIST.xprint}lib/X11/xserver/de_CH.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/de_CH.iso88591 -${PLIST.xprint}lib/X11/xserver/de_CH.utf8 -${PLIST.xprint}lib/X11/xserver/de_DE -${PLIST.xprint}lib/X11/xserver/de_DE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/de_DE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/de_DE.UTF-8 -${PLIST.xprint}lib/X11/xserver/de_DE.iso88591 -${PLIST.xprint}lib/X11/xserver/de_DE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/de_DE.utf8 -${PLIST.xprint}lib/X11/xserver/de_DE@euro -${PLIST.xprint}lib/X11/xserver/de_LU -${PLIST.xprint}lib/X11/xserver/de_LU.iso88591 -${PLIST.xprint}lib/X11/xserver/de_LU.iso885915@euro -${PLIST.xprint}lib/X11/xserver/de_LU.utf8 -${PLIST.xprint}lib/X11/xserver/de_LU@euro -${PLIST.xprint}lib/X11/xserver/deutsch -${PLIST.xprint}lib/X11/xserver/el_GR -${PLIST.xprint}lib/X11/xserver/el_GR.ISO8859-7 -${PLIST.xprint}lib/X11/xserver/el_GR.ISO8859-7@euro -${PLIST.xprint}lib/X11/xserver/el_GR.iso88597 -${PLIST.xprint}lib/X11/xserver/el_GR.utf8 -${PLIST.xprint}lib/X11/xserver/en_AU -${PLIST.xprint}lib/X11/xserver/en_AU.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_AU.iso88591 -${PLIST.xprint}lib/X11/xserver/en_AU.utf8 -${PLIST.xprint}lib/X11/xserver/en_BW -${PLIST.xprint}lib/X11/xserver/en_BW.iso88591 -${PLIST.xprint}lib/X11/xserver/en_CA -${PLIST.xprint}lib/X11/xserver/en_CA.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_CA.iso88591 -${PLIST.xprint}lib/X11/xserver/en_CA.utf8 -${PLIST.xprint}lib/X11/xserver/en_DK -${PLIST.xprint}lib/X11/xserver/en_DK.iso88591 -${PLIST.xprint}lib/X11/xserver/en_GB -${PLIST.xprint}lib/X11/xserver/en_GB.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_GB.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/en_GB.iso88591 -${PLIST.xprint}lib/X11/xserver/en_GB.iso885915 -${PLIST.xprint}lib/X11/xserver/en_GB.utf8 -${PLIST.xprint}lib/X11/xserver/en_HK -${PLIST.xprint}lib/X11/xserver/en_HK.iso88591 -${PLIST.xprint}lib/X11/xserver/en_IE -${PLIST.xprint}lib/X11/xserver/en_IE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_IE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/en_IE.iso88591 -${PLIST.xprint}lib/X11/xserver/en_IE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/en_IE.utf8 -${PLIST.xprint}lib/X11/xserver/en_IE@euro -${PLIST.xprint}lib/X11/xserver/en_IN -${PLIST.xprint}lib/X11/xserver/en_IN.utf8 -${PLIST.xprint}lib/X11/xserver/en_NZ -${PLIST.xprint}lib/X11/xserver/en_NZ.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_NZ.iso88591 -${PLIST.xprint}lib/X11/xserver/en_NZ.utf8 -${PLIST.xprint}lib/X11/xserver/en_PH -${PLIST.xprint}lib/X11/xserver/en_PH.iso88591 -${PLIST.xprint}lib/X11/xserver/en_SG -${PLIST.xprint}lib/X11/xserver/en_SG.iso88591 -${PLIST.xprint}lib/X11/xserver/en_US.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/en_US.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/en_US.UTF-8 -${PLIST.xprint}lib/X11/xserver/en_US.iso88591 -${PLIST.xprint}lib/X11/xserver/en_US.iso885915 -${PLIST.xprint}lib/X11/xserver/en_US.utf8 -${PLIST.xprint}lib/X11/xserver/en_US/print/attributes/document -${PLIST.xprint}lib/X11/xserver/en_ZA -${PLIST.xprint}lib/X11/xserver/en_ZA.iso88591 -${PLIST.xprint}lib/X11/xserver/en_ZA.utf8 -${PLIST.xprint}lib/X11/xserver/en_ZW -${PLIST.xprint}lib/X11/xserver/en_ZW.iso88591 -${PLIST.xprint}lib/X11/xserver/es_AR -${PLIST.xprint}lib/X11/xserver/es_AR.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_AR.iso88591 -${PLIST.xprint}lib/X11/xserver/es_AR.utf8 -${PLIST.xprint}lib/X11/xserver/es_BO -${PLIST.xprint}lib/X11/xserver/es_BO.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_BO.iso88591 -${PLIST.xprint}lib/X11/xserver/es_BO.utf8 -${PLIST.xprint}lib/X11/xserver/es_CL -${PLIST.xprint}lib/X11/xserver/es_CL.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_CL.iso88591 -${PLIST.xprint}lib/X11/xserver/es_CL.utf8 -${PLIST.xprint}lib/X11/xserver/es_CO -${PLIST.xprint}lib/X11/xserver/es_CO.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_CO.iso88591 -${PLIST.xprint}lib/X11/xserver/es_CO.utf8 -${PLIST.xprint}lib/X11/xserver/es_CR -${PLIST.xprint}lib/X11/xserver/es_CR.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_CR.iso88591 -${PLIST.xprint}lib/X11/xserver/es_CR.utf8 -${PLIST.xprint}lib/X11/xserver/es_DO -${PLIST.xprint}lib/X11/xserver/es_DO.iso88591 -${PLIST.xprint}lib/X11/xserver/es_DO.utf8 -${PLIST.xprint}lib/X11/xserver/es_EC -${PLIST.xprint}lib/X11/xserver/es_EC.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_EC.iso88591 -${PLIST.xprint}lib/X11/xserver/es_EC.utf8 -${PLIST.xprint}lib/X11/xserver/es_ES -${PLIST.xprint}lib/X11/xserver/es_ES.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_ES.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/es_ES.UTF-8 -${PLIST.xprint}lib/X11/xserver/es_ES.iso88591 -${PLIST.xprint}lib/X11/xserver/es_ES.iso885915@euro -${PLIST.xprint}lib/X11/xserver/es_ES.utf8 -${PLIST.xprint}lib/X11/xserver/es_ES@euro -${PLIST.xprint}lib/X11/xserver/es_GT -${PLIST.xprint}lib/X11/xserver/es_GT.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_GT.iso88591 -${PLIST.xprint}lib/X11/xserver/es_GT.utf8 -${PLIST.xprint}lib/X11/xserver/es_HN -${PLIST.xprint}lib/X11/xserver/es_HN.iso88591 -${PLIST.xprint}lib/X11/xserver/es_HN.utf8 -${PLIST.xprint}lib/X11/xserver/es_MX -${PLIST.xprint}lib/X11/xserver/es_MX.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_MX.iso88591 -${PLIST.xprint}lib/X11/xserver/es_MX.utf8 -${PLIST.xprint}lib/X11/xserver/es_NI -${PLIST.xprint}lib/X11/xserver/es_NI.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_NI.iso88591 -${PLIST.xprint}lib/X11/xserver/es_NI.utf8 -${PLIST.xprint}lib/X11/xserver/es_PA -${PLIST.xprint}lib/X11/xserver/es_PA.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_PA.iso88591 -${PLIST.xprint}lib/X11/xserver/es_PA.utf8 -${PLIST.xprint}lib/X11/xserver/es_PE -${PLIST.xprint}lib/X11/xserver/es_PE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_PE.iso88591 -${PLIST.xprint}lib/X11/xserver/es_PE.utf8 -${PLIST.xprint}lib/X11/xserver/es_PR -${PLIST.xprint}lib/X11/xserver/es_PR.iso88591 -${PLIST.xprint}lib/X11/xserver/es_PR.utf8 -${PLIST.xprint}lib/X11/xserver/es_PY -${PLIST.xprint}lib/X11/xserver/es_PY.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_PY.iso88591 -${PLIST.xprint}lib/X11/xserver/es_PY.utf8 -${PLIST.xprint}lib/X11/xserver/es_SV -${PLIST.xprint}lib/X11/xserver/es_SV.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_SV.iso88591 -${PLIST.xprint}lib/X11/xserver/es_SV.utf8 -${PLIST.xprint}lib/X11/xserver/es_US -${PLIST.xprint}lib/X11/xserver/es_US.iso88591 -${PLIST.xprint}lib/X11/xserver/es_UY -${PLIST.xprint}lib/X11/xserver/es_UY.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_UY.iso88591 -${PLIST.xprint}lib/X11/xserver/es_UY.utf8 -${PLIST.xprint}lib/X11/xserver/es_VE -${PLIST.xprint}lib/X11/xserver/es_VE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/es_VE.iso88591 -${PLIST.xprint}lib/X11/xserver/es_VE.utf8 -${PLIST.xprint}lib/X11/xserver/et_EE -${PLIST.xprint}lib/X11/xserver/et_EE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/et_EE.iso88591 -${PLIST.xprint}lib/X11/xserver/et_EE.utf8 -${PLIST.xprint}lib/X11/xserver/eu_ES -${PLIST.xprint}lib/X11/xserver/eu_ES.iso88591 -${PLIST.xprint}lib/X11/xserver/eu_ES.iso885915@euro -${PLIST.xprint}lib/X11/xserver/eu_ES@euro -${PLIST.xprint}lib/X11/xserver/fa_IR.utf8 -${PLIST.xprint}lib/X11/xserver/fi_FI -${PLIST.xprint}lib/X11/xserver/fi_FI.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/fi_FI.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/fi_FI.UTF-8 -${PLIST.xprint}lib/X11/xserver/fi_FI.iso88591 -${PLIST.xprint}lib/X11/xserver/fi_FI.iso885915@euro -${PLIST.xprint}lib/X11/xserver/fi_FI.utf8 -${PLIST.xprint}lib/X11/xserver/fi_FI@euro -${PLIST.xprint}lib/X11/xserver/fo_FO -${PLIST.xprint}lib/X11/xserver/fo_FO.iso88591 -${PLIST.xprint}lib/X11/xserver/fo_FO.utf8 -${PLIST.xprint}lib/X11/xserver/fr_BE -${PLIST.xprint}lib/X11/xserver/fr_BE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/fr_BE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/fr_BE.UTF-8 -${PLIST.xprint}lib/X11/xserver/fr_BE.iso88591 -${PLIST.xprint}lib/X11/xserver/fr_BE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/fr_BE.utf8 -${PLIST.xprint}lib/X11/xserver/fr_BE@euro -${PLIST.xprint}lib/X11/xserver/fr_CA -${PLIST.xprint}lib/X11/xserver/fr_CA.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/fr_CA.iso88591 -${PLIST.xprint}lib/X11/xserver/fr_CA.utf8 -${PLIST.xprint}lib/X11/xserver/fr_CH -${PLIST.xprint}lib/X11/xserver/fr_CH.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/fr_CH.iso88591 -${PLIST.xprint}lib/X11/xserver/fr_CH.utf8 -${PLIST.xprint}lib/X11/xserver/fr_FR -${PLIST.xprint}lib/X11/xserver/fr_FR.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/fr_FR.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/fr_FR.UTF-8 -${PLIST.xprint}lib/X11/xserver/fr_FR.iso88591 -${PLIST.xprint}lib/X11/xserver/fr_FR.iso885915@euro -${PLIST.xprint}lib/X11/xserver/fr_FR.utf8 -${PLIST.xprint}lib/X11/xserver/fr_FR@euro -${PLIST.xprint}lib/X11/xserver/fr_LU -${PLIST.xprint}lib/X11/xserver/fr_LU.iso88591 -${PLIST.xprint}lib/X11/xserver/fr_LU.iso885915@euro -${PLIST.xprint}lib/X11/xserver/fr_LU.utf8 -${PLIST.xprint}lib/X11/xserver/fr_LU@euro -${PLIST.xprint}lib/X11/xserver/ga_IE -${PLIST.xprint}lib/X11/xserver/ga_IE.iso88591 -${PLIST.xprint}lib/X11/xserver/ga_IE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/ga_IE.utf8 -${PLIST.xprint}lib/X11/xserver/ga_IE@euro -${PLIST.xprint}lib/X11/xserver/gl_ES -${PLIST.xprint}lib/X11/xserver/gl_ES.iso88591 -${PLIST.xprint}lib/X11/xserver/gl_ES.iso885915@euro -${PLIST.xprint}lib/X11/xserver/gl_ES.utf8 -${PLIST.xprint}lib/X11/xserver/gl_ES@euro -${PLIST.xprint}lib/X11/xserver/gu_IN.UTF-8 -${PLIST.xprint}lib/X11/xserver/gu_IN.utf8 -${PLIST.xprint}lib/X11/xserver/gv_GB -${PLIST.xprint}lib/X11/xserver/gv_GB.iso88591 -${PLIST.xprint}lib/X11/xserver/he -${PLIST.xprint}lib/X11/xserver/he_IL -${PLIST.xprint}lib/X11/xserver/he_IL.ISO8859-8 -${PLIST.xprint}lib/X11/xserver/he_IL.UTF-8 -${PLIST.xprint}lib/X11/xserver/he_IL.iso88598 -${PLIST.xprint}lib/X11/xserver/he_IL.utf8 -${PLIST.xprint}lib/X11/xserver/hebrew -${PLIST.xprint}lib/X11/xserver/hi_IN.UTF-8 -${PLIST.xprint}lib/X11/xserver/hi_IN.utf8 -${PLIST.xprint}lib/X11/xserver/hr_HR -${PLIST.xprint}lib/X11/xserver/hr_HR.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/hr_HR.iso88592 -${PLIST.xprint}lib/X11/xserver/hr_HR.utf8 -${PLIST.xprint}lib/X11/xserver/hu_HU -${PLIST.xprint}lib/X11/xserver/hu_HU.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/hu_HU.iso88592 -${PLIST.xprint}lib/X11/xserver/hu_HU.utf8 -${PLIST.xprint}lib/X11/xserver/id_ID -${PLIST.xprint}lib/X11/xserver/id_ID.iso88591 -${PLIST.xprint}lib/X11/xserver/id_ID.utf8 -${PLIST.xprint}lib/X11/xserver/is_IS -${PLIST.xprint}lib/X11/xserver/is_IS.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/is_IS.iso88591 -${PLIST.xprint}lib/X11/xserver/is_IS.utf8 -${PLIST.xprint}lib/X11/xserver/it -${PLIST.xprint}lib/X11/xserver/it.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/it.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/it.UTF-8 -${PLIST.xprint}lib/X11/xserver/it_CH -${PLIST.xprint}lib/X11/xserver/it_CH.iso88591 -${PLIST.xprint}lib/X11/xserver/it_CH.utf8 -${PLIST.xprint}lib/X11/xserver/it_IT -${PLIST.xprint}lib/X11/xserver/it_IT.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/it_IT.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/it_IT.UTF-8 -${PLIST.xprint}lib/X11/xserver/it_IT.iso88591 -${PLIST.xprint}lib/X11/xserver/it_IT.iso885915@euro -${PLIST.xprint}lib/X11/xserver/it_IT.utf8 -${PLIST.xprint}lib/X11/xserver/it_IT@euro -${PLIST.xprint}lib/X11/xserver/italian -${PLIST.xprint}lib/X11/xserver/iw_IL -${PLIST.xprint}lib/X11/xserver/iw_IL.iso88598 -${PLIST.xprint}lib/X11/xserver/ja -${PLIST.xprint}lib/X11/xserver/ja_JP -${PLIST.xprint}lib/X11/xserver/ja_JP.EUC -${PLIST.xprint}lib/X11/xserver/ja_JP.PCK -${PLIST.xprint}lib/X11/xserver/ja_JP.UTF-8 -${PLIST.xprint}lib/X11/xserver/ja_JP.eucJP -${PLIST.xprint}lib/X11/xserver/ja_JP.eucjp -${PLIST.xprint}lib/X11/xserver/ja_JP.sjis -${PLIST.xprint}lib/X11/xserver/ja_JP.ujis -${PLIST.xprint}lib/X11/xserver/ja_JP.utf8 -${PLIST.xprint}lib/X11/xserver/japan -${PLIST.xprint}lib/X11/xserver/japanese -${PLIST.xprint}lib/X11/xserver/japanese.euc -${PLIST.xprint}lib/X11/xserver/japanese.sjis -${PLIST.xprint}lib/X11/xserver/ka_GE -${PLIST.xprint}lib/X11/xserver/ka_GE.georgianps -${PLIST.xprint}lib/X11/xserver/kl_GL -${PLIST.xprint}lib/X11/xserver/kl_GL.iso88591 -${PLIST.xprint}lib/X11/xserver/kl_GL.utf8 -${PLIST.xprint}lib/X11/xserver/ko -${PLIST.xprint}lib/X11/xserver/ko.UTF-8 -${PLIST.xprint}lib/X11/xserver/ko_KR -${PLIST.xprint}lib/X11/xserver/ko_KR.EUC -${PLIST.xprint}lib/X11/xserver/ko_KR.EUC@dict -${PLIST.xprint}lib/X11/xserver/ko_KR.UTF-8 -${PLIST.xprint}lib/X11/xserver/ko_KR.UTF-8@dict -${PLIST.xprint}lib/X11/xserver/ko_KR.euckr -${PLIST.xprint}lib/X11/xserver/ko_KR.utf8 -${PLIST.xprint}lib/X11/xserver/korean -${PLIST.xprint}lib/X11/xserver/korean.euc -${PLIST.xprint}lib/X11/xserver/kw_GB -${PLIST.xprint}lib/X11/xserver/kw_GB.iso88591 -${PLIST.xprint}lib/X11/xserver/lithuanian -${PLIST.xprint}lib/X11/xserver/lt -${PLIST.xprint}lib/X11/xserver/lt.ISO8859-13 -${PLIST.xprint}lib/X11/xserver/lt_LT -${PLIST.xprint}lib/X11/xserver/lt_LT.ISO8859-13 -${PLIST.xprint}lib/X11/xserver/lt_LT.iso885913 -${PLIST.xprint}lib/X11/xserver/lt_LT.utf8 -${PLIST.xprint}lib/X11/xserver/lv -${PLIST.xprint}lib/X11/xserver/lv.ISO8859-13 -${PLIST.xprint}lib/X11/xserver/lv_LV -${PLIST.xprint}lib/X11/xserver/lv_LV.ISO8859-13 -${PLIST.xprint}lib/X11/xserver/lv_LV.iso885913 -${PLIST.xprint}lib/X11/xserver/lv_LV.utf8 -${PLIST.xprint}lib/X11/xserver/mi_NZ -${PLIST.xprint}lib/X11/xserver/mi_NZ.iso885913 -${PLIST.xprint}lib/X11/xserver/mk_MK -${PLIST.xprint}lib/X11/xserver/mk_MK.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/mk_MK.iso88595 -${PLIST.xprint}lib/X11/xserver/mk_MK.utf8 -${PLIST.xprint}lib/X11/xserver/mr_IN.utf8 -${PLIST.xprint}lib/X11/xserver/ms_MY -${PLIST.xprint}lib/X11/xserver/ms_MY.iso88591 -${PLIST.xprint}lib/X11/xserver/mt_MT -${PLIST.xprint}lib/X11/xserver/mt_MT.iso88593 -${PLIST.xprint}lib/X11/xserver/nb_NO -${PLIST.xprint}lib/X11/xserver/nb_NO.ISO-8859-1 -${PLIST.xprint}lib/X11/xserver/nl -${PLIST.xprint}lib/X11/xserver/nl.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/nl.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/nl_BE -${PLIST.xprint}lib/X11/xserver/nl_BE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/nl_BE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/nl_BE.iso88591 -${PLIST.xprint}lib/X11/xserver/nl_BE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/nl_BE.utf8 -${PLIST.xprint}lib/X11/xserver/nl_BE@euro -${PLIST.xprint}lib/X11/xserver/nl_NL -${PLIST.xprint}lib/X11/xserver/nl_NL.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/nl_NL.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/nl_NL.iso88591 -${PLIST.xprint}lib/X11/xserver/nl_NL.iso885915@euro -${PLIST.xprint}lib/X11/xserver/nl_NL.utf8 -${PLIST.xprint}lib/X11/xserver/nl_NL@euro -${PLIST.xprint}lib/X11/xserver/nn_NO -${PLIST.xprint}lib/X11/xserver/nn_NO.iso88591 -${PLIST.xprint}lib/X11/xserver/no -${PLIST.xprint}lib/X11/xserver/no.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/no_NO -${PLIST.xprint}lib/X11/xserver/no_NO.ISO8859-1@bokmal -${PLIST.xprint}lib/X11/xserver/no_NO.ISO8859-1@nynorsk -${PLIST.xprint}lib/X11/xserver/no_NO.iso88591 -${PLIST.xprint}lib/X11/xserver/no_NO.utf8 -${PLIST.xprint}lib/X11/xserver/norwegian -${PLIST.xprint}lib/X11/xserver/oc_FR -${PLIST.xprint}lib/X11/xserver/oc_FR.iso88591 -${PLIST.xprint}lib/X11/xserver/pa_IN.UTF-8 -${PLIST.xprint}lib/X11/xserver/pa_IN.utf8 -${PLIST.xprint}lib/X11/xserver/pl_PL -${PLIST.xprint}lib/X11/xserver/pl_PL.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/pl_PL.UTF-8 -${PLIST.xprint}lib/X11/xserver/pl_PL.iso88592 -${PLIST.xprint}lib/X11/xserver/pl_PL.utf8 -${PLIST.xprint}lib/X11/xserver/polish -${PLIST.xprint}lib/X11/xserver/portuguese -${PLIST.xprint}lib/X11/xserver/pt -${PLIST.xprint}lib/X11/xserver/pt.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/pt.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/pt_BR -${PLIST.xprint}lib/X11/xserver/pt_BR.88591 -${PLIST.xprint}lib/X11/xserver/pt_BR.88591.en -${PLIST.xprint}lib/X11/xserver/pt_BR.ISO-8859-1 -${PLIST.xprint}lib/X11/xserver/pt_BR.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/pt_BR.ISO_8859-1 -${PLIST.xprint}lib/X11/xserver/pt_BR.UTF-8 -${PLIST.xprint}lib/X11/xserver/pt_BR.iso88591 -${PLIST.xprint}lib/X11/xserver/pt_BR.iso885915 -${PLIST.xprint}lib/X11/xserver/pt_BR.utf8 -${PLIST.xprint}lib/X11/xserver/pt_PT -${PLIST.xprint}lib/X11/xserver/pt_PT.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/pt_PT.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/pt_PT.iso88591 -${PLIST.xprint}lib/X11/xserver/pt_PT.iso885915@euro -${PLIST.xprint}lib/X11/xserver/pt_PT.utf8 -${PLIST.xprint}lib/X11/xserver/pt_PT@euro -${PLIST.xprint}lib/X11/xserver/ro_RO -${PLIST.xprint}lib/X11/xserver/ro_RO.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/ro_RO.iso88592 -${PLIST.xprint}lib/X11/xserver/ro_RO.utf8 -${PLIST.xprint}lib/X11/xserver/romanian -${PLIST.xprint}lib/X11/xserver/ru -${PLIST.xprint}lib/X11/xserver/ru.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/ru.UTF-8 -${PLIST.xprint}lib/X11/xserver/ru.ansi1251 -${PLIST.xprint}lib/X11/xserver/ru.koi8-r -${PLIST.xprint}lib/X11/xserver/ru_RU -${PLIST.xprint}lib/X11/xserver/ru_RU.ANSI1251 -${PLIST.xprint}lib/X11/xserver/ru_RU.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/ru_RU.KOI8-R -${PLIST.xprint}lib/X11/xserver/ru_RU.UTF-8 -${PLIST.xprint}lib/X11/xserver/ru_RU.iso88595 -${PLIST.xprint}lib/X11/xserver/ru_RU.koi8r -${PLIST.xprint}lib/X11/xserver/ru_RU.utf8 -${PLIST.xprint}lib/X11/xserver/ru_SU -${PLIST.xprint}lib/X11/xserver/ru_UA -${PLIST.xprint}lib/X11/xserver/ru_UA.koi8u -${PLIST.xprint}lib/X11/xserver/russian -${PLIST.xprint}lib/X11/xserver/se_NO -${PLIST.xprint}lib/X11/xserver/se_NO.utf8 -${PLIST.xprint}lib/X11/xserver/sh -${PLIST.xprint}lib/X11/xserver/sh.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/sh_BA.ISO8859-2@bosnia -${PLIST.xprint}lib/X11/xserver/sh_YU -${PLIST.xprint}lib/X11/xserver/sh_YU.iso88592 -${PLIST.xprint}lib/X11/xserver/sh_YU.utf8 -${PLIST.xprint}lib/X11/xserver/si -${PLIST.xprint}lib/X11/xserver/si_LK -${PLIST.xprint}lib/X11/xserver/si_LK.UTF8 -${PLIST.xprint}lib/X11/xserver/sinhala -${PLIST.xprint}lib/X11/xserver/sk -${PLIST.xprint}lib/X11/xserver/sk.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/sk_SK -${PLIST.xprint}lib/X11/xserver/sk_SK.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/sk_SK.iso88592 -${PLIST.xprint}lib/X11/xserver/sk_SK.utf8 -${PLIST.xprint}lib/X11/xserver/sl_SI -${PLIST.xprint}lib/X11/xserver/sl_SI.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/sl_SI.iso88592 -${PLIST.xprint}lib/X11/xserver/sl_SI.utf8 -${PLIST.xprint}lib/X11/xserver/slovak -${PLIST.xprint}lib/X11/xserver/slovene -${PLIST.xprint}lib/X11/xserver/slovenian -${PLIST.xprint}lib/X11/xserver/spanish -${PLIST.xprint}lib/X11/xserver/sq_AL -${PLIST.xprint}lib/X11/xserver/sq_AL.ISO8859-2 -${PLIST.xprint}lib/X11/xserver/sq_AL.iso88591 -${PLIST.xprint}lib/X11/xserver/sq_AL.utf8 -${PLIST.xprint}lib/X11/xserver/sr_SP -${PLIST.xprint}lib/X11/xserver/sr_SP.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/sr_YU -${PLIST.xprint}lib/X11/xserver/sr_YU.ISO8859-5 -${PLIST.xprint}lib/X11/xserver/sr_YU.iso88592 -${PLIST.xprint}lib/X11/xserver/sr_YU.iso88595@cyrillic -${PLIST.xprint}lib/X11/xserver/sr_YU.utf8 -${PLIST.xprint}lib/X11/xserver/sr_YU@cyrillic -${PLIST.xprint}lib/X11/xserver/su -${PLIST.xprint}lib/X11/xserver/su.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/sv -${PLIST.xprint}lib/X11/xserver/sv.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/sv.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/sv.UTF-8 -${PLIST.xprint}lib/X11/xserver/sv_FI -${PLIST.xprint}lib/X11/xserver/sv_FI.iso88591 -${PLIST.xprint}lib/X11/xserver/sv_FI.iso885915@euro -${PLIST.xprint}lib/X11/xserver/sv_FI.utf8 -${PLIST.xprint}lib/X11/xserver/sv_FI@euro -${PLIST.xprint}lib/X11/xserver/sv_SE -${PLIST.xprint}lib/X11/xserver/sv_SE.ISO8859-1 -${PLIST.xprint}lib/X11/xserver/sv_SE.ISO8859-15 -${PLIST.xprint}lib/X11/xserver/sv_SE.UTF-8 -${PLIST.xprint}lib/X11/xserver/sv_SE.iso88591 -${PLIST.xprint}lib/X11/xserver/sv_SE.iso885915 -${PLIST.xprint}lib/X11/xserver/sv_SE.utf8 -${PLIST.xprint}lib/X11/xserver/swedish -${PLIST.xprint}lib/X11/xserver/ta_IN -${PLIST.xprint}lib/X11/xserver/ta_IN.utf8 -${PLIST.xprint}lib/X11/xserver/te_IN -${PLIST.xprint}lib/X11/xserver/te_IN.utf8 -${PLIST.xprint}lib/X11/xserver/tg_TJ -${PLIST.xprint}lib/X11/xserver/tg_TJ.koi8t -${PLIST.xprint}lib/X11/xserver/th -${PLIST.xprint}lib/X11/xserver/th_TH -${PLIST.xprint}lib/X11/xserver/th_TH.ISO8859-11 -${PLIST.xprint}lib/X11/xserver/th_TH.TIS620 -${PLIST.xprint}lib/X11/xserver/th_TH.UTF-8 -${PLIST.xprint}lib/X11/xserver/th_TH.tis620 -${PLIST.xprint}lib/X11/xserver/th_TH.utf8 -${PLIST.xprint}lib/X11/xserver/thai -${PLIST.xprint}lib/X11/xserver/tl_PH -${PLIST.xprint}lib/X11/xserver/tl_PH.iso88591 -${PLIST.xprint}lib/X11/xserver/tr -${PLIST.xprint}lib/X11/xserver/tr.ISO8859-9 -${PLIST.xprint}lib/X11/xserver/tr_TR -${PLIST.xprint}lib/X11/xserver/tr_TR.ISO8859-9 -${PLIST.xprint}lib/X11/xserver/tr_TR.UTF-8 -${PLIST.xprint}lib/X11/xserver/tr_TR.iso88599 -${PLIST.xprint}lib/X11/xserver/tr_TR.utf8 -${PLIST.xprint}lib/X11/xserver/turkish -${PLIST.xprint}lib/X11/xserver/uk_UA -${PLIST.xprint}lib/X11/xserver/uk_UA.koi8u -${PLIST.xprint}lib/X11/xserver/uk_UA.utf8 -${PLIST.xprint}lib/X11/xserver/ur_PK -${PLIST.xprint}lib/X11/xserver/ur_PK.utf8 -${PLIST.xprint}lib/X11/xserver/uz_UZ -${PLIST.xprint}lib/X11/xserver/uz_UZ.iso88591 -${PLIST.xprint}lib/X11/xserver/vi_VN -${PLIST.xprint}lib/X11/xserver/vi_VN.tcvn -${PLIST.xprint}lib/X11/xserver/vi_VN.utf8 -${PLIST.xprint}lib/X11/xserver/wa_BE -${PLIST.xprint}lib/X11/xserver/wa_BE.iso88591 -${PLIST.xprint}lib/X11/xserver/wa_BE.iso885915@euro -${PLIST.xprint}lib/X11/xserver/wa_BE@euro -${PLIST.xprint}lib/X11/xserver/yi_US -${PLIST.xprint}lib/X11/xserver/yi_US.cp1255 -${PLIST.xprint}lib/X11/xserver/zh -${PLIST.xprint}lib/X11/xserver/zh.GBK -${PLIST.xprint}lib/X11/xserver/zh.UTF-8 -${PLIST.xprint}lib/X11/xserver/zh_CN -${PLIST.xprint}lib/X11/xserver/zh_CN.EUC -${PLIST.xprint}lib/X11/xserver/zh_CN.EUC@pinyin -${PLIST.xprint}lib/X11/xserver/zh_CN.EUC@radical -${PLIST.xprint}lib/X11/xserver/zh_CN.EUC@stroke -${PLIST.xprint}lib/X11/xserver/zh_CN.GB18030 -${PLIST.xprint}lib/X11/xserver/zh_CN.GB18030@pinyin -${PLIST.xprint}lib/X11/xserver/zh_CN.GB18030@radical -${PLIST.xprint}lib/X11/xserver/zh_CN.GB18030@stroke -${PLIST.xprint}lib/X11/xserver/zh_CN.GBK -${PLIST.xprint}lib/X11/xserver/zh_CN.GBK@pinyin -${PLIST.xprint}lib/X11/xserver/zh_CN.GBK@radical -${PLIST.xprint}lib/X11/xserver/zh_CN.GBK@stroke -${PLIST.xprint}lib/X11/xserver/zh_CN.UTF-8 -${PLIST.xprint}lib/X11/xserver/zh_CN.UTF-8@pinyin -${PLIST.xprint}lib/X11/xserver/zh_CN.UTF-8@radical -${PLIST.xprint}lib/X11/xserver/zh_CN.UTF-8@stroke -${PLIST.xprint}lib/X11/xserver/zh_CN.gb18030 -${PLIST.xprint}lib/X11/xserver/zh_CN.gb2312 -${PLIST.xprint}lib/X11/xserver/zh_CN.gbk -${PLIST.xprint}lib/X11/xserver/zh_CN.utf8 -${PLIST.xprint}lib/X11/xserver/zh_HK -${PLIST.xprint}lib/X11/xserver/zh_HK.BIG5HK -${PLIST.xprint}lib/X11/xserver/zh_HK.BIG5HK@radical -${PLIST.xprint}lib/X11/xserver/zh_HK.BIG5HK@stroke -${PLIST.xprint}lib/X11/xserver/zh_HK.UTF-8 -${PLIST.xprint}lib/X11/xserver/zh_HK.UTF-8@radical -${PLIST.xprint}lib/X11/xserver/zh_HK.UTF-8@stroke -${PLIST.xprint}lib/X11/xserver/zh_HK.big5hkscs -${PLIST.xprint}lib/X11/xserver/zh_HK.utf8 -${PLIST.xprint}lib/X11/xserver/zh_TW -${PLIST.xprint}lib/X11/xserver/zh_TW.BIG5 -${PLIST.xprint}lib/X11/xserver/zh_TW.BIG5@pinyin -${PLIST.xprint}lib/X11/xserver/zh_TW.BIG5@radical -${PLIST.xprint}lib/X11/xserver/zh_TW.BIG5@stroke -${PLIST.xprint}lib/X11/xserver/zh_TW.BIG5@zhuyin -${PLIST.xprint}lib/X11/xserver/zh_TW.EUC -${PLIST.xprint}lib/X11/xserver/zh_TW.EUC@pinyin -${PLIST.xprint}lib/X11/xserver/zh_TW.EUC@radical -${PLIST.xprint}lib/X11/xserver/zh_TW.EUC@stroke -${PLIST.xprint}lib/X11/xserver/zh_TW.EUC@zhuyin -${PLIST.xprint}lib/X11/xserver/zh_TW.UTF-8 -${PLIST.xprint}lib/X11/xserver/zh_TW.UTF-8@pinyin -${PLIST.xprint}lib/X11/xserver/zh_TW.UTF-8@radical -${PLIST.xprint}lib/X11/xserver/zh_TW.UTF-8@stroke -${PLIST.xprint}lib/X11/xserver/zh_TW.UTF-8@zhuyin -${PLIST.xprint}lib/X11/xserver/zh_TW.big5 -${PLIST.xprint}lib/X11/xserver/zh_TW.euctw -${PLIST.xprint}lib/X11/xserver/zh_TW.utf8 lib/pkgconfig/xorg-server.pc ${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la lib/xorg/modules/extensions/libdbe.la @@ -1106,6 +201,7 @@ lib/xorg/modules/libshadow.la lib/xorg/modules/libshadowfb.la lib/xorg/modules/libvbe.la lib/xorg/modules/libvgahw.la +lib/xorg/modules/libwfb.la lib/xorg/modules/libxaa.la lib/xorg/modules/libxf1bpp.la lib/xorg/modules/libxf4bpp.la @@ -1122,21 +218,18 @@ lib/xorg/modules/multimedia/uda1380_drv.la lib/xserver/SecurityPolicy man/man1/Xnest.1 man/man1/Xorg.1 -${PLIST.xprint}man/man1/Xprt.1 man/man1/Xserver.1 man/man1/Xvfb.1 man/man1/cvt.1 man/man1/gtf.1 man/man1/pcitweak.1 man/man1/scanpci.1 -man/man1/xorgcfg.1 man/man1/xorgconfig.1 man/man4/exa.4 man/man4/fbdevhw.4 +man/man5/SecurityPolicy.5 man/man5/xorg.conf.5 -share/X11/xkb/compiled/README.compiled share/aclocal/xorg-server.m4 -@dirrm share/X11/xkb/compiled @dirrm lib/xserver @dirrm lib/xorg/modules/multimedia @dirrm lib/xorg/modules/linux @@ -1144,30 +237,4 @@ share/aclocal/xorg-server.m4 @dirrm lib/xorg/modules/extensions @dirrm lib/xorg/modules @dirrm lib/xorg -${PLIST.xprint}@dirrm lib/X11/xserver/en_US/print/attributes -${PLIST.xprint}@dirrm lib/X11/xserver/en_US/print -${PLIST.xprint}@dirrm lib/X11/xserver/en_US -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/SPSPARC2 -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/PSspooldir -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/PSdefault -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/PS2PDFspooldir-GS -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPLJ4family -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/HPDJ1600C -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/GSdefault -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models/CANONBJ10E-GS -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/models -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/ddx-config/raster -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/ddx-config -${PLIST.xprint}@dirrm lib/X11/xserver/C/print/attributes -${PLIST.xprint}@dirrm lib/X11/xserver/C/print -${PLIST.xprint}@dirrm lib/X11/xserver/C -${PLIST.xprint}@dirrm lib/X11/xserver @dirrm include/xorg diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index 55673a2f516..346543bf537 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/04/25 20:47:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2008/09/18 20:56:01 bjs Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+ @@ -12,10 +12,13 @@ BUILDLINK_PACKAGES+= modular-xorg-server BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server .if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.2.99 +BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.4.2 BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server + .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK +.include "../../x11/pixman/buildlink3.mk" + .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index c64253ef739..4a704a901c5 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,43 +1,19 @@ -$NetBSD: distinfo,v 1.23 2008/07/13 20:41:46 tonnerre Exp $ +$NetBSD: distinfo,v 1.24 2008/09/18 20:56:01 bjs Exp $ -SHA1 (MesaLib-6.5.2.tar.bz2) = ba860bb6ee57c02202342dfd5927464a068ea18f -RMD160 (MesaLib-6.5.2.tar.bz2) = 9a92d69110c066ae6734bcaafb78f222ac2df6d3 -Size (MesaLib-6.5.2.tar.bz2) = 3295166 bytes -SHA1 (xorg-server-1.3.0.0.tar.bz2) = 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c -RMD160 (xorg-server-1.3.0.0.tar.bz2) = 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 -Size (xorg-server-1.3.0.0.tar.bz2) = 5968263 bytes -SHA1 (patch-aa) = f72780165c9ecd3e9ab31d03c1b2d777290d09e2 -SHA1 (patch-ab) = d99c045eff730b3fbdc92938faaa75b653640c58 -SHA1 (patch-ac) = 06b26c3f0658bc323363ec860063b7ffc636ac2e -SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064 -SHA1 (patch-ae) = 53ce49bec7674be40b93de33bd8ec01942e18c9c -SHA1 (patch-af) = 6c58872798a30b31154dd7b167c84bf20ac417be -SHA1 (patch-ag) = 222427db3e1bdbf977e992aa91aae5f16992345a -SHA1 (patch-ah) = 23767542ea672d590050e258317c0352bb321810 -SHA1 (patch-aj) = 7a538538a04ff466595527b7a65a196fc06a625e -SHA1 (patch-ak) = 82331e3ee5e6e70275e688b215519f76340523d9 -SHA1 (patch-al) = 004ba3b2524e151c8d6bc42f943088a587634c2a -SHA1 (patch-am) = 9f76dd58bc87e1c4163dc2788cc4d37c1bb7b3b0 -SHA1 (patch-an) = b3adf58649353c036e798754283030a1f4c0f3c9 -SHA1 (patch-db) = 28913a094c8499536a71c8d4d7ca57a5efb25b39 -SHA1 (patch-dc) = 75df6f37b1cbc9574adb5ee66cb84d0f5ebac853 -SHA1 (patch-dd) = cfb7c9d470098b0fcfcddbe9a1363a14f762fe19 -SHA1 (patch-de) = f887f3fd09406006b6165779b74be780b7fddd18 -SHA1 (patch-ea) = 435ac0e1795c68fa6e125deceb4624564f7ce0dd -SHA1 (patch-eb) = 925a8a7e7880e545feac439850372548d04e8f87 -SHA1 (patch-ec) = 86959d152174cbc8a03dbe6bde32545b824bfd74 -SHA1 (patch-ed) = 875ee1f03e94e709d878ccbbfc8f9a3ce924eac5 -SHA1 (patch-ef) = 9edb141038c08417a0f06395e4cdff0de9e9fdcf -SHA1 (patch-eg) = 6953b53d41af088b855d22c6459aa1eefd0d25eb -SHA1 (patch-eh) = 5e1dbbf82c01bc340d1ef4029cd5352b9fcf775e -SHA1 (patch-ei) = 893b23b9e67ad640d984c962b93b5db639a780b3 -SHA1 (patch-ej) = 0719d0fa6fb55739a58b157e31f0ae442d57c211 -SHA1 (patch-ek) = de8ee96433a65b9f59804c4e78d6b04496e30d37 -SHA1 (patch-el) = cc7f39c82d017657bb72ff332b65f797bdbdd6fc -SHA1 (patch-em) = 25ec7e56ceb87ea5bfc53f5734dab84ad15b88ca -SHA1 (patch-en) = 447e7f996ab7e0179227676a9f7f2c4b51a69d62 -SHA1 (patch-eo) = 499b6d47db383acb0e7fcb90faebf4ede1ccd2a9 -SHA1 (patch-ep) = 0beae9b5cbc5e87c757e22796aed82c1c4436f0e +SHA1 (MesaLib-7.0.4.tar.bz2) = 7e2ecbe89d245510d2681d04e959aee6adc205c5 +RMD160 (MesaLib-7.0.4.tar.bz2) = 0394bb9e00ea13f2399bc5895d4264221bbc03ac +Size (MesaLib-7.0.4.tar.bz2) = 3414357 bytes +SHA1 (xorg-server-1.4.2-20080917.patch.gz) = e8fced0a6ada867d6bfdedda22a8bf178fa48977 +RMD160 (xorg-server-1.4.2-20080917.patch.gz) = 2463fa939dc9340e79c03356fa47310343d9e10c +Size (xorg-server-1.4.2-20080917.patch.gz) = 28955 bytes +SHA1 (xorg-server-1.4.2.tar.bz2) = 385348721ecb6da4bc51a2b7ee5784de6be0a8b6 +RMD160 (xorg-server-1.4.2.tar.bz2) = 6f12b28d7e4186dfbdec3c9116c65e6831ed2e54 +Size (xorg-server-1.4.2.tar.bz2) = 6216638 bytes +SHA1 (patch-aa) = 05ded41f5d114b2d21bce2629999ea5758ae7e87 +SHA1 (patch-ab) = 20b62798fd6f4ea173f827a5e122cf95f4673983 +SHA1 (patch-ac) = 0e7d01cbdd692b75256318a0309551f6e5d2f5ec +SHA1 (patch-ad) = 57f9b5413d0c48ac12343f9d75879a46bd334931 +SHA1 (patch-ah) = b92699ae5913459799b8b870664786b3583e292d SHA1 (patch-sa) = 5586e998e2239b6851291b5f79b2e6009c78b174 SHA1 (patch-sb) = b769780b446e4f10bc99ccd3373d666daf44f863 SHA1 (patch-sc) = 33c4d4731e3732032f84946fc17e28d0cba389a6 diff --git a/x11/modular-xorg-server/files/mesalib-patch-aq b/x11/modular-xorg-server/files/mesalib-patch-aq new file mode 100644 index 00000000000..dc4cb8f6b80 --- /dev/null +++ b/x11/modular-xorg-server/files/mesalib-patch-aq @@ -0,0 +1,23 @@ +$NetBSD: mesalib-patch-aq,v 1.1 2008/09/18 20:56:01 bjs Exp $ + +--- ../Mesa-7.0.4/src/mesa/main/imports.h.orig 2008-03-19 19:25:18.000000000 -0400 ++++ ../Mesa-7.0.4/src/mesa/main/imports.h +@@ -292,7 +292,7 @@ static INLINE int GET_FLOAT_BITS( float + *** LDEXPF: multiply value by an integral power of two + *** FREXPF: extract mantissa and exponent from value + ***/ +-#if defined(__gnu_linux__) ++#if defined(USE_NATIVE_LIBM_FUNCS) + /* C99 functions */ + #define CEILF(x) ceilf(x) + #define FLOORF(x) floorf(x) +@@ -515,7 +515,9 @@ static INLINE int iceil(float f) + /* Hardware default: All exceptions masked, extended double precision, + * round to nearest (IEEE compliant): + */ ++#ifndef DEFAULT_X86_FPU + #define DEFAULT_X86_FPU 0x037f ++#endif + /* All exceptions masked, single precision, round to nearest: + */ + #define FAST_X86_FPU 0x003f diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 726e23e8955..86251a2a698 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,47 +1,45 @@ -# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:15 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2008/09/18 20:56:01 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= dri inet6 -# remove after 2007Q4 -PKG_OPTIONS_LEGACY_OPTS=glx:dri -.if defined(PKG_OPTIONS.xorg-server) -PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.xorg-server} -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.xorg-server used, use "${PKG_OPTIONS_VAR:Q}" instead." -.endif .include "../../mk/bsd.options.mk" PLIST_VARS+= dri + .if !empty(PKG_OPTIONS:Mdri) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= MesaLib-6.5.2.tar.bz2 -SITES.MesaLib-6.5.2.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} -MESA_SRC= ${WRKDIR}/Mesa-6.5.2 -CONFIGURE_ARGS+= --enable-glx -CONFIGURE_ARGS+= --with-mesa-source=${MESA_SRC} -.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "alpha" -GLX_DEFINES+= -D__GLX_ALIGN64 -.endif -CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q} -# glcore.h and dri_interface.h shipped with *proto are older than -# those in Mesa-6.5.2. Either patch them or trick the build into using -# the newer ones. -#BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1 -#BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1 PLIST.dri= yes +. include "../../graphics/Mesa/Makefile.version" +. include "../../graphics/MesaLib/glx-config.mk" + +DISTFILES= ${DEFAULT_DISTFILES} +MESA_DISTFILE= ${MESA_DISTNAME}${EXTRACT_SUFX} # .tar.bz2 +DISTFILES+= ${MESA_DISTFILE} +SITES.${MESA_DISTFILE}= ${MESA_SITES} +MESA_SRC= ${WRKDIR}/Mesa-${MESA_VERSION} +### +### XXX Is there a better way to do this? For now, when updating these +### patches (don't forget about Mesa updates!), please ensure that +### the relative path in the patch matches "Mesa-${MESA_VERSION}". +### +_PKGSRC_PATCHES+= ${FILESDIR}/mesalib-patch-aq +CONFIGURE_ARGS+= --enable-glx +CONFIGURE_ARGS+= --enable-aiglx +CONFIGURE_ARGS+= --with-mesa-source=${MESA_SRC} dri-post-extract: ${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL - .else +### +### XXX Perhaps we should allow for a built-in glx without dri enabled? +### CONFIGURE_ARGS+= --disable-glx dri-post-extract: @${DO_NADA} # for GLX we already have the Mesa source -.include "../../graphics/MesaLib/buildlink3.mk" +. include "../../graphics/MesaLib/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Minet6) diff --git a/x11/modular-xorg-server/patches/patch-aa b/x11/modular-xorg-server/patches/patch-aa index f03c35beebf..965b9e02a1b 100644 --- a/x11/modular-xorg-server/patches/patch-aa +++ b/x11/modular-xorg-server/patches/patch-aa @@ -1,31 +1,33 @@ -$NetBSD: patch-aa,v 1.3 2007/03/02 11:51:49 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2008/09/18 20:56:01 bjs Exp $ ---- hw/xfree86/os-support/bsd/bsd_init.c.orig 2007-01-23 00:39:16.000000000 -0500 -+++ hw/xfree86/os-support/bsd/bsd_init.c -@@ -160,7 +160,9 @@ xf86OpenConsole() - xf86ConsOpen_t *driver; - #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) - int result; -+#ifdef __FreeBSD__ - struct utsname uts; -+#endif - vtmode_t vtmode; - #endif - -@@ -251,6 +253,7 @@ xf86OpenConsole() - #endif - /* otherwise fall through */ - case PCVT: -+#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)) - /* - * First activate the #1 VT. This is a hack to allow a server - * to be started while another one is active. There should be -@@ -265,7 +268,7 @@ xf86OpenConsole() - } - sleep(1); - } -- -+#endif - acquire_vt: - /* - * now get the VT +On Friday 04 July 2008, Joerg Sonnenberger wrote: +> On Thu, Jul 03, 2008 at 07:52:31PM -0600, Sverre Froyen wrote: +> > I've tracked the jumping cursor issue down to the function +> > acceleratePointer in dix/getevents.c. +> +> All this issues in the past happened because some very smart guys +> decided to do random broken things from signal context. Which is why +> this is extremely hard to trace down. + +I still see the jumps in 1.4.2. Perhaps my workaround (attached) could be +included until a proper fix is developed? + +--- dix/getevents.c.orig 2008-06-29 00:23:13.000000000 -0400 ++++ dix/getevents.c +@@ -613,9 +613,15 @@ GetPointerEvents(xEvent *events, DeviceI + clipAxis(pDev, 1, &y); + } + else { +- if (flags & POINTER_ACCELERATE) ++ if (flags & POINTER_ACCELERATE) { ++ int x_in; ++ if (num_valuators >= 1) ++ x_in = valuators[0]; + acceleratePointer(pDev, first_valuator, num_valuators, + valuators); ++ if (num_valuators >= 1 && valuators[0] < -3000) ++ valuators[0] = x_in; ++ } + + if (pDev->coreEvents) { + /* Get and convert the core pointer coordinate space into diff --git a/x11/modular-xorg-server/patches/patch-ab b/x11/modular-xorg-server/patches/patch-ab index 176b25a5127..09fbee62a40 100644 --- a/x11/modular-xorg-server/patches/patch-ab +++ b/x11/modular-xorg-server/patches/patch-ab @@ -1,86 +1,16 @@ -$NetBSD: patch-ab,v 1.6 2007/11/01 14:43:47 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2008/09/18 20:56:01 bjs Exp $ ---- configure.orig 2007-04-20 01:25:26.000000000 +0000 -+++ configure -@@ -24767,6 +24767,10 @@ _ACEOF - #define USE_DEV_IO 1 - _ACEOF - ;; -+ *dragonfly*) cat >>confdefs.h <<\_ACEOF -+#define USE_DEV_IO 1 -+_ACEOF -+ ;; - *netbsd*) cat >>confdefs.h <<\_ACEOF - #define USE_I386_IOPL 1 - _ACEOF -@@ -24873,7 +24877,7 @@ fi - DRI=no - KDRIVE_HW=no - case $host_os in -- *freebsd*) -+ *freebsd* | *dragonfly*) - case $host_os in - kfreebsd*-gnu) ;; - *) -@@ -24912,6 +24916,11 @@ _ACEOF +--- hw/xfree86/xorgconf.cpp.orig 2008-06-10 13:57:20.000000000 -0400 ++++ hw/xfree86/xorgconf.cpp +@@ -608,3 +608,11 @@ Section "ServerLayout" + InputDevice "Keyboard1" "CoreKeyboard" + EndSection - - cat >>confdefs.h <<\_ACEOF -+#define PCVT_SUPPORT 1 -+_ACEOF -+ ++ ++XCOMM Two experimental extensions are available -- Composite and XEVIE. Uncomment ++XCOMM the section below to enable Composite. Many extensions can also be disabled ++XCOMM in this manner. + -+cat >>confdefs.h <<\_ACEOF - #define WSCONS_SUPPORT 1 - _ACEOF - -@@ -26417,15 +26426,7 @@ echo $ECHO_N "checking for $prefix/share - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- test "$cross_compiling" = yes && -- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 --echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -- { (exit 1); exit 1; }; } --if test -r "$prefix/share/X11/sgml/defs.ent"; then - eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi - fi - ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -@@ -28182,7 +28183,7 @@ _ACEOF - - fi - --VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)" -+VENDOR_RELEASE=`expr \( $VERSION_MAJOR \* 10000000 \) + \( $VERSION_MINOR \* 100000 \) + \( $VERSION_PATCH \* 1000 \) + $VERSION_SNAP` - - if test $VERSION_SNAP = "0"; then - if test $VERSION_PATCH = "0"; then -@@ -30903,7 +30904,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - XORG_OS="freebsd" - XORG_OS_SUBDIR="bsd" - XORG_OS_KBD="BSD" -@@ -31146,7 +31147,14 @@ echo "$as_me: error: Your OS is unknown. - ;; - sparc*) - xorg_bus_sparcpci="yes" -- xorg_bus_sparc="yes" -+ case $host_os in -+ netbsd*) -+ xorg_bus_sparc="no" -+ ;; -+ *) -+ xorg_bus_sparc="yes" -+ ;; -+ esac - ;; - x86_64*|amd64*) - case $host_os in ++XCOMM Section "Extensions" ++XCOMM Option "Composite" "Enable" ++XCOMM EndSection diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac index 07d48e63b03..be09b2ef146 100644 --- a/x11/modular-xorg-server/patches/patch-ac +++ b/x11/modular-xorg-server/patches/patch-ac @@ -1,34 +1,15 @@ -$NetBSD: patch-ac,v 1.3 2008/06/20 13:34:40 joerg Exp $ +$NetBSD: patch-ac,v 1.4 2008/09/18 20:56:01 bjs Exp $ -CVE-2008-2360 - ---- render/glyph.c.orig 2006-09-18 08:04:18.000000000 +0200 -+++ render/glyph.c -@@ -42,6 +42,12 @@ - #include "picturestr.h" - #include "glyphstr.h" +--- hw/xfree86/common/Makefile.am.orig 2008-08-02 04:52:04.000000000 -0400 ++++ hw/xfree86/common/Makefile.am +@@ -23,8 +23,8 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c x + + MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes + +-xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) +- cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@ ++xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) ++ cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@ + + BUILT_SOURCES = xf86DefModeSet.c -+#if HAVE_STDINT_H -+#include <stdint.h> -+#elif !defined(UINT32_MAX) -+#define UINT32_MAX 0xffffffffU -+#endif -+ - /* - * From Knuth -- a good choice for hash/rehash values is p, p-2 where - * p and p-2 are both prime. These tables are sized to have an extra 10% -@@ -626,8 +632,12 @@ AllocateGlyph (xGlyphInfo *gi, int fdept - int size; - GlyphPtr glyph; - int i; -- -- size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]); -+ size_t padded_width; -+ -+ padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]); -+ if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height) -+ return 0; -+ size = gi->height * padded_width; - glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec)); - if (!glyph) - return 0; diff --git a/x11/modular-xorg-server/patches/patch-ad b/x11/modular-xorg-server/patches/patch-ad index e7187b6da07..56ff07ebcee 100644 --- a/x11/modular-xorg-server/patches/patch-ad +++ b/x11/modular-xorg-server/patches/patch-ad @@ -1,26 +1,15 @@ -$NetBSD: patch-ad,v 1.2 2007/02/26 17:51:16 drochner Exp $ +$NetBSD: patch-ad,v 1.3 2008/09/18 20:56:01 bjs Exp $ -So mouse pointer does not get stuck on left side of screen. - ---- hw/xfree86/common/xf86Xinput.c.orig 2006-07-05 18:31:40.000000000 +0000 -+++ hw/xfree86/common/xf86Xinput.c -@@ -940,15 +940,10 @@ xf86PostMotionEvent(DeviceIntPtr device, - /* modeled from xf86Events.c */ - if (device->ptrfeed->ctrl.threshold) { - if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) { -- local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) / -- (float)(device->ptrfeed->ctrl.den) + local->dxremaind; -- valuator[0] = (int)local->dxremaind; -- local->dxremaind = local->dxremaind - (float)valuator[0]; -- -- local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) / -- (float)(device->ptrfeed->ctrl.den) + local->dyremaind; -- valuator[1] = (int)local->dyremaind; -- local->dyremaind = local->dyremaind - (float)valuator[1]; -+ valuator[0] = (dx * device->ptrfeed->ctrl.num) / -+ device->ptrfeed->ctrl.den; -+ valuator[1] = (dy * device->ptrfeed->ctrl.num) / -+ device->ptrfeed->ctrl.den; - } - } - else if (dx || dy) { +--- hw/xfree86/common/Makefile.in.orig 2008-06-11 10:31:17.000000000 -0400 ++++ hw/xfree86/common/Makefile.in +@@ -810,8 +810,8 @@ uninstall-am: uninstall-sdkHEADERS + tags uninstall uninstall-am uninstall-sdkHEADERS + + +-xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) +- cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@ ++xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) ++ cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae deleted file mode 100644 index b1f534180dc..00000000000 --- a/x11/modular-xorg-server/patches/patch-ae +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2008/06/20 13:34:40 joerg Exp $ - -CVE-2008-1377 - ---- record/record.c.orig 2006-09-18 08:04:18.000000000 +0200 -+++ record/record.c -@@ -2656,7 +2656,7 @@ SProcRecordQueryVersion(ClientPtr client - } /* SProcRecordQueryVersion */ - - --static void -+static int - SwapCreateRegister(xRecordRegisterClientsReq *stuff) - { - register char n; -@@ -2667,11 +2667,17 @@ SwapCreateRegister(xRecordRegisterClient - swapl(&stuff->nClients, n); - swapl(&stuff->nRanges, n); - pClientID = (XID *)&stuff[1]; -+ if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2)) -+ return BadLength; - for (i = 0; i < stuff->nClients; i++, pClientID++) - { - swapl(pClientID, n); - } -+ if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2) -+ - stuff->nClients) -+ return BadLength; - RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges); -+ return Success; - } /* SwapCreateRegister */ - - -@@ -2679,11 +2685,13 @@ static int - SProcRecordCreateContext(ClientPtr client) - { - REQUEST(xRecordCreateContextReq); -+ int status; - register char n; - - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq); -- SwapCreateRegister((pointer)stuff); -+ if ((status = SwapCreateRegister((pointer)stuff)) != Success) -+ return status; - return ProcRecordCreateContext(client); - } /* SProcRecordCreateContext */ - -@@ -2692,11 +2700,13 @@ static int - SProcRecordRegisterClients(ClientPtr client) - { - REQUEST(xRecordRegisterClientsReq); -+ int status; - register char n; - - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq); -- SwapCreateRegister((pointer)stuff); -+ if ((status = SwapCreateRegister((pointer)stuff)) != Success) -+ return status; - return ProcRecordRegisterClients(client); - } /* SProcRecordRegisterClients */ - diff --git a/x11/modular-xorg-server/patches/patch-af b/x11/modular-xorg-server/patches/patch-af deleted file mode 100644 index 9a1ac29ace1..00000000000 --- a/x11/modular-xorg-server/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/03/02 11:51:49 drochner Exp $ - ---- hw/xfree86/os-support/bsd/i386_video.c.orig 2007-01-23 00:39:16.000000000 -0500 -+++ hw/xfree86/os-support/bsd/i386_video.c -@@ -50,6 +50,11 @@ - #include <machine/mtrr.h> - #include <machine/sysarch.h> - #include <sys/queue.h> -+#ifdef __x86_64__ -+#define i386_set_mtrr x86_64_set_mtrr -+#define i386_get_mtrr x86_64_get_mtrr -+#define i386_iopl x86_64_iopl -+#endif - #endif - - #if defined(__OpenBSD__) && defined(__amd64__) diff --git a/x11/modular-xorg-server/patches/patch-ag b/x11/modular-xorg-server/patches/patch-ag deleted file mode 100644 index 0aa17c8b8fc..00000000000 --- a/x11/modular-xorg-server/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2007/08/14 21:34:37 joerg Exp $ - ---- hw/xfree86/common/Makefile.am.orig 2007-08-14 20:51:48.000000000 +0200 -+++ hw/xfree86/common/Makefile.am -@@ -25,8 +25,8 @@ KBDSOURCES = xf86Kbd@XORG_OS_KBD@.c - - MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes - --xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) -- cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@ -+xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) -+ cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@ - - BUILT_SOURCES = xf86DefModeSet.c - diff --git a/x11/modular-xorg-server/patches/patch-ah b/x11/modular-xorg-server/patches/patch-ah index 2c133e57863..fd30655e85d 100644 --- a/x11/modular-xorg-server/patches/patch-ah +++ b/x11/modular-xorg-server/patches/patch-ah @@ -1,15 +1,22 @@ -$NetBSD: patch-ah,v 1.1 2007/08/14 21:34:37 joerg Exp $ +$NetBSD: patch-ah,v 1.2 2008/09/18 20:56:01 bjs Exp $ ---- hw/xfree86/common/Makefile.in.orig 2007-08-14 20:51:05.000000000 +0200 -+++ hw/xfree86/common/Makefile.in -@@ -990,8 +990,8 @@ uninstall-am: uninstall-info-am uninstal - uninstall-sdkHEADERS +This patch provides a black background by default--a little +nicer, no? + +--- dix/window.c.orig 2008-06-10 13:57:18.000000000 -0400 ++++ dix/window.c +@@ -138,8 +138,12 @@ Equipment Corporation. + * + ******/ + +-static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; +-static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; ++/* TODO: Perhaps we should allow the user/system administrator ++ * to set this via environment variable or configuration ++ * directive? ++ */ ++static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; ++static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; + _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF; --xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) -- cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@ -+xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) -+ cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/x11/modular-xorg-server/patches/patch-aj b/x11/modular-xorg-server/patches/patch-aj deleted file mode 100644 index 2fc3b6fbc0d..00000000000 --- a/x11/modular-xorg-server/patches/patch-aj +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2007/08/16 20:10:16 joerg Exp $ - ---- configure.ac.orig 2007-08-16 17:12:23.000000000 +0200 -+++ configure.ac -@@ -217,6 +217,7 @@ case $host_cpu in - case $host_os in - *linux*) DEFAULT_INT10=vm86 ;; - *freebsd*) AC_DEFINE(USE_DEV_IO) ;; -+ *dragonfly*) AC_DEFINE(USE_DEV_IO) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL) - SYS_LIBS=-li386 - ;; -@@ -275,6 +276,7 @@ case $host_os in - *netbsd*) - AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) - AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) -+ AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console]) - AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) - DRI=yes - ;; -@@ -1147,7 +1149,7 @@ int main () { - AC_DEFINE_UNQUOTED(LNX_KBD_PERIOD_NAME, [$period_field], - [Name of the period field in struct kbd_repeat]) - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly) - XORG_OS="freebsd" - XORG_OS_SUBDIR="bsd" - XORG_OS_KBD="BSD" -@@ -1260,7 +1262,14 @@ int main () { - ;; - sparc*) - xorg_bus_sparcpci="yes" -- xorg_bus_sparc="yes" -+ case $host_os in -+ netbsd*) -+ xorg_bus_sparc="no" -+ ;; -+ *) -+ xorg_bus_sparc="yes" -+ ;; -+ esac - ;; - x86_64*|amd64*) - case $host_os in diff --git a/x11/modular-xorg-server/patches/patch-ak b/x11/modular-xorg-server/patches/patch-ak deleted file mode 100644 index 75e28869c03..00000000000 --- a/x11/modular-xorg-server/patches/patch-ak +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2008/07/13 12:37:29 tonnerre Exp $ - ---- composite/compalloc.c.orig 2007-03-18 01:29:16.000000000 +0100 -+++ composite/compalloc.c -@@ -462,7 +462,6 @@ compNewPixmap (WindowPtr pWin, int x, in - ScreenPtr pScreen = pWin->drawable.pScreen; - WindowPtr pParent = pWin->parent; - PixmapPtr pPixmap; -- GCPtr pGC; - - pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth); - -@@ -472,25 +471,63 @@ compNewPixmap (WindowPtr pWin, int x, in - pPixmap->screen_x = x; - pPixmap->screen_y = y; - -- pGC = GetScratchGC (pWin->drawable.depth, pScreen); -- -- /* -- * Copy bits from the parent into the new pixmap so that it will -- * have "reasonable" contents in case for background None areas. -- */ -- if (pGC) -+ if (pParent->drawable.depth == pWin->drawable.depth) - { -- XID val = IncludeInferiors; -+ GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); - -- ValidateGC(&pPixmap->drawable, pGC); -- dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); -- (*pGC->ops->CopyArea) (&pParent->drawable, -- &pPixmap->drawable, -- pGC, -- x - pParent->drawable.x, -- y - pParent->drawable.y, -- w, h, 0, 0); -- FreeScratchGC (pGC); -+ /* -+ * Copy bits from the parent into the new pixmap so that it will -+ * have "reasonable" contents in case for background None areas. -+ */ -+ if (pGC) -+ { -+ XID val = IncludeInferiors; -+ -+ ValidateGC(&pPixmap->drawable, pGC); -+ dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); -+ (*pGC->ops->CopyArea) (&pParent->drawable, -+ &pPixmap->drawable, -+ pGC, -+ x - pParent->drawable.x, -+ y - pParent->drawable.y, -+ w, h, 0, 0); -+ FreeScratchGC (pGC); -+ } -+ } -+ else -+ { -+ PictFormatPtr pSrcFormat = compWindowFormat (pParent); -+ PictFormatPtr pDstFormat = compWindowFormat (pWin); -+ XID inferiors = IncludeInferiors; -+ int error; -+ -+ PicturePtr pSrcPicture = CreatePicture (None, -+ &pParent->drawable, -+ pSrcFormat, -+ CPSubwindowMode, -+ &inferiors, -+ serverClient, &error); -+ -+ PicturePtr pDstPicture = CreatePicture (None, -+ &pPixmap->drawable, -+ pDstFormat, -+ 0, 0, -+ serverClient, &error); -+ -+ if (pSrcPicture && pDstPicture) -+ { -+ CompositePicture (PictOpSrc, -+ pSrcPicture, -+ NULL, -+ pDstPicture, -+ x - pParent->drawable.x, -+ y - pParent->drawable.y, -+ 0, 0, 0, 0, w, h); -+ } -+ if (pSrcPicture) -+ FreePicture (pSrcPicture, 0); -+ if (pDstPicture) -+ FreePicture (pDstPicture, 0); - } - return pPixmap; - } diff --git a/x11/modular-xorg-server/patches/patch-al b/x11/modular-xorg-server/patches/patch-al deleted file mode 100644 index 27a6d89fa2a..00000000000 --- a/x11/modular-xorg-server/patches/patch-al +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-al,v 1.1 2008/07/13 12:37:29 tonnerre Exp $ - ---- composite/compint.h.orig 2007-03-16 19:13:57.000000000 +0100 -+++ composite/compint.h -@@ -237,6 +237,9 @@ compCheckTree (ScreenPtr pScreen); - #define compCheckTree(s) - #endif - -+PictFormatPtr -+compWindowFormat (WindowPtr pWin); -+ - void - compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap); - diff --git a/x11/modular-xorg-server/patches/patch-am b/x11/modular-xorg-server/patches/patch-am deleted file mode 100644 index 12906cd4e1e..00000000000 --- a/x11/modular-xorg-server/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2008/07/13 12:37:29 tonnerre Exp $ - ---- composite/compwindow.c.orig 2007-03-18 01:29:16.000000000 +0100 -+++ composite/compwindow.c -@@ -686,7 +686,7 @@ compGetWindowVisual (WindowPtr pWin) - return 0; - } - --static PictFormatPtr -+PictFormatPtr - compWindowFormat (WindowPtr pWin) - { - ScreenPtr pScreen = pWin->drawable.pScreen; diff --git a/x11/modular-xorg-server/patches/patch-an b/x11/modular-xorg-server/patches/patch-an deleted file mode 100644 index 28698af7547..00000000000 --- a/x11/modular-xorg-server/patches/patch-an +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-an,v 1.2 2008/07/13 20:41:46 tonnerre Exp $ - ---- render/render.c.orig 2008-07-13 14:29:02.000000000 +0200 -+++ render/render.c -@@ -1917,6 +1917,8 @@ static int ProcRenderCreateLinearGradien - LEGAL_NEW_RESOURCE(stuff->pid, client); - - len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq); -+ if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) -+ return BadLength; - if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) - return BadLength; - -@@ -2488,18 +2490,18 @@ SProcRenderCreateSolidFill(ClientPtr cli - return (*ProcRenderVector[stuff->renderReqType]) (client); - } - --static void swapStops(void *stuff, int n) -+static void swapStops(void *stuff, int num) - { -- int i; -+ int i, n; - CARD32 *stops; - CARD16 *colors; - stops = (CARD32 *)(stuff); -- for (i = 0; i < n; ++i) { -+ for (i = 0; i < num; ++i) { - swapl(stops, n); - ++stops; - } - colors = (CARD16 *)(stops); -- for (i = 0; i < 4*n; ++i) { -+ for (i = 0; i < 4*num; ++i) { - swaps(stops, n); - ++stops; - } -@@ -2522,6 +2524,8 @@ SProcRenderCreateLinearGradient (ClientP - swapl(&stuff->nStops, n); - - len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq); -+ if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) -+ return BadLength; - if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) - return BadLength; - -@@ -2549,6 +2553,8 @@ SProcRenderCreateRadialGradient (ClientP - swapl(&stuff->nStops, n); - - len = (client->req_len << 2) - sizeof(xRenderCreateRadialGradientReq); -+ if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) -+ return BadLength; - if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) - return BadLength; - -@@ -2573,6 +2579,8 @@ SProcRenderCreateConicalGradient (Client - swapl(&stuff->nStops, n); - - len = (client->req_len << 2) - sizeof(xRenderCreateConicalGradientReq); -+ if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) -+ return BadLength; - if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) - return BadLength; - diff --git a/x11/modular-xorg-server/patches/patch-db b/x11/modular-xorg-server/patches/patch-db deleted file mode 100644 index c9a384038cf..00000000000 --- a/x11/modular-xorg-server/patches/patch-db +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-db,v 1.1 2007/02/05 23:08:36 joerg Exp $ - ---- Xext/xf86bigfont.c.orig 2007-02-05 21:02:23.000000000 +0000 -+++ Xext/xf86bigfont.c -@@ -104,7 +104,7 @@ static unsigned int pagesize; - - static Bool badSysCall = FALSE; - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) - - #include <sys/signal.h> - diff --git a/x11/modular-xorg-server/patches/patch-dc b/x11/modular-xorg-server/patches/patch-dc deleted file mode 100644 index b29ce66959f..00000000000 --- a/x11/modular-xorg-server/patches/patch-dc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dc,v 1.1 2007/02/05 23:08:36 joerg Exp $ - ---- hw/xfree86/loader/os.c.orig 2007-02-05 21:03:59.000000000 +0000 -+++ hw/xfree86/loader/os.c -@@ -42,6 +42,8 @@ - #define OSNAME "linux" - #elif defined(__FreeBSD__) - #define OSNAME "freebsd" -+#elif defined(__DragonFly__) -+#define OSNAME "dragonfly" - #elif defined(__NetBSD__) - #define OSNAME "netbsd" - #elif defined(__OpenBSD__) diff --git a/x11/modular-xorg-server/patches/patch-dd b/x11/modular-xorg-server/patches/patch-dd deleted file mode 100644 index d151a5ac277..00000000000 --- a/x11/modular-xorg-server/patches/patch-dd +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-dd,v 1.2 2007/08/16 20:10:16 joerg Exp $ - ---- hw/xfree86/os-support/bus/Pci.h.orig 2006-11-16 18:39:04.000000000 +0100 -+++ hw/xfree86/os-support/bus/Pci.h -@@ -235,7 +235,7 @@ - # if defined(linux) - # define ARCH_PCI_INIT axpPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# elif defined(__FreeBSD__) || defined(__OpenBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -@@ -322,6 +322,10 @@ - # elif defined(sun) - # define ARCH_PCI_INIT sparcPciInit - # define INCLUDE_XF86_MAP_PCI_MEM -+# elif defined(__NetBSD__) -+# define ARCH_PCI_INIT netbsdPciInit -+# define INCLUDE_XF86_MAP_PCI_MEM -+# define INCLUDE_XF86_NO_DOMAIN - # elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM diff --git a/x11/modular-xorg-server/patches/patch-de b/x11/modular-xorg-server/patches/patch-de deleted file mode 100644 index 8b52746b4ad..00000000000 --- a/x11/modular-xorg-server/patches/patch-de +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-de,v 1.1 2007/02/05 23:08:36 joerg Exp $ - ---- hw/xfree86/os-support/bus/freebsdPci.c.orig 2007-02-05 21:09:30.000000000 +0000 -+++ hw/xfree86/os-support/bus/freebsdPci.c -@@ -83,7 +83,7 @@ static pciBusInfo_t freebsdPci0 = { - /* bridge */ NULL - }; - --#if !defined(__OpenBSD__) && !defined(__FreeBSD__) -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #if X_BYTE_ORDER == X_BIG_ENDIAN - #ifdef __sparc__ - #ifndef ASI_PL diff --git a/x11/modular-xorg-server/patches/patch-ea b/x11/modular-xorg-server/patches/patch-ea deleted file mode 100644 index 73b3491e84c..00000000000 --- a/x11/modular-xorg-server/patches/patch-ea +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xext/EVI.c.orig 2006-09-18 08:04:17.000000000 +0200 -+++ Xext/EVI.c -@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include <X11/extensions/XEVIstr.h> - #include "EVIstruct.h" - #include "modinit.h" -+#include "scrnintstr.h" - - #if 0 - static unsigned char XEVIReqCode = 0; -@@ -87,10 +88,22 @@ ProcEVIGetVisualInfo(ClientPtr client) - { - REQUEST(xEVIGetVisualInfoReq); - xEVIGetVisualInfoReply rep; -- int n, n_conflict, n_info, sz_info, sz_conflict; -+ int i, n, n_conflict, n_info, sz_info, sz_conflict; - VisualID32 *conflict; -+ unsigned int total_visuals = 0; - xExtendedVisualInfo *eviInfo; - int status; -+ -+ /* -+ * do this first, otherwise REQUEST_FIXED_SIZE can overflow. we assume -+ * here that you don't have more than 2^32 visuals over all your screens; -+ * this seems like a safe assumption. -+ */ -+ for (i = 0; i < screenInfo.numScreens; i++) -+ total_visuals += screenInfo.screens[i]->numVisuals; -+ if (stuff->n_visual > total_visuals) -+ return BadValue; -+ - REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32); - status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual, - &eviInfo, &n_info, &conflict, &n_conflict); diff --git a/x11/modular-xorg-server/patches/patch-eb b/x11/modular-xorg-server/patches/patch-eb deleted file mode 100644 index ffed16daf0c..00000000000 --- a/x11/modular-xorg-server/patches/patch-eb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-eb,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xext/cup.c.orig 2006-09-18 08:04:17.000000000 +0200 -+++ Xext/cup.c -@@ -196,6 +196,9 @@ int ProcGetReservedColormapEntries( - - REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq); - -+ if (stuff->screen >= screenInfo.numScreens) -+ return BadValue; -+ - #ifndef HAVE_SPECIAL_DESKTOP_COLORS - citems[CUP_BLACK_PIXEL].pixel = - screenInfo.screens[stuff->screen]->blackPixel; diff --git a/x11/modular-xorg-server/patches/patch-ec b/x11/modular-xorg-server/patches/patch-ec deleted file mode 100644 index 0ae3bf77dc7..00000000000 --- a/x11/modular-xorg-server/patches/patch-ec +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ec,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xext/sampleEVI.c.orig 2006-09-18 08:04:17.000000000 +0200 -+++ Xext/sampleEVI.c -@@ -35,6 +35,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include <X11/extensions/XEVIstr.h> - #include "EVIstruct.h" - #include "scrnintstr.h" -+ -+#if HAVE_STDINT_H -+#include <stdint.h> -+#elif !defined(UINT32_MAX) -+#define UINT32_MAX 0xffffffffU -+#endif -+ - static int sampleGetVisualInfo( - VisualID32 *visual, - int n_visual, -@@ -43,24 +50,36 @@ static int sampleGetVisualInfo( - VisualID32 **conflict_rn, - int *n_conflict_rn) - { -- int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens; -+ unsigned int max_sz_evi; - VisualID32 *temp_conflict; - xExtendedVisualInfo *evi; -- int max_visuals = 0, max_sz_conflict, sz_conflict = 0; -+ unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0; - register int visualI, scrI, sz_evi = 0, conflictI, n_conflict; -- *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi); -- if (!*evi_rn) -- return BadAlloc; -+ -+ if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens)) -+ return BadAlloc; -+ max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens; -+ - for (scrI = 0; scrI < screenInfo.numScreens; scrI++) { - if (screenInfo.screens[scrI]->numVisuals > max_visuals) - max_visuals = screenInfo.screens[scrI]->numVisuals; - } -+ -+ if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens -+ * max_visuals)) -+ return BadAlloc; - max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals; -+ -+ *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi); -+ if (!*evi_rn) -+ return BadAlloc; -+ - temp_conflict = (VisualID32 *)xalloc(max_sz_conflict); - if (!temp_conflict) { - xfree(*evi_rn); - return BadAlloc; - } -+ - for (scrI = 0; scrI < screenInfo.numScreens; scrI++) { - for (visualI = 0; visualI < n_visual; visualI++) { - evi[sz_evi].core_visual_id = visual[visualI]; diff --git a/x11/modular-xorg-server/patches/patch-ed b/x11/modular-xorg-server/patches/patch-ed deleted file mode 100644 index 94deef642de..00000000000 --- a/x11/modular-xorg-server/patches/patch-ed +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-ed,v 1.2 2008/06/20 13:34:40 joerg Exp $ - ---- Xext/security.c.orig 2006-11-16 18:39:03.000000000 +0100 -+++ Xext/security.c -@@ -651,15 +651,19 @@ SProcSecurityGenerateAuthorization( - register char n; - CARD32 *values; - unsigned long nvalues; -+ int values_offset; - - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xSecurityGenerateAuthorizationReq); - swaps(&stuff->nbytesAuthProto, n); - swaps(&stuff->nbytesAuthData, n); - swapl(&stuff->valueMask, n); -- values = (CARD32 *)(&stuff[1]) + -- ((stuff->nbytesAuthProto + (unsigned)3) >> 2) + -- ((stuff->nbytesAuthData + (unsigned)3) >> 2); -+ values_offset = ((stuff->nbytesAuthProto + (unsigned)3) >> 2) + -+ ((stuff->nbytesAuthData + (unsigned)3) >> 2); -+ if (values_offset > -+ stuff->length - (sz_xSecurityGenerateAuthorizationReq >> 2)) -+ return BadLength; -+ values = (CARD32 *)(&stuff[1]) + values_offset; - nvalues = (((CARD32 *)stuff) + stuff->length) - values; - SwapLongs(values, nvalues); - return ProcSecurityGenerateAuthorization(client); -@@ -1567,9 +1571,9 @@ SecurityLoadPropertyAccessList(void) - return; - - #ifndef __UNIXOS2__ -- f = fopen(SecurityPolicyFile, "r"); -+ f = Fopen(SecurityPolicyFile, "r"); - #else -- f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); -+ f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); - #endif - if (!f) - { -@@ -1653,7 +1657,7 @@ SecurityLoadPropertyAccessList(void) - } - #endif /* PROPDEBUG */ - -- fclose(f); -+ Fclose(f); - } /* SecurityLoadPropertyAccessList */ - - diff --git a/x11/modular-xorg-server/patches/patch-ef b/x11/modular-xorg-server/patches/patch-ef deleted file mode 100644 index 7d4d9748611..00000000000 --- a/x11/modular-xorg-server/patches/patch-ef +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-ef,v 1.2 2008/06/20 13:34:40 joerg Exp $ - ---- Xext/shm.c.orig 2008-06-20 14:39:43.000000000 +0200 -+++ Xext/shm.c -@@ -156,7 +156,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePi - } - - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) - #include <sys/signal.h> - - static Bool badSysCall = FALSE; -@@ -723,6 +723,8 @@ ProcPanoramiXShmCreatePixmap( - int i, j, result; - ShmDescPtr shmdesc; - REQUEST(xShmCreatePixmapReq); -+ unsigned int width, height, depth; -+ unsigned long size; - PanoramiXRes *newPix; - - REQUEST_SIZE_MATCH(xShmCreatePixmapReq); -@@ -732,11 +734,26 @@ ProcPanoramiXShmCreatePixmap( - LEGAL_NEW_RESOURCE(stuff->pid, client); - VERIFY_GEOMETRABLE(pDraw, stuff->drawable, client); - VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); -- if (!stuff->width || !stuff->height) -+ -+ width = stuff->width; -+ height = stuff->height; -+ depth = stuff->depth; -+ if (!width || !height || !depth) - { - client->errorValue = 0; - return BadValue; - } -+ if (width > 32767 || height > 32767) -+ return BadAlloc; -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; -@@ -747,9 +764,7 @@ ProcPanoramiXShmCreatePixmap( - return BadValue; - } - CreatePmap: -- VERIFY_SHMSIZE(shmdesc, stuff->offset, -- PixmapBytePad(stuff->width, stuff->depth) * stuff->height, -- client); -+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - - if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) - return BadAlloc; -@@ -841,8 +856,17 @@ ProcShmPutImage(client) - return BadValue; - } - -- VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight, -- client); -+ /* -+ * There's a potential integer overflow in this check: -+ * VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight, -+ * client); -+ * the version below ought to avoid it -+ */ -+ if (stuff->totalHeight != 0 && -+ length > (shmdesc->size - stuff->offset)/stuff->totalHeight) { -+ client->errorValue = stuff->totalWidth; -+ return BadValue; -+ } - if (stuff->srcX > stuff->totalWidth) - { - client->errorValue = stuff->srcX; -@@ -1047,6 +1071,8 @@ ProcShmCreatePixmap(client) - register int i; - ShmDescPtr shmdesc; - REQUEST(xShmCreatePixmapReq); -+ unsigned int width, height, depth; -+ unsigned long size; - - REQUEST_SIZE_MATCH(xShmCreatePixmapReq); - client->errorValue = stuff->pid; -@@ -1055,11 +1081,26 @@ ProcShmCreatePixmap(client) - LEGAL_NEW_RESOURCE(stuff->pid, client); - VERIFY_GEOMETRABLE(pDraw, stuff->drawable, client); - VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); -- if (!stuff->width || !stuff->height) -+ -+ width = stuff->width; -+ height = stuff->height; -+ depth = stuff->depth; -+ if (!width || !height || !depth) - { - client->errorValue = 0; - return BadValue; - } -+ if (width > 32767 || height > 32767) -+ return BadAlloc; -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; -@@ -1070,9 +1111,7 @@ ProcShmCreatePixmap(client) - return BadValue; - } - CreatePmap: -- VERIFY_SHMSIZE(shmdesc, stuff->offset, -- PixmapBytePad(stuff->width, stuff->depth) * stuff->height, -- client); -+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( - pDraw->pScreen, stuff->width, - stuff->height, stuff->depth, diff --git a/x11/modular-xorg-server/patches/patch-eg b/x11/modular-xorg-server/patches/patch-eg deleted file mode 100644 index c957a9f9013..00000000000 --- a/x11/modular-xorg-server/patches/patch-eg +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-eg,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/chgfctl.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/chgfctl.c -@@ -451,18 +451,13 @@ ChangeStringFeedback(ClientPtr client, D - xStringFeedbackCtl * f) - { - register char n; -- register long *p; - int i, j; - KeySym *syms, *sup_syms; - - syms = (KeySym *) (f + 1); - if (client->swapped) { - swaps(&f->length, n); /* swapped num_keysyms in calling proc */ -- p = (long *)(syms); -- for (i = 0; i < f->num_keysyms; i++) { -- swapl(p, n); -- p++; -- } -+ SwapLongs((CARD32 *) syms, f->num_keysyms); - } - - if (f->num_keysyms > s->ctrl.max_symbols) { diff --git a/x11/modular-xorg-server/patches/patch-eh b/x11/modular-xorg-server/patches/patch-eh deleted file mode 100644 index ee6b2fecdda..00000000000 --- a/x11/modular-xorg-server/patches/patch-eh +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-eh,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/chgkmap.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/chgkmap.c -@@ -79,18 +79,14 @@ int - SProcXChangeDeviceKeyMapping(register ClientPtr client) - { - register char n; -- register long *p; -- register int i, count; -+ unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); -- p = (long *)&stuff[1]; - count = stuff->keyCodes * stuff->keySymsPerKeyCode; -- for (i = 0; i < count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), count); - return (ProcXChangeDeviceKeyMapping(client)); - } - -@@ -106,10 +102,14 @@ ProcXChangeDeviceKeyMapping(register Cli - int ret; - unsigned len; - DeviceIntPtr dev; -+ unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); - -+ count = stuff->keyCodes * stuff->keySymsPerKeyCode; -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); -+ - dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, diff --git a/x11/modular-xorg-server/patches/patch-ei b/x11/modular-xorg-server/patches/patch-ei deleted file mode 100644 index ccdb225a1c5..00000000000 --- a/x11/modular-xorg-server/patches/patch-ei +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ei,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/chgprop.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/chgprop.c -@@ -81,19 +81,15 @@ int - SProcXChangeDeviceDontPropagateList(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xChangeDeviceDontPropagateListReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); - return (ProcXChangeDeviceDontPropagateList(client)); - } - diff --git a/x11/modular-xorg-server/patches/patch-ej b/x11/modular-xorg-server/patches/patch-ej deleted file mode 100644 index bb63e69a2ce..00000000000 --- a/x11/modular-xorg-server/patches/patch-ej +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ej,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/grabdev.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/grabdev.c -@@ -82,8 +82,6 @@ int - SProcXGrabDevice(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceReq); - swaps(&stuff->length, n); -@@ -91,11 +89,11 @@ SProcXGrabDevice(register ClientPtr clie - swapl(&stuff->grabWindow, n); - swapl(&stuff->time, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ -+ if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count) -+ return BadLength; -+ -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDevice(client)); - } diff --git a/x11/modular-xorg-server/patches/patch-ek b/x11/modular-xorg-server/patches/patch-ek deleted file mode 100644 index e50f933a9a2..00000000000 --- a/x11/modular-xorg-server/patches/patch-ek +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ek,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/grabdevb.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/grabdevb.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceButton(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceButtonReq); - swaps(&stuff->length, n); -@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(register ClientPt - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceButtonReq, -+ stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDeviceButton(client)); - } diff --git a/x11/modular-xorg-server/patches/patch-el b/x11/modular-xorg-server/patches/patch-el deleted file mode 100644 index f038a8f1dad..00000000000 --- a/x11/modular-xorg-server/patches/patch-el +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-el,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/grabdevk.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/grabdevk.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceKey(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceKeyReq); - swaps(&stuff->length, n); -@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(register ClientPtr c - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return (ProcXGrabDeviceKey(client)); - } - diff --git a/x11/modular-xorg-server/patches/patch-em b/x11/modular-xorg-server/patches/patch-em deleted file mode 100644 index ce7a5eb7f65..00000000000 --- a/x11/modular-xorg-server/patches/patch-em +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-em,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/selectev.c.orig 2006-11-16 19:01:22.000000000 +0100 -+++ Xi/selectev.c -@@ -84,19 +84,16 @@ int - SProcXSelectExtensionEvent(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xSelectExtensionEventReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xSelectExtensionEventReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); -+ - return (ProcXSelectExtensionEvent(client)); - } - diff --git a/x11/modular-xorg-server/patches/patch-en b/x11/modular-xorg-server/patches/patch-en deleted file mode 100644 index 8649ba46562..00000000000 --- a/x11/modular-xorg-server/patches/patch-en +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-en,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- Xi/sendexev.c.orig 2006-06-06 19:13:52.000000000 +0200 -+++ Xi/sendexev.c -@@ -83,7 +83,7 @@ int - SProcXSendExtensionEvent(register ClientPtr client) - { - register char n; -- register long *p; -+ register CARD32 *p; - register int i; - xEvent eventT; - xEvent *eventP; -@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(register Client - REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq); - swapl(&stuff->destination, n); - swaps(&stuff->count, n); -+ -+ if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + -+ (stuff->num_events * (sizeof(xEvent) >> 2))) -+ return BadLength; -+ - eventP = (xEvent *) & stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { - proc = EventSwapVector[eventP->u.u.type & 0177]; -@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(register Client - *eventP = eventT; - } - -- p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events); -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); -+ SwapLongs(p, stuff->count); - return (ProcXSendExtensionEvent(client)); - } - diff --git a/x11/modular-xorg-server/patches/patch-eo b/x11/modular-xorg-server/patches/patch-eo deleted file mode 100644 index ad68e196d85..00000000000 --- a/x11/modular-xorg-server/patches/patch-eo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-eo,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- dix/dixfonts.c.orig 2006-11-16 19:01:22.000000000 +0100 -+++ dix/dixfonts.c -@@ -329,6 +329,13 @@ doOpenFont(ClientPtr client, OFclosurePt - err = BadFontName; - goto bail; - } -+ /* check values for firstCol, lastCol, firstRow, and lastRow */ -+ if (pfont->info.firstCol > pfont->info.lastCol || -+ pfont->info.firstRow > pfont->info.lastRow || -+ pfont->info.lastCol - pfont->info.firstCol > 255) { -+ err = AllocError; -+ goto bail; -+ } - if (!pfont->fpe) - pfont->fpe = fpe; - pfont->refcnt++; diff --git a/x11/modular-xorg-server/patches/patch-ep b/x11/modular-xorg-server/patches/patch-ep deleted file mode 100644 index 8e1d2aa67cb..00000000000 --- a/x11/modular-xorg-server/patches/patch-ep +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ep,v 1.1 2008/02/25 15:39:16 joerg Exp $ - ---- hw/xfree86/common/xf86MiscExt.c.orig 2006-11-16 19:01:24.000000000 +0100 -+++ hw/xfree86/common/xf86MiscExt.c -@@ -640,6 +640,10 @@ MiscExtPassMessage(int scrnIndex, const - - DEBUG_P("MiscExtPassMessage"); - -+ /* should check this in the protocol, but xf86NumScreens isn't exported */ -+ if (scrnIndex >= xf86NumScreens) -+ return BadValue; -+ - if (*pScr->HandleMessage == NULL) - return BadImplementation; - return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr); |