diff options
Diffstat (limited to 'x11-servers/XttXF86srv-common')
77 files changed, 0 insertions, 3419 deletions
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile deleted file mode 100644 index b362e86cf4a1..000000000000 --- a/x11-servers/XttXF86srv-common/Makefile +++ /dev/null @@ -1,227 +0,0 @@ -# New ports collection makefile for: Common Files for Xservers with Xtt -# Date created: 15 April 1998 -# Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> -# -# $FreeBSD$ -# - -PORTNAME?= xtt-common -PORTVERSION= ${VERSION}.${PATCHLEVEL} -PORTREVISION= 1 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE} \ - http://X-TT.dsl.gr.jp/dists/1.x/${VERSION}/ -MASTER_SITE_SUBDIR= ${XFREE_VERSION} -DISTFILES= X336src-1.tgz xtt-${VERSION}.tgz - -PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,${XFREE_VERSION}/fixes,} -PATCHFILES= fix-01-r128 fix-04-s3trio3d2x fix-05-s3trio3d fix-06-s3trio3d2x\ - fix-07-s3trio64v2gx+netfinity fix-08-s3savage_ix+mx - -MAINTAINER?= taguchi@tohoku.iij.ad.jp -COMMENT?= Common files for X True Type Servers -DEPRECATED= "fails to fetch\; apparently applies to older version of XFree86" -EXPIRATION_DATE= "April 09, 2004" - -RUN_DEPENDS+= mkttfdir:${PORTSDIR}/print/perlftlib - -FORBIDDEN= "Broken pkg-plist" - -USE_SUBMAKE= yes -XFREE_VERSION= 3.3.6 -VERSION= 1.3 -PATCHLEVEL= 1 -SERVER?= common -INSTALLS_SHLIB= yes -.if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE) -USE_SHARED_WRKSRC= YES -.endif -.if !defined(XDM_DES) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO -MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ - ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ - ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ -DISTFILES+= Wraphelp.c -IGNOREFILES= Wraphelp.c -.endif -USE_X_PREFIX= YES -USE_FREETYPE= YES -EXTRACT_ONLY= X336src-1.tgz xtt-${VERSION}.tgz -BINOWN= root -BINGRP= wheel -MASTERDIR?= ${.CURDIR}/../XttXF86srv-common -FILESDIR= ${MASTERDIR}/files -PATCHDIR= ${MASTERDIR}/files -.if defined(USE_SHARED_WRKSRC) -WRKDIR= ${MASTERDIR}/work -.endif -WRKSRC= ${WRKDIR}/xc -DIST_SUBDIR= xc -XTTDIR= ${WRKDIR}/xtt-${VERSION} -.if !defined(PATCH_DEBUG) -XTTPATCHARGS= -p1 -E -t -s -N -.else -XTTPATCHARGS= -p1 -E -.endif -COREPATCHES= shared-libfont-1.2.diff xfs-for-delayed-font-1.0.diff \ - make-xfs-only-1.3.diff xtt-xf335-changes.diff -XTTTARBALL= xtt-core.tar -ADDPATCHES= ${XTTDIR}/contribute/xtt-xfsft-lib.patch -DOCDIR= ${PREFIX}/share/doc/Xtt -PATCH_DIST_STRIP= -p1 - -.include <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= xmkmf:${PORTSDIR}/devel/imake-4 -.endif - -# ****************** -# USE_SHARED_WRKSRC: -# All Xtt ports require many disk space. Imagen, X source code will extract -# under server and common ports dir. This variable save your disk space. -# if this variable is defined, X source will only extract under common -# ports. server ports will use this common's WRKSRC. -# COMPILE_ALL_SERVERS_AT_ONCE: -# If this variable is defined, All server ports will build at once. -# This variable will save your time, if you want to make all xtt packages. -# ****************** -.if defined(USE_SHARED_WRKSRC) -SHARED_COOKIE= ${WRKDIR}/.compiled_by_other_server_ports -CONFIGURE_COOKIE= ${WRKDIR}/.configure_done.${SERVER} -BUILD_COOKIE= ${WRKDIR}/.build_done.${SERVER} -INSTALL_COOKIE= ${WRKDIR}/.install_done.${SERVER} -PACKAGE_COOKIE= ${WRKDIR}/.package_done.${SERVER} -TMPPLIST= ${WRKDIR}/.PLIST.${SERVER}.mktmp -.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE) -EXTRACT_ONLY= -.endif -.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE) -NO_BUILD= YES -.endif -.if defined(COMPILE_ALL_SERVERS_AT_ONCE) && ${SERVER} != xfs -ALL_SERVER= XF86_3DLabs XF86_8514 XF86_AGX XF86_I128 XF86_Mach32 \ - XF86_Mach64 XF86_Mach8 XF86_Mono XF86_P9000 XF86_S3 XF86_S3V \ - XF86_SVGA XF86_VGA16 XF86_W32 \ - XF98_EGC XF98_GA968 XF98_GANBWAP XF98_MGA XF98_NEC480 \ - XF98_NECS3 XF98_NKVNEC XF98_SVGA XF98_TGUI XF98_PWLB XF98_PWSKB \ - XF98_WABEP XF98_WABS XF98_WSNA \ - common -HOSTDEFSRV= ${FILESDIR}/host.def.ALL -.else -ALL_SERVER= ${SERVER} common -HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} -.endif -.else -ALL_SERVER= ${SERVER} -HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} -.endif - -LOCALFILE= host.def.local -HOSTDEFLOCAL= ${WRKDIR}/${LOCALFILE} -HOSTDEFDST= ${WRKSRC}/config/cf/${LOCALFILE} -HOSTDEFORG= ${WRKSRC}/config/cf/host.def -.if ${SERVER} == xfs -ALL_TARGET= xfs -.elif ${SERVER} == common && !defined(COMPILE_ALL_SERVERS_AT_ONCE) -ALL_TARGET= libfont -.else -ALL_TARGET= World -.endif - -pre-fetch: -.if defined(USE_SHARED_WRKSRC) - @( \ - ${ECHO} "************************************************************"; \ - ${ECHO} "* ALL PORTS COMMONLY USE x11/XttXF86srv-common/work ! *"; \ - ${ECHO} "************************************************************") -.if defined(COMPILE_ALL_SERVERS_AT_ONCE) - @( \ - ${ECHO} "************************************************************"; \ - ${ECHO} "* ALL PORTS (except xfs) BUILD AT ONCE ! *"; \ - ${ECHO} "************************************************************") -.endif -.endif - -.if !defined(USE_SHARED_WRKSRC) && exists(${MASTERDIR}/work/.configure_done.${SERVER}) -pre-extract: - @( \ - ${ECHO} "ERROR:" ; \ - ${ECHO} "Xtt ${SERVER} ports have already extracted with" ; \ - ${ECHO} "\"USE_SHARED_WRKSRC\" option." ; \ - ${FALSE} ) -.endif - -pre-patch: - @( cd ${WRKSRC}; \ - ${PATCH} -s < ${PATCHDIR}/xttpatch ; \ - for i in ${COREPATCHES} ; do \ - ${PATCH} ${XTTPATCHARGS} < ${XTTDIR}/$${i}; \ - done; \ - ${TAR} xf ${XTTDIR}/${XTTTARBALL} -C ${WRKSRC}/lib/font; \ - for i in ${ADDPATCHES} ; do \ - ${PATCH} ${XTTPATCHARGS} < $${i}; \ - done ) - -pre-configure: - @( ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ - (cd ${WRKDIR} ; ${XMKMF} ; \ - ${SETENV} ${SCRIPT_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \ - FILESDIR=${FILESDIR} ${MAKE}) ; \ - ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ; \ - ${ECHO_CMD} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} ) - -.if ${SERVER} == common -do-install: - @( \ - cd ${WRKSRC}/lib/font; \ - ${SETENV} ${MAKE_ENV} ${MAKE} install; \ - ${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \ - ${MKDIR} ${DOCDIR}; \ - ${INSTALL_DATA} ${XTTDIR}/doc/[0A-Z]*.eng ${DOCDIR}; \ - ${INSTALL_DATA} ${XTTDIR}/doc/[0A-Z]*.jis ${DOCDIR} ) -.if ${PORTOBJFORMAT} == "aout" - ${LN} -sf libfont.so.1.2 ${PREFIX}/lib/libfont.so -.endif -.elif ${SERVER} == xfs -do-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} \ - ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt -.else -do-install: - @( \ - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} \ - ${WRKSRC}/programs/Xserver/${SERVER} ${PREFIX}/bin/${SERVER}.xtt; \ - ${LN} -fs ${PREFIX}/bin/${SERVER}.xtt ${PREFIX}/bin/X ) -.endif - -.if defined(USE_SHARED_WRKSRC) -post-configure: - @( \ - cd ${WRKDIR} ; \ - for i in ${ALL_SERVER} ; do \ - ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${CONFIGURE_COOKIE} .${SERVER}`.$${i} ; \ - done ) -.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE)) - @${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE} -.endif - -post-build: - @( \ - cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \ - ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.$${i} ; \ - done ) -.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE)) - @${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE} -.endif - -post-install: - @( \ - cd ${WRKDIR} ; ${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} ; \ - ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${INSTALL_COOKIE} .${SERVER}`.common ) - -post-package: - @( \ - cd ${WRKDIR} ; ${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} ) -.endif - -.include <bsd.port.post.mk> diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo deleted file mode 100644 index 7e20b9b2bb18..000000000000 --- a/x11-servers/XttXF86srv-common/distinfo +++ /dev/null @@ -1,17 +0,0 @@ -MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485 -SIZE (xc/X336src-1.tgz) = 17388037 -MD5 (xc/xtt-1.3.tgz) = f4c9efdb90d848701c305e2955149920 -SIZE (xc/xtt-1.3.tgz) = 370424 -MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f -SIZE (xc/fix-01-r128) = 2307 -MD5 (xc/fix-04-s3trio3d2x) = 75569a9d49bb45b8ecb311ab3f8c2469 -SIZE (xc/fix-04-s3trio3d2x) = 3599 -MD5 (xc/fix-05-s3trio3d) = eb8fd33328c8b5fbd0410472339dee44 -SIZE (xc/fix-05-s3trio3d) = 1637 -MD5 (xc/fix-06-s3trio3d2x) = 79c4e3f340f1df5786649559d09c2378 -SIZE (xc/fix-06-s3trio3d2x) = 604 -MD5 (xc/fix-07-s3trio64v2gx+netfinity) = 6b09cc9b7b3d89f18ea5e9591969b99c -SIZE (xc/fix-07-s3trio64v2gx+netfinity) = 5768 -MD5 (xc/fix-08-s3savage_ix+mx) = 8df8d4b013de9e5f87d028b1bf2415a5 -SIZE (xc/fix-08-s3savage_ix+mx) = 64278 -MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile deleted file mode 100644 index 0b2a0cf6f604..000000000000 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ /dev/null @@ -1,172 +0,0 @@ -CONFFILE= host.def.local -CP= /bin/cp -DO_NADA= /usr/bin/true -ECHO_MSG= echo -ECHO= echo -WRKDIR?= . -DISTDIR?= /usr/ports/distfiles -FILESDIR?= ../files -LOCALBASE?= /usr/local - -#if BuildXInputExt -BUILDXINPUTEXT= YES -#else -JOYSTICSUPPORT= YES -#endif -#if BuildPexExt -BUILDPEXEXT= YES -#endif -#if BuildXIE -BUILDXIE= YES -#endif -#if HasSecureRPC -HASSECURERPC= YES -#endif -#if HasXdmAuth -HASXDMAUTH= YES -#endif - -all:: SecureRPCCheck XdmAuthCheck \ - InputExtCheck pexCheck xieCheck \ - ELFCheck - -initialize:: - @( \ - ${ECHO_MSG} " Now checking your XFree86 environment."; \ - rm -f ${CONFFILE}; \ - ${ECHO} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \ - ${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype1/freetype" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86SVGAServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86VGA16Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86MonoServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86MonoDualServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86S3Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86S3VServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86I8514Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86Mach8Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86Mach32Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86Mach64Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86P9000Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86AGXServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86W32Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86I128Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF86GLINTServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98EGCServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98GA968Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98GANBWAPServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98MGAServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98NEC480Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98NECS3Server" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98NKVNECServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98PWLBServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98PWSKBServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98SVGAServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98TGUIServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98WABEPServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98WABSServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XF98WSNAServer" >> ${CONFFILE}; \ - ${ECHO} "#undef BuildFontServer" >> ${CONFFILE}; \ - ${ECHO} "#undef BuildFonts" >> ${CONFFILE}; \ - ${ECHO} "#undef XnestServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XVirtualFramebufferServer" >> ${CONFFILE}; \ - ${ECHO} "#undef XprtServer" >> ${CONFFILE}; \ - ${ECHO} "#define BuildFonts NO" >> ${CONFFILE}; \ - ${ECHO} "#define XnestServer NO" >> ${CONFFILE}; \ - ${ECHO} "#define XVirtualFramebufferServer NO" >> ${CONFFILE}; \ - ${ECHO} "#define XprtServer NO" >> ${CONFFILE}; \ - ) - -InputExtCheck:: initialize -.if defined(BUILDXINPUTEXT) && ${BUILDXINPUTEXT} == YES - @( \ - ${ECHO} "#ifdef BuildXInputExt" >> ${CONFFILE}; \ - ${ECHO} "#undef BuildXInputExt" >> ${CONFFILE}; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define BuildXInputExt YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using BuildXInputExt." ) -.elif !defined (AlphaArchitecture) - @( \ - ${ECHO} "#ifdef JoystickSupport" >> ${CONFFILE}; \ - ${ECHO} "#undef JoystickSupport" >> ${CONFFILE}; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define JoystickSupport YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using JoystickSupport." ) -.endif - -pexCheck:: initialize -.if defined(BUILDPEXEXT) && ${BUILDPEXEXT} == YES - @( \ - ${ECHO} "#ifdef BuildPexExt" >> ${CONFFILE}; \ - ${ECHO} "#undef BuildPexExt" >> ${CONFFILE}; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define BuildPexExt YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using BuildPexExt." ) -.else - @${DO_NADA} -.endif - - -xieCheck:: initialize -.if defined(BUILDXIE) && ${BUILDXIE} == YES - @( \ - ${ECHO} "#ifdef BuildXIE" >> ${CONFFILE}; \ - ${ECHO} "#undef BuildXIE" >> ${CONFFILE}; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define BuildXIE YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using BuildXIE." ) -.else - @${DO_NADA} -.endif - -ELFCheck:: initialize -.if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf - @( \ - ${ECHO} "#define UseElfFormat YES" >> ${CONFFILE}; \ - ${ECHO} "#define BuildDynamicLoading YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using ELF format." ) -.else - @${DO_NADA} -.endif - -SecureRPCCheck:: initialize -.if defined(HASSECURERPC) && ${HASSECURERPC} == YES - @( \ - ${ECHO} "#ifdef HasSecureRPC" >> ${CONFFILE}; \ - ${ECHO} "#undefine HasSecureRPC" >> ${CONFFILE}; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define HasSecureRPC YES" >> ${CONFFILE}; \ - ${ECHO_MSG} " Using Secure RPC"; \ - ) -.else - @${DO_NADA} -.endif - -XdmAuthCheck:: initialize -.if defined(HASXDMAUTH) && ${HASXDMAUTH} == YES - @( \ - ${ECHO_MSG} " Using XdmAuth." ; \ - if [ ! -f ${WRKDIR}/xc/lib/Xdmcp/Wraphelp.c ]; then \ - if [ -f ${DISTDIR}/xc/Wraphelp.c ]; then \ - ${ECHO_MSG} " Whaphelp.c found in DISTDIR directory, copying it to source tree." ; \ - ${CP} ${DISTDIR}/xc/Wraphelp.c ${WRKDIR}/xc/lib/Xdmcp/ ; \ - ${ECHO} "#ifdef HasXdmAuth" >> ${CONFFILE} ; \ - ${ECHO} "#undef HasXdmAuth" >> ${CONFFILE} ; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ - elif [ -f ${FILESDIR}/Wraphelp.c ]; then \ - ${ECHO_MSG} " Whaphelp.c found in FILESDIR directory, copying it to source tree." ; \ - ${CP} ${FILESDIR}/Wraphelp.c ${WRKDIR}/xc/lib/Xdmcp/ ; \ - ${ECHO} "#ifdef HasXdmAuth" >> ${CONFFILE} ; \ - ${ECHO} "#undef HasXdmAuth" >> ${CONFFILE} ; \ - ${ECHO} "#endif" >> ${CONFFILE}; \ - ${ECHO} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ - else \ - ${ECHO_MSG} "Wraphelp.c not found. You can not use XDM-AUTHORIZATION-1!" ; \ - false ; \ - fi ; \ - fi ; \ - ) -.else - @${DO_NADA} -.endif diff --git a/x11-servers/XttXF86srv-common/files/host.def.ALL b/x11-servers/XttXF86srv-common/files/host.def.ALL deleted file mode 100644 index 2cd88a31fa32..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.ALL +++ /dev/null @@ -1,37 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer YES -#define XF86VGA16Server YES -#define XF86VGA16DualServer YES -#define XF86MonoServer YES -#define XF86MonoDualServer YES -#define XF86S3Server YES -#define XF86S3VServer YES -#define XF86I8514Server YES -#define XF86Mach8Server YES -#define XF86Mach32Server YES -#define XF86Mach64Server YES -#define XF86P9000Server YES -#define XF86AGXServer YES -#define XF86W32Server YES -#define XF86I128Server YES -#define XF86GLINTServer YES - -#define BuildPC98Servers YES - -#define XF98EGCServer YES -#define XF98GA968Server YES -#define XF98GANBWAPServer YES -#define XF98MGAServer YES -#define XF98NEC480Server YES -#define XF98NECS3Server YES -#define XF98NKVNECServer YES -#define XF98PWLBServer YES -#define XF98PWSKBServer YES -#define XF98SVGAServer YES -#define XF98TGUIServer YES -#define XF98WABEPServer YES -#define XF98WABSServer YES -#define XF98WSNAServer YES diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_3DLabs b/x11-servers/XttXF86srv-common/files/host.def.XF86_3DLabs deleted file mode 100644 index b81e785bb2a7..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_3DLabs +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer YES - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 b/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 deleted file mode 100644 index ad719ee082e1..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 +++ /dev/null @@ -1,24 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server YES -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX b/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX deleted file mode 100644 index f8652155f5bd..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer YES -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 b/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 deleted file mode 100644 index c80968367290..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server YES -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 deleted file mode 100644 index de3b8c40a26e..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 +++ /dev/null @@ -1,24 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server YES -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 deleted file mode 100644 index 2bd19753e855..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server YES -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 deleted file mode 100644 index f0dc129c9a3b..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server YES -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono deleted file mode 100644 index c2032fbb2b8c..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer YES -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 b/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 deleted file mode 100644 index 0bde6641d1c5..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server YES -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 deleted file mode 100644 index 468429da787d..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server YES -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V deleted file mode 100644 index bea887c26855..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer YES -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA b/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA deleted file mode 100644 index a37b5fe1363f..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer YES -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 b/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 deleted file mode 100644 index ea7b42be7b74..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 +++ /dev/null @@ -1,24 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server YES -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 deleted file mode 100644 index 8170fb861e11..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server YES -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_EGC b/x11-servers/XttXF86srv-common/files/host.def.XF98_EGC deleted file mode 100644 index 45e7c3ebce7c..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_EGC +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer YES -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_GA968 b/x11-servers/XttXF86srv-common/files/host.def.XF98_GA968 deleted file mode 100644 index 611a1d13d355..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_GA968 +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server YES -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_GANBWAP b/x11-servers/XttXF86srv-common/files/host.def.XF98_GANBWAP deleted file mode 100644 index 8dca83c5e66e..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_GANBWAP +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer YES -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_MGA b/x11-servers/XttXF86srv-common/files/host.def.XF98_MGA deleted file mode 100644 index f8ae84cb90b6..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_MGA +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer YES -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_NEC480 b/x11-servers/XttXF86srv-common/files/host.def.XF98_NEC480 deleted file mode 100644 index 0895b7e0031d..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_NEC480 +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server YES -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_NECS3 b/x11-servers/XttXF86srv-common/files/host.def.XF98_NECS3 deleted file mode 100644 index ac709d52d83e..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_NECS3 +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server YES -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_NKVNEC b/x11-servers/XttXF86srv-common/files/host.def.XF98_NKVNEC deleted file mode 100644 index 2bff8d7d8b92..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_NKVNEC +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer YES -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_PWLB b/x11-servers/XttXF86srv-common/files/host.def.XF98_PWLB deleted file mode 100644 index ae6ba6398cf9..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_PWLB +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer YES -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_PWSKB b/x11-servers/XttXF86srv-common/files/host.def.XF98_PWSKB deleted file mode 100644 index c3635f534e3f..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_PWSKB +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer YES -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_SVGA b/x11-servers/XttXF86srv-common/files/host.def.XF98_SVGA deleted file mode 100644 index f3db16636b41..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_SVGA +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer YES -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_TGUI b/x11-servers/XttXF86srv-common/files/host.def.XF98_TGUI deleted file mode 100644 index 6e04bdf5fdef..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_TGUI +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer YES -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_WABEP b/x11-servers/XttXF86srv-common/files/host.def.XF98_WABEP deleted file mode 100644 index 2313830e3ed7..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_WABEP +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer YES -#define XF98WABSServer NO -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_WABS b/x11-servers/XttXF86srv-common/files/host.def.XF98_WABS deleted file mode 100644 index 86ab76b829be..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_WABS +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer YES -#define XF98WSNAServer NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF98_WSNA b/x11-servers/XttXF86srv-common/files/host.def.XF98_WSNA deleted file mode 100644 index d6c1ec94ec5f..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.XF98_WSNA +++ /dev/null @@ -1,20 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define BuildPC98Servers YES - -#define XF98EGCServer NO -#define XF98GA968Server NO -#define XF98GANBWAPServer NO -#define XF98MGAServer NO -#define XF98NEC480Server NO -#define XF98NECS3Server NO -#define XF98NKVNECServer NO -#define XF98PWLBServer NO -#define XF98PWSKBServer NO -#define XF98SVGAServer NO -#define XF98TGUIServer NO -#define XF98WABEPServer NO -#define XF98WABSServer NO -#define XF98WSNAServer YES diff --git a/x11-servers/XttXF86srv-common/files/host.def.common b/x11-servers/XttXF86srv-common/files/host.def.common deleted file mode 100644 index 8d641080b3ab..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.common +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly YES -#define BuildFontServer NO - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/host.def.xfs b/x11-servers/XttXF86srv-common/files/host.def.xfs deleted file mode 100644 index 14294ee56c4c..000000000000 --- a/x11-servers/XttXF86srv-common/files/host.def.xfs +++ /dev/null @@ -1,23 +0,0 @@ - -#define BuildServersOnly NO -#define BuildFontServer YES - -#define XF86SVGAServer NO -#define XF86VGA16Server NO -#define XF86VGA16DualServer NO -#define XF86MonoServer NO -#define XF86MonoDualServer NO -#define XF86S3Server NO -#define XF86S3VServer NO -#define XF86I8514Server NO -#define XF86Mach8Server NO -#define XF86Mach32Server NO -#define XF86Mach64Server NO -#define XF86P9000Server NO -#define XF86AGXServer NO -#define XF86W32Server NO -#define XF86I128Server NO -#define XF86GLINTServer NO - -#undef BuildPC98Servers -#define BuildPC98Servers NO diff --git a/x11-servers/XttXF86srv-common/files/mkfontdir.pl b/x11-servers/XttXF86srv-common/files/mkfontdir.pl deleted file mode 100644 index 928cfbb735b1..000000000000 --- a/x11-servers/XttXF86srv-common/files/mkfontdir.pl +++ /dev/null @@ -1,523 +0,0 @@ -#!/usr/bin/perl - -@font = ( -"hgra8lsj.ttf -ricoh-akane maru gothic line-w8-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgra8lsj.ttf -ricoh-akane maru gothic line-w8-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgra8ssj.ttf -ricoh-akane maru gothic line shadow-w8-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgra8ssj.ttf -ricoh-akane maru gothic line shadow-w8-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrah8sj.ttf -ricoh-akane maru gothic-w8-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrah8sj.ttf -ricoh-akane maru gothic-w8-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrbfksj.ttf -ricoh-takahashi kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrbfksj.ttf -ricoh-takahashi kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrbpnsj.ttf -ricoh-chiba pen-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrbpnsj.ttf -ricoh-chiba pen-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrbresj.ttf -ricoh-takahashi reisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrbresj.ttf -ricoh-takahashi reisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrcbsj.ttc -ricoh-bouquet-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrcbsj.ttc -ricoh-bouquet-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrcksj.ttc -ricoh-hankoin-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrcksj.ttc -ricoh-hankoin-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrcresj.ttc -ricoh-reisic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrcresj.ttc -ricoh-reisic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrg9lsj.ttf -ricoh-kaku gothic line-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrg9lsj.ttf -ricoh-kaku gothic line-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrg9ssj.ttf -ricoh-kaku gothic line shadow-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrg9ssj.ttf -ricoh-kaku gothic line shadow-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrgysj.ttc -ricoh-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrgysj.ttc -ricoh-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhabsj.ttf -ricoh-hagoromo-b-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhabsj.ttf -ricoh-hagoromo-b-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhaesj.ttf -ricoh-hagoromo-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhaesj.ttf -ricoh-hagoromo-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhalsj.ttf -ricoh-hagoromo-l-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhalsj.ttf -ricoh-hagoromo-l-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhamsj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhamsj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrgbpsj.ttf -ricoh-gothic-bpro-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrgbpsj.ttf -ricoh-gothic-bpro-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg3sj.ttc -ricoh-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg3sj.ttc -ricoh-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg3sj.ttf -ricoh-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg3sj.ttf -ricoh-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg5sj.ttc -ricoh-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg5sj.ttc -ricoh-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg5sj.ttf -ricoh-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg5sj.ttf -ricoh-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg7sj.ttc -ricoh-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg7sj.ttc -ricoh-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg7sj.ttf -ricoh-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg7sj.ttf -ricoh-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg9sj.ttc -ricoh-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg9sj.ttc -ricoh-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhg9sj.ttf -ricoh-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhg9sj.ttf -ricoh-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhkfsj.ttc -ricoh-sirasu kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhkfsj.ttc -ricoh-sirasu kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhkgsj.ttc -ricoh-sirasu gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhkgsj.ttc -ricoh-sirasu gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhkpsj.ttc -ricoh-sirasu pen-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhkpsj.ttc -ricoh-sirasu pen-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrmlpsj.ttf -ricoh-mincho-lpro-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrmlpsj.ttf -ricoh-mincho-lpro-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhm3sj.ttc -ricoh-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhm3sj.ttc -ricoh-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhm3sj.ttf -ricoh-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhm3sj.ttf -ricoh-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhm9sj.ttc -ricoh-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhm9sj.ttc -ricoh-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhm9sj.ttf -ricoh-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhm9sj.ttf -ricoh-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhr4sj.ttc -ricoh-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhr4sj.ttc -ricoh-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhr8sj.ttc -ricoh-maru gothic-w8-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhr8sj.ttc -ricoh-maru gothic-w8-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrkesj.ttf -ricoh-kyokusui-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrkesj.ttf -ricoh-kyokusui-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrkksj.ttc -ricoh-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrkksj.ttc -ricoh-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrkmsj.ttf -ricoh-kyokusui-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrkmsj.ttf -ricoh-kyokusui-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrkrsj.ttc -ricoh-kanteiryu-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrkrsj.ttc -ricoh-kanteiryu-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrlksj.ttc -ricoh-ozawa kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrlksj.ttc -ricoh-ozawa kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrm9lsj.ttf -ricoh-mincho line-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrm9lsj.ttf -ricoh-mincho line-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrm9ssj.ttf -ricoh-mincho line shadow-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrm9ssj.ttf -ricoh-mincho line shadow-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrpn1sj.ttc -ricoh-souei pen-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrpn1sj.ttc -ricoh-souei pen-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrpp1sj.ttc -ricoh-kaku pop-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrpp1sj.ttc -ricoh-kaku pop-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrpp1sj.ttf -ricoh-kaku pop-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrpp1sj.ttf -ricoh-kaku pop-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrpp2sj.ttc -ricoh-maru pop-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrpp2sj.ttc -ricoh-maru pop-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrr8lsj.ttf -ricoh-maru gothic line-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrr8lsj.ttf -ricoh-maru gothic line-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrr8ssj.ttf -ricoh-maru gothic line shadow-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrr8ssj.ttf -ricoh-maru gothic line shadow-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrsksj.ttc -ricoh-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrsksj.ttc -ricoh-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrsksj.ttf -ricoh-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrsksj.ttf -ricoh-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw3.ttc -dynalab-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw3.ttc -dynalab-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw3.ttf -dynalab-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw3.ttf -dynalab-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw5.ttc -dynalab-mincho-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw5.ttc -dynalab-mincho-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw5.ttf -dynalab-mincho-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw5.ttf -dynalab-mincho-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw7.ttc -dynalab-mincho-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw7.ttc -dynalab-mincho-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw7.ttf -dynalab-mincho-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw7.ttf -dynalab-mincho-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw9.ttc -dynalab-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw9.ttc -dynalab-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsmw9.ttf -dynalab-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsmw9.ttf -dynalab-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfminub.ttc -dynalab-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfminub.ttc -dynalab-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfminub.ttf -dynalab-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfminub.ttf -dynalab-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw3.ttc -dynalab-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw3.ttc -dynalab-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw3.ttf -dynalab-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw3.ttf -dynalab-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw5.ttc -dynalab-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw5.ttc -dynalab-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw5.ttf -dynalab-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw5.ttf -dynalab-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw7.ttc -dynalab-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw7.ttc -dynalab-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw7.ttf -dynalab-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw7.ttf -dynalab-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw9.ttc -dynalab-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw9.ttc -dynalab-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsgw9.ttf -dynalab-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsgw9.ttf -dynalab-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgoteb.ttc -dynalab-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgoteb.ttc -dynalab-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgoteb.ttf -dynalab-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgoteb.ttf -dynalab-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgotub.ttc -dynalab-gothic-ultra bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgotub.ttc -dynalab-gothic-ultra bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgotub.ttf -dynalab-gothic-ultra bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgotub.ttf -dynalab-gothic-ultra bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsrw4.ttc -dynalab-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsrw4.ttc -dynalab-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfhsrw4.ttf -dynalab-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfhsrw4.ttf -dynalab-maru gothic-w4-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrglt.ttc -dynalab-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrglt.ttc -dynalab-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrglt.ttf -dynalab-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrglt.ttf -dynalab-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrgmd.ttc -dynalab-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrgmd.ttc -dynalab-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrgmd.ttf -dynalab-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrgmd.ttf -dynalab-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrgbd.ttc -dynalab-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrgbd.ttc -dynalab-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrgbd.ttf -dynalab-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrgbd.ttf -dynalab-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkailt.ttc -dynalab-kaisyo-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkailt.ttc -dynalab-kaisyo-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkailt.ttf -dynalab-kaisyo-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkailt.ttf -dynalab-kaisyo-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaimd.ttc -dynalab-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaimd.ttc -dynalab-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaimd.ttf -dynalab-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaimd.ttf -dynalab-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaisb.ttc -dynalab-kaisyo-semi bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaisb.ttc -dynalab-kaisyo-semi bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaisb.ttf -dynalab-kaisyo-semi bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaisb.ttf -dynalab-kaisyo-semi bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaibd.ttc -dynalab-kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaibd.ttc -dynalab-kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkaibd.ttf -dynalab-kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkaibd.ttf -dynalab-kaisyo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgyomd.ttc -dynalab-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgyomd.ttc -dynalab-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgyomd.ttf -dynalab-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgyomd.ttf -dynalab-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfleimd.ttc -dynalab-leisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfleimd.ttc -dynalab-leisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfleimd.ttf -dynalab-leisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfleimd.ttf -dynalab-leisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfktrxb.ttc -dynalab-kanteiryu-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfktrxb.ttc -dynalab-kanteiryu-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfktrxb.ttf -dynalab-kanteiryu-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfktrxb.ttf -dynalab-kanteiryu-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw3.ttc -dynalab-pop1-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw3.ttc -dynalab-pop1-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw3.ttf -dynalab-pop1-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw3.ttf -dynalab-pop1-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw5.ttc -dynalab-pop1-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw5.ttc -dynalab-pop1-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw5.ttf -dynalab-pop1-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw5.ttf -dynalab-pop1-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw9.ttc -dynalab-pop1-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw9.ttc -dynalab-pop1-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpopw9.ttf -dynalab-pop1-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpopw9.ttf -dynalab-pop1-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpop1.ttc -dynalab-pop1-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpop1.ttc -dynalab-pop1-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfpop1.ttf -dynalab-pop1-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfpop1.ttf -dynalab-pop1-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw3.ttc -dynalab-marumoji-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw3.ttc -dynalab-marumoji-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw3.ttf -dynalab-marumoji-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw3.ttf -dynalab-marumoji-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw7.ttc -dynalab-marumoji-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw7.ttc -dynalab-marumoji-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw7.ttf -dynalab-marumoji-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw7.ttf -dynalab-marumoji-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw9.ttc -dynalab-marumoji-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw9.ttc -dynalab-marumoji-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmw9.ttf -dynalab-marumoji-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmw9.ttf -dynalab-marumoji-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmmd.ttc -dynalab-marumoji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmmd.ttc -dynalab-marumoji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfmrmmd.ttf -dynalab-marumoji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfmrmmd.ttf -dynalab-marumoji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkoimd.ttc -dynalab-koinji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkoimd.ttc -dynalab-koinji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfkoimd.ttf -dynalab-koinji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfkoimd.ttf -dynalab-koinji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgihbd.ttc -dynalab-gihitai-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgihbd.ttc -dynalab-gihitai-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"dfgihbd.ttf -dynalab-gihitai-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"dfgihbd.ttf -dynalab-gihitai-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfm2.ttc -fujitsu-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfm2.ttc -fujitsu-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfm2.ttf -fujitsu-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfm2.ttf -fujitsu-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfm8.ttc -fujitsu-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfm8.ttc -fujitsu-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfm8.ttf -fujitsu-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfm8.ttf -fujitsu-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfg3.ttc -fujitsu-gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfg3.ttc -fujitsu-gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfg3.ttf -fujitsu-gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfg3.ttf -fujitsu-gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfg7.ttc -fujitsu-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfg7.ttc -fujitsu-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfg7.ttf -fujitsu-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfg7.ttf -fujitsu-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfr3.ttc -fujitsu-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfr3.ttc -fujitsu-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfr3.ttf -fujitsu-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfr3.ttf -fujitsu-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfr7.ttc -fujitsu-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfr7.ttc -fujitsu-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcfr7.ttf -fujitsu-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcfr7.ttf -fujitsu-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcky1.ttc -fujitsu-kyokasyo-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcky1.ttc -fujitsu-kyokasyo-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcky1.ttf -fujitsu-kyokasyo-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcky1.ttf -fujitsu-kyokasyo-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcky2.ttc -fujitsu-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcky2.ttc -fujitsu-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcky2.ttf -fujitsu-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcky2.ttf -fujitsu-kyokasyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcgyk.ttc -fujitsu-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcgyk.ttc -fujitsu-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcgyk.ttf -fujitsu-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcgyk.ttf -fujitsu-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcrei.ttc -fujitsu-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcrei.ttc -fujitsu-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajcrei.ttf -fujitsu-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajcrei.ttf -fujitsu-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajchik.ttc -fujitsu-hikkitai-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajchik.ttc -fujitsu-hikkitai-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajchik.ttf -fujitsu-hikkitai-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajchik.ttf -fujitsu-hikkitai-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci18.ttc -fujitsu-ima108-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci18.ttc -fujitsu-ima108-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci18.ttf -fujitsu-ima108-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci18.ttf -fujitsu-ima108-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci25.ttc -fujitsu-ima205-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci25.ttc -fujitsu-ima205-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci25.ttf -fujitsu-ima205-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci25.ttf -fujitsu-ima205-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci3a.ttc -fujitsu-ima310-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci3a.ttc -fujitsu-ima310-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci3a.ttf -fujitsu-ima310-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci3a.ttf -fujitsu-ima310-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci47.ttc -fujitsu-ima407-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci47.ttc -fujitsu-ima407-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci47.ttf -fujitsu-ima407-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci47.ttf -fujitsu-ima407-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci5d.ttc -fujitsu-ima513-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci5d.ttc -fujitsu-ima513-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"f5ajci5d.ttf -fujitsu-ima513-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"f5ajci5d.ttf -fujitsu-ima513-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhml.ttc -ryobi-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhml.ttc -ryobi-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhml.ttf -ryobi-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhml.ttf -ryobi-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhmm.ttc -ryobi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhmm.ttc -ryobi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhmm.ttf -ryobi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhmm.ttf -ryobi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhmb.ttc -ryobi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhmb.ttc -ryobi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhmb.ttf -ryobi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhmb.ttf -ryobi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhme.ttc -ryobi-mincho-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhme.ttc -ryobi-mincho-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhme.ttf -ryobi-mincho-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhme.ttf -ryobi-mincho-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgtm.ttc -ryobi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgtm.ttc -ryobi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgtm.ttf -ryobi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgtm.ttf -ryobi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgtb.ttc -ryobi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgtb.ttc -ryobi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgtb.ttf -ryobi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgtb.ttf -ryobi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgte.ttc -ryobi-gothic-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgte.ttc -ryobi-gothic-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfgte.ttf -ryobi-gothic-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfgte.ttf -ryobi-gothic-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrl.ttc -ryobi-serious-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrl.ttc -ryobi-serious-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrl.ttf -ryobi-serious-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrl.ttf -ryobi-serious-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrm.ttc -ryobi-serious-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrm.ttc -ryobi-serious-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrm.ttf -ryobi-serious-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrm.ttf -ryobi-serious-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrb.ttc -ryobi-serious-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrb.ttc -ryobi-serious-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsrb.ttf -ryobi-serious-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsrb.ttf -ryobi-serious-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsre.ttc -ryobi-serious-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsre.ttc -ryobi-serious-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfsre.ttf -ryobi-serious-e-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfsre.ttf -ryobi-serious-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhgm.ttc -ryobi-hagoromo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhgm.ttc -ryobi-hagoromo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhgm.ttf -ryobi-hagoromo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhgm.ttf -ryobi-hagoromo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhgb.ttc -ryobi-hagoromo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhgb.ttc -ryobi-hagoromo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfhgb.ttf -ryobi-hagoromo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfhgb.ttf -ryobi-hagoromo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfnmb.ttc -ryobi-now-mb-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfnmb.ttc -ryobi-now-mb-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfnmb.ttf -ryobi-now-mb-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfnmb.ttf -ryobi-now-mb-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfnmu.ttc -ryobi-now-mu-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfnmu.ttc -ryobi-now-mu-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfnmu.ttf -ryobi-now-mu-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfnmu.ttf -ryobi-now-mu-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfngb.ttc -ryobi-now-gb-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfngb.ttc -ryobi-now-gb-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfngb.ttf -ryobi-now-gb-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfngb.ttf -ryobi-now-gb-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfngu.ttc -ryobi-now-gu-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfngu.ttc -ryobi-now-gu-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"rfngu.ttf -ryobi-now-gu-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"rfngu.ttf -ryobi-now-gu-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargl.ttc -fontgal-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargl.ttc -fontgal-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargl.ttf -fontgal-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargl.ttf -fontgal-maru gothic-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargm.ttc -fontgal-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargm.ttc -fontgal-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargm.ttf -fontgal-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargm.ttf -fontgal-maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargb.ttc -fontgal-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargb.ttc -fontgal-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccargb.ttf -fontgal-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccargb.ttf -fontgal-maru gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntrgm.ttc -fontgal-ntc maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntrgm.ttc -fontgal-ntc maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntrgm.ttf -fontgal-ntc maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntrgm.ttf -fontgal-ntc maru gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw3.ttc -fontgal-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw3.ttc -fontgal-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw3.ttf -fontgal-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw3.ttf -fontgal-gothic-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw5.ttc -fontgal-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw5.ttc -fontgal-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw5.ttf -fontgal-gothic-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw5.ttf -fontgal-gothic-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw7.ttc -fontgal-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw7.ttc -fontgal-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw7.ttf -fontgal-gothic-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw7.ttf -fontgal-gothic-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw9.ttc -fontgal-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw9.ttc -fontgal-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchgw9.ttf -fontgal-gothic-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchgw9.ttf -fontgal-gothic-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpgou.ttc -fontgal-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpgou.ttc -fontgal-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpgou.ttf -fontgal-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpgou.ttf -fontgal-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwmil.ttc -fontgal-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwmil.ttc -fontgal-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwmil.ttf -fontgal-mincho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwmil.ttf -fontgal-mincho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw3.ttc -fontgal-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw3.ttc -fontgal-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw3.ttf -fontgal-mincho-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw3.ttf -fontgal-mincho-w3-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw5.ttc -fontgal-mincho-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw5.ttc -fontgal-mincho-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw5.ttf -fontgal-mincho-w5-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw5.ttf -fontgal-mincho-w5-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw7.ttc -fontgal-mincho-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw7.ttc -fontgal-mincho-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw7.ttf -fontgal-mincho-w7-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw7.ttf -fontgal-mincho-w7-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw9.ttc -fontgal-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw9.ttc -fontgal-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcchmw9.ttf -fontgal-mincho-w9-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcchmw9.ttf -fontgal-mincho-w9-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpmiu.ttc -fontgal-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpmiu.ttc -fontgal-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpmiu.ttf -fontgal-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpmiu.ttf -fontgal-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcccgym.ttc -fontgal-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcccgym.ttc -fontgal-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcccgym.ttf -fontgal-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcccgym.ttf -fontgal-gyosyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgclcgym.ttc -fontgal-gyosyo-lcm-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgclcgym.ttc -fontgal-gyosyo-lcm-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgclcgym.ttf -fontgal-gyosyo-lcm-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgclcgym.ttf -fontgal-gyosyo-lcm-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccghkm.ttc -fontgal-han koin-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccghkm.ttc -fontgal-han koin-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgccghkm.ttf -fontgal-han koin-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgccghkm.ttf -fontgal-han koin-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpsgm.ttc -fontgal-syoukei gyosyo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpsgm.ttc -fontgal-syoukei gyosyo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgchpsgm.ttf -fontgal-syoukei gyosyo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgchpsgm.ttf -fontgal-syoukei gyosyo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwkyd.ttc -fontgal-kyokasho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwkyd.ttc -fontgal-kyokasho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwkyd.ttf -fontgal-kyokasho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwkyd.ttf -fontgal-kyokasho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwkyl.ttc -fontgal-kyokasho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwkyl.ttc -fontgal-kyokasho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgciwkyl.ttf -fontgal-kyokasho-light-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgciwkyl.ttf -fontgal-kyokasho-light-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntkym.ttc -fontgal-kyokasho-ntm-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntkym.ttc -fontgal-kyokasho-ntm-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntkym.ttf -fontgal-kyokasho-ntm-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntkym.ttf -fontgal-kyokasho-ntm-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbgym.ttc -fontgal-syoukei shin gyosyo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbgym.ttc -fontgal-syoukei shin gyosyo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbgym.ttf -fontgal-syoukei shin gyosyo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbgym.ttf -fontgal-syoukei shin gyosyo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbreb.ttc -fontgal-reisyo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbreb.ttc -fontgal-reisyo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbreb.ttf -fontgal-reisyo-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbreb.ttf -fontgal-reisyo-bold-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbrem.ttc -fontgal-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbrem.ttc -fontgal-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgckbrem.ttf -fontgal-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgckbrem.ttf -fontgal-reisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcltsgl.ttc -fontgal-seibi shirogane-l-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcltsgl.ttc -fontgal-seibi shirogane-l-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcltsgl.ttf -fontgal-seibi shirogane-l-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcltsgl.ttf -fontgal-seibi shirogane-l-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcmrkrr.ttc -fontgal-koreisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcmrkrr.ttc -fontgal-koreisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcmrkrr.ttf -fontgal-koreisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcmrkrr.ttf -fontgal-koreisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcmrseu.ttc -fontgal-senshamoji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcmrseu.ttc -fontgal-senshamoji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcmrseu.ttf -fontgal-senshamoji-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcmrseu.ttf -fontgal-senshamoji-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntkym.ttc -fontgal-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntkym.ttc -fontgal-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntkym.ttf -fontgal-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntkym.ttf -fontgal-kaisyo-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntscl.ttc -fontgal-ntc souchou-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntscl.ttc -fontgal-ntc souchou-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntscl.ttf -fontgal-ntc souchou-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntscl.ttf -fontgal-ntc souchou-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntskd.ttc -fontgal-ntc shinkaisho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntskd.ttc -fontgal-ntc shinkaisho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcntskd.ttf -fontgal-ntc shinkaisho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcntskd.ttf -fontgal-ntc shinkaisho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcseedu.ttc -fontgal-shin edo1-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcseedu.ttc -fontgal-shin edo1-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcseedu.ttf -fontgal-shin edo1-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcseedu.ttf -fontgal-shin edo1-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcseppb.ttc -fontgal-pop2-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcseppb.ttc -fontgal-pop2-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"fgcseppb.ttf -fontgal-pop2-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"fgcseppb.ttf -fontgal-pop2-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"msgothic.ttc -microsoft-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"msgothic.ttc -microsoft-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"msmincho.ttc -microsoft-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"msmincho.ttc -microsoft-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -); - -open(DIR,"ls -1 |") || die "can't ls -1 "; -$c = 0; -while (<DIR>) { - chop; - $file = $_; - if (@g=grep(/^$file\t/,@font)) { - $count++; - push (@f, @g); - }else{ - print STDERR "$file: Unknown\n"; - } -} -if ($count) { - $count = $#f + 1; - print "$count\n"; - print @f; -}else{ - print "No font file found\n"; -} - -exit 0; - diff --git a/x11-servers/XttXF86srv-common/files/patch-00 b/x11-servers/XttXF86srv-common/files/patch-00 deleted file mode 100644 index 683899cea08f..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-00 +++ /dev/null @@ -1,71 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf config/cf/FreeBSD.cf ---- /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf Sun Nov 8 11:19:10 1998 -+++ config/cf/FreeBSD.cf Tue Dec 8 10:10:06 1998 -diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf config/cf/Imake.cf -@@ -308,7 +308,12 @@ - # define AsmDefines AsmElfDefines - #endif - -+#ifdef i386Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines -+#endif -+#ifdef AlphaArchitecture -+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -+#endif - - #define StandardDefines -DCSRG_BASED - -@@ -333,14 +338,14 @@ - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 -+#define DefaultGcc2i386Opt - #endif - #endif - - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags - #endif - - #ifndef PreIncDir -@@ -449,14 +454,18 @@ - #define DlLibrary /**/ - #endif - -+#ifdef AlphaArchitecture -+#define IoLibrary -lio -+#else -+#define IoLibrary /**/ -+#endif -+ - #if BuildDynamicLoading --#define ServerExtraSysLibs DlLibrary -+#define ServerExtraSysLibs DlLibrary IoLibrary - #else --#define ServerExtraSysLibs /**/ -+#define ServerExtraSysLibs IoLibrary - #endif - - #include <bsdLib.rules> - --#ifdef i386Architecture - #include <xfree86.cf> --#endif ---- /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf Fri Nov 13 14:10:12 1998 -+++ config/cf/Imake.cf Tue Dec 8 10:05:49 1998 -@@ -160,6 +160,11 @@ - # define i386Architecture - # undef i386 - # endif -+# ifdef __alpha__ -+# define AlphaBsdArchitecture -+# define AlphaArchitecture -+# undef __alpha__ -+# endif - #endif /* __FreeBSD__ */ - - #ifdef AMOEBA diff --git a/x11-servers/XttXF86srv-common/files/patch-01 b/x11-servers/XttXF86srv-common/files/patch-01 deleted file mode 100644 index 677d184b5c89..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-01 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/xfree86.cf config/cf/xfree86.cf ---- /usr/ports/x11/XFree86/work/xc/config/cf/xfree86.cf Sun Nov 8 11:19:11 1998 -+++ config/cf/xfree86.cf Tue Dec 8 10:05:55 1998 -@@ -853,7 +853,7 @@ - #endif - - #ifndef XFree86ConsoleDefines --#ifdef i386BsdArchitecture -+#if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) - #define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT - #else - #define XFree86ConsoleDefines /**/ diff --git a/x11-servers/XttXF86srv-common/files/patch-02 b/x11-servers/XttXF86srv-common/files/patch-02 deleted file mode 100644 index 036e849db7fe..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-02 +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h Mon Dec 23 06:31:04 1996 -+++ programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h Tue Dec 8 10:05:55 1998 -@@ -37,6 +37,18 @@ - #define outw(p,v) _outw((v),(p)) - #define outl(p,v) _outl((v),(p)) - #else -+#if defined(__FreeBSD__) && defined(__alpha__) -+ -+#include <sys/types.h> -+ -+extern void outb(u_int32_t port, u_int8_t val); -+extern void outw(u_int32_t port, u_int16_t val); -+extern void outl(u_int32_t port, u_int32_t val); -+extern u_int8_t inb(u_int32_t port); -+extern u_int16_t inw(u_int32_t port); -+extern u_int32_t inl(u_int32_t port); -+ -+#else - #ifdef GCCUSESGAS - static __inline__ void - outb(port, val) -@@ -156,6 +168,7 @@ - - #endif /* GCCUSESGAS */ - #endif /* linux && __alpha__ */ -+#endif /* __FreeBSD__ && __alpha__ */ - - #ifdef linux - diff --git a/x11-servers/XttXF86srv-common/files/patch-03 b/x11-servers/XttXF86srv-common/files/patch-03 deleted file mode 100644 index d4005c2cb7ce..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-03 +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile programs/Xserver/hw/xfree86/SuperProbe/Imakefile ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile Mon Oct 19 21:38:44 1998 -+++ programs/Xserver/hw/xfree86/SuperProbe/Imakefile Tue Dec 8 10:05:55 1998 -@@ -31,6 +31,10 @@ - #if defined(i386BsdArchitecture) - # define OSModule OS_386BSD - #endif -+#if defined(AlphaBsdArchitecture) -+# define OSModule OS_386BSD -+ SYS_LIBRARIES = -lio -+#endif - #if defined(MinixArchitecture) - # define OSModule OS_Minix - #endif diff --git a/x11-servers/XttXF86srv-common/files/patch-04 b/x11-servers/XttXF86srv-common/files/patch-04 deleted file mode 100644 index 45d6465c8354..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-04 +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c programs/Xserver/hw/xfree86/accel/s3/s3.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c Mon Oct 19 21:39:13 1998 -+++ programs/Xserver/hw/xfree86/accel/s3/s3.c Wed Dec 9 10:27:41 1998 -@@ -291,7 +291,7 @@ - int s3_968_DashBug = 0; - unsigned long s3MemBase = 0; - Bool tmp_useSWCursor = FALSE; --#ifdef __alpha__ -+#if defined(__alpha__) && defined(linux) - unsigned long _bus_base(void); - Bool isJensen = FALSE; - #endif -@@ -1034,7 +1034,7 @@ - - xf86VerifyOptions(&validOptions, &s3InfoRec); - --#ifdef __alpha__ -+#if defined(__alpha__) && defined(linux) - #ifdef TEST_JENSEN_CODE - if (1) - #else diff --git a/x11-servers/XttXF86srv-common/files/patch-05 b/x11-servers/XttXF86srv-common/files/patch-05 deleted file mode 100644 index 4480d68e23c3..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-05 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c programs/Xserver/hw/xfree86/accel/s3/s3im.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c Fri Nov 13 14:15:12 1998 -+++ programs/Xserver/hw/xfree86/accel/s3/s3im.c Wed Dec 9 10:29:01 1998 -@@ -51,7 +51,7 @@ - (a & 0x02) << 5 | \ - (a & 0x01) << 7; - --#ifdef __alpha__ -+#if defined(__alpha__) && defined(linux) - extern Bool isJensen; - #define MemToBusBase(Base,dst,src,count) { if(isJensen) JensenMemToBus(Base,dst,src,count); else MemToBus(&Base[dst],src,count); } - #define BusToMemBase(dst,Base,src,count) { if(isJensen) JensenBusToMem(Base,dst,src,count); else BusToMem(dst,&Base[src],count); } diff --git a/x11-servers/XttXF86srv-common/files/patch-06 b/x11-servers/XttXF86srv-common/files/patch-06 deleted file mode 100644 index 1749cb1532ae..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-06 +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common/compiler.h programs/Xserver/hw/xfree86/common/compiler.h ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common/compiler.h Mon Oct 19 21:39:32 1998 -+++ programs/Xserver/hw/xfree86/common/compiler.h Tue Dec 8 10:58:16 1998 -@@ -145,7 +145,21 @@ - return _inl(port); - } - --# else /* defined(linux) */ -+# elif defined(__FreeBSD__) -+/* for FreeBSD on Alpha, we use the libio inx/outx routines */ -+/* note that the appropriate setup via "ioperm" needs to be done */ -+/* *before* any inx/outx is done. */ -+ -+#include <sys/types.h> -+ -+extern void outb(u_int32_t port, u_int8_t val); -+extern void outw(u_int32_t port, u_int16_t val); -+extern void outl(u_int32_t port, u_int32_t val); -+extern u_int8_t inb(u_int32_t port); -+extern u_int16_t inw(u_int32_t port); -+extern u_int32_t inl(u_int32_t port); -+ -+# else /* defined(__FreeBSD__) */ - - #define outb(a, b) /* NOP */ - #define outw(a, b) /* NOP */ diff --git a/x11-servers/XttXF86srv-common/files/patch-07 b/x11-servers/XttXF86srv-common/files/patch-07 deleted file mode 100644 index 6f47aca6451f..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-07 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.c programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.c Sun Nov 24 09:55:37 1996 -+++ programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.c Tue Dec 8 10:05:56 1998 -@@ -299,8 +299,6 @@ - * "bge reg, xx"). I hope alpha-gcc will be fixed to notice this eventually.. - */ - --#include <linux/types.h> -- - /* - * This should be done in one go with ldq_u*2/mask/stq_u. Do it - * with a macro so that we can fix it up later.. diff --git a/x11-servers/XttXF86srv-common/files/patch-08 b/x11-servers/XttXF86srv-common/files/patch-08 deleted file mode 100644 index 2cd67f8d3b08..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-08 +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile programs/Xserver/hw/xfree86/common_hw/Imakefile ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile Tue Feb 24 21:01:21 1998 -+++ programs/Xserver/hw/xfree86/common_hw/Imakefile Tue Dec 8 10:05:56 1998 -@@ -15,7 +15,7 @@ - XSRCS = BUSmemcpy.c IODelay.c SlowBcopy.c $(IOSRC) - XOBJS = BUSmemcpy.o IODelay.o SlowBcopy.o $(IOOBJ) - #else --#if defined(ArcArchitecture) -+#if defined(ArcArchitecture) || defined(AlphaArchitecture) - XSRCS = BUSmemcpy.c IODelay.c SlowBcopy.c $(IOSRC) - XOBJS = BUSmemcpy.o IODelay.o SlowBcopy.o $(IOOBJ) - #else -@@ -42,7 +42,7 @@ - - NormalLibraryTarget(xf86_hw,$(OBJS)) - --#if !(defined(LinuxArchitecture) && defined(AlphaArchitecture)) && !defined(ArcArchitecture) -+#if !defined(AlphaArchitecture) && !defined(ArcArchitecture) - ObjectFromAsmSource(BUSmemcpy,NullParameter) - ObjectFromAsmSource(IODelay,NullParameter) - ObjectFromAsmSource(SlowBcopy,NullParameter) diff --git a/x11-servers/XttXF86srv-common/files/patch-09 b/x11-servers/XttXF86srv-common/files/patch-09 deleted file mode 100644 index 579b70768c05..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-09 +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/SlowBcopy.c programs/Xserver/hw/xfree86/common_hw/SlowBcopy.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/SlowBcopy.c Sun Jan 5 11:58:24 1997 -+++ programs/Xserver/hw/xfree86/common_hw/SlowBcopy.c Tue Dec 8 10:05:56 1998 -@@ -37,7 +37,12 @@ - * Martin Ostermann (ost@comnets.rwth-aachen.de) - Apr.-Sep. 1996 - */ - -+#ifdef linux - unsigned long _bus_base(void); -+#define isJensen() (!_bus_base()) -+#else -+#define isJensen() 0 -+#endif - - #ifdef TEST_JENSEN_CODE /* define to test the Sparse addressing on a non-Jensen */ - #define SPARSE (5) -@@ -50,7 +55,7 @@ - unsigned char *src, *dst; - int count; - { -- if (!_bus_base()) /* Jensen */ -+ if (isJensen()) - { - unsigned long addr; - long result; -@@ -74,7 +79,7 @@ - unsigned char *src, *dst; - int count; - { -- if (!_bus_base()) /* Jensen */ -+ if (isJensen()) - { - unsigned long addr; - diff --git a/x11-servers/XttXF86srv-common/files/patch-0a b/x11-servers/XttXF86srv-common/files/patch-0a deleted file mode 100644 index 0808363a702d..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0a +++ /dev/null @@ -1,112 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/xf86_PCI.c programs/Xserver/hw/xfree86/common_hw/xf86_PCI.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/common_hw/xf86_PCI.c Fri Nov 13 14:15:23 1998 -+++ programs/Xserver/hw/xfree86/common_hw/xf86_PCI.c Tue Dec 8 10:05:56 1998 -@@ -490,7 +490,7 @@ - static int pciConfigType = 0; - static int pciMaxDevice = 0; - --#if defined(__alpha__) -+#if defined(__alpha__) && defined(linux) - #include <asm/unistd.h> - #define BUS(tag) (((tag)>>16)&0xff) - #define DFN(tag) (((tag)>>8)&0xff) -@@ -512,7 +512,69 @@ - { - return syscall(__NR_pciconfig_write, bus, dfn, off, len, buf); - } --#endif /* __alpha__ */ -+#endif /* __alpha__ && linux */ -+#if defined(__alpha__) && defined(__FreeBSD__) -+ -+#include <sys/pciio.h> -+ -+#define BUS(tag) (((tag)>>16)&0xff) -+#define DFN(tag) (((tag)>>8)&0xff) -+ -+static int pciFd = -1; -+ -+void pciconfig_enable(void) -+{ -+ pciFd = open("/dev/pci", O_RDWR); -+} -+ -+void pciconfig_disable(void) -+{ -+#if 0 -+ /* MGA server calls pciWriteLong after pciDisableIO */ -+ close(pciFd); -+ pciFd = -1; -+#endif -+} -+ -+int pciconfig_read( -+ unsigned char bus, -+ unsigned char dfn, -+ unsigned char off, -+ unsigned char len, -+ void * buf) -+{ -+ struct pci_io io; -+ int error; -+ io.pi_sel.pc_bus = bus; -+ io.pi_sel.pc_dev = dfn >> 3; -+ io.pi_sel.pc_func = dfn & 7; -+ io.pi_reg = off; -+ io.pi_width = len; -+ error = ioctl(pciFd, PCIOCREAD, &io); -+ if (error) -+ return error; -+ memcpy(buf, &io.pi_data, len); -+ return 0; -+} -+ -+int pciconfig_write( -+ unsigned char bus, -+ unsigned char dfn, -+ unsigned char off, -+ unsigned char len, -+ void * buf) -+{ -+ struct pci_io io; -+ io.pi_sel.pc_bus = bus; -+ io.pi_sel.pc_dev = dfn >> 3; -+ io.pi_sel.pc_func = dfn & 7; -+ io.pi_reg = off; -+ io.pi_width = len; -+ memcpy(&io.pi_data, buf, len); -+ return ioctl(pciFd, PCIOCWRITE, &io); -+} -+ -+#endif /* __alpha__ && __FreeBSD__ */ - - static Bool - pcibusCheck() -@@ -1052,6 +1114,9 @@ - static void - pciEnableIO(int scrnIndex) - { -+#if defined(__alpha__) && defined(__FreeBSD__) -+ pciconfig_enable(); -+#else - /* This is enough to ensure that full I/O is enabled */ - unsigned pciIOPorts[] = { PCI_MODE1_ADDRESS_REG }; - int numPciIOPorts = sizeof(pciIOPorts) / sizeof(pciIOPorts[0]); -@@ -1059,13 +1124,18 @@ - xf86ClearIOPortList(scrnIndex); - xf86AddIOPorts(scrnIndex, numPciIOPorts, pciIOPorts); - xf86EnableIOPorts(scrnIndex); -+#endif - } - - static void - pciDisableIO(int scrnIndex) - { -+#if defined(__alpha__) && defined(__FreeBSD__) -+ pciconfig_disable(); -+#else - xf86DisableIOPorts(scrnIndex); - xf86ClearIOPortList(scrnIndex); -+#endif - } - - static Bool diff --git a/x11-servers/XttXF86srv-common/files/patch-0b b/x11-servers/XttXF86srv-common/files/patch-0b deleted file mode 100644 index 6eae94c40370..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0b +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/Imakefile programs/Xserver/hw/xfree86/os-support/Imakefile ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/Imakefile Sun May 11 06:04:24 1997 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Tue Dec 8 10:05:56 1998 -@@ -38,7 +38,7 @@ - OS_SUBDIR = lynxos - #endif - --#if defined(i386BsdArchitecture) -+#if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) - # if defined(BSD386Architecture) - OS_SUBDIR = bsdi - # else diff --git a/x11-servers/XttXF86srv-common/files/patch-0c b/x11-servers/XttXF86srv-common/files/patch-0c deleted file mode 100644 index 433600270792..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0c +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile programs/Xserver/hw/xfree86/os-support/bsd/Imakefile ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Sun Jan 5 11:59:09 1997 -+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Tue Dec 8 10:05:56 1998 -@@ -31,8 +31,12 @@ - IOPERMDEFINES = -DUSE_I386_IOPL - # endif - #else -+# if defined(AlphaBsdArchitecture) -+ IOPERMDEFINES = -DUSE_ALPHA_PORTS -+# else - IOPERM_SRC = ioperm_noop.c - IOPERM_OBJ = ioperm_noop.o -+# endif - #endif - - SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c bios_devmem.c mapVT_noop.c \ diff --git a/x11-servers/XttXF86srv-common/files/patch-0d b/x11-servers/XttXF86srv-common/files/patch-0d deleted file mode 100644 index 40c39830d8a5..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0d +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c Mon Oct 19 21:40:36 1998 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c Tue Dec 8 10:05:56 1998 -@@ -386,7 +386,7 @@ - vtmode_t vtmode; - char vtname[12]; - struct stat status; -- long syscons_version; -+ int syscons_version; - - /* Check for syscons */ - if ((fd = open(SYSCONS_CONSOLE_DEV1, SYSCONS_CONSOLE_MODE, 0)) >= 0 diff --git a/x11-servers/XttXF86srv-common/files/patch-0e b/x11-servers/XttXF86srv-common/files/patch-0e deleted file mode 100644 index 562c6b102ee0..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0e +++ /dev/null @@ -1,398 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c Mon Feb 16 00:42:01 1998 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c Tue Dec 8 10:05:56 1998 -@@ -40,6 +40,13 @@ - #define MAP_FLAGS (MAP_FILE | MAP_SHARED) - #endif - -+#ifdef __alpha__ -+extern u_int64_t dense_base(); -+#define BUS_BASE dense_base() -+#else -+#define BUS_BASE 0L -+#endif -+ - /***************************************************************************/ - /* Video Memory Mapping section */ - /***************************************************************************/ -@@ -77,7 +84,7 @@ - { - /* Try to map a page at the VGA address */ - base = (pointer)mmap((caddr_t)0, 4096, PROT_READ|PROT_WRITE, -- MAP_FLAGS, fd, (off_t)0xA0000); -+ MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE); - - if (base != (pointer)-1) - { -@@ -147,7 +154,6 @@ - #endif - } - -- - pointer - xf86MapVidMem(ScreenNum, Region, Base, Size) - int ScreenNum; -@@ -160,6 +166,10 @@ - if (!devMemChecked) - checkDevMem(FALSE); - -+#ifdef __alpha__ -+ Base = (pointer)((unsigned long)Base & ((1L<<32) - 1)); -+#endif -+ - if (useDevMem) - { - if (devMemFd < 0) -@@ -169,7 +179,7 @@ - } - base = (pointer)mmap((caddr_t)0, Size, PROT_READ|PROT_WRITE, - MAP_FLAGS, devMemFd, -- (off_t)(unsigned long) Base); -+ (off_t)(unsigned long) Base + BUS_BASE); - if (base == (pointer)-1) - { - FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n", -@@ -195,11 +205,14 @@ - } - base = (pointer)mmap(0, Size, PROT_READ|PROT_WRITE, MAP_FLAGS, - xf86Info.screenFd, --#ifdef __mips__ -- (unsigned long)Base); -+#if defined(__alpha__) -+ (unsigned long)Base + BUS_BASE -+#elif defined(__mips__) -+ (unsigned long)Base - #else -- (unsigned long)Base - 0xA0000); -+ (unsigned long)Base - 0xA0000 - #endif -+ ); - if (base == (pointer)-1) - { - FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n", -@@ -397,7 +410,73 @@ - ErrorF("EnableIOPorts: failed to open %s (%s)\n", - "/dev/ttyC0", strerror(errno)); - } -- -+ -+ ExtendedEnabled = TRUE; -+ -+ return; -+} -+ -+void -+xf86DisableIOPorts(ScreenNum) -+int ScreenNum; -+{ -+ int i; -+ -+ ScreenEnabled[ScreenNum] = FALSE; -+ -+ return; -+} -+ -+void xf86DisableIOPrivs() -+{ -+} -+ -+#endif /* USE_ARC_MMAP */ -+ -+#ifdef USE_ALPHA_PORTS -+ -+static Bool ScreenEnabled[MAXSCREENS]; -+static Bool ExtendedEnabled = FALSE; -+static Bool InitDone = FALSE; -+ -+void -+xf86ClearIOPortList(ScreenNum) -+int ScreenNum; -+{ -+ if (!InitDone) -+ { -+ int i; -+ for (i = 0; i < MAXSCREENS; i++) -+ ScreenEnabled[i] = FALSE; -+ InitDone = TRUE; -+ } -+ return; -+} -+ -+void -+xf86AddIOPorts(ScreenNum, NumPorts, Ports) -+int ScreenNum; -+int NumPorts; -+unsigned *Ports; -+{ -+ return; -+} -+ -+void -+xf86EnableIOPorts(ScreenNum) -+int ScreenNum; -+{ -+ int i; -+ int fd; -+ pointer base; -+ -+ ScreenEnabled[ScreenNum] = TRUE; -+ -+ if (ExtendedEnabled) -+ return; -+ -+ ioperm(0, 65536, TRUE); -+ - ExtendedEnabled = TRUE; - - return; -@@ -411,6 +490,8 @@ - - ScreenEnabled[ScreenNum] = FALSE; - -+ ioperm(0, 65536, FALSE); -+ - return; - } - -@@ -428,7 +509,7 @@ - xf86DisableInterrupts() - { - --#if !defined(__mips__) -+#if !defined(__mips__) && !defined(__alpha__) - #ifdef __GNUC__ - __asm__ __volatile__("cli"); - #else -@@ -443,7 +524,7 @@ - xf86EnableInterrupts() - { - --#if !defined(__mips__) -+#if !defined(__mips__) && !defined(__alpha__) - #ifdef __GNUC__ - __asm__ __volatile__("sti"); - #else -@@ -453,3 +534,223 @@ - - return; - } -+ -+#if defined(__alpha__) -+ -+#if 0 -+ -+#include <machine/sysarch.h> -+ -+#define SPARSE_SHIFT 5 -+ -+static pointer sparseMappedVirt; -+static unsigned long sparseMappedPhys; -+ -+pointer xf86MapVidMemSparse(ScreenNum, Region, Base, Size) -+int ScreenNum; -+int Region; -+pointer Base; -+unsigned long Size; -+{ -+ pointer base; -+ int fd; -+ -+ sparseMappedPhys = (unsigned long) Base; -+ -+ Size <<= SPARSE_SHIFT; -+ Base = (pointer)((sparseMappedPhys & ~_bus_hae_mask()) << SPARSE_SHIFT); -+ -+ if ((fd = open("/dev/mem", O_RDWR)) < 0) -+ { -+ FatalError("xf86MapVidMem: failed to open /dev/mem (%s)\n", -+ strerror(errno)); -+ } -+ /* This requirers linux-0.99.pl10 or above */ -+ base = (pointer)mmap((caddr_t)0, Size, -+ PROT_READ | PROT_WRITE, -+ MAP_SHARED, fd, -+ (off_t)Base + _bus_base_sparse()); -+ close(fd); -+ if ((long)base == -1) -+ { -+ FatalError("xf86MapVidMem: Could not mmap framebuffer (%s)\n", -+ strerror(errno)); -+ } -+ -+ /* -+ * This enables user HAE settings for this process. -+ */ -+ alpha_sethae(0); -+ -+ sparseMappedVirt = base; -+ -+ return base; -+} -+ -+void xf86UnMapVidMemSparse(ScreenNum, Region, Base, Size) -+int ScreenNum; -+int Region; -+pointer Base; -+unsigned long Size; -+{ -+ Size <<= SPARSE_SHIFT; -+ -+ munmap((caddr_t)Base, Size); -+} -+ -+#define vuip volatile unsigned int * -+ -+static void -+setupAddress(Offset) -+unsigned long Offset; -+{ -+ unsigned long phys = sparseMappedPhys + Offset; -+ alpha_sethae(phys & _bus_hae_mask()); -+} -+ -+int xf86ReadSparse8(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ unsigned long result, shift; -+ -+ shift = (Offset & 0x3) * 8; -+ setupAddress(Offset); -+ result = *(vuip) ((unsigned long)Base + (Offset << SPARSE_SHIFT)); -+ result >>= shift; -+ return 0xffUL & result; -+} -+ -+int xf86ReadSparse16(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ unsigned long result, shift; -+ -+ shift = (Offset & 0x2) * 8; -+ setupAddress(Offset); -+ result = *(vuip)((unsigned long)Base+(Offset<<SPARSE_SHIFT)+(1<<(SPARSE_SHIFT-2))); -+ result >>= shift; -+ return 0xffffUL & result; -+} -+ -+int xf86ReadSparse32(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ unsigned long result; -+ -+ setupAddress(Offset); -+ result = *(vuip)((unsigned long)Base+(Offset<<SPARSE_SHIFT)+(3<<(SPARSE_SHIFT-2))); -+ return result; -+} -+ -+void xf86WriteSparse8(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ unsigned int b = Value & 0xffU; -+ -+ setupAddress(Offset); -+ *(vuip) ((unsigned long)Base + (Offset << SPARSE_SHIFT)) = b * 0x01010101; -+} -+ -+void xf86WriteSparse16(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ unsigned int w = Value & 0xffffU; -+ -+ setupAddress(Offset); -+ *(vuip)((unsigned long)Base+(Offset<<SPARSE_SHIFT)+(1<<(SPARSE_SHIFT-2))) = -+ w * 0x00010001; -+} -+ -+void xf86WriteSparse32(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ setupAddress(Offset); -+ *(vuip)((unsigned long)Base+(Offset<<SPARSE_SHIFT)+(3<<(SPARSE_SHIFT-2))) = Value; -+} -+ -+#else -+ -+extern void *map_memory(u_int32_t address, u_int32_t size); -+extern void unmap_memory(void *handle, u_int32_t size); -+extern u_int8_t readb(void *handle, u_int32_t offset); -+extern u_int16_t readw(void *handle, u_int32_t offset); -+extern u_int32_t readl(void *handle, u_int32_t offset); -+extern void writeb(void *handle, u_int32_t offset, u_int8_t val); -+extern void writew(void *handle, u_int32_t offset, u_int16_t val); -+extern void writel(void *handle, u_int32_t offset, u_int32_t val); -+ -+pointer xf86MapVidMemSparse(ScreenNum, Region, Base, Size) -+int ScreenNum; -+int Region; -+pointer Base; -+unsigned long Size; -+{ -+ return (pointer) map_memory((u_int32_t) (u_int64_t) Base, Size); -+} -+ -+void xf86UnMapVidMemSparse(ScreenNum, Region, Base, Size) -+int ScreenNum; -+int Region; -+pointer Base; -+unsigned long Size; -+{ -+ unmap_memory(Base, Size); -+} -+ -+int xf86ReadSparse8(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ return readb(Base, Offset); -+} -+ -+int xf86ReadSparse16(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ return readw(Base, Offset); -+} -+ -+int xf86ReadSparse32(Base, Offset) -+pointer Base; -+unsigned long Offset; -+{ -+ return readl(Base, Offset); -+} -+ -+void xf86WriteSparse8(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ writeb(Base, Offset, Value); -+} -+ -+void xf86WriteSparse16(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ writel(Base, Offset, Value); -+} -+ -+void xf86WriteSparse32(Value, Base, Offset) -+int Value; -+pointer Base; -+unsigned long Offset; -+{ -+ writel(Base, Offset, Value); -+} -+ -+#endif -+ -+#endif /* __alpha__ */ diff --git a/x11-servers/XttXF86srv-common/files/patch-0f b/x11-servers/XttXF86srv-common/files/patch-0f deleted file mode 100644 index be49e3258157..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-0f +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c ---- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c Mon Dec 23 06:50:58 1996 -+++ programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c Tue Dec 8 10:05:56 1998 -@@ -60,25 +60,7 @@ - * re: boundaries and sizes and such... - */ - --/* -- * The Jensen lacks dense memory, thus we have to address the bus via -- * the sparse addressing scheme. -- * -- * Martin Ostermann (ost@comnets.rwth-aachen.de) - Apr.-Sep. 1996 -- */ -- --#ifdef TEST_JENSEN_CODE /* define to test the Sparse addressing on a non-Jensen */ --#define SPARSE (5) --#define isJensen (1) --#else --#define isJensen (!_bus_base()) --#define SPARSE (7) --#endif -- --extern unsigned long _bus_base(void); --extern unsigned long _bus_base_sparse(void); --#define BUS_BASE (isJensen ? _bus_base_sparse() : _bus_base()) --#define JENSEN_SHIFT(x) (isJensen ? ((long)x<<SPARSE) : (long)x) -+extern u_int64_t dense_base(void); - - #define SIZE (64*1024) - -@@ -92,8 +74,8 @@ - return(-1); - } - -- base = mmap((caddr_t)0, JENSEN_SHIFT(SIZE), PROT_READ, -- MAP_SHARED, fd, (off_t)(JENSEN_SHIFT(Base) + BUS_BASE)); -+ base = mmap((caddr_t)0, SIZE, PROT_READ, -+ MAP_SHARED, fd, (off_t)Base + dense_base()); - - if (base == (caddr_t)-1UL) - { -@@ -102,9 +84,9 @@ - return(-1); - } - -- SlowBCopyFromBus(base+JENSEN_SHIFT(Offset), Buf, Len); -+ SlowBCopyFromBus(base+Offset, Buf, Len); - -- munmap((caddr_t)JENSEN_SHIFT(base), JENSEN_SHIFT(SIZE)); -+ munmap((caddr_t)base, SIZE); - close(fd); - return(Len); - diff --git a/x11-servers/XttXF86srv-common/files/patch-5 b/x11-servers/XttXF86srv-common/files/patch-5 deleted file mode 100644 index a5f67a13c03f..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-5 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/os/access.c.orig Thu Dec 24 13:43:25 1998 -+++ programs/Xserver/os/access.c Wed Dec 23 15:32:23 1998 -@@ -634,7 +634,7 @@ - #endif - ifc.ifc_len = sizeof (buf); - ifc.ifc_buf = buf; -- if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0) -+ if (ifioctl (fd, SIOCGIFCONF, (pointer) &ifc) < 0) - Error ("Getting interface configuration (4)"); - - #ifdef ISC diff --git a/x11-servers/XttXF86srv-common/files/patch-6 b/x11-servers/XttXF86srv-common/files/patch-6 deleted file mode 100644 index 82ba1e24384d..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-6 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xdm/Imakefile.orig Sun Aug 1 15:28:12 1999 -+++ programs/xdm/Imakefile Sun Aug 1 15:33:53 1999 -@@ -20,7 +20,7 @@ - */ - #ifndef SharedLibXdmGreet - #define SharedLibXdmGreet \ -- ((defined(AlphaArchitecture) && \ -+ ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) && \ - (!defined(NetBSDArchitecture) || \ - (defined(NetBSDArchitecture) && HasSharedLibraries))) || \ - SystemV4) diff --git a/x11-servers/XttXF86srv-common/files/patch-7 b/x11-servers/XttXF86srv-common/files/patch-7 deleted file mode 100644 index 40944438d6d7..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-7 +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/Xxf86dga/XF86DGA.c.orig Sun Sep 5 10:53:57 1999 -+++ lib/Xxf86dga/XF86DGA.c Sun Sep 5 10:56:20 1999 -@@ -30,7 +30,7 @@ - - /* Alpha Patch by Georg Acher, acher@in.tum.de - modified by Ivan Kokshaysky <ink@rc.ru> */ --#ifdef __alpha__ -+#if defined(__alpha__) && !defined(__FreeBSD__) - extern unsigned long _bus_base(void); - #endif - -@@ -571,7 +571,7 @@ - HFILE hfd; - #endif - --#ifdef __alpha__ -+#if defined(__alpha__) && !defined(__FreeBSD__) - off_t bus_base_addr = _bus_base(); - - /* DGA would be broken on Jensen anyway due to the lack of diff --git a/x11-servers/XttXF86srv-common/files/patch-8 b/x11-servers/XttXF86srv-common/files/patch-8 deleted file mode 100644 index 58f16f2ed4de..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-8 +++ /dev/null @@ -1,13 +0,0 @@ ---- nls/Imakefile.orig Sun Jan 23 02:22:04 2000 -+++ nls/Imakefile Sun Jan 23 02:38:08 2000 -@@ -8,7 +8,9 @@ - #define PassCDebugFlags - - SUBDIRS = XLC_LOCALE Compose -- -+#if defined(FreeBSDArchitecture) -+STD_CPP_DEFINES+= -DINCLUDE_ru_SU -+#endif - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) - diff --git a/x11-servers/XttXF86srv-common/files/patch-9 b/x11-servers/XttXF86srv-common/files/patch-9 deleted file mode 100644 index 985d7dddac3d..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-9 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/xdm/sessreg.c~ Sun Jan 16 18:33:06 2000 -+++ programs/xdm/sessreg.c Sun Jan 23 03:31:15 2000 -@@ -79,7 +79,9 @@ - - #ifdef CSRG_BASED - /* *BSD doesn't like a ':0' type entry in utmp */ -+#ifndef __FreeBSD__ - #define NO_UTMP -+#endif - #endif - - #ifndef WTMP_FILE diff --git a/x11-servers/XttXF86srv-common/files/patch-aa b/x11-servers/XttXF86srv-common/files/patch-aa deleted file mode 100644 index def1d4dd3fb6..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Imakefile.ORIG Sun Nov 14 18:16:17 1999 -+++ programs/Xserver/Imakefile Sun Nov 14 18:17:24 1999 -@@ -161,7 +161,7 @@ - SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS) - #endif - #if HasPam -- PAMLIBS = -lpam -lpam_misc -ldl -+ PAMLIBS = -lpam - #endif - CBRT = mi/LibraryTargetName(cbrt) - STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS) diff --git a/x11-servers/XttXF86srv-common/files/patch-ab b/x11-servers/XttXF86srv-common/files/patch-ab deleted file mode 100644 index 1f204572627b..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-ab +++ /dev/null @@ -1,9 +0,0 @@ ---- lib/font/X-TrueType/BIG5ETEN/Imakefile.orig Fri Nov 26 04:47:12 1999 -+++ lib/font/X-TrueType/BIG5ETEN/Imakefile Fri Nov 26 04:47:22 1999 -@@ -1,6 +1,6 @@ - /* code converter: BIG5ETEN */ - --#define ModuleName BIG5 -+#define ModuleName BIG5ETEN - SRCS = BIG5ETENtoUCS2.c main.c - OBJS = BIG5ETENtoUCS2.o main.o diff --git a/x11-servers/XttXF86srv-common/files/patch-ac b/x11-servers/XttXF86srv-common/files/patch-ac deleted file mode 100644 index 7eeb517a654b..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-ac +++ /dev/null @@ -1,317 +0,0 @@ ---- lib/font/X-TrueType/BIG5/BIG5toUCS2.c.orig Fri Oct 8 01:59:09 1999 -+++ lib/font/X-TrueType/BIG5/BIG5toUCS2.c Sun Jun 18 06:14:33 2000 -@@ -49,9 +49,9 @@ - static ucs2_t tblBig5ToUcs2[] = { - /* 0xA140 - 0xA1FF */ - 0x3000, 0xFF0C, 0x3001, 0x3002, 0xFF0E, 0x2022, 0xFF1B, 0xFF1A, -- 0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFF64, 0xFE52, -+ 0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFE51, 0xFE52, - 0x00B7, 0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFF5C, 0x2013, 0xFE31, -- 0x2014, 0xFE33, 0xFFFD, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35, -+ 0x2014, 0xFE33, 0x2574, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35, - 0xFE36, 0xFF5B, 0xFF5D, 0xFE37, 0xFE38, 0x3014, 0x3015, 0xFE39, - 0xFE3A, 0x3010, 0x3011, 0xFE3B, 0xFE3C, 0x300A, 0x300B, 0xFE3D, - 0xFE3E, 0x3008, 0x3009, 0xFE3F, 0xFE40, 0x300C, 0x300D, 0xFE41, -@@ -64,16 +64,16 @@ - 0x201D, 0x301D, 0x301E, 0x2035, 0x2032, 0xFF03, 0xFF06, 0xFF0A, - 0x203B, 0x00A7, 0x3003, 0x25CB, 0x25CF, 0x25B3, 0x25B2, 0x25CE, - 0x2606, 0x2605, 0x25C7, 0x25C6, 0x25A1, 0x25A0, 0x25BD, 0x25BC, -- 0x32A3, 0x2105, 0x203E, 0xFFFD, 0xFF3F, 0xFFFD, 0xFE49, 0xFE4A, -+ 0x32A3, 0x2105, 0x203E, 0xFFE3, 0xFF3F, 0x02CD, 0xFE49, 0xFE4A, - 0xFE4D, 0xFE4E, 0xFE4B, 0xFE4C, 0xFE5F, 0xFE60, 0xFE61, 0xFF0B, - 0xFF0D, 0x00D7, 0x00F7, 0x00B1, 0x221A, 0xFF1C, 0xFF1E, 0xFF1D, - 0x2266, 0x2267, 0x2260, 0x221E, 0x2252, 0x2261, 0xFE62, 0xFE63, -- 0xFE64, 0xFE65, 0xFE66, 0x223C, 0x2229, 0x222A, 0x22A5, 0x2220, -+ 0xFE64, 0xFE65, 0xFE66, 0xFF5E, 0x2229, 0x222A, 0x22A5, 0x2220, - 0x221F, 0x22BF, 0x33D2, 0x33D1, 0x222B, 0x222E, 0x2235, 0x2234, - 0x2640, 0x2642, 0x2641, 0x2609, 0x2191, 0x2193, 0x2190, 0x2192, -- 0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFFFD, ALTCHR, -+ 0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFF0F, ALTCHR, - /* 0xA240 - 0xA2FF */ -- 0xFFFD, 0xFF0F, 0xFF3C, 0xFF04, 0x00A5, 0x3012, 0x00A2, 0x00A3, -+ 0xFF3C, 0xFF0F, 0xFF3C, 0xFF04, 0xFFE5, 0x3012, 0x00A2, 0x00A3, - 0xFF05, 0xFF20, 0x2103, 0x2109, 0xFE69, 0xFE6A, 0xFE6B, 0x33D5, - 0x339C, 0x339D, 0x339E, 0x33CE, 0x33A1, 0x338E, 0x338F, 0x33C4, - 0x00B0, 0x5159, 0x515B, 0x515E, 0x515D, 0x5161, 0x5163, 0x55E7, -@@ -90,7 +90,7 @@ - 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, - 0xFF19, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, - 0x2167, 0x2168, 0x2169, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, -- 0x3026, 0x3027, 0x3028, 0x3029, 0xFFFD, 0x5344, 0xFFFD, 0xFF21, -+ 0x3026, 0x3027, 0x3028, 0x3029, 0x5341, 0x5344, 0x5345, 0xFF21, - 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, - 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, - 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, -@@ -985,68 +985,68 @@ - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF6B1, 0xF6B2, 0xF6B3, 0xF6B4, 0xF6B5, 0xF6B6, 0xF6B7, -+ 0xF6B8, 0xF6B9, 0xF6BA, 0xF6BB, 0xF6BC, 0xF6BD, 0xF6BE, 0xF6BF, -+ 0xF6C0, 0xF6C1, 0xF6C2, 0xF6C3, 0xF6C4, 0xF6C5, 0xF6C6, 0xF6C7, -+ 0xF6C8, 0xF6C9, 0xF6CA, 0xF6CB, 0xF6CC, 0xF6CD, 0xF6CE, 0xF6CF, -+ 0xF6D0, 0xF6D1, 0xF6D2, 0xF6D3, 0xF6D4, 0xF6D5, 0xF6D6, 0xF6D7, -+ 0xF6D8, 0xF6D9, 0xF6DA, 0xF6DB, 0xF6DC, 0xF6DD, 0xF6DE, 0xF6DF, -+ 0xF6E0, 0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xF6E5, 0xF6E6, 0xF6E7, -+ 0xF6E8, 0xF6E9, 0xF6EA, 0xF6EB, 0xF6EC, 0xF6ED, 0xF6EE, 0xF6EF, -+ 0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, 0xF6F5, 0xF6F6, 0xF6F7, -+ 0xF6F8, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, 0xF6FD, 0xF6FE, 0xF6FF, -+ 0xF700, 0xF701, 0xF702, 0xF703, 0xF704, 0xF705, 0xF706, 0xF707, -+ 0xF708, 0xF709, 0xF70A, 0xF70B, 0xF70C, 0xF70D, 0xF70E, ALTCHR, -+/* 0xC740 - 0xC7FF */ -+ 0xF70F, 0xF710, 0xF711, 0xF712, 0xF713, 0xF714, 0xF715, 0xF716, -+ 0xF717, 0xF718, 0xF719, 0xF71A, 0xF71B, 0xF71C, 0xF71D, 0xF71E, -+ 0xF71F, 0xF720, 0xF721, 0xF722, 0xF723, 0xF724, 0xF725, 0xF726, -+ 0xF727, 0xF728, 0xF729, 0xF72A, 0xF72B, 0xF72C, 0xF72D, 0xF72E, -+ 0xF72F, 0xF730, 0xF731, 0xF732, 0xF733, 0xF734, 0xF735, 0xF736, -+ 0xF737, 0xF738, 0xF739, 0xF73A, 0xF73B, 0xF73C, 0xF73D, 0xF73E, -+ 0xF73F, 0xF740, 0xF741, 0xF742, 0xF743, 0xF744, 0xF745, 0xF746, -+ 0xF747, 0xF748, 0xF749, 0xF74A, 0xF74B, 0xF74C, 0xF74D, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF74E, 0xF74F, 0xF750, 0xF751, 0xF752, 0xF753, 0xF754, -+ 0xF755, 0xF756, 0xF757, 0xF758, 0xF759, 0xF75A, 0xF75B, 0xF75C, -+ 0xF75D, 0xF75E, 0xF75F, 0xF760, 0xF761, 0xF762, 0xF763, 0xF764, -+ 0xF765, 0xF766, 0xF767, 0xF768, 0xF769, 0xF76A, 0xF76B, 0xF76C, -+ 0xF76D, 0xF76E, 0xF76F, 0xF770, 0xF771, 0xF772, 0xF773, 0xF774, -+ 0xF775, 0xF776, 0xF777, 0xF778, 0xF779, 0xF77A, 0xF77B, 0xF77C, -+ 0xF77D, 0xF77E, 0xF77F, 0xF780, 0xF781, 0xF782, 0xF783, 0xF784, -+ 0xF785, 0xF786, 0xF787, 0xF788, 0xF789, 0xF78A, 0xF78B, 0xF78C, -+ 0xF78D, 0xF78E, 0xF78F, 0xF790, 0xF791, 0xF792, 0xF793, 0xF794, -+ 0xF795, 0xF796, 0xF797, 0xF798, 0xF799, 0xF79A, 0xF79B, 0xF79C, -+ 0xF79D, 0xF79E, 0xF79F, 0xF7A0, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, -+ 0xF7A5, 0xF7A6, 0xF7A7, 0xF7A8, 0xF7A9, 0xF7AA, 0xF7AB, ALTCHR, -+/* 0xC840 - 0xC8FF */ -+ 0xF7AC, 0xF7AD, 0xF7AE, 0xF7AF, 0xF7B0, 0xF7B1, 0xF7B2, 0xF7B3, -+ 0xF7B4, 0xF7B5, 0xF7B6, 0xF7B7, 0xF7B8, 0xF7B9, 0xF7BA, 0xF7BB, -+ 0xF7BC, 0xF7BD, 0xF7BE, 0xF7BF, 0xF7C0, 0xF7C1, 0xF7C2, 0xF7C3, -+ 0xF7C4, 0xF7C5, 0xF7C6, 0xF7C7, 0xF7C8, 0xF7C9, 0xF7CA, 0xF7CB, -+ 0xF7CC, 0xF7CD, 0xF7CE, 0xF7CF, 0xF7D0, 0xF7D1, 0xF7D2, 0xF7D3, -+ 0xF7D4, 0xF7D5, 0xF7D6, 0xF7D7, 0xF7D8, 0xF7D9, 0xF7DA, 0xF7DB, -+ 0xF7DC, 0xF7DD, 0xF7DE, 0xF7DF, 0xF7E0, 0xF7E1, 0xF7E2, 0xF7E3, -+ 0xF7E4, 0xF7E5, 0xF7E6, 0xF7E7, 0xF7E8, 0xF7E9, 0xF7EA, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, --/* 0xC740 - 0xC7FF */ -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, --/* 0xC840 - 0xC8FF */ -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF7EB, 0xF7EC, 0xF7ED, 0xF7EE, 0xF7EF, 0xF7F0, 0xF7F1, -+ 0xF7F2, 0xF7F3, 0xF7F4, 0xF7F5, 0xF7F6, 0xF7F7, 0xF7F8, 0xF7F9, -+ 0xF7FA, 0xF7FB, 0xF7FC, 0xF7FD, 0xF7FE, 0xF7FF, 0xF800, 0xF801, -+ 0xF802, 0xF803, 0xF804, 0xF805, 0xF806, 0xF807, 0xF808, 0xF809, -+ 0xF80A, 0xF80B, 0xF80C, 0xF80D, 0xF80E, 0xF80F, 0xF810, 0xF811, -+ 0xF812, 0xF813, 0xF814, 0xF815, 0xF816, 0xF817, 0xF818, 0xF819, -+ 0xF81A, 0xF81B, 0xF81C, 0xF81D, 0xF81E, 0xF81F, 0xF820, 0xF821, -+ 0xF822, 0xF823, 0xF824, 0xF825, 0xF826, 0xF827, 0xF828, 0xF829, -+ 0xF82A, 0xF82B, 0xF82C, 0xF82D, 0xF82E, 0xF82F, 0xF830, 0xF831, -+ 0xF832, 0xF833, 0xF834, 0xF835, 0xF836, 0xF837, 0xF838, 0xF839, -+ 0xF83A, 0xF83B, 0xF83C, 0xF83D, 0xF83E, 0xF83F, 0xF840, 0xF841, -+ 0xF842, 0xF843, 0xF844, 0xF845, 0xF846, 0xF847, 0xF848, ALTCHR, - /* 0xC940 - 0xC9FF */ - 0x4E42, 0x4E5C, 0x51F5, 0x531A, 0x5382, 0x4E07, 0x4E0C, 0x4E47, - 0x4E8D, 0x56D7, 0xFA0C, 0x5C6E, 0x5F73, 0x4E0F, 0x5187, 0x4E0E, -@@ -2266,17 +2266,142 @@ - 0x9E17, 0x9F48, 0x6207, 0x6B1E, 0x7227, 0x864C, 0x8EA8, 0x9482, - 0x9480, 0x9481, 0x9A69, 0x9A68, 0x9B2E, 0x9E19, 0x7229, 0x864B, - 0x8B9F, 0x9483, 0x9C79, 0x9EB7, 0x7675, 0x9A6B, 0x9C7A, 0x9E1D, -- 0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ 0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, 0x7881, 0x92B9, -+ 0x88CF, 0x58BB, 0x6052, 0x7CA7, 0x5AFA, 0x2554, 0x2566, 0x2557, -+ 0x2560, 0x256C, 0x2563, 0x255A, 0x2569, 0x255D, 0x2552, 0x2564, -+ 0x2555, 0x255E, 0x256A, 0x2561, 0x2558, 0x2567, 0x255B, 0x2553, -+ 0x2565, 0x2556, 0x255F, 0x256B, 0x2562, 0x2559, 0x2568, 0x255C, -+ 0x2551, 0x2550, 0x256D, 0x256E, 0x2570, 0x256F, 0x2593, ALTCHR, -+/* 0xFA40 - 0xFAFF */ -+ 0xE000, 0xE001, 0xE002, 0xE003, 0xE004, 0xE005, 0xE006, 0xE007, -+ 0xE008, 0xE009, 0xE00A, 0xE00B, 0xE00C, 0xE00D, 0xE00E, 0xE00F, -+ 0xE010, 0xE011, 0xE012, 0xE013, 0xE014, 0xE015, 0xE016, 0xE017, -+ 0xE018, 0xE019, 0xE01A, 0xE01B, 0xE01C, 0xE01D, 0xE01E, 0xE01F, -+ 0xE020, 0xE021, 0xE022, 0xE023, 0xE024, 0xE025, 0xE026, 0xE027, -+ 0xE028, 0xE029, 0xE02A, 0xE02B, 0xE02C, 0xE02D, 0xE02E, 0xE02F, -+ 0xE030, 0xE031, 0xE032, 0xE033, 0xE034, 0xE035, 0xE036, 0xE037, -+ 0xE038, 0xE039, 0xE03A, 0xE03B, 0xE03C, 0xE03D, 0xE03E, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE03F, 0xE040, 0xE041, 0xE042, 0xE043, 0xE044, 0xE045, -+ 0xE046, 0xE047, 0xE048, 0xE049, 0xE04A, 0xE04B, 0xE04C, 0xE04D, -+ 0xE04E, 0xE04F, 0xE050, 0xE051, 0xE052, 0xE053, 0xE054, 0xE055, -+ 0xE056, 0xE057, 0xE058, 0xE059, 0xE05A, 0xE05B, 0xE05C, 0xE05D, -+ 0xE05E, 0xE05F, 0xE060, 0xE061, 0xE062, 0xE063, 0xE064, 0xE065, -+ 0xE066, 0xE067, 0xE068, 0xE069, 0xE06A, 0xE06B, 0xE06C, 0xE06D, -+ 0xE06E, 0xE06F, 0xE070, 0xE071, 0xE072, 0xE073, 0xE074, 0xE075, -+ 0xE076, 0xE077, 0xE078, 0xE079, 0xE07A, 0xE07B, 0xE07C, 0xE07D, -+ 0xE07E, 0xE07F, 0xE080, 0xE081, 0xE082, 0xE083, 0xE084, 0xE085, -+ 0xE086, 0xE087, 0xE088, 0xE089, 0xE08A, 0xE08B, 0xE08C, 0xE08D, -+ 0xE08E, 0xE08F, 0xE090, 0xE091, 0xE092, 0xE093, 0xE094, 0xE095, -+ 0xE096, 0xE097, 0xE098, 0xE099, 0xE09A, 0xE09B, 0xE09C, ALTCHR, -+/* 0xFB40 - 0xFBFF */ -+ 0xE09D, 0xE09E, 0xE09F, 0xE0A0, 0xE0A1, 0xE0A2, 0xE0A3, 0xE0A4, -+ 0xE0A5, 0xE0A6, 0xE0A7, 0xE0A8, 0xE0A9, 0xE0AA, 0xE0AB, 0xE0AC, -+ 0xE0AD, 0xE0AE, 0xE0AF, 0xE0B0, 0xE0B1, 0xE0B2, 0xE0B3, 0xE0B4, -+ 0xE0B5, 0xE0B6, 0xE0B7, 0xE0B8, 0xE0B9, 0xE0BA, 0xE0BB, 0xE0BC, -+ 0xE0BD, 0xE0BE, 0xE0BF, 0xE0C0, 0xE0C1, 0xE0C2, 0xE0C3, 0xE0C4, -+ 0xE0C5, 0xE0C6, 0xE0C7, 0xE0C8, 0xE0C9, 0xE0CA, 0xE0CB, 0xE0CC, -+ 0xE0CD, 0xE0CE, 0xE0CF, 0xE0D0, 0xE0D1, 0xE0D2, 0xE0D3, 0xE0D4, -+ 0xE0D5, 0xE0D6, 0xE0D7, 0xE0D8, 0xE0D9, 0xE0DA, 0xE0DB, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE0DC, 0xE0DD, 0xE0DE, 0xE0DF, 0xE0E0, 0xE0E1, 0xE0E2, -+ 0xE0E3, 0xE0E4, 0xE0E5, 0xE0E6, 0xE0E7, 0xE0E8, 0xE0E9, 0xE0EA, -+ 0xE0EB, 0xE0EC, 0xE0ED, 0xE0EE, 0xE0EF, 0xE0F0, 0xE0F1, 0xE0F2, -+ 0xE0F3, 0xE0F4, 0xE0F5, 0xE0F6, 0xE0F7, 0xE0F8, 0xE0F9, 0xE0FA, -+ 0xE0FB, 0xE0FC, 0xE0FD, 0xE0FE, 0xE0FF, 0xE100, 0xE101, 0xE102, -+ 0xE103, 0xE104, 0xE105, 0xE106, 0xE107, 0xE108, 0xE109, 0xE10A, -+ 0xE10B, 0xE10C, 0xE10D, 0xE10E, 0xE10F, 0xE110, 0xE111, 0xE112, -+ 0xE113, 0xE114, 0xE115, 0xE116, 0xE117, 0xE118, 0xE119, 0xE11A, -+ 0xE11B, 0xE11C, 0xE11D, 0xE11E, 0xE11F, 0xE120, 0xE121, 0xE122, -+ 0xE123, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128, 0xE129, 0xE12A, -+ 0xE12B, 0xE12C, 0xE12D, 0xE12E, 0xE12F, 0xE130, 0xE131, 0xE132, -+ 0xE133, 0xE134, 0xE135, 0xE136, 0xE137, 0xE138, 0xE139, ALTCHR, -+/* 0xFC40 - 0xFCFF */ -+ 0xE13A, 0xE13B, 0xE13C, 0xE13D, 0xE13E, 0xE13F, 0xE140, 0xE141, -+ 0xE142, 0xE143, 0xE144, 0xE145, 0xE146, 0xE147, 0xE148, 0xE149, -+ 0xE14A, 0xE14B, 0xE14C, 0xE14D, 0xE14E, 0xE14F, 0xE150, 0xE151, -+ 0xE152, 0xE153, 0xE154, 0xE155, 0xE156, 0xE157, 0xE158, 0xE159, -+ 0xE15A, 0xE15B, 0xE15C, 0xE15D, 0xE15E, 0xE15F, 0xE160, 0xE161, -+ 0xE162, 0xE163, 0xE164, 0xE165, 0xE166, 0xE167, 0xE168, 0xE169, -+ 0xE16A, 0xE16B, 0xE16C, 0xE16D, 0xE16E, 0xE16F, 0xE170, 0xE171, -+ 0xE172, 0xE173, 0xE174, 0xE175, 0xE176, 0xE177, 0xE178, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE179, 0xE17A, 0xE17B, 0xE17C, 0xE17D, 0xE17E, 0xE17F, -+ 0xE180, 0xE181, 0xE182, 0xE183, 0xE184, 0xE185, 0xE186, 0xE187, -+ 0xE188, 0xE189, 0xE18A, 0xE18B, 0xE18C, 0xE18D, 0xE18E, 0xE18F, -+ 0xE190, 0xE191, 0xE192, 0xE193, 0xE194, 0xE195, 0xE196, 0xE197, -+ 0xE198, 0xE199, 0xE19A, 0xE19B, 0xE19C, 0xE19D, 0xE19E, 0xE19F, -+ 0xE1A0, 0xE1A1, 0xE1A2, 0xE1A3, 0xE1A4, 0xE1A5, 0xE1A6, 0xE1A7, -+ 0xE1A8, 0xE1A9, 0xE1AA, 0xE1AB, 0xE1AC, 0xE1AD, 0xE1AE, 0xE1AF, -+ 0xE1B0, 0xE1B1, 0xE1B2, 0xE1B3, 0xE1B4, 0xE1B5, 0xE1B6, 0xE1B7, -+ 0xE1B8, 0xE1B9, 0xE1BA, 0xE1BB, 0xE1BC, 0xE1BD, 0xE1BE, 0xE1BF, -+ 0xE1C0, 0xE1C1, 0xE1C2, 0xE1C3, 0xE1C4, 0xE1C5, 0xE1C6, 0xE1C7, -+ 0xE1C8, 0xE1C9, 0xE1CA, 0xE1CB, 0xE1CC, 0xE1CD, 0xE1CE, 0xE1CF, -+ 0xE1D0, 0xE1D1, 0xE1D2, 0xE1D3, 0xE1D4, 0xE1D5, 0xE1D6, ALTCHR, -+/* 0xFD40 - 0xFDFF */ -+ 0xE1D7, 0xE1D8, 0xE1D9, 0xE1DA, 0xE1DB, 0xE1DC, 0xE1DD, 0xE1DE, -+ 0xE1DF, 0xE1E0, 0xE1E1, 0xE1E2, 0xE1E3, 0xE1E4, 0xE1E5, 0xE1E6, -+ 0xE1E7, 0xE1E8, 0xE1E9, 0xE1EA, 0xE1EB, 0xE1EC, 0xE1ED, 0xE1EE, -+ 0xE1EF, 0xE1F0, 0xE1F1, 0xE1F2, 0xE1F3, 0xE1F4, 0xE1F5, 0xE1F6, -+ 0xE1F7, 0xE1F8, 0xE1F9, 0xE1FA, 0xE1FB, 0xE1FC, 0xE1FD, 0xE1FE, -+ 0xE1FF, 0xE200, 0xE201, 0xE202, 0xE203, 0xE204, 0xE205, 0xE206, -+ 0xE207, 0xE208, 0xE209, 0xE20A, 0xE20B, 0xE20C, 0xE20D, 0xE20E, -+ 0xE20F, 0xE210, 0xE211, 0xE212, 0xE213, 0xE214, 0xE215, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE216, 0xE217, 0xE218, 0xE219, 0xE21A, 0xE21B, 0xE21C, -+ 0xE21D, 0xE21E, 0xE21F, 0xE220, 0xE221, 0xE222, 0xE223, 0xE224, -+ 0xE225, 0xE226, 0xE227, 0xE228, 0xE229, 0xE22A, 0xE22B, 0xE22C, -+ 0xE22D, 0xE22E, 0xE22F, 0xE230, 0xE231, 0xE232, 0xE233, 0xE234, -+ 0xE235, 0xE236, 0xE237, 0xE238, 0xE239, 0xE23A, 0xE23B, 0xE23C, -+ 0xE23D, 0xE23E, 0xE23F, 0xE240, 0xE241, 0xE242, 0xE243, 0xE244, -+ 0xE245, 0xE246, 0xE247, 0xE248, 0xE249, 0xE24A, 0xE24B, 0xE24C, -+ 0xE24D, 0xE24E, 0xE24F, 0xE250, 0xE251, 0xE252, 0xE253, 0xE254, -+ 0xE255, 0xE256, 0xE257, 0xE258, 0xE259, 0xE25A, 0xE25B, 0xE25C, -+ 0xE25D, 0xE25E, 0xE25F, 0xE260, 0xE261, 0xE262, 0xE263, 0xE264, -+ 0xE265, 0xE266, 0xE267, 0xE268, 0xE269, 0xE26A, 0xE26B, 0xE26C, -+ 0xE26D, 0xE26E, 0xE26F, 0xE270, 0xE271, 0xE272, 0xE273, ALTCHR, -+/* 0xFE40 - 0xFEFF */ -+ 0xE274, 0xE275, 0xE276, 0xE277, 0xE278, 0xE279, 0xE27A, 0xE27B, -+ 0xE27C, 0xE27D, 0xE27E, 0xE27F, 0xE280, 0xE281, 0xE282, 0xE283, -+ 0xE284, 0xE285, 0xE286, 0xE287, 0xE288, 0xE289, 0xE28A, 0xE28B, -+ 0xE28C, 0xE28D, 0xE28E, 0xE28F, 0xE290, 0xE291, 0xE292, 0xE293, -+ 0xE294, 0xE295, 0xE296, 0xE297, 0xE298, 0xE299, 0xE29A, 0xE29B, -+ 0xE29C, 0xE29D, 0xE29E, 0xE29F, 0xE2A0, 0xE2A1, 0xE2A2, 0xE2A3, -+ 0xE2A4, 0xE2A5, 0xE2A6, 0xE2A7, 0xE2A8, 0xE2A9, 0xE2AA, 0xE2AB, -+ 0xE2AC, 0xE2AD, 0xE2AE, 0xE2AF, 0xE2B0, 0xE2B1, 0xE2B2, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE2B3, 0xE2B4, 0xE2B5, 0xE2B6, 0xE2B7, 0xE2B8, 0xE2B9, -+ 0xE2BA, 0xE2BB, 0xE2BC, 0xE2BD, 0xE2BE, 0xE2BF, 0xE2C0, 0xE2C1, -+ 0xE2C2, 0xE2C3, 0xE2C4, 0xE2C5, 0xE2C6, 0xE2C7, 0xE2C8, 0xE2C9, -+ 0xE2CA, 0xE2CB, 0xE2CC, 0xE2CD, 0xE2CE, 0xE2CF, 0xE2D0, 0xE2D1, -+ 0xE2D2, 0xE2D3, 0xE2D4, 0xE2D5, 0xE2D6, 0xE2D7, 0xE2D8, 0xE2D9, -+ 0xE2DA, 0xE2DB, 0xE2DC, 0xE2DD, 0xE2DE, 0xE2DF, 0xE2E0, 0xE2E1, -+ 0xE2E2, 0xE2E3, 0xE2E4, 0xE2E5, 0xE2E6, 0xE2E7, 0xE2E8, 0xE2E9, -+ 0xE2EA, 0xE2EB, 0xE2EC, 0xE2ED, 0xE2EE, 0xE2EF, 0xE2F0, 0xE2F1, -+ 0xE2F2, 0xE2F3, 0xE2F4, 0xE2F5, 0xE2F6, 0xE2F7, 0xE2F8, 0xE2F9, -+ 0xE2FA, 0xE2FB, 0xE2FC, 0xE2FD, 0xE2FE, 0xE2FF, 0xE300, 0xE301, -+ 0xE302, 0xE303, 0xE304, 0xE305, 0xE306, 0xE307, 0xE308, 0xE309, -+ 0xE30A, 0xE30B, 0xE30C, 0xE30D, 0xE30E, 0xE30F, 0xE310, ALTCHR, - }; - - CODE_CONV_TWO_OCTET_TO_UCS2(cc_big5_to_ucs2, /* function name */ - tblBig5ToUcs2, /* table name */ -- 0x00A1, 0x00F9, /* code range (high byte) */ -+ 0x00A1, 0x00FE, /* code range (high byte) */ - 0x0040, 0x00FF, /* code range (low byte) */ - ALTCHR /* alt char code (on UCS2) */ - ) diff --git a/x11-servers/XttXF86srv-common/files/patch-ad b/x11-servers/XttXF86srv-common/files/patch-ad deleted file mode 100644 index 829f94b29d52..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xtt.tmpl.orig Fri Apr 26 22:57:11 2002 -+++ config/cf/xtt.tmpl Fri Apr 26 22:57:19 2002 -@@ -68,7 +68,7 @@ - - # ifndef FreeTypeIncDir - # if HasFreeType --# define FreeTypeIncDir /usr/local/include/freetype -+# define FreeTypeIncDir /usr/local/include/freetype1/freetype - # else - # define FreeTypeIncDir - # endif diff --git a/x11-servers/XttXF86srv-common/files/patch-ae b/x11-servers/XttXF86srv-common/files/patch-ae deleted file mode 100644 index e066a7a79491..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xttsite.def.orig Fri Apr 26 22:57:05 2002 -+++ config/cf/xttsite.def Fri Apr 26 22:57:36 2002 -@@ -15,7 +15,7 @@ - * defaults). - * - #define FreeTypeLibDir /usr/local/lib --#define FreeTypeIncDir /usr/local/include/freetype -+#define FreeTypeIncDir /usr/local/include/freetype1/freetype - #define FreeTypeLibName ttf - */ - diff --git a/x11-servers/XttXF86srv-common/files/patch-b b/x11-servers/XttXF86srv-common/files/patch-b deleted file mode 100644 index a1e92a81cb2a..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-b +++ /dev/null @@ -1,20 +0,0 @@ ---- config/cf/Imake.tmpl.orig Sat Jan 9 15:18:57 1999 -+++ config/cf/Imake.tmpl Thu Nov 25 02:31:28 1999 -@@ -1150,7 +1150,7 @@ - CXXOPTIONS = CplusplusOptions - CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) -- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) - #endif - COMPRESS = CompressCmd - GZIPCMD = GzipCmd -@@ -1321,7 +1321,7 @@ - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) -- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib - LDPOSTLIB = LdPostLib diff --git a/x11-servers/XttXF86srv-common/files/patch-c b/x11-servers/XttXF86srv-common/files/patch-c deleted file mode 100644 index 01ac36e89a74..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig Mon Jan 17 00:34:06 2000 -+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Wed Jan 19 02:51:43 2000 -@@ -586,6 +586,9 @@ - set mseRes $initres - if { $mseRes <= 0 } { - set mseRes 100 -+ } -+ if { $mseRes > 200 } { -+ set mseRes 200 - } - $w.mouse.resolution.$mseRes invoke - set mseButtons $initbtn diff --git a/x11-servers/XttXF86srv-common/files/patch-d b/x11-servers/XttXF86srv-common/files/patch-d deleted file mode 100644 index 70cb0a30c77f..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-d +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86Version.h.orig Sat Jan 8 19:24:57 2000 -+++ programs/Xserver/hw/xfree86/xf86Version.h Wed Feb 9 16:44:53 2000 -@@ -19,6 +19,6 @@ - XF86_VERSION_BETA, \ - XF86_VERSION_ALPHA) - --#define XF86_DATE "January 8 1999" -+#define XF86_DATE "January 8 2000" - - /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ diff --git a/x11-servers/XttXF86srv-common/files/patch-e b/x11-servers/XttXF86srv-common/files/patch-e deleted file mode 100644 index c111df47dd0f..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-e +++ /dev/null @@ -1,13 +0,0 @@ ---- config/cf/FreeBSD.cf-3.3.6 Sat Feb 12 06:36:11 2000 -+++ config/cf/FreeBSD.cf Tue Feb 15 00:25:54 2000 -@@ -69,7 +69,7 @@ - #define MkdirHierCmd mkdir -p - - #define CcCmd cc --#define CppCmd /usr/libexec/cpp -+#define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppDefines -traditional - #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) - - diff --git a/x11-servers/XttXF86srv-common/files/patch-f b/x11-servers/XttXF86srv-common/files/patch-f deleted file mode 100644 index a3bc926c6263..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-f +++ /dev/null @@ -1,11 +0,0 @@ ---- nls/locale.alias.orig Thu Feb 17 16:04:55 2000 -+++ nls/locale.alias Thu Feb 17 16:04:29 2000 -@@ -27,6 +27,7 @@ - cs_CS.ISO8859-2 cs_CZ.ISO8859-2 - cs_CZ cs_CZ.ISO8859-2 - cs_CZ.iso88592 cs_CZ.ISO8859-2 -+cs_CZ.ISO_8859-2 cs_CZ.ISO8859-2 - cz cz_CZ.ISO8859-2 - cz_CZ cz_CZ.ISO8859-2 - da da_DK.ISO8859-1 - diff --git a/x11-servers/XttXF86srv-common/files/patch-g b/x11-servers/XttXF86srv-common/files/patch-g deleted file mode 100644 index 999a5f929328..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-g +++ /dev/null @@ -1,9 +0,0 @@ -Index: programs/Xserver/hw/xfree86/vga256/drivers/i810/i810_accel.c -@@ -39,6 +39,7 @@ - - #include <math.h> - #include <stdio.h> -+#include <sys/types.h> - #include <sys/mman.h> - #include <signal.h> - diff --git a/x11-servers/XttXF86srv-common/files/patch-i b/x11-servers/XttXF86srv-common/files/patch-i deleted file mode 100644 index c042eae5760a..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-i +++ /dev/null @@ -1,208 +0,0 @@ -S3 Savage/MX and Savage/IX patches for XFree86 3.3.6 post fix-08 - -http://www.probo.com/timr/savagemx.html - -from: Sun Oct 22 10:12:06 CEST 2000 - ---- programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_cursor.c.orig Sun Oct 22 09:52:21 2000 -+++ programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_cursor.c Fri Sep 1 22:12:56 2000 -@@ -250,7 +250,7 @@ - /* VerticalRetraceWait(); */ - - /* turn cursor off */ -- S3VHideCursor(); -+ S3SAVHideCursor(); - - /* move cursor off-screen */ - outb(vgaCRIndex, 0x46); ---- programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_driver.c.orig Sun Oct 22 09:52:21 2000 -+++ programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_driver.c Fri Sep 29 23:19:23 2000 -@@ -94,6 +94,7 @@ - static void S3SAVRestore(); - static void S3SAVAdjust(); - static void S3SAVFbInit(); -+static int S3SAVPitchAdjust(); - void S3SAVSetRead(); - void S3SAVAccelInit(); - void S3SAVInitialize2DEngine(); -@@ -721,12 +722,12 @@ - - /* Restore the desired video mode with CR67 */ - -- outb(vgaCRIndex, 0x67); - #if 0 -+ outb(vgaCRIndex, 0x67); - cr67 = inb(vgaCRReg) & 0xf; /* Possible hardware bug on VX? */ --#endif - outb(vgaCRReg, 0x50 | cr67); - usleep(10000); -+#endif - outb(vgaCRIndex, 0x67); - outb(vgaCRReg, restore->CR67 & ~0x0c); /* Don't enable STREAMS yet */ - -@@ -745,9 +746,11 @@ - outb(vgaCRReg, restore->CR51); - - /* Memory timings */ -- outb(vgaCRIndex, 0x36); -+ outb(vgaCRIndex, 0x36); - outb(vgaCRReg, restore->CR36); -- outb(vgaCRIndex, 0x68); -+ outb(vgaCRIndex, 0x60); -+ outb(vgaCRReg, restore->CR60); -+ outb(vgaCRIndex, 0x68); - outb(vgaCRReg, restore->CR68); - outb(vgaCRIndex, 0x69); - outb(vgaCRReg, restore->CR69); -@@ -764,8 +767,11 @@ - outb(vgaCRReg, restore->CR90); - outb(vgaCRIndex, 0x91); - outb(vgaCRReg, restore->CR91); -- outb(vgaCRIndex, 0xB0); /* Savage4 config3 */ -- outb(vgaCRReg, restore->CRB0); -+ if( s3vPriv.chip == S3_SAVAGE4 ) -+ { -+ outb(vgaCRIndex, 0xB0); /* Savage4 config3 */ -+ outb(vgaCRReg, restore->CRB0); -+ } - - outb(vgaCRIndex, 0x32); - outb(vgaCRReg, restore->CR32); -@@ -981,6 +987,8 @@ - save->CR53 = inb(vgaCRReg); - outb(vgaCRIndex, 0x58); - save->CR58 = inb(vgaCRReg); -+ outb(vgaCRIndex, 0x60); -+ save->CR60 = inb(vgaCRReg); - outb(vgaCRIndex, 0x66); - save->CR66 = inb(vgaCRReg); - outb(vgaCRIndex, 0x67); -@@ -1135,10 +1143,29 @@ - } - - -+/* -+ * This function adjusts the pitch to a multiple of 16 pixels. -+ */ -+ -+static int -+S3SAVPitchAdjust( void ) -+{ -+ int pitch = vga256InfoRec.virtualX; -+ -+ if( pitch % 16 != 0 ) -+ { -+ pitch = (pitch + 15) & ~15; -+ -+ ErrorF("%s %s: %s: Display width padded to %d bytes.\n", -+ XCONFIG_PROBED, vga256InfoRec.name, vga256InfoRec.chipset, -+ pitch); -+ } -+ return pitch; -+} -+ -+ - /* -- * This is the main probe function for the virge chipsets. -- * Right now, I have taken a shortcut and get most of the info from -- * PCI probing. -+ * This is the main probe function for the Savage chipsets. - */ - - static Bool -@@ -1511,6 +1538,8 @@ - S3V.ChipLinearBase = vga256InfoRec.MemBase; - S3V.ChipLinearSize = vga256InfoRec.videoRam * 1024; - -+ vgaSetPitchAdjustHook(S3SAVPitchAdjust); -+ - return TRUE; - } - -@@ -1782,9 +1811,9 @@ - outb(vgaCRIndex, 0x3a); - tmp = inb(vgaCRReg); - if(!OFLG_ISSET(OPTION_PCI_BURST_ON, &vga256InfoRec.options)) -- new->CR3A = tmp | 0x95; /* ENH 256, no PCI burst! */ -+ new->CR3A = tmp | 0x90; /* ENH 256, no PCI burst! */ - else -- new->CR3A = (tmp & 0x7f) | 0x15; /* ENH 256, PCI burst */ -+ new->CR3A = (tmp & 0x7f) | 0x10; /* ENH 256, PCI burst */ - - new->CR53 &= ~0x08; /* Enables MMIO */ - new->CR31 = 0x8c; /* Dis. 64k window, en. ENH maps */ -@@ -1806,12 +1835,22 @@ - - dclk = vga256InfoRec.clock[mode->Clock]; - new->CR67 = 0x00; /* Defaults */ -- new->SR15 = 0x03 | 0x80; -+ if( s3vPriv.chip != S3_SAVAGE2000 ) -+ new->SR15 = 0x03 | 0x80; -+ else -+ /* One-cycle writes broken on Savage2000? */ -+ new->SR15 = 0x03; - new->SR18 = 0x00; - new->CR43 = 0x00; - new->CR45 = 0x00; - new->CR65 = 0x00; - -+ outb(vgaCRIndex, 0x60); -+ new->CR60 = inb(vgaCRReg); -+ -+ if( s3vPriv.chip == S3_SAVAGE_MX ) -+ new->CR60 = 0x09; -+ - outb(vgaCRIndex, 0x40); - new->CR40 = inb(vgaCRReg) & ~0x01; - -@@ -1852,16 +1891,19 @@ - - { - if (vgaBitsPerPixel == 8) { -- if (dclk <= 110000) new->CR67 = 0x00; /* 8bpp, 135MHz */ -- else new->CR67 = 0x10; /* 8bpp, 220MHz */ -+ new->CR67 = 0x00; /* 8bpp, 220MHz */ - } - else if ((vgaBitsPerPixel == 16) && (vga256InfoRec.weight.green == 5)) { -- if (dclk <= 110000) new->CR67 = 0x20; /* 15bpp, 135MHz */ -- else new->CR67 = 0x30; /* 15bpp, 220MHz */ -+ if( s3vPriv.chip == S3_SAVAGE_MX ) -+ new->CR67 = 0x30; /* 15bpp, 220MHz */ -+ else -+ new->CR67 = 0x20; - } - else if (vgaBitsPerPixel == 16) { -- if (dclk <= 110000) new->CR67 = 0x40; /* 16bpp, 135MHz */ -- else new->CR67 = 0x50; /* 16bpp, 220MHz */ -+ if( s3vPriv.chip == S3_SAVAGE_MX ) -+ new->CR67 = 0x50; /* 16bpp, 220MHz */ -+ else -+ new->CR67 = 0x40; - } - else if ((vgaBitsPerPixel == 24) || (vgaBitsPerPixel == 32)) { - new->CR67 = 0xd0; /* 24bpp, 135MHz */ -@@ -1967,8 +2009,12 @@ - else - new->CR50 |= 0xC1; /* default to use GlobalBD */ - -- new->CR33 = 0x20; -+ if( s3vPriv.chip == S3_SAVAGE2000 ) -+ new->CR33 = 0x08; -+ else -+ new->CR33 = 0x20; - -+ new->std.CRTC[0x17] = 0xeb; - - /* Now we handle various XConfig memory options and others */ - ---- programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_driver.h.orig Sun Oct 22 09:52:21 2000 -+++ programs/Xserver/hw/xfree86/vga256/drivers/s3_savage/s3sav_driver.h Sat Sep 2 02:57:01 2000 -@@ -25,7 +25,7 @@ - unsigned char CR31, CR32, CR33, CR34, CR36, CR3A, CR3B, CR3C; - unsigned char CR40, CR42, CR43, CR45; - unsigned char CR50, CR51, CR53, CR58, CR5B, CR5D, CR5E; -- unsigned char CR65, CR66, CR67, CR68, CR69, CR6F; /* Video attrib. */ -+ unsigned char CR60, CR65, CR66, CR67, CR68, CR69, CR6F; /* Video attrib. */ - unsigned char CR86, CR88; - unsigned char CR90, CR91, CRB0; - unsigned char ColorStack[8]; /* S3 hw cursor color stack CR4A/CR4B */ diff --git a/x11-servers/XttXF86srv-common/files/patch-q b/x11-servers/XttXF86srv-common/files/patch-q deleted file mode 100644 index 66937ce3de9a..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-q +++ /dev/null @@ -1,21 +0,0 @@ ---- programs/Xserver/hw/xfree86/etc/scanpci.c.orig Fri Dec 3 04:43:47 1999 -+++ programs/Xserver/hw/xfree86/etc/scanpci.c Mon Dec 4 14:14:39 2000 -@@ -101,7 +101,17 @@ - #endif - #if defined(__FreeBSD__) || defined(__386BSD__) - #include <sys/file.h> --#include <machine/console.h> -+#if defined(__FreeBSD__) -+# include <osreldate.h> -+# if __FreeBSD_version >= 410000 -+# include <sys/consio.h> -+# include <sys/kbio.h> -+# else -+# include <machine/console.h> -+# endif -+#else -+# include <machine/console.h> -+#endif - #ifndef GCCUSESGAS - #define GCCUSESGAS - #endif diff --git a/x11-servers/XttXF86srv-common/files/patch-r b/x11-servers/XttXF86srv-common/files/patch-r deleted file mode 100644 index ef144a258fcc..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-r +++ /dev/null @@ -1,43 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.ORIG Mon Nov 27 13:29 :06 2000 -+++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Mon Nov 27 14:26:21 2000 -@@ -461,11 +461,21 @@ - # endif - # ifdef SYSCONS_SUPPORT - # define COMPAT_SYSCONS --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+# if defined(__NetBSD__) || defined(__OpenBSD__) - # include <machine/console.h> - # else --# include <sys/console.h> --# endif /* __FreeBSD__ || __NetBSD__ || defined(__OpenBSD__) */ -+# if defined(__FreeBSD__) -+# include <osreldate.h> -+# if __FreeBSD_version >= 410000 -+# include <sys/consio.h> -+# include <sys/kbio.h> -+# else -+# include <machine/console.h> -+# endif /* FreeBSD 4.1 RELEASE or lator */ -+# else -+# include <sys/console.h> -+# endif -+# endif - # endif /* SYSCONS_SUPPORT */ - # if defined(PCVT_SUPPORT) - # if !defined(SYSCONS_SUPPORT) -@@ -496,8 +506,13 @@ - # include <dev/wscons/wsconsio.h> - # endif /* WSCONS_SUPPORT */ - # if defined(__FreeBSD__) --# undef MOUSE_GETINFO --# include <machine/mouse.h> -+# include <osreldate.h> -+# if __FreeBSD_version >= 500013 -+# include <sys/mouse.h> -+# else -+# undef MOUSE_GETINFO -+# include <machine/mouse.h> -+# endif - # endif - /* Include these definitions in case ioctl_pc.h didn't get included */ - # ifndef CONSOLE_X_MODE_ON diff --git a/x11-servers/XttXF86srv-common/files/patch-s b/x11-servers/XttXF86srv-common/files/patch-s deleted file mode 100644 index 3697f7b18ac3..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-s +++ /dev/null @@ -1,21 +0,0 @@ ---- programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c.ORIG Mon Nov 27 14:29 :12 2000 -+++ programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c Mon Nov 27 14:37:03 2000 -@@ -83,7 +83,17 @@ - # endif - # ifdef SYSCONS_SUPPORT - /* both, Free and NetBSD have syscons */ --# include <machine/console.h> -+# if defined(__FreeBSD__) -+# include <osreldate.h> -+# if __FreeBSD_version >= 410000 -+# include <sys/consio.h> -+# include <sys/kbio.h> -+# else -+# include <machine/console.h> -+# endif -+# else -+# include <machine/console.h> -+# endif - # endif - # else - # ifdef CODRV_SUPPORT diff --git a/x11-servers/XttXF86srv-common/files/patch-z01 b/x11-servers/XttXF86srv-common/files/patch-z01 deleted file mode 100644 index d298fd26cf8a..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-z01 +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/font/X-TrueType/xttcconv.c.ORIG Mon Jun 19 11:28:44 2000 -+++ lib/font/X-TrueType/xttcconv.c Mon Jun 19 11:37:26 2000 -@@ -515,12 +515,14 @@ - char **tryItFirst = NULL; - - for (l=list; *l ; l++) { -- if(!strcasecmp(*l,moduleArg.charSetHints->charsetStdName)) -+ if(!strcasecmp(*l,moduleArg.charSetHints->charsetStdName)) { - tryItFirst = l; -+ break; - #if 0 - ErrorF("%s/%s\n", - *l, moduleArg.charSetHints->charsetStdName); - #endif -+ } - } - - if(tryItFirst) diff --git a/x11-servers/XttXF86srv-common/files/patch-z02 b/x11-servers/XttXF86srv-common/files/patch-z02 deleted file mode 100644 index 4254fffcb9a1..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-z02 +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/font/X-TrueType/xttfuncs.c.ORIG Mon Jun 19 11:38:08 2000 -+++ lib/font/X-TrueType/xttfuncs.c Mon Jun 19 11:41:00 2000 -@@ -698,7 +698,7 @@ - - if ((entry = FontCacheGetEntry()) == NULL) { - charInfo = &nocharinfo; -- fprintf(stderr, "can't get cache entry\n"); -+ fprintf(stderr, "get_metrics: can't get cache entry\n"); - goto next; - } - FC_TT_SETVFUNC(entry); -@@ -786,10 +786,9 @@ - char_width.pixel = char_width.raw = 0; - get_metrics(ft, c, char_width); - /* Retry to get it created in get_metrics(). */ -- FontCacheSearchEntry(ft->cache, c, &entry); -- if (!charInfo) { -+ if (!FontCacheSearchEntry(ft->cache, c, &entry)) { - charInfo = &nocharinfo; -- fprintf(stderr, "can't get cache entry\n"); -+ fprintf(stderr, "get_glyph: can't get cache entry\n"); - goto next; - } - } diff --git a/x11-servers/XttXF86srv-common/files/patch-z03 b/x11-servers/XttXF86srv-common/files/patch-z03 deleted file mode 100644 index 373a4199faaf..000000000000 --- a/x11-servers/XttXF86srv-common/files/patch-z03 +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/font/X-TrueType/Imakefile.orig Thu Sep 14 01:55:53 2000 -+++ lib/font/X-TrueType/Imakefile Thu Sep 14 01:56:07 2000 -@@ -54,10 +54,7 @@ - XTT_CONFIG_SRCDIR = $(TOP)/config/cf - XTT_CONFIG_FILES = \ - $(XTT_CONFIG_SRCDIR)/xtt.tmpl $(XTT_CONFIG_SRCDIR)/xttMod.tmpl \ -- $(XTT_CONFIG_SRCDIR)/xttsite.def $(XTT_CONFIG_SRCDIR)/Imake.rules \ -- $(XTT_CONFIG_SRCDIR)/Imake.tmpl $(XTT_CONFIG_SRCDIR)/X11.tmpl \ -- $(XTT_CONFIG_SRCDIR)/bsdLib.rules $(XTT_CONFIG_SRCDIR)/ibmLib.rules \ -- $(XTT_CONFIG_SRCDIR)/linux.cf -+ $(XTT_CONFIG_SRCDIR)/xttsite.def - # if XTrueTypeInstallConfigFiles - InstallMultipleDestFlags(install,$(XTT_CONFIG_FILES),$(CONFIGDIR),$(INSTDATFLAGS)) - # endif diff --git a/x11-servers/XttXF86srv-common/files/xttpatch b/x11-servers/XttXF86srv-common/files/xttpatch deleted file mode 100644 index 45d96e76427e..000000000000 --- a/x11-servers/XttXF86srv-common/files/xttpatch +++ /dev/null @@ -1,15 +0,0 @@ ---- ../xtt-1.3/shared-libfont-1.2.diff~ Sun May 28 18:55:42 2000 -+++ ../xtt-1.3/shared-libfont-1.2.diff Sun May 28 21:52:50 2000 -@@ -1050,9 +1050,9 @@ - DIX = dix/LibraryTargetName(dix) - - FONT = $(DEPFONTLIB) - + FONT = $(FONTLIB) $(XPFBLIBS) -- #ifdef ServerExtraSysLibs -- EXTRASYSLIBS = ServerExtraSysLibs -- #endif -+ #if UsbMouseSupport -+ #if !HasLibUsb -+ USB = $(XF86OSSRC)/libusb/LibraryTargetName(usb) - @@ -209,7 +209,8 @@ - DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) - DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o diff --git a/x11-servers/XttXF86srv-common/pkg-descr b/x11-servers/XttXF86srv-common/pkg-descr deleted file mode 100644 index f01ae53931e7..000000000000 --- a/x11-servers/XttXF86srv-common/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -Common files for X True Type Servers. -This ports requires XFree86 3.3.3. - -I. INSTALL: - For compiling this ports, you will need about 200 MByte on your HDD. - -II. CONFIGURATION - After installing this ports, following instructions are required. - -1. extract your True Type Font to FONTDIR. - # mkdir /usr/X11R6/lib/X11/fonts/TrueType - # cp *.ttf /usr/X11R6/lib/X11/fonts/TrueType/ -2. create your font.dir file. mkttfdir.pl is a good utility script. - And now, this port depend on it. For more detail, see its documents. -3. set FontPath in your XF86Config add following line to your XF86Config - FontPath "/usr/X11R6/lib/X11/fonts/TrueType" -4. restart your X server. - -enjoy! diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist deleted file mode 100644 index c8c2bef4194b..000000000000 --- a/x11-servers/XttXF86srv-common/pkg-plist +++ /dev/null @@ -1,52 +0,0 @@ -bin/mkfontdir.pl -include/X11/fonts/codeconv/xttcap.h -include/X11/fonts/codeconv/xttcconv.h -include/X11/fonts/codeconv/xttcconvP.h -include/X11/fonts/codeconv/xttcommon.h -lib/X11/config/xtt.tmpl -lib/X11/config/xttMod.tmpl -lib/X11/config/xttsite.def -lib/libfont.a -lib/libfont.so -lib/libfont.so.1.3 -lib/modules/codeconv/ARABIC.so -lib/modules/codeconv/ARMSCII8.so -lib/modules/codeconv/BIG5.so -lib/modules/codeconv/BIG5ETEN.so -lib/modules/codeconv/DOSENCODING.so -lib/modules/codeconv/GB2312.so -lib/modules/codeconv/GEORGIAN.so -lib/modules/codeconv/ISO8859_1.so -lib/modules/codeconv/ISO8859_10.so -lib/modules/codeconv/ISO8859_11.so -lib/modules/codeconv/ISO8859_14.so -lib/modules/codeconv/ISO8859_15.so -lib/modules/codeconv/ISO8859_2.so -lib/modules/codeconv/ISO8859_3.so -lib/modules/codeconv/ISO8859_4.so -lib/modules/codeconv/ISO8859_5.so -lib/modules/codeconv/ISO8859_6.so -lib/modules/codeconv/ISO8859_7.so -lib/modules/codeconv/ISO8859_8.so -lib/modules/codeconv/ISO8859_9.so -lib/modules/codeconv/JISX0201.so -lib/modules/codeconv/JISX0208.so -lib/modules/codeconv/JISX0212.so -lib/modules/codeconv/KOI8.so -lib/modules/codeconv/KSC5601.so -lib/modules/codeconv/KSCJOHAB.so -lib/modules/codeconv/MULEENCODING.so -lib/modules/codeconv/TCVN.so -lib/modules/codeconv/VISCII.so -share/doc/Xtt/00README.eng -share/doc/Xtt/00README.jis -share/doc/Xtt/CHANGES.eng -share/doc/Xtt/CHANGES.jis -share/doc/Xtt/EXAMPLES.eng -share/doc/Xtt/EXAMPLES.jis -share/doc/Xtt/INSTALL.eng -share/doc/Xtt/INSTALL.jis -share/doc/Xtt/MISCNOTES.eng -share/doc/Xtt/MISCNOTES.jis -@dirrm share/doc/Xtt -@dirrm include/X11/fonts/codeconv |