Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x

Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14

10 files changed, 2 insertions, 1581 deletions

diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index 3923e4a10..e023b6d26 100644
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -2119,16 +2119,6 @@ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
 LintLibReferences(varname,libname,libsource)
 #endif
 
- /*
- * ProjectUnsharedFontLibReferences - unshared font libraries
- */
-#ifndef ProjectUnsharedFontLibReferences
-#define ProjectUnsharedFontLibReferences()					@@\
-DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont))	@@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont		@@\
-LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
-#endif
-
 /*
  * SharedLibDependencies - shared library dependencies
  */
@@ -2137,17 +2127,6 @@ LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
 #endif
 
 /*
- * SharedFontLibReferences - shared font libraries
- */
-#ifndef SharedFontLibReferences
-#define SharedFontLibReferences()					@@\
-SOFONTREV = SharedFontRev						@@\
-DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV)	@@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont	@@\
-LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
-#endif
-
-/*
  * SharedDSLibDependencies - shared library dependencies with data separation
  */
 #ifndef SharedDSLibDependencies
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 595617267..4a9e98598 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -602,14 +602,6 @@ XCOMM deprecated; please strongly consider using vendor-supplied packages.
 #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
 #define GzipLibrary -lz
 #endif
-/* If the system has the Freetype2 library - if NO, the copy in extras is built */
-#ifndef HasFreetype2
-#define HasFreetype2		YES
-#endif
-/* If the system has the Fontconfig library - if NO, the copy in extras is built  */
-#ifndef HasFontconfig
-#define HasFontconfig		NO
-#endif
 /* If the system has the PNG library - if NO, xcursorgen is not built */
 #ifndef HasLibpng
 #define HasLibpng		NO
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index a31490377..80113a9e3 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -178,7 +178,6 @@ X11.tmpl provides defaults for the following variables:
 	BuildDBE		build DOUBLE-BUFFER extension
 	BuildDmx		build Distributed Multihead X server and extension
 	BuildDPMS		build Display Power Management Signaling extension
-	BuildFonts		build pcf fonts
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
 	BuildEVI		build EVI server extension
@@ -214,7 +213,6 @@ X11.tmpl provides defaults for the following variables:
 	DebugLibXag		build libXag_d.a
 	DebugOldX		build liboldX_d.a
 	DefaultCursorTheme      name of default cursor theme
-	DefaultFSConfigFile	default font server config file
 	DefaultFontPath		default server font path
 	DefaultRGBDatabase	default server rgb color database
 	DefaultSystemPath	default system xdm PATH environment variable
@@ -226,13 +224,7 @@ X11.tmpl provides defaults for the following variables:
 	DriverManSuffix		man suffix for driver pages
 	ExtensionDefines	-D's for universal extensions
 	ExtensionOSDefines	-D's for additional extensions
-	FontCompilerFlags	flags for bdftosnf
-	FontDefines		-D's to turn on font options
-	FontDir			directory in which to install fonts
-	FontFilters		-D's to specify font conversion filters
-	FontOSDefines		-D's for which fonts to support
 	ForceNormalLib		force building of .a in addition to shared lib
-	GzipFontCompression	boolean for using gzip instead of compress
 	HasXdmAuth		boolean for using XDM-AUTHORIZATION-1;
 					needs Wraphelp.c, see Release Notes
 	InstallAppDefFiles	install new app defaults files over old?
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index b6ff72e1f..30b04510b 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -23,20 +23,6 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
  *
  * InstallAppDefaults		(class)
  * InstallAppDefaultsLong	(file,class)
- * MakeFontsDir			(deplist)
- * MakeFcCache			(deplist)
- * MakeFonts			()
- * InstallFontObjs		(objs,dest)
- * InstallFonts			(dest)
- * InstallFontAliases		(dest)
- * InstallFcCache		(dest)
- * FontSrc			(basename)
- * FontBaseObj			(basename)
- * InstallFontScale		(dest)
- * UncompressedFontTarget	(basename)
- * CompressedFontTarget		(basename)
- * FontTarget			(basename)
- * FontObj			(basename)
  * MakeXkbDir			(basedir,subdir)
  */
 
@@ -144,144 +130,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildLibrariesForXServers
 #define BuildLibrariesForXServers	BuildServer
 #endif
-#ifndef XserverStaticFontLib
-#define XserverStaticFontLib	YES
-#endif
-#ifndef BuildSpeedo
-#define BuildSpeedo		NO
-#endif
-#ifndef BuildType1
-#define BuildType1		NO
-#endif
-#ifndef BuildCID
-#define BuildCID		YES
-#endif
-#ifndef BuildFreeType
-#define BuildFreeType		NO
-#endif
-#ifndef BuildBuiltinFonts
-#define BuildBuiltinFonts	NO
-#endif
-#ifndef BuildFonts
-#define BuildFonts		BuildServer
-#endif
-#ifndef Build75DpiFonts
-#define Build75DpiFonts		YES
-#endif
-#ifndef Build100DpiFonts
-#define Build100DpiFonts	YES
-#endif
-#ifndef BuildSpeedoFonts
-#define BuildSpeedoFonts	NO
-#endif
-#ifndef BuildType1Fonts
-#define BuildType1Fonts		YES
-#endif
-#ifndef BuildCIDFonts
-#define BuildCIDFonts		YES
-#endif
-#ifndef BuildTrueTypeFonts
-#define BuildTrueTypeFonts	YES
-#endif
-#ifndef BuildBethMarduthoFonts
-#define BuildBethMarduthoFonts	NO
-#endif
-#ifndef BuildEthiopicFonts
-#define BuildEthiopicFonts	NO
-#endif
-#ifndef BuildCyrillicFonts
-#define BuildCyrillicFonts	YES
-#endif
-/* Some bdf font generation details.  The scripts for this require perl. */
-#ifndef TruncateUCSFonts
-#define TruncateUCSFonts	HasPerl5
-#endif
-#ifndef MaxUCSChar
-#define MaxUCSChar		0x3200
-#endif
-#ifndef DerivedUCSFonts
-#define DerivedUCSFonts		YES
-#endif
-/* These primarily control generation of derived 8-bit fonts. */
-#ifndef BuildUCSFonts
-#define BuildUCSFonts		YES
-#endif
-/* Setting BuildISO8859_1Fonts to NO may result in problems. */
-#ifndef BuildISO8859_1Fonts
-#define BuildISO8859_1Fonts	YES
-#endif
-#ifndef BuildISO8859_2Fonts
-#define BuildISO8859_2Fonts	YES
-#endif
-#ifndef BuildISO8859_3Fonts
-#define BuildISO8859_3Fonts	YES
-#endif
-#ifndef BuildISO8859_4Fonts
-#define BuildISO8859_4Fonts	YES
-#endif
-#ifndef BuildISO8859_5Fonts
-#define BuildISO8859_5Fonts	BuildCyrillicFonts
-#endif
-#ifndef BuildArabicFonts
-#define BuildArabicFonts	YES
-#endif
-#ifndef BuildISO8859_6Fonts
-#define BuildISO8859_6Fonts	BuildArabicFonts
-#endif
-#ifndef BuildGreekFonts
-#define BuildGreekFonts		YES
-#endif
-#ifndef BuildISO8859_7Fonts
-#define BuildISO8859_7Fonts	BuildGreekFonts
-#endif
-#ifndef BuildHebrewFonts
-#define BuildHebrewFonts	YES
-#endif
-#ifndef BuildISO8859_8Fonts
-#define BuildISO8859_8Fonts	BuildHebrewFonts
-#endif
-#ifndef BuildISO8859_9Fonts
-#define BuildISO8859_9Fonts	YES
-#endif
-#ifndef BuildISO8859_10Fonts
-#define BuildISO8859_10Fonts	YES
-#endif
-#ifndef BuildThaiFonts
-#define BuildThaiFonts		YES
-#endif
-#ifndef BuildISO8859_11Fonts
-#define BuildISO8859_11Fonts	BuildThaiFonts
-#endif
-#ifndef BuildISO8859_13Fonts
-#define BuildISO8859_13Fonts	YES
-#endif
-#ifndef BuildISO8859_14Fonts
-#define BuildISO8859_14Fonts	YES
-#endif
-#ifndef BuildISO8859_15Fonts
-#define BuildISO8859_15Fonts	YES
-#endif
-#ifndef BuildISO8859_16Fonts
-#define BuildISO8859_16Fonts	YES
-#endif
-#ifndef BuildKOI8_RFonts
-#define BuildKOI8_RFonts	BuildCyrillicFonts
-#endif
-#ifndef BuildJapaneseFonts
-#define BuildJapaneseFonts	YES
-#endif
-#ifndef BuildJISX0201Fonts
-#define BuildJISX0201Fonts	BuildJapaneseFonts
-#endif
-#ifndef BuildKoreanFonts
-#define BuildKoreanFonts	YES
-#endif
-#ifndef BuildChineseFonts
-#define BuildChineseFonts	YES
-#endif
-#ifndef MakeLocalFontDir
-#define MakeLocalFontDir	YES
-#endif
 #ifndef HasXAudio
 #define HasXAudio		NO
 #endif
@@ -366,35 +214,9 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildDPMS
 #define BuildDPMS		YES
 #endif
-#ifndef BuildFontLib
-#if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer)
-#define BuildFontLib		(BuildLibraries || BuildServer)
-#else
-#define BuildFontLib		(BuildLibraries || (BuildServer && !DoLoadableServer))
-#endif
-#endif
 #ifndef BuildFontCache
 #define BuildFontCache		NO
 #endif
-#ifndef BuildFontCacheLib
-#define BuildFontCacheLib	(BuildFontCache && !BuildServersOnly)
-#endif
-#ifndef BuildFontEncLib
-#define BuildFontEncLib		BuildLibraries
-#endif
-/*
- * This enables binary compatibility with the older (XFree86 <= 4.1) fontenc
- * entry points in the Xfont library (and X server).  If this is turned off,
- * then SharedFontRev should have it's major revision bumped, and the
- * XFree86 font module ABI (in xfree86/common/xf86Module.h) should have it's
- * major revision bumped.
- *
- * Note: this does not enable those older functions in the separate libfontenc
- * library (which didn't exist previously).
- */
-#ifndef FontencCompatibility
-#define FontencCompatibility	YES
-#endif
 #ifndef BuildLBX
 #define BuildLBX		YES
 #endif
@@ -580,40 +402,16 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildRenderLibrary
 #define BuildRenderLibrary	!BuildServersOnly
 #endif
-#ifndef BuildXftLibrary
-#define BuildXftLibrary		BuildRenderLibrary
-#endif
-#ifndef BuildXft1Library
-#define BuildXft1Library	BuildRenderLibrary
-#endif
-#ifndef UseFontconfig
-#define UseFontconfig		BuildXftLibrary
-#endif
-#ifndef BuildFontconfigLibrary
-#define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
-#endif
-#ifndef UseFreetype2
-#define UseFreetype2		(BuildXftLibrary || BuildXft1Library || \
-				 UseFontconfig || BuildFreeType)
-#endif
-#ifndef InstallFontconfigLibrary
-# define InstallFontconfigLibrary  YES
-#endif
+
 #ifndef HasExpat
 #define HasExpat		YES
 #endif
 #ifndef UseExpat
-#define UseExpat		(UseFontconfig || BuildXF86DRI)
+#define UseExpat		BuildXF86DRI
 #endif
 #ifndef BuildExpatLibrary
 #define BuildExpatLibrary	(UseExpat && !HasExpat)
 #endif
-#ifndef BuildFreetype2Library
-#define BuildFreetype2Library	(UseFreetype2 && !HasFreetype2)
-#endif
-#ifndef Freetype2BuildDefines
-#define Freetype2BuildDefines	/**/
-#endif
 
 #ifndef BuildRandR
 #define BuildRandR		YES
@@ -739,9 +537,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef UseConfDirForXkb
 #define UseConfDirForXkb	YES
 #endif
-#ifndef CompressAllFonts
-#define CompressAllFonts	NO
-#endif
 #ifndef ThreadedX
 #if HasPosixThreads || HasCThreads
 #define ThreadedX		YES	/* multi-threaded libraries */
@@ -795,9 +590,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef ServerErrorDefines
 #define ServerErrorDefines	/**/
 #endif
-#ifndef FontCompilerFlags
-#define FontCompilerFlags -t
-#endif
 /*
  * NOTE:  IPv6Flags could be tacked on to either ConnectionFlags or
  *        ExtraConnectionDefs.  Here, we choose the later in order to
@@ -849,12 +641,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef ProjectThreadsDefines
 #define ProjectThreadsDefines -DXTHREADS
 #endif
-#ifndef FontOSDefines
-#define FontOSDefines /**/
-#endif
-#ifndef FontDefines
-#define FontDefines -DFONT_SNF -DFONT_BDF -DFONT_PCF -DCOMPRESSED_FONTS FontOSDefines
-#endif
 #ifndef XawI18nDefines
 #if SystemV4
 #define XawI18nDefines -DHAS_WCTYPE_H
@@ -1627,44 +1413,26 @@ XCOMM X Window System make variables; these need to be coordinated with rules
       LBXPROXYDIR = LbxproxyDir		/* lbxproxy files */
   PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
-       FONTCFLAGS = FontCompilerFlags
 
      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
 
 #if UseInstalledX11
               RGB = $(XBINDIR)/rgb
-            FONTC = $(XBINDIR)/bdftopcf
-      MKFONTSCALE = $(XBINDIR)/mkfontscale
-        MKFONTDIR = $(XBINDIR)/mkfontdir
       MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
-          UCS2ANY = $(XBINDIR)/ProgramTargetName(ucs2any)
-      BDFTRUNCATE = $(XBINDIR)/bdftruncate
-     UCSMAPPREFIX = $(FONTDIR)/util/map-
        XCURSORGEN = $(XBINDIR)/xcursorgen
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
 # if !CrossCompiling
-            FONTC = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/bdftopcf
-      MKFONTSCALE = $(CLIENTENVSETUP) $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale
-        MKFONTDIR = $(MKFONTSCALE) -b -s -l
        XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
-          UCS2ANY = $(XBUILDBINDIR)/ProgramTargetName(ucs2any)
 # elif UseInstalledOnCrossCompile
-        MKFONTDIR = $(XBINDIR)/mkfontdir
-      MKFONTSCALE = $(XBINDIR)/mkfontscale
-            FONTC = $(XBINDIR)/bdftopcf
        XCURSORGEN = $(XBINDIR)/xcursorgen
-          UCS2ANY = $(XBINDIR)/ucs2any
 # endif
 # if HasPerl
       MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
 # else
       MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
 # endif
-      BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl
-     UCSMAPPREFIX = $(FONTSRC)/util/map-
 #endif
-
      HTMLINDEXCMD = HtmlIndexCmd
 
        DOCUTILSRC = $(XTOP)/doc/util
@@ -1674,8 +1442,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
        XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
        PROGRAMSRC = $(TOP)/programs
            LIBSRC = $(XTOP)/lib
-          FONTSRC = $(XTOP)/fonts
-     ENCODINGSSRC = $(FONTSRC)/encodings
        INCLUDESRC = BuildIncDir
       XINCLUDESRC = $(INCLUDESRC)/X11
         SERVERSRC = $(XTOP)/programs/Xserver
@@ -1683,11 +1449,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
    UNSUPPORTEDSRC = UnsupportedDir
            DOCSRC = $(XTOP)/doc
            RGBSRC = $(XTOP)/programs/rgb
-      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
-     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-       FONTINCSRC = $(XTOP)/include/fonts
         EXTINCSRC = $(XTOP)/include/extensions
-      FTSOURCEDIR = FreeTypeSrcDir
         DRMSRCDIR = DRMSrcDir
        MESASRCDIR = MesaSrcDir
   OGLSAMPLESRCDIR = OglSampleSrcDir
@@ -1740,15 +1502,6 @@ VENDORSUPPORTDEFS = VendorSupportDefines
 #ifdef PreloadSetup
      PRELOADSETUP = PreloadSetup
 #endif
-#ifdef PreloadFontSetup
- PRELOADFONTSETUP = PreloadFontSetup
-#endif
-#ifdef PreloadFreetypeSetup
- PRELOADFREETYPESETUP = PreloadFreetypeSetup
-#endif
-#ifdef PreloadXFTSetup
-     PRELOADXFTSETUP = PreloadXFTSetup
-#endif
 
 #ifndef ShLibIncludeFile
 /* need this to make ANSI-style preprocessors happy */
@@ -2663,29 +2416,6 @@ SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,Sha
 ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
 #endif
 
-# ifndef SharedLibXfontcache
-#  define SharedLibXfontcache	HasSharedLibraries
-# endif
-# ifndef NormalLibXfontcache
-#  define NormalLibXfontcache	(!SharedLibXfontcache || ForceNormalLib)
-# endif
-# ifndef DebugLibXfontcache
-#  define DebugLibXfontcache	NO
-# endif
-# ifndef ProfileLibXfontcache
-#  define ProfileLibXfontcache	NO
-# endif
-
-    XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
-#if SharedLibXfontcache
-#ifndef SharedXfontcacheRev
-#define SharedXfontcacheRev 1.2
-#endif
-SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev)
-#else
-ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
-#endif
-
 #ifndef SharedLibXau
 #define SharedLibXau		YES
 #endif
@@ -3107,58 +2837,6 @@ SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir)
 #endif
 
-#ifndef SharedLibFont
-#define SharedLibFont HasSharedLibraries
-#endif
-#ifndef NormalLibFont
-#define NormalLibFont (!SharedLibFont | ForceNormalLib | XserverStaticFontLib)
-#endif
-#ifndef DebugLibFont
-#define DebugLibFont		NO	/* debugged Font library */
-#endif
-#ifndef ProfileLibFont
-#define ProfileLibFont		NO	/* profiled Font library */
-#endif
-         FONTLIBSRC = $(LIBSRC)/font
-#if SharedLibFont
-#ifndef SharedFontRev
-#define SharedFontRev 1.5
-#endif
-SharedFontLibReferences()
-XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
-#else
-ProjectUnsharedFontLibReferences()
-XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir)
-#endif
-
-     FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
-ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
-         DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
-            FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
-
-
-#ifndef SharedLibFontEnc
-#define SharedLibFontEnc	HasSharedLibraries
-#endif
-#ifndef NormalLibFontEnc
-#define NormalLibFontEnc (!SharedLibFontEnc | ForceNormalLib)
-#endif
-#ifndef DebugLibFontEnc
-#define DebugLibFontEnc		NO	/* debugged fontenc library */
-#endif
-#ifndef ProfileLibFontEnc
-#define ProfileLibFontEnc	NO	/* profiled fontenc library */
-#endif
-         FONTENCLIBSRC = $(LIBSRC)/fontenc
-#if SharedLibFontEnc
-#ifndef SharedFontEncRev
-#define SharedFontEncRev 1.0
-#endif
-SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev)
-#else
-ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir)
-#endif
-
 #ifndef SharedLibXpm
 #define SharedLibXpm HasSharedLibraries
 #endif
@@ -3181,121 +2859,6 @@ SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
 ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
 #endif
 
-#if UseFreetype2
-
-#if BuildFreetype2Library
-
-#ifndef SharedLibFreetype2
-#define SharedLibFreetype2 HasSharedLibraries
-#endif
-#ifndef NormalLibFreetype2
-#define NormalLibFreetype2 (!SharedLibFreetype2 | ForceNormalLib)
-#endif
-#ifndef DebugLibFreetype2
-#define DebugLibFreetype2		NO
-#endif
-#ifndef ProfileLibFreetype2
-#define ProfileLibFreetype2		NO
-#endif
-          FREETYPE2LIBSRC = $(LIBSRC)/freetype2
-
-/*
- * FreeType 2.1.9
- *
- * Get the library version information from version_info in
- * in xc/extras/freetype2/builds/unix/configure.ac.
- *
- * current:revision:age = 9:7:3
- *
- * The LibtoolMinorVersions revision is "(current - age).age".
- * The !LibtoolMinorVersions revision is "current.0".
- * Freetype2Version should be set to "current.revision.age"
- */
-#ifndef Freetype2Version
-#define Freetype2Version 9.7.3
-#endif
-
-#if SharedLibFreetype2
-#ifndef SharedLibtoolFreetype2Rev
-#define SharedLibtoolFreetype2Rev	9:7:3
-#endif
-#ifndef SharedFreetype2Rev
-#if LibtoolMinorVersions
-#define SharedFreetype2Rev 6.3.8
-#else
-#define SharedFreetype2Rev 9.0
-#endif
-#endif
-SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev)
-#else
-ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir)
-#endif
-
-#ifdef UseInstalled
-FREETYPE2INCDIR=$(INCDIR)
-#else
-FREETYPE2INCDIR=$(BUILDINCDIR)
-#endif
-
-#else /* BuildFreetype2Library */
-
-#if HasFreetype2
-
-#ifndef Freetype2Dir
-#define Freetype2Dir /usr
-#ifndef Freetype2DirStandard
-# define Freetype2DirStandard YES
-#endif
-#endif
-#ifndef Freetype2DirStandard
-#define Freetype2DirStandard NO
-#endif
-
-#ifndef Freetype2LibDir
-#define Freetype2LibDir Freetype2Dir/LibDirName
-# if Freetype2DirStandard
-#  define Freetype2LibDirStandard YES
-# endif
-#endif
-#ifndef Freetype2LibDirStandard
-# define Freetype2LibDirStandard NO
-#endif
-
-#ifndef Freetype2IncDir
-#define Freetype2IncDir Freetype2Dir/include
-# if Freetype2DirStandard
-#  define Freetype2IncDirStandard YES
-# endif
-#endif
-
-FREETYPE2DIR = Freetype2Dir
-FREETYPE2LIBDIR = Freetype2LibDir
-FREETYPE2INCDIR = Freetype2IncDir
-#if Freetype2LibDirStandard
-FREETYPE2LIB = -lfreetype
-#else
-FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
-#endif
-
-#endif /* HasFreetype2 */
-
-#endif /* else BuildFreetype2Library */
-
-#ifndef Freetype2IncDirStandard
-# define Freetype2IncDirStandard NO
-#endif
-
-#if BuildFreetype2Library || HasFreetype2
-#if Freetype2IncDirStandard
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-#else
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-#endif
-FREETYPE2DEFINES = -DFREETYPE2
-#endif
-
-#endif /* UseFreetype2 */
-
 #if HasMotif
 
 #ifndef MotifDir
@@ -3448,188 +3011,6 @@ EXPATDEFINES = -DEXPAT
 
 #endif /* UseExpat */
 
-#ifndef SharedLibXft1
-#define SharedLibXft1 HasSharedLibraries
-#endif
-#ifndef NormalLibXft1
-#define NormalLibXft1		NO
-#endif
-#ifndef DebugLibXft1
-#define DebugLibXft1		NO
-#endif
-#ifndef ProfileLibXft1
-#define ProfileLibXft1		NO
-#endif
-          XFT1LIBSRC = $(LIBSRC)/Xft1
-#if SharedLibXft1
-#ifndef SharedXft1Rev
-#define SharedXft1Rev 1.1
-#endif
-SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev)
-#else
-ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir)
-#endif
-
-#ifndef Xft1ClientDepLibs
-#if UseFreetype2
-#define Xft1ClientDepLibs $(DEPXFT1LIB) $(DEPFREETYPE2LIB) $(DEPXRENDERLIB)
-#else
-#define Xft1ClientDepLibs $(DEPXFT1LIB) $(DEPXRENDERLIB)
-#endif
-#endif
-#ifndef Xft1ClientLibs
-#if UseFreetype2
-#define Xft1ClientLibs $(XFT1LIB) $(FREETYPE2LIB) $(XRENDERLIB)
-#else
-#define Xft1ClientLibs $(XFT1LIB) $(XRENDERLIB)
-#endif
-#endif
-
-#ifndef SharedLibXft
-#define SharedLibXft HasSharedLibraries
-#endif
-#ifndef NormalLibXft
-#define NormalLibXft (!SharedLibXft | ForceNormalLib)
-#endif
-#ifndef DebugLibXft
-#define DebugLibXft		NO
-#endif
-#ifndef ProfileLibXft
-#define ProfileLibXft		NO
-#endif
-          XFTLIBSRC = $(LIBSRC)/Xft
-#if SharedLibXft
-#ifndef SharedXftRev
-#define SharedXftRev 2.1.2
-#endif
-SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
-#else
-ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef XftClientDepLibs
-#define XftClientDepLibs $(DEPXFTLIB) FontconfigClientDepLibs $(DEPXRENDERLIB)
-#endif
-#ifndef XftClientLibs
-#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
-#endif
-
-#if UseFontconfig
-
-#if BuildFontconfigLibrary
-
-#ifndef SharedLibFontconfig
-#define SharedLibFontconfig HasSharedLibraries
-#endif
-#ifndef NormalLibFontconfig
-#define NormalLibFontconfig (!SharedLibFontconfig | ForceNormalLib)
-#endif
-#ifndef DebugLibFontconfig
-#define DebugLibFontconfig		NO
-#endif
-#ifndef ProfileLibFontconfig
-#define ProfileLibFontconfig		NO
-#endif
-          FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig
-#if SharedLibFontconfig
-#ifndef SharedFontconfigRev
-#define SharedFontconfigRev 1.0.4
-#endif
-SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev)
-#else
-ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir)
-#endif
-
-#ifdef UseInstalled
-FONTCONFIGINCDIR=$(INCDIR)
-#else
-FONTCONFIGINCDIR=$(BUILDINCDIR)
-#endif
-
-FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR)
-
-#if UseInstalledX11
-FCCACHE = $(BINDIR)/fc-cache
-#else
-FCCACHE = set -x; $(CLIENTENVSETUP) $(PRELOADXFTSETUP) FONTCONFIG_PATH=$(FONTCONFIGLIBSRC) $(XBUILDBINDIR)/fc-cache
-#endif
-
-#else /* BuildFontconfigLibrary */
-
-#if HasFontconfig
-
-#ifndef FontconfigDir
-# define FontconfigDir /usr
-# ifndef FontconfigDirStandard
-#  define FontconfigDirStandard YES
-# endif
-#endif
-
-#ifndef FontconfigDirStandard
-# define FontconfigDirStandard NO
-#endif
-
-#ifndef FontconfigLibDir
-# define FontconfigLibDir FontconfigDir/LibDirName
-# if FontconfigDirStandard
-#  define FontconfigLibDirStandard YES
-# endif
-#endif
-#ifndef FontconfigLibDirStandard
-# define FontconfigLibDirStandard NO
-#endif
-
-#ifndef FontconfigBinDir
-# define FontconfigBinDir FontconfigDir/bin
-#endif
-
-#ifndef FontconfigIncDir
-# define FontconfigIncDir FontconfigDir/include
-# if FontconfigDirStandard
-#  define FontconfigIncDirStandard YES
-# endif
-#endif
-
-#ifndef FontconfigIncDirStandard
-# define FontconfigIncDirStandard NO
-#endif
-
-FONTCONFIGDIR = FontconfigDir
-FONTCONFIGLIBDIR = FontconfigLibDir
-FONTCONFIGINCDIR = FontconfigIncDir
-FONTCONFIGBINDIR = FontconfigBinDir
-#if FontconfigLibDirStandard
-FONTCONFIGLIB = -lfontconfig
-#else
-FONTCONFIGLIB = -L$(FONTCONFIGLIBDIR) LinkerRuntimeLibraryPathFlag($(FONTCONFIGLIBDIR)) -lfontconfig
-#endif
-
-#if FontconfigIncDirStandard
-FONTCONFIGINCLUDES =
-#else
-FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR)
-#endif
-
-FCCACHE = $(FONTCONFIGBINDIR)/fc-cache
-
-#endif /* HasFontconfig */
-
-#endif /* else BuildFontconfigLibrary */
-
-#if BuildFontconfigLibrary || HasFontconfig
-FONTCONFIGDEFINES = -DFONTCONFIG
-#endif
-
-#ifndef FontconfigClientDepLibs
-#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB) ExpatClientDepLibs
-#endif
-#ifndef FontconfigClientLibs
-#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
-#endif
-
-#endif /* UseFontconfig */
-
-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
 
 #ifdef HasLibpng
 
@@ -3952,383 +3333,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #endif /* InstallAppDefaultsLong */
 
 /*
- * MakeFcCache - generate rules to build fontconfig cache database
- */
-
-#if defined UseFreetype2 && !CrossCompiling
-
-# ifndef MakeFcCache
-#  define MakeFcCache(deplist)						@@\
-all:: fonts.cache							@@\
-									@@\
-fonts.cache: deplist							@@\
-	RunProgram(FCCACHE, $(FCCACHEOPTS) .)				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(fonts.cache*)
-# endif /* MakeFcCache */
-
-# ifndef InstallFcCache
-#  define InstallFcCache(dest)						@@\
-install::								@@\
-	RunProgram(FCCACHE, $(FCCACHEOPTS) $(DESTDIR)dest)
-# endif /* InstallFcCache */
-
-#else
-
-#ifndef MakeFcCache
-#define MakeFcCache(deplist)
-#endif
-
-#ifndef InstallFcCache
-#define InstallFcCache(dest)
-#endif
-
-#endif
-
-/*
- * MakeFontsScale - generate rules to build fonts.scale database.
- */
-#ifndef MakeFontsScale
-# if !CrossCompiling ||  UseInstalledOnCrossCompile
-#  define MakeFontsScale(deplist)					@@\
-all:: fonts.scale							@@\
-									@@\
-fonts.scale:  deplist							@@\
-	RemoveFile(fonts.scale)						@@\
-	RunProgram(MKFONTSCALE, .)					@@\
-									@@\
-clean::									@@\
-	RemoveFile(fonts.scale)
-# else
-#  define MakeFontsScale(deplist)					@@\
-clean::									@@\
-	RemoveFile(fonts.scale)
-# endif
-#endif /* MakeFontsScale */
-
-/*
- * MakeFontsDir - generate rules to build fonts.dir database.
- */
-#ifndef MakeFontsDir
-# if !CrossCompiling ||  UseInstalledOnCrossCompile
-#  define MakeFontsDir(deplist)						@@\
-all:: fonts.dir								@@\
-									@@\
-fonts.dir:  deplist							@@\
-	RemoveFile(fonts.dir)						@@\
-	RunProgram(MKFONTDIR, $(MKFONTDIROPTS) .)			@@\
-									@@\
-clean::									@@\
-	RemoveFile(fonts.dir)
-# else
-#  define MakeFontsDir(deplist)						@@\
-clean::									@@\
-	RemoveFile(fonts.dir)
-# endif
-#endif /* MakeFontsDir */
-
-
-/*
- * MakeFonts - generate rules to build font database.
- */
-#ifndef MakeFonts
-# if !CrossCompiling || UseInstalledOnCrossCompile
-#  define MakeFonts()							@@\
-all::  $(OBJS)								@@\
-									@@\
-MakeFontsDir($(OBJS))							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(*.pcf *.pcf.Z *.pcf.gz)
-# else
-#  define MakeFonts()							@@\
-MakeFontsDir($(OBJS))							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(*.pcf *.pcf.Z *.pcf.gz)
-# endif
-#endif /* MakeFonts */
-
-#ifndef InstallFontsDir
-# if !CrossCompiling ||  UseInstalledOnCrossCompile
-#  define InstallFontsDir(dest)						@@\
-install::								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@if [ X$(STATIC_FONTS_SCALE) = X ]; then (set -x; \		@@\
-	  RemoveFile($(DESTDIR)dest/fonts.scale); \			@@\
-	  RunProgram(MKFONTSCALE, $(DESTDIR)dest)); \			@@\
-	else (set -x; \							@@\
-	  InstallInline(fonts.scale,$(INSTDATFLAGS),dest)); \		@@\
-	fi								@@\
-	RemoveFile($(DESTDIR)dest/fonts.dir)				@@\
-	RunProgram(MKFONTDIR, $(MKFONTDIROPTS) $(DESTDIR)dest)
-# else
-#  define InstallFontsDir(dest)
-# endif
-#endif
-
-/*
- * InstallFontObjs - generate rules to install font files
- */
-#ifndef InstallFontObjs
-# if !CrossCompiling || UseInstalledOnCrossCompile
-#  define InstallFontObjs(objs,dest)					@@\
-InstallMultipleFlags(objs,dest,$(INSTDATFLAGS))				@@\
-									@@\
-InstallFontsDir(dest)
-# else
-#  define InstallFontObjs(objs,dest)
-# endif
-#endif /* InstallFontObjs */
-
-
-/*
- * InstallFonts - generate rules to install font files
- */
-#ifndef InstallFonts
-#define InstallFonts(dest)						@@\
-InstallFontObjs($(OBJS),dest)
-#endif /* InstallFonts */
-
-
-/*
- * InstallFontAliases - generate rules to install font aliases databases.
- */
-#ifndef InstallFontAliases
-#define InstallFontAliases(dest)					@@\
-InstallTarget(install,fonts.alias,$(INSTDATFLAGS),dest)
-#endif /* InstallFontAliases */
-
-#ifndef InstallNamedFontAliases
-#define InstallNamedFontAliases(src,dest)				@@\
-InstallNamedTarget(install,src,$(INSTDATFLAGS),dest,fonts.alias)
-#endif /* InstallNamedFontAliases */
-
-#ifndef FontSrc
-#define FontSrc(basename) basename.bdf
-#endif
-
-#ifndef FontBaseObj
-#define FontBaseObj(basename)basename.pcf
-#endif
-
-/*
- * InstallFontScale - generate rules to install font scale database.
- */
-#ifndef InstallFontScale
-#define InstallFontScale(dest)						@@\
-InstallTarget(install,fonts.scale,$(INSTDATFLAGS),dest)
-#endif /* InstallFontScale */
-
-/*
- * UncompressedFontTargetLong
- */
-#if ! CrossCompiling || UseInstalledOnCrossCompile
-# ifndef UncompressedFontTargetLong
-#  define UncompressedFontTargetLong(sname,tname)			@@\
-FontBaseObj(tname):  FontSrc(sname)					@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $? -o $@)
-# endif /* UncompressedFontTargetLong */
-#else
-# ifndef UncompressedFontTargetLong
-#  define UncompressedFontTargetLong(sname,tname)
-# endif
-#endif
-
-/*
- * CompressedFontTarget
- */
-#ifndef GzipFontCompression
-#define GzipFontCompression NO
-#endif
-
-#if ! CrossCompiling || UseInstalledOnCrossCompile
-# ifndef CompressedFontTargetLong
-#  if GzipFontCompression
-#   define CompressedFontTargetLong(sname,tname)			@@\
-FontBaseObj(tname).gz:  FontSrc(sname)					@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $?) | $(GZIPCMD) > $@
-#  else
-#   define CompressedFontTargetLong(sname,tname)			@@\
-FontBaseObj(tname).Z:  FontSrc(sname)					@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $?) | $(COMPRESS) > $@
-#  endif
-# endif /* CompressedFontTargetLong */
-#else
-#   define CompressedFontTargetLong(sname,tname)
-#endif
-
-/*
- * UncompressedFontTarget
- */
-#ifndef UncompressedFontTarget
-#define UncompressedFontTarget(basename) UncompressedFontTargetLong(basename,basename)
-#endif /* UncompressedFontTarget */
-
-#ifndef CompressedFontTarget
-#define CompressedFontTarget(basename) CompressedFontTargetLong(basename,basename)
-#endif /* CompressedFontTarget */
-
-#if !defined(FontTarget) && !defined(FontObj)
-#if CompressAllFonts
-#define FontTargetLong(sname,tname) CompressedFontTargetLong(sname,tname)
-#define FontTarget(basename) CompressedFontTarget(basename)
-#if GzipFontCompression
-#define FontObj(basename) FontBaseObj(basename).gz
-#else
-#define FontObj(basename) FontBaseObj(basename).Z
-#endif
-#else
-#define FontTargetLong(sname,tname) UncompressedFontTargetLong(sname,tname)
-#define FontTarget(basename) UncompressedFontTarget(basename)
-#define FontObj(basename) FontBaseObj(basename)
-#endif /* CompressAllFonts */
-#endif
-
-
-#ifndef EncObj
-#define EncObj(basename) basename.enc
-#endif
-#ifndef EncObjComp
-#if GzipFontCompression
-#define EncObjComp(basename) basename.enc.gz
-#else
-#define EncObjComp(basename) basename.enc.Z
-#endif
-#endif
-
-#ifndef EncodingTarget
-#define EncodingTarget(basename) /**/
-#endif
-
-#ifndef CompEncodingTarget
-#if GzipFontCompression
-#define CompEncodingTarget(basename)					@@\
-EncObjComp(basename): EncObj(basename)					@@\
-	cat $? | $(GZIPCMD) > $@
-#else
-#define CompEncodingTarget(basename)					@@\
-EncObjComp(basename): EncObj(basename)					@@\
-	cat $? | $(COMPRESS) > $@
-#endif
-#endif
-
-#ifndef MakeEncDir
-# if !CrossCompiling || UseInstalledOnCrossCompile
-#  define MakeEncDir(deplist,inst,dirlist )				@@\
-AllTarget(encodings.dir)						@@\
-									@@\
-encodings.dir: deplist							@@\
-	RemoveFiles(encodings.dir fonts.dir)				@@\
-	@(E=; for i in dirlist; do \					@@\
-	   E="$$E -e $$i"; done; \					@@\
-	 set -x; \							@@\
-	 RunProgram(MKFONTDIR, -n -r -p inst/ $$E .))			@@\
-									@@\
-clean::									@@\
-	RemoveFiles(fonts.dir encodings.dir)
-# else
-#  define MakeEncDir(deplist,inst,dirlist )				@@\
-clean::									@@\
-	RemoveFiles(fonts.dir encodings.dir)
-# endif
-#endif
-
-#ifndef MakeEncodings
-#define MakeEncodings(deplist,inst,dirlist)				@@\
-									@@\
-MakeEncDir(deplist $(OBJS),inst,dirlist)				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(*.enc.Z *.enc.gz)
-#endif /* MakeEncodings */
-
-#ifndef InstallEncObjs
-# if !CrossCompiling || UseInstalledOnCrossCompile
-#  define InstallEncObjs(objs,dest)					@@\
-InstallMultipleFlags(objs,dest,$(INSTDATFLAGS))				@@\
-									@@\
-InstallTarget(install,encodings.dir,$(INSTDATFLAGS),dest)
-# else
-#  define InstallEncObjs(objs,dest)
-# endif
-#endif /* InstallEncObjs */
-
-#ifndef InstallEncodings
-#define InstallEncodings(dest)						@@\
-InstallEncObjs($(OBJS),dest)
-#endif /* InstallEncodings */
-
-#ifndef InstallEncodingsDir
-# if !CrossCompiling || UseInstalledOnCrossCompile
-#  define InstallEncodingsDir(edir,fdir)				@@\
-InstallNamedTarget(install,edir/encodings.dir,$(INSTDATFLAGS),fdir,encodings.dir)
-# else
-#  define InstallEncodingsDir(edir,fdir)
-# endif
-#endif
-
-
-#ifndef MakeBdfFontFromUCSMaster
-#define MakeBdfFontFromUCSMaster(font,enc)				@@\
-font-enc.bdf: font.bdf $(UCS2ANY)					@@\
-	RemoveFile($@)							@@\
-	$(UCS2ANY) font.bdf $(UCSMAPPREFIX)enc enc			@@\
-									@@\
-clean::									@@\
-	RemoveFile(font-enc.bdf)
-#endif
-
-#ifndef MakeTruncatedUCSBdfFont
-#if HasPerl5
-#define MakeTruncatedUCSBdfFont(font,trunc,name)			@@\
-name.bdf: font.bdf $(BDFTRUNCATE)					@@\
-	RemoveFile($@)							@@\
-	RunPerlScript($(BDFTRUNCATE),trunc < font.bdf > name.bdf)	@@\
-									@@\
-clean::									@@\
-	RemoveFile(name.bdf)
-#endif
-#endif
-
-/* 
- * InstallXpPMFLink - install link for a Xprint PMF "font" from one
- * print model to another
- */
-#ifndef InstallXpPMFLink
-#define InstallXpPMFLink(fontfilename,srcmodelfontdir,destmodelfontdir)				@@\
-	InstallLink(install,srcmodelfontdir/fontfilename,fontfilename,destmodelfontdir)
-#endif /* InstallXpPMFLink */
-/* 
- * InstallXpMultiplePMFLinks - install multiple links for PMF fonts
- * from one print model to another
- */
-#ifndef InstallXpMultiplePMFLinks
-#define InstallXpMultiplePMFLinks(list,srcmodelfontdir,destmodelfontdir)			@@\
-install::											@@\
-	MakeDir($(DESTDIR)destmodelfontdir)							@@\
-	for i in list ; do \									@@\
-	    $(RM) $(DESTDIR)destmodelfontdir/$$i ; \						@@\
-	    $(LN) -s -f srcmodelfontdir/$$i $(DESTDIR)destmodelfontdir/$$i ; \			@@\
-	done
-#endif /* InstallXpPMFLink */
-
-/*
- * InstallXpPMFFontsDir - make and install a fonts.dir index for model-config fonts
- */
-#ifndef InstallXpPMFFontsDir
-#if BuildServersOnly
-#define InstallXpPMFFontsDir(destmodelfontdir) /**/
-#else
-#define InstallXpPMFFontsDir(destmodelfontdir)			@@\
-install::							@@\
-	($(MKFONTSCALE) -b -s -l $(DESTDIR)destmodelfontdir)
-#endif
-#endif /* InstallXpPMFFontsDir */
-
-
-/*
  * MakeXkbDir
  */
 #ifndef MakeXkbDir
@@ -4647,42 +3651,6 @@ clean::									@@\
 InstallDoc(name,deps)
 #endif
 
-/*
- * Rule for maintainers to use to updated generated copies of fonts in the
- * source tree.  Use with care.
- */
-
-#ifndef UpdateDerivedFont
-#define UpdateDerivedFont(src,dst)					@@\
-update.fonts:: src							@@\
-	-@if [ -f dst ]; then \						@@\
-	    if [ "$(FORCEUPDATE)" = yes ]; then \			@@\
-		if [ "$(FOLLOWLINK)" = no ]; then \			@@\
-			(set -x; $(RM) dst); \				@@\
-		fi; \							@@\
-		set -x; cp src dst; \					@@\
-	    else \							@@\
-		grep -v "XFree86:" src > __tmp1__; \			@@\
-		grep -v "XFree86:" dst > __tmp2__; \			@@\
-		if diff __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \	@@\
-		else \							@@\
-			if [ "$(FOLLOWLINK)" = no ]; then \		@@\
-				(set -x; $(RM) dst); \			@@\
-			fi; \						@@\
-			set -x; cp src dst; \					@@\
-		fi; \							@@\
-	    fi; \							@@\
-	fi								@@\
-	@$(RM) __tmp1__ __tmp2__
-#endif
-
-#if !HasFreetype2
-      FT2PRELOADPATTERN = libfreetype.so.?
-#endif
-#if !HasFontconfig
-       FCPRELOADPATTERN = libfontconfig.so.?
-#endif
-      XFTPRELOADPATTERN = libXft.so.?
   XRENDERPRELOADPATTERN = libXrender.so.?
     XFONTPRELOADPATTERN = libXfont*.so.?
 
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 58b3df923..76318b4f8 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -91,9 +91,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 
 #ifdef NXAgentServer
 #define BuildRenderLibrary	YES
-#define SharedLibFreetype2	YES
-#define NormalLibFreetype2	YES
-#define FontLibSharedFreeType 	YES
 #endif
 
 /*
@@ -241,101 +238,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * Speedo fonts have been disabled by default in this release.
- * To re-enable support for Speedo fonts, uncomment this.
- *
-#define BuildSpeedo		YES
- */
-
-/*
- * To disable support for CID fonts, uncomment this.
- *
-#define BuildCID		NO
- */
-
-/*
- * To disable support for TrueType fonts, uncomment these.
- *
-#define BuildFreeType		NO
- */
-#define BuildFreeType		NO
-
-/*
- * To set non-default build options for the underlying FreeType libraries,
- * add them here and uncomment.
- *
-#define Freetype2BuildDefines	-DFREETYPE_BUILD_DEFINES
- */
-
-/*
- * To build the FreeType libraries with the TrueType byte code interpreter
- * enabled, uncomment this.  Note that there are patent issues related to the
- * TrueType byte code interpreter, and we only recommend you enabling this
- * if you are sure that there are no legal impediments to you doing so.  See
- * <http://www.freetype.org/patents.html> for further information.
- *
-#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
- */
-
-/*
- * Do you want to Build Fonts (Usually you only want to build and install
- * fonts once, if this is a first time install you will want to build the
- * fonts)
- *
-#define BuildFonts		NO
- */
-#define BuildFonts		NO
-
-/*
- * To not build/install the 75dpi fonts, uncomment the following
- *
-#define Build75DpiFonts		NO
- */
-
-/*
- * To not build/install the 100dpi fonts, uncomment the following
- *
-#define Build100DpiFonts	NO
- */
-
-/*
- * To build/install the Speedo fonts, uncomment the following
- * (see setting above about Speedo support as well)
- *
-#define BuildSpeedoFonts	YES
- */
-
-/*
- * To not build/install the Type1 fonts, uncomment the following
- *
-#define BuildType1Fonts		NO
- */
-
-/*
- * To not build/install the CID fonts, uncomment the following
- *
-#define BuildCIDFonts		NO
- */
-
-/*
- * To not build/install the True Type fonts, uncomment the following
- *
-#define BuildTrueTypeFonts	NO
- */
-
-/*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
-#define BuildCyrillicFonts	NO
- */
-
-/*
- * To not install the local font directory, uncomment the following
- *
-#define MakeLocalFontDir	NO
- */
-
-/*
  * Include True Type Fonts to default font path. It is safe to do
  * this by default as NX intaller carries only misc and TTF in the
  * basic set of fonts installed under Windows.
@@ -368,7 +270,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  *
 #define InstallXinitConfig	YES
 #define InstallXdmConfig	YES
-#define InstallFSConfig		YES
  */
 
 /*
@@ -592,21 +493,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To link the X server with a dynamic version of the Xfont library,
- * uncomment this.
- *
-#define XserverStaticFontLib	NO
- */
-#define XserverStaticFontLib	YES
-
-/*
- * To enable binary compatibility with previous versions of the font
- * encoding support, uncomment this.
- *
-#define FontencCompatibility    YES
- */
-
-/*
  * To disable building XInput support, uncomment this
  *
 #define BuildXInputExt		NO
@@ -834,38 +720,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define X86EMU_LIBPATH /usr/local/lib
  */ 
 
-/*
- * Most platforms default to using an already installed FreeType 2 library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasFreetype2 NO
- */
-#define HasFreetype2 YES
-
-/* 
- * To use a FreeType library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
- *
-#define HasFreetype2 YES
-#define Freetype2Dir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed Fontconfig library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasFontconfig NO
- */
-#define HasFontconfig YES
-
-/* 
- * To use a Fontconfig library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasFontconfig YES
-#define FontconfigDir /usr/local
- */
-
 
 /*
  * Most platforms default to using an already installed Expat library.
@@ -912,9 +766,5 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define BuildXaw7              NO
 
 #define BuildRman NO
-#define BuildFontEncLib NO
 #define BuildXcursorLibrary NO
-#define BuildXftLibrary NO
-#define BuildXft1Library NO
-#define SharedLibFont NO
 #define BuildLoadableXlibI18n NO
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 32b7a8658..fa18feb4e 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -116,7 +116,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # define SharedLibXdmGreet	NO
 # define LinkGLToUsrInclude	NO
 # define LinkGLToUsrLib		NO
-# define SharedLibFont		NO
 # define SharedLibGlu		YES
 # define NormalLibGlu		YES
 # define FSUseSyslog		YES
@@ -156,9 +155,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define BuildRman			NO
 #  define BuildHtmlManPages		NO
 
-/* we build-depend on libfreetype6-dev (FreeType 2.x) */
-#   define BuildFreetype2Library	NO
-#   define HasFreetype2			YES
 /* m68k has no 2.4 kernel yet */
 #   ifndef Mc68020Architecture
 #    define HasLinuxInput		YES
@@ -539,10 +535,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # define HasExpat		YES
 #endif
 
-#ifndef HasFreetype2
-# define HasFreetype2		YES
-#endif
-
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO
diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def
index 39d8980b6..3f48cd124 100644
--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -139,103 +139,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable support for Speedo fonts, uncomment this.
- *
-#define BuildSpeedo		NO
- */
-
-/*
- * To disable support for Type1 fonts, uncomment this.
- *
-#define BuildType1		NO
- */
-
-/*
- * To disable support for CID fonts, uncomment this.
- *
-#define BuildCID		NO
- */
-
-/*
- * To disable support for TrueType fonts, uncomment these.
- *
-#define BuildFreeType		NO
- */
-
-/*
- * To set non-default build options for the underlying FreeType libraries,
- * add them here and uncomment.
- *
-#define Freetype2BuildDefines	-DFREETYPE_BUILD_DEFINES
- */
-
-/*
- * To build the FreeType libraries with the TrueType byte code interpreter
- * enabled, uncomment this.  Note that there are patent issues related to the
- * TrueType byte code interpreter, and we only recommend you enabling this
- * if you are sure that there are no legal impediments to you doing so.  See
- * <http://www.freetype.org/patents.html> for further information.
- *
-#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
- */
-
-/*
- * Do you want to Build Fonts (Usually you only want to build and install
- * fonts once, if this is a first time install you will want to build the
- * fonts)
- *
-#define BuildFonts		NO
- */
-
-/*
- * To not build/install the 75dpi fonts, uncomment the following
- *
-#define Build75DpiFonts		NO
- */
-
-/*
- * To not build/install the 100dpi fonts, uncomment the following
- *
-#define Build100DpiFonts	NO
- */
-
-/*
- * To not build/install the Speedo fonts, uncomment the following
- *
-#define BuildSpeedoFonts	NO
- */
-
-/*
- * To not build/install the Type1 fonts, uncomment the following
- *
-#define BuildType1Fonts		NO
- */
-
-/*
- * To not build/install the CID fonts, uncomment the following
- *
-#define BuildCIDFonts		NO
- */
-
-/*
- * To not build/install the True Type fonts, uncomment the following
- *
-#define BuildTrueTypeFonts	NO
- */
-
-/*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
-#define BuildCyrillicFonts	NO
- */
-
-/*
- * To not install the local font directory, uncomment the following
- *
-#define MakeLocalFontDir	NO
- */
-
-/*
  * To build only the servers with a cut-down source tree, uncomment
  * this.
  *
@@ -456,20 +359,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To link the X server with a dynamic version of the Xfont library,
- * uncomment this.
- *
-#define XserverStaticFontLib	NO
- */
-
-/*
- * To enable binary compatibility with previous versions of the font
- * encoding support, uncomment this.
- *
-#define FontencCompatibility    YES
- */
-
-/*
  * To disable building XInput support, uncomment this
  *
 #define BuildXInputExt		NO
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf
index 0348c0302..41790c019 100644
--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1684,50 +1684,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Include fonts support
- */
-#ifndef BuildSpeedo
-# define BuildSpeedo		NO
-#endif
-
-#ifndef BuildType1
-# define BuildType1		NO
-#endif
-
-#ifndef BuildCID
-# define BuildCID		YES
-#endif
-
-#ifndef BuildFreeType
-# define BuildFreeType		YES
-#endif
-
-/*
- * By default, build all of the fonts.
- */
-#ifndef Build75DpiFonts
-# define Build75DpiFonts	YES
-#endif
-#ifndef Build100DpiFonts
-# define Build100DpiFonts	YES
-#endif
-#ifndef BuildSpeedoFonts
-# define BuildSpeedoFonts	NO
-#endif
-#ifndef BuildType1Fonts
-# define BuildType1Fonts	YES
-#endif
-#ifndef BuildCIDFonts
-# define BuildCIDFonts		YES
-#endif
-#ifndef BuildTrueTypeFonts
-# define BuildTrueTypeFonts	YES
-#endif
-#ifndef BuildCyrillicFonts
-# define BuildCyrillicFonts	YES
-#endif
-
-/*
  * Build scanpci?
  */
 #ifndef SystemV
@@ -1748,14 +1704,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # endif
 #endif
 
-#ifndef CompressAllFonts
-# define CompressAllFonts	YES
-#endif
-
-#ifndef GzipFontCompression
-# define GzipFontCompression	YES
-#endif
-
 /* Disable stripping installed programs for this release. */
 #ifndef StripInstalledPrograms
 # define StripInstalledPrograms	NO
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 3f922359e..9fb2f6589 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1248,50 +1248,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Include fonts support
- */
-#ifndef BuildSpeedo
-# define BuildSpeedo		NO
-#endif
-
-#ifndef BuildType1
-# define BuildType1		NO
-#endif
-
-#ifndef BuildCID
-# define BuildCID		YES
-#endif
-
-#ifndef BuildFreeType
-# define BuildFreeType		YES
-#endif
-
-/*
- * By default, build all of the fonts.
- */
-#ifndef Build75DpiFonts
-# define Build75DpiFonts	YES
-#endif
-#ifndef Build100DpiFonts
-# define Build100DpiFonts	YES
-#endif
-#ifndef BuildSpeedoFonts
-# define BuildSpeedoFonts	NO
-#endif
-#ifndef BuildType1Fonts
-# define BuildType1Fonts	YES
-#endif
-#ifndef BuildCIDFonts
-# define BuildCIDFonts		YES
-#endif
-#ifndef BuildTrueTypeFonts
-# define BuildTrueTypeFonts	YES
-#endif
-#ifndef BuildCyrillicFonts
-# define BuildCyrillicFonts	YES
-#endif
-
-/*
  * Build scanpci?
  */
 #ifndef SystemV
@@ -1312,14 +1268,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # endif
 #endif
 
-#ifndef CompressAllFonts
-# define CompressAllFonts	YES
-#endif
-
-#ifndef GzipFontCompression
-# define GzipFontCompression	YES
-#endif
-
 /* Disable stripping installed programs for this release. */
 #ifndef StripInstalledPrograms
 # define StripInstalledPrograms	NO
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index eeaffa496..eca20fab4 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -153,99 +153,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * Speedo fonts have been disabled by default in this release.
- * To re-enable support for Speedo fonts, uncomment this.
- *
-#define BuildSpeedo		YES
- */
-
-/*
- * To disable support for CID fonts, uncomment this.
- *
-#define BuildCID		NO
- */
-
-/*
- * To disable support for TrueType fonts, uncomment these.
- *
-#define BuildFreeType		NO
- */
-
-/*
- * To set non-default build options for the underlying FreeType libraries,
- * add them here and uncomment.
- *
-#define Freetype2BuildDefines	-DFREETYPE_BUILD_DEFINES
- */
-
-/*
- * To build the FreeType libraries with the TrueType byte code interpreter
- * enabled, uncomment this.  Note that there are patent issues related to the
- * TrueType byte code interpreter, and we only recommend you enabling this
- * if you are sure that there are no legal impediments to you doing so.  See
- * <http://www.freetype.org/patents.html> for further information.
- *
-#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
- */
-
-/*
- * Do you want to Build Fonts (Usually you only want to build and install
- * fonts once, if this is a first time install you will want to build the
- * fonts)
- *
-#define BuildFonts		NO
- */
-
-/*
- * To not build/install the 75dpi fonts, uncomment the following
- *
-#define Build75DpiFonts		NO
- */
-
-/*
- * To not build/install the 100dpi fonts, uncomment the following
- *
-#define Build100DpiFonts	NO
- */
-
-/*
- * To build/install the Speedo fonts, uncomment the following
- * (see setting above about Speedo support as well)
- *
-#define BuildSpeedoFonts	YES
- */
-
-/*
- * To not build/install the Type1 fonts, uncomment the following
- *
-#define BuildType1Fonts		NO
- */
-
-/*
- * To not build/install the CID fonts, uncomment the following
- *
-#define BuildCIDFonts		NO
- */
-
-/*
- * To not build/install the True Type fonts, uncomment the following
- *
-#define BuildTrueTypeFonts	NO
- */
-
-/*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
-#define BuildCyrillicFonts	NO
- */
-
-/*
- * To not install the local font directory, uncomment the following
- *
-#define MakeLocalFontDir	NO
- */
-
-/*
  * To build only the servers with a cut-down source tree, uncomment
  * this.
  *
@@ -464,20 +371,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To link the X server with a dynamic version of the Xfont library,
- * uncomment this.
- *
-#define XserverStaticFontLib	NO
- */
-
-/*
- * To enable binary compatibility with previous versions of the font
- * encoding support, uncomment this.
- *
-#define FontencCompatibility    YES
- */
-
-/*
  * To disable building XInput support, uncomment this
  *
 #define BuildXInputExt		NO
@@ -669,36 +562,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define X86EMU_LIBPATH /usr/local/lib
  */ 
 
-/*
- * Most platforms default to using an already installed FreeType 2 library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasFreetype2 NO
- */
-
-/* 
- * To use a FreeType library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
- *
-#define HasFreetype2 YES
-#define Freetype2Dir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed Fontconfig library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasFontconfig NO
- */
-
-/* 
- * To use a Fontconfig library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasFontconfig YES
-#define FontconfigDir /usr/local
- */
-
 
 /*
  * Most platforms default to using an already installed Expat library.