Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x

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

Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x
bb23f7a3 · Mihai Moldovan · 8ed8a43d · d280fa15 · bb23f7a3 · bb23f7a3
Commit bb23f7a3 authored Apr 05, 2015 by Mihai Moldovan
29 changed files
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,6 @@ override_dh_install:
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/Print*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h
@@ -59,8 +58,6 @@ override_dh_install:
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxext.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxproto.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h

--- 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
-	BuildFontServer		build font server
 	BuildFonts		build pcf fonts
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
@@ -325,14 +324,6 @@ X11.tmpl provides defaults for the following variables:
 	XdmDir			directory in which to install xdm files
 	XdmServersType		type of xdm Xservers file to install
 	XinitDir		directory in which to install xinit files
-	XPrintDir		parent of X Print server config directory
-	XprtServer		build the X Print server
-	XpRasterDDX		include the raster print ddx driver
-	XpColorPclDDX		include the color PCL print ddx driver
-	XpMonoPclDDX		include the monochrome PCL print ddx driver
-	XpPostScriptDDX		include the PostScript print ddx driver
-	XpPdfDDX		include the PDF print ddx driver
-	XpSvgDDX		include the SVG print ddx driver
 	XmanLocalSearchPath	non-standard path for man pages
 	XtErrorPrefix		leading text in XtError() msg; eg. 'X Toolkit '
 	XtWarningPrefix		leading text in XtWarning()msg, same as above
@@ -461,13 +452,10 @@ The following variables are used by some part of the tree:
 	SvgaConfig		default SVGA configuration
 	HasGetReturnAddress	util/memleak
 	HasShadowPasswd		system has getspnam() function
-	XnestServer		build X server with Xlib-based ddx
-	XVirtualFramebufferServer	build X server with virtual memory framebuffer
 	WebServer		host:port of your Web server (see programs/xrx)
 	HtmlDir			path used by Web server for HTML and RX docs
 	CgiBinDir		path used by Web server for CGI programs
 	ProxyManager		ICE network ID to contact a running proxymngr
-	XdmxServer		build Distributed Multihead X server


 Make Variables

--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -138,25 +138,12 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildDocs
 #define BuildDocs		!BuildServersOnly
 #endif
-#ifndef BuildDmx
-#define BuildDmx		NO
-#endif
-#ifndef XdmxServer
-#define XdmxServer		BuildDmx
-#endif
-#ifndef BuildLibrariesForDmx
-#define BuildLibrariesForDmx	XdmxServer
-#endif
 #ifndef BuildLibraries
-#define BuildLibraries		(!BuildServersOnly || BuildClients || \
-				 BuildLibrariesForDmx)
+#define BuildLibraries		(!BuildServersOnly || BuildClients)
 #endif
 #ifndef BuildLibrariesForXServers
 #define BuildLibrariesForXServers	BuildServer
 #endif
-#ifndef BuildFontServer
-#define BuildFontServer		YES
-#endif
 #ifndef XserverStaticFontLib
 #define XserverStaticFontLib	YES
 #endif
@@ -176,7 +163,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildBuiltinFonts	NO
 #endif
 #ifndef BuildFonts
-#define BuildFonts		(BuildServer | BuildFontServer)
+#define BuildFonts		BuildServer
 #endif
 #ifndef Build75DpiFonts
 #define Build75DpiFonts		YES
@@ -362,8 +349,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildXInputExt		NO
 #endif
 #ifndef BuildXInputLib
-#define BuildXInputLib		(BuildXInputExt && \
-				 (!BuildServersOnly || BuildLibrariesForDmx))
+#define BuildXInputLib		(BuildXInputExt && !BuildServersOnly)
 #endif
 #ifndef BuildEVI
 #define BuildEVI		YES
@@ -384,10 +370,7 @@ XORGRELSTRING = XorgManVersionString
 #if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer)
 #define BuildFontLib		(BuildLibraries || BuildServer)
 #else
-#define BuildFontLib		(BuildLibraries || \
-				 (BuildServer && !DoLoadableServer) || \
-				 XnestServer || XVirtualFramebufferServer || \
-				 XprtServer || XdmxServer)
+#define BuildFontLib		(BuildLibraries || (BuildServer && !DoLoadableServer))
 #endif
 #endif
 #ifndef BuildFontCache
@@ -420,7 +403,6 @@ XORGRELSTRING = XorgManVersionString
 #endif
 #ifndef BuildXKBlib
 #define BuildXKBlib		(BuildXKB && (!BuildServersOnly || \
-					      XnestServer || XdmxServer || \
 					      BuildXkbcomp ))
 #endif
 #ifndef BuildXKBuilib
@@ -460,13 +442,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildXineramaLibrary
 #define BuildXineramaLibrary	(BuildXinerama)
 #endif
-#ifndef BuildDmxDevelTools
-#define BuildDmxDevelTools	NO
-#endif
-#ifndef BuildDmxLibrary
-#define BuildDmxLibrary		(BuildDmx && \
-				 (!BuildServersOnly || BuildDmxDevelTools))
-#endif
 #ifndef BuildXCSecurity
 #define BuildXCSecurity		YES
 #endif
@@ -507,19 +482,6 @@ XORGRELSTRING = XorgManVersionString
 #define XpSvgDDX                YES
 #endif

-#ifndef BuildXprint
-#define BuildXprint		YES
-#endif
-#ifndef XprtServer
-#define XprtServer		(BuildServer && BuildXprint)
-#endif
-#ifndef BuildXprintLib
-#define BuildXprintLib		(!BuildServersOnly && BuildXprint)
-#endif
-#ifndef BuildXprintClients
-#define BuildXprintClients	BuildXprintLib
-#endif
-
 #ifndef BuildScreenSaverExt
 #define BuildScreenSaverExt	NO
 #endif
@@ -551,8 +513,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildXResExt            NO
 #endif
 #ifndef BuildXResLibrary
-#define BuildXResLibrary        (BuildXResExt && \
-				 (!BuildServersOnly || BuildDmxDevelTools))
+#define BuildXResLibrary        (BuildXResExt && !BuildServersOnly)
 #endif
 #ifndef BuildXvExt
 #define BuildXvExt		NO
@@ -617,7 +578,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildRender		YES
 #endif
 #ifndef BuildRenderLibrary
-#define BuildRenderLibrary	(XdmxServer || !BuildServersOnly)
+#define BuildRenderLibrary	!BuildServersOnly
 #endif
 #ifndef BuildXftLibrary
 #define BuildXftLibrary		BuildRenderLibrary
@@ -1000,17 +961,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef PrintOnlyServer
 #define PrintOnlyServer YES
 #endif
-#ifndef XprintDefines
-#if BuildXprint
-#if PrintOnlyServer
-#define XprintDefines -DXPRINT -DPIXPRIV
-#else
-#define XprintDefines -DXPRINT -DLOADABLEPRINTDDX -DPIXPRIV
-#endif
-#else
-#define XprintDefines /**/
-#endif
-#endif
 #ifndef XkbDefines
 #if BuildXKB
 #define XkbDefines -DXKB
@@ -1243,7 +1193,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 	ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \
 	XCSecurityDefines CupDefines PervasiveDBEDefines \
 	XF86BigfontExtensionDefines DPMSDefines \
-	XprintDefines XineramaDefines \
+	XineramaDefines \
 	SitePervasiveExtensionDefines RenderDefines RandRDefines \
 	XfixesDefines XDamageDefines CompositeDefines XevieDefines \
 	RootlessDefines
@@ -1544,9 +1494,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef ServerConfigDir
 #define ServerConfigDir $(LIBDIR)/xserver
 #endif
-#ifndef XPrintDir
-#define XPrintDir ServerConfigDir
-#endif
 #ifndef EtcX11Directory
 #define EtcX11Directory /etc/X11
 #endif
@@ -1679,7 +1626,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
       XLOCALEDIR = XLocaleDir		/* locale files */
      LBXPROXYDIR = LbxproxyDir		/* lbxproxy files */
  PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
-        XPRINTDIR = XPrintDir		/* print config file root */
      XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
       FONTCFLAGS = FontCompilerFlags

@@ -1739,7 +1685,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
           RGBSRC = $(XTOP)/programs/rgb
      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-    FONTSERVERSRC = $(PROGRAMSRC)/xfs
       FONTINCSRC = $(XTOP)/include/fonts
        EXTINCSRC = $(XTOP)/include/extensions
      FTSOURCEDIR = FreeTypeSrcDir
@@ -2517,30 +2462,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
 ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
 #endif

-#if BuildDmxLibrary
-#ifndef SharedLibDmx
-#define SharedLibDmx		NO
-#endif
-#ifndef NormalLibDmx
-#define NormalLibDmx		YES
-#endif
-#ifndef DebugLibDmx
-#define DebugLibDmx		NO
-#endif
-#ifndef ProfileLibDmx
-#define ProfileLibDmx		NO
-#endif
-#else /* BuildDmxLibrary */
-#undef SharedLibDmx
-#define SharedLibDmx		NO
-#undef NormalLibDmx
-#define NormalLibDmx		NO
-#undef DebugLibDmx
-#define DebugLibDmx		NO
-#undef ProfileLibDmx
-#define ProfileLibDmx		NO
-#endif /* BuildDmxLibrary */
-
    XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
 #if SharedLibXxf86rush
 #ifndef SharedXxf86rushRev
@@ -2593,16 +2514,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
 ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
 #endif

-    DMXLIBSRC = $(LIBSRC)/dmx
-#if SharedLibDmx
-#ifndef SharedDmxRev
-#define SharedDmxRev 1.0
-#endif
-SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
-#else
-ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
-#endif
-
    DPSLIBSRC = $(LIBSRC)/dps
 #if SharedLibDps
 #ifndef SharedDpsRev
@@ -2964,7 +2875,7 @@ UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
 #endif

 #ifndef BuildXaw
-#define BuildXaw (BuildXprintLib && !BuildServersOnly)
+#define BuildXaw !BuildServersOnly
 #endif

       /* AWIDGETSRC is needed by libXaw6 and libXaw7 */

--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -46,8 +46,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 /*                                                                        */
 /**************************************************************************/

-#if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture)
-
 #if defined(SunArchitecture)
 #define ProjectRoot /usr/openwin
 #endif
@@ -76,42 +74,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define XorgServer		NO

 /*
- * To disable building the Xnest server, uncomment this.
- *
-#define XnestServer		NO
- */
-#define XnestServer		NO
-
-/*
- * To disable building Xvfb, uncomment this.
- *
-#define XVirtualFramebufferServer	NO
- */
-#define XVirtualFramebufferServer	NO
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-#define XdmxServer NO
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-#define XprtServer NO
-
-/*
- * Xprint is needed by Xprt. You can disable it if
- * you are not going to build Xprt.
- *
-#define BuildXprint		NO
- */
-#define BuildXprint		NO
-
-/*
 * Building libraries with NX enhancements is disabled
 * by default. You should enable this in your host.def.
 *
@@ -149,7 +111,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */
 #if defined(cygwinArchitecture)
 #define NXWinServer             NO
-#define XWinServer              NO
 #endif

 /*
@@ -168,7 +129,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 *
 #define BuildLibrariesForXServers	YES
 */
-#if XnestServer || NXAgentServer
+#if NXAgentServer
 #define BuildLibraries			YES
 #endif

@@ -287,13 +248,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-#define BuildFontServer		NO
-
-/*
 * Speedo fonts have been disabled by default in this release.
 * To re-enable support for Speedo fonts, uncomment this.
 *
@@ -964,63 +918,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $

 #define BuildXaw7              NO

-#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
-
-#if defined(DarwinArchitecture) && !defined(NXZaurusXServer) && !defined(NXiPAQXServer)
-#define NXDarwinServer              NO
-#define BuildServersOnly            YES
-#define DefaultFontPath             /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/
-#define DefaultRGBDatabase          /usr/NX/share/rgb
-#define XprtServer                  NO
-#define BuildXprint                 NO
-#define XnestServer                 NO
-#define XVirtualFramebufferServer   NO
-#define BuildFontServer             NO
-#define BuildFreeType               NO
-#define BuildXTrueType              NO
-#define FontLibSharedFreeType       YES
-#endif
-
-#if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
-#define KDriveXServer               YES
-#define XiPAQH3500Server            YES
-#define BuildServersOnly            YES
-#define NXEmbeddedXServer           YES
-#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
-#define TinyXServer                 YES
-#define CrossCompiling              YES
-#define TouchScreen                 YES
-#define ItsyCompilerBug             YES
-#undef  BuildRandR
-#define BuildRandR                  YES
-#define BuildXInputLib              YES
-#define BuildXTrueType              YES
-#define ServerXdmcpDefines
-#define XipaqServer                 YES
-#endif
-
-#if !defined(NXiPAQXServer) && defined(NXZaurusXServer)
-#define KDriveXServer               YES
-#define XiPAQH3500Server            YES
-#define BuildServersOnly            YES
-#define ZaurusXServer               YES
-#define NXEmbeddedXServer           YES
-#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
-#define TinyXServer                 YES
-#define CrossCompiling              YES
-#define TouchScreen                 YES
-#define ItsyCompilerBug             YES
-#undef  BuildRandR
-#define BuildRandR                  YES
-#define BuildXInputLib              YES
-#define BuildXTrueType              YES
-#define ServerXdmcpDefines
-#define XipaqServer                 YES
-#define XfbdevServer                YES
-#endif
-
-#endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
-
 #define BuildRman NO
 #define BuildFontEncLib NO
 #define BuildXcursorLibrary NO

--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -45,30 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * To disable building the Xnest server, uncomment this.
- *
-#define XnestServer		NO
- */
-
-/*
- * To disable building Xvfb, uncomment this.
- *
-#define XVirtualFramebufferServer	NO
- */
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer		YES
- */
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
 * Set the default server (ie the one that gets the sym-link to "X")
 *
 #define ServerToInstall		XFree86
@@ -163,12 +139,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
 * To disable support for Speedo fonts, uncomment this.
 *
 #define BuildSpeedo		NO

--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1684,13 +1684,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif

 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
 * Include fonts support
 */
 #ifndef BuildSpeedo
@@ -1876,16 +1869,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define UseServerLock	YES
 #endif

-#ifndef XnestServer
-# define XnestServer		YES
-#endif
-#ifndef XVirtualFramebufferServer
-# define XVirtualFramebufferServer	YES
-#endif
-#ifndef XprtServer
-# define XprtServer			YES
-#endif
-
 #ifndef ServerExtraDefines
 # define ServerExtraDefines	XFree86ServerDefines
 #endif

--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1248,13 +1248,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif

 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
 * Include fonts support
 */
 #ifndef BuildSpeedo
@@ -1441,13 +1434,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define UseServerLock	YES
 #endif

-#ifndef XnestServer
-# define XnestServer		YES
-#endif
-#ifndef XVirtualFramebufferServer
-# define XVirtualFramebufferServer	YES
-#endif
-
 #ifndef ServerExtraDefines
 # define ServerExtraDefines	XFree86ServerDefines
 #endif

--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -45,30 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * To disable building the Xnest server, uncomment this.
- *
-#define XnestServer		NO
- */
-
-/*
- * To disable building Xvfb, uncomment this.
- *
-#define XVirtualFramebufferServer	NO
- */
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
 * Set the default server (ie the one that gets the sym-link to "X")
 *
 #define ServerToInstall		Xorg
@@ -177,12 +153,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
 * Speedo fonts have been disabled by default in this release.
 * To re-enable support for Speedo fonts, uncomment this.
 *

--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -64,9 +64,6 @@ XRESHEADERS = XRes.h XResproto.h
 #if BuildXevie || BuildXevieLibrary
 XEVIEHEADERS = Xevie.h Xeviestr.h
 #endif
-#if BuildDmx || BuildDmxLibrary
-XDMXHEADERS = dmxext.h dmxproto.h
-#endif

 EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
 	       $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
@@ -74,7 +71,7 @@ EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
 	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
 	       $(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \
 	       $(XEVIEHEADERS) \
-	       $(XTRAPHEADERS) $(XRESHEADERS) $(XDMXHEADERS)
+	       $(XTRAPHEADERS) $(XRESHEADERS)



@@ -95,7 +92,6 @@ HEADERS = Xext.h \
 	security.h securstr.h \
 	shape.h shapestr.h \
 	sync.h syncstr.h \
-	Print.h Printstr.h \
 	Xcup.h Xcupstr.h \
 	dpms.h dpmsstr.h \
 	XEVI.h XEVIstr.h

--- a/nx-X11/include/extensions/Print.h
+++ b/nx-X11/include/extensions/Print.h
--- a/nx-X11/include/extensions/Printstr.h
+++ b/nx-X11/include/extensions/Printstr.h
--- a/nx-X11/include/extensions/dmxext.h
+++ b/nx-X11/include/extensions/dmxext.h
-/* $XFree86$ */
-/*
- * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * Authors:
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * This file describes the interface to the client-side libdmx.a
- * library.  All DMX-aware client-side applications should include this
- * file. */
-
-#ifndef _DMXEXT_H_
-#define _DMXEXT_H_
-
-/* These values must be larger than LastExtensionError.
-   The values in dmxext.h and dmxproto.h *MUST* match. */
-#define DmxBadXinerama         1001
-#define DmxBadValue            1002
-#define DmxBadReply            1003
-
-#define DMXScreenWindowWidth   (1L<<0)
-#define DMXScreenWindowHeight  (1L<<1)
-#define DMXScreenWindowXoffset (1L<<2)
-#define DMXScreenWindowYoffset (1L<<3)
-#define DMXRootWindowWidth     (1L<<4)
-#define DMXRootWindowHeight    (1L<<5)
-#define DMXRootWindowXoffset   (1L<<6)
-#define DMXRootWindowYoffset   (1L<<7)
-#define DMXRootWindowXorigin   (1L<<8)
-#define DMXRootWindowYorigin   (1L<<9)
-
-#define DMXDesktopWidth        (1L<<0)
-#define DMXDesktopHeight       (1L<<1)
-#define DMXDesktopShiftX       (1L<<2)
-#define DMXDesktopShiftY       (1L<<3)
-
-#define DMXInputType           (1L<<0)
-#define DMXInputPhysicalScreen (1L<<1)
-#define DMXInputSendsCore      (1L<<2)
-
-#ifndef _DMX_SERVER_
-
-/** Client-library screen information structure, returned by
- * #DMXGetScreenAttributes.  */
-typedef struct {
-    char         *displayName;
-    int          logicalScreen;
-
-    unsigned int screenWindowWidth;    /* displayName's coordinate system */
-    unsigned int screenWindowHeight;   /* displayName's coordinate system */
-    int          screenWindowXoffset;  /* displayName's coordinate system */
-    int          screenWindowYoffset;  /* displayName's coordinate system */
-
-    unsigned int rootWindowWidth;      /* screenWindow's coordinate system */
-    unsigned int rootWindowHeight;     /* screenWindow's coordinate system */
-    int          rootWindowXoffset;    /* screenWindow's coordinate system */
-    int          rootWindowYoffset;    /* screenWindow's coordinate system */
-
-    int          rootWindowXorigin;    /* global coordinate system */
-    int          rootWindowYorigin;    /* global coordinate system */
-} DMXScreenAttributes;
-
-/** Client-library window information structure, returned by
- * #DMXGetWindowAttributes. */
-typedef struct {
-    int          screen;
-    Window       window;
-    XRectangle   pos, vis;
-} DMXWindowAttributes;
-
-/** Client-library desktop information structure, returned by
- * #DMXGetDesktopAttributes. */
-typedef struct {
-    unsigned int width;         /* global coordinate system */
-    unsigned int height;        /* global coordinate system */
-    int          shiftX;        /* global coordinate system */
-    int          shiftY;        /* global coordinate system */
-} DMXDesktopAttributes;
-
-/** Enumeration for the #inputType field in the #DMXInputAttributes
- * structure. */
-typedef enum {
-    DMXLocalInputType,
-    DMXConsoleInputType,
-    DMXBackendInputType
-} DMXInputEnum;
-
-/** Client-library input information structure, returned by
- * #DMXGetInputAttributes. */ 
-typedef struct {
-    DMXInputEnum inputType;
-    int          physicalScreen;
-    int          physicalId;
-    Bool         isCore;
-    Bool         sendsCore;
-    const char   *name;
-    Bool         detached;
-} DMXInputAttributes;
-
-_XFUNCPROTOBEGIN
-
-extern Bool DMXQueryExtension(Display *dpy,
-                              int *event_basep, int *error_basep);
-extern Bool DMXQueryVersion(Display *dpy, int *major_version,
-                            int *minor_version, int *patch_version);
-extern Bool DMXSync(Display *dpy);
-extern Bool DMXForceWindowCreation(Display *dpy, Window window);
-
-
-extern Bool DMXGetScreenCount(Display *dpy, int *screen_count);
-extern Bool DMXGetScreenAttributes(Display *dpy,
-                                   int screen,
-                                   DMXScreenAttributes *attr);
-extern int  DMXChangeScreensAttributes(Display *dpy,
-                                       int screen_count,
-                                       int *screens,
-                                       int mask_count,
-                                       unsigned int *masks,
-                                       DMXScreenAttributes *attr, /* vector */
-                                       int *error_screen);
-
-extern Bool DMXAddScreen(Display *dpy,
-                         const char *displayName,
-                         unsigned int mask,
-                         DMXScreenAttributes *attr,
-                         int *screen);
-extern Bool DMXRemoveScreen(Display *dpy, int screen);
-
-/* Call DMXGetScreenWindowCount and allocate info to that size.  Pass
- * the size in available_count.  This call can generate a large amount
- * of wire traffic and should not be used called with available_count=0
- * just to determine the screen_count value -- use DMXGetScreenCount
- * instead.  NOTE: Also see DMX protocol specification (DMXSpec.txt) for
- * usage of DMXSync to flush pending commands. */
-extern Bool DMXGetWindowAttributes(Display *dpy, Window window,
-                                   int *screen_count, int available_count,
-                                   DMXWindowAttributes *attr);
-
-extern Bool DMXGetDesktopAttributes(Display *dpy, DMXDesktopAttributes *attr);
-extern int  DMXChangeDesktopAttributes(Display *dpy,
-                                       unsigned int mask,
-                                       DMXDesktopAttributes *attr);
-
-extern Bool DMXGetInputCount(Display *dpy, int *input_count);
-extern Bool DMXGetInputAttributes(Display *dpy, int id,
-                                  DMXInputAttributes *attr);
-
-extern Bool DMXAddInput(Display *dpy,
-                        unsigned int mask,
-                        DMXInputAttributes *attr,
-                        int *id);
-extern Bool DMXRemoveInput(Display *dpy, int id);
-
-/* These are helper functions that call DMXAddInput. */
-extern Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore,
-                               int *newId);
-extern Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
-                               int *newId);
-
-_XFUNCPROTOEND
-#endif
-#endif
--- a/nx-X11/include/extensions/dmxproto.h
+++ b/nx-X11/include/extensions/dmxproto.h
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -181,10 +181,6 @@ REGEXDIR = regex
 XALIBDIR = Xa
 #endif

-#if BuildXprintLib
-XPRINTLIBDIRS = Xp XprintUtil XprintAppUtil
-#endif
-
 #if BuildFontCacheLib
 FONTCACHELIBDIR = Xfontcache
 #endif
@@ -221,7 +217,7 @@ LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
             $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
             $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
             $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
-             $(XPRINTLIBDIRS) $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
+             $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
             $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
             $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
             $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \

--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
        HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
 		Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h

-#if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !NXAgentServer
+#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !NXAgentServer
 all::

 BuildIncludes($(HEADERS),IncSubdir,..)

--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
-XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
 /**************************************************************************/
 /*                                                                        */
 /* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
@@ -23,156 +18,15 @@ XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"

-#if BuildServer || UseRgbTxt
-       RGBSRCDIR = rgb
-#endif
 #if BuildServer
        XSSRCDIR = Xserver
 #endif
-#if BuildXkbcomp
-      XKBCOMPDIR = xkbcomp
-#endif
-#ifndef Win32Architecture
-#if HasXServer
-     XINITSRCDIR = xinit
-#endif
-#if BuildFontServer
-       XFSSRCDIR = xfs
-#endif
-#if BuildXKBlib
-      XKBSRCDIRS = setxkbmap $(XKBCOMPDIR) xkbevd xkbprint xkbutils
-#endif
-#if BuildScreenSaverLibrary
-SCREENSAVESRCDIR = beforelight
-#endif
-#if BuildXF86VidModeLibrary
-  XVIDTUNESRCDIR = xvidtune
-#endif
-#if BuildXF86DGALibrary
-   XF86DGASRCDIR = xf86dga
-#endif
-#if BuildXAServer
-       XASSRCDIR = Xaserver
-#endif
-#if BuildLBX
-  LBXPROXYSRCDIR = lbxproxy
-#endif
-#if BuildXprintClients
-  XPSRCDIRS = xplsprinters xprehashprinterlist xphelloworld xpr
-#endif
-  PROXYMGRSRCDIR = proxymngr
-    RSTARTSRCDIR = rstart
-   SMPROXYSRCDIR = smproxy
-       TWMSRCDIR = twm
-  XCONSOLESRCDIR = xconsole
-       XDMSRCDIR = xdm
-XFINDPROXYSRCDIR = xfindproxy
-      XFWPSRCDIR = xfwp
-#if BuildXF86VidModeLibrary
-    XGAMMASRCDIR = xgamma
-#endif
-#if BuildXvLibrary
-    XVINFOSRCDIR = xvinfo
-#endif
-     XHOSTSRCDIR = xhost
-#if BuildPlugin && BuildXaw
-       XRXSRCDIR = xrx
-#endif
-       XSMSRCDIR = xsm
-#if BuildXterm
-     XTERMSRCDIR = xterm
-#endif
-      SCRIPTSDIR = scripts
-#endif /* Win32Architecture */
-#if BuildCID
-     MKCFMSRCDIR = mkcfm
-#endif
-
-#if (HasFreetype2 || BuildFreetype2Library) && BuildFontEncLib
-  MKFONTSCALEDIR = mkfontscale
-#endif

-#if BuildXInputLib
-XINPUTCLIENTDIRS = xsetmode xsetpointer
-#endif
-
-#if BuildXTrapLibrary
-XTRAPCLIENTDIRS = xtrap
-#endif
-
-/* makepsres should be considered as part of the DPS libraries */
-#if BuildDPSLibraries
-    MAKEPSRESDIR = makepsres
-#endif
-
-/* on the other hand, the following are independent clients */
-#if BuildDPSClients
-     DPSCLIENTDIRS = dpsinfo dpsexec texteroids
-#endif
-#if BuildDBElib && BuildXprintClients
-     DBECLIENTDIRS = xdbedizzy
-#endif
-
-   XPMCLIENTDIRS = cxpm sxpm
-
-#if BuildGLXLibrary
-      GLXCLIENTDIRS = glxinfo glxgears
-#endif
-
-        XLOADDIR = xload
-
-#if BuildRandRLibrary
-       XRANDRDIR = xrandr
-#endif
-
-#if BuildXcursorgen
-   XCURSORGENDIR = xcursorgen
-#endif
-
-#if BuildFontconfigLibrary
-          FCDIRS = fc-cache fc-list
-#endif
-#if 0
-       FCLANGDIR = fc-lang
-#endif
-
-#if BuildXDriInfo
-        XDRIINFO = xdriinfo
-#endif
-
-#if BuildXaw
-        XMORE = xmore
-#endif
-
-#if BuildServersOnly || !BuildClients
 #if defined(NXEmbeddedXServer)
 SUBDIRS = $(XSSRCDIR) 
 #else
 SUBDIRS = $(XSSRCDIR) nxauth
 #endif
-#else
-SUBDIRS = \
-	appres bdftopcf bitmap \
-	$(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \
-	iceauth ico listres luit \
-	$(MAKEPSRESDIR) $(DPSCLIENTDIRS) $(DBECLIENTDIRS) \
-	$(MKCFMSRCDIR) \
-	mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \
-	$(RGBSRCDIR) $(RSTARTSRCDIR) showfont \
-	$(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \
-	xclipboard xclock \
-	xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \
-	$(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \
-	$(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \
-	$(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \
-	xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \
-	xrdb xrefresh $(XRXSRCDIR) xset \
-	xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
-	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
-	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(XPSRCDIRS) $(SCRIPTSDIR) \
-	$(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) $(XDRIINFO)
-#endif

 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -113,11 +113,6 @@ XF86BIGFOBJS = xf86bigfont.o
        PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
    PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
 #endif
-#if XdmxServer
-         DMXSRCS = dmx.c
-         DMXOBJS = dmx.o
-     DMXINCLUDES = -I../hw/dmx
-#endif
 #if BuildDPMS
        DPMSSRCS = dpms.c
        DPMSOBJS = dpms.o
@@ -136,16 +131,11 @@ XF86BIGFOBJS = xf86bigfont.o
       XEVIEOBJS = xevie.o
 #endif

-#if BuildXprint
-      XPRINTSRCS = xprint.c
-      XPRINTOBJS = xprint.o
-#endif
-
       SRCS = shape.c $(SHMSRCS) $(MULTIBUFSRC) \
              mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
 	      bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \
 	      $(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \
-	      $(APPGROUPSRCS) $(XPRINTSRCS) $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
+	      $(APPGROUPSRCS) $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
 	      $(XEVIESRCS) \
 	      $(EVISRCS) $(XVSRCS) $(FONTCACHESRCS) $(XRESSRCS) $(DMXSRCS)

@@ -153,11 +143,11 @@ XF86BIGFOBJS = xf86bigfont.o
              mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
              bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \
 	      $(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \
-	      $(APPGROUPOBJS) $(XPRINTOBJS) $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
+	      $(APPGROUPOBJS) $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
 	      $(XEVIEOBJS) \
 	      $(EVIOBJS) $(XVOBJS) $(FONTCACHEOBJS) $(XRESOBJS) $(DMXOBJS)

-      SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) $(XPRINTOBJS) \
+      SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) \
 	      shape.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
 	      $(XEVIEOBJS) \
 	      $(XF86BIGFOBJS)

--- a/nx-X11/programs/Xserver/Xext/dmx.c
+++ b/nx-X11/programs/Xserver/Xext/dmx.c
--- a/nx-X11/programs/Xserver/Xext/xprint.c
+++ b/nx-X11/programs/Xserver/Xext/xprint.c
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -7,10 +7,8 @@ XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.17 2003/04/15 18:30:43 ala

 #include <Server.tmpl>

-#if !BuildXprint || PrintOnlyServer
 XPSRC = xpstubs.c
 XPOBJ = xpstubs.o
-#endif

 #if !HasFfs
 FFS_SRC = ffs.c
@@ -27,7 +25,7 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
 	tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ)

    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) \
-	       -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx -I../Xprint
+	       -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx
    LINTLIBS = ../os/llib-los.ln

 /*
@@ -94,8 +92,6 @@ SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES))

-#if !BuildXprint || PrintOnlyServer
 NormalLibraryTarget(xpstubs,$(XPOBJ))
-#endif

 DependTarget()
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -104,9 +104,6 @@ Equipment Corporation.
 #include "site.h"
 #include "dixfont.h"
 #include "extnsionst.h"
-#ifdef XPRINT
-#include "DiPrint.h"
-#endif
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
 #else
@@ -255,9 +252,6 @@ main(int argc, char *argv[], char *envp[])
    display = "0";

    InitGlobals();
-#ifdef XPRINT
-    PrinterInitGlobals();
-#endif

    /* Quartz support on Mac OS X requires that the Cocoa event loop be in
     * the main thread. This allows the X server main to be called again
@@ -370,9 +364,6 @@ main(int argc, char *argv[], char *envp[])
 	InitCallbackManager();
 	InitVisualWrap();
 	InitOutput(&screenInfo, argc, argv);
-#ifdef XPRINT
-	PrinterInitOutput(&screenInfo, argc, argv);
-#endif

 	if (screenInfo.numScreens < 1)
 	    FatalError("no screens found");

--- a/nx-X11/programs/Xserver/dix/xpstubs.c
+++ b/nx-X11/programs/Xserver/dix/xpstubs.c
@@ -33,9 +33,6 @@ from The Open Group.

 #include "misc.h"
 #include <X11/fonts/font.h>
-#ifdef XPRINT
-#include "DiPrint.h"
-#endif

 Bool
 XpClientIsBitmapClient(
@@ -51,27 +48,3 @@ XpClientIsPrintClient(
 {
    return FALSE;
 }
-#ifdef XPRINT
-int
-PrinterOptions(
-    int argc,
-    char **argv,
-    int i)
-{
-    return i;
-}
-void
-PrinterInitOutput(
-     ScreenInfo *pScreenInfo,
-     int argc,
-     char **argv)
-{
-}
-void PrinterUseMsg(void)
-{
-}
-void PrinterInitGlobals(void)
-{
-}
-#endif /* XPRINT */
-
--- a/nx-X11/programs/Xserver/hw/Imakefile
+++ b/nx-X11/programs/Xserver/hw/Imakefile
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:20 cpqbld Exp $
-XCOMM This is only used on NT where we do not know how to jump over this dir
-
-#ifdef Win32Architecture
-
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-#if XnestServer
-XNESTDIR = xnest
-#endif
-
-#if XVirtualFramebufferServer
-XVFBDIR = vfb
-#endif
-
-#if XdmxServer
-XDMXDIR = dmx
-#endif
-
-SUBDIRS= $(XNESTDIR) $(XVFBDIR) $(XDMXDIR)
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-#endif
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -66,6 +66,7 @@ SRCS =  NXwindow.c \
 	Composite.c \
 	Pixels.c \
 	stubs.c \
+	xpstubs.c \
 	miinitext.c \
 	$(SRCS1)

@@ -128,6 +129,7 @@ OBJS =  NXwindow.o \
 	Composite.o \
 	Pixels.o \
 	stubs.o \
+	xpstubs.o \
 	miinitext.o \
 	$(OBJS1)

@@ -220,6 +222,7 @@ DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) $(NX_DEFINES) \
 all:: $(OBJS)

 LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
+LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix)
 SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_))
 LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
 SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_))

--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -73,34 +73,6 @@ SOFTWARE.
 #undef GLXEXT
 #endif

-/* Make sure Xprt only announces extensions it supports */
-#ifdef PRINT_ONLY_SERVER
-#undef MITSHM /* this is incompatible to the vector-based Xprint DDX */
-#undef XKB
-#undef PANORAMIX
-#undef RES
-#undef XINPUT
-#undef XV
-#undef SCREENSAVER
-#undef XIDLE
-#undef XRECORD
-#undef XF86VIDMODE
-#undef XF86MISC
-#undef XFreeXDGA
-#undef XF86DRI
-#undef DPMSExtension
-#undef DPSEXT
-#undef FONTCACHE
-#undef DAMAGE
-#undef XFIXES
-#undef XEVIE
-#else
-#ifndef LOADABLEPRINTDDX
-#undef XPRINT
-#endif /* LOADABLEPRINTDDX */
-#endif /* PRINT_ONLY_SERVER */
-
-
 extern Bool noTestExtensions;

 #ifdef BIGREQS
@@ -232,9 +204,6 @@ typedef void (*InitExtension)(INITARGS);
 #define _XLBX_SERVER_
 #include <X11/extensions/lbxstr.h>
 #endif
-#ifdef XPRINT
-#include "Print.h"
-#endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
 #include <X11/extensions/Xagstr.h>
@@ -321,9 +290,6 @@ extern void XagExtensionInit(INITARGS);
 #ifdef XCSECURITY
 extern void SecurityExtensionInit(INITARGS);
 #endif
-#ifdef XPRINT
-extern void XpExtensionInit(INITARGS);
-#endif
 #ifdef XF86BIGFONT
 extern void XFree86BigfontExtensionInit(INITARGS);
 #endif
@@ -606,9 +572,6 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
    if (!noSecurityExtension) SecurityExtensionInit();
 #endif
-#ifdef XPRINT
-    XpExtensionInit(); /* server-specific extension, cannot be disabled */
-#endif
 #ifdef TOGCUP
    if (!noXcupExtension) XcupExtensionInit();
 #endif
@@ -642,11 +605,6 @@ InitExtensions(argc, argv)
    if (!noGlxExtension) DarwinGlxExtensionInit();
 #endif
 #endif
-#ifdef DPSEXT
-#ifndef XPRINT
-    if (!noDPSExtension) DPSExtensionInit();
-#endif
-#endif
 #ifdef XFIXES
    /* must be before Render to layer DisplayCursor correctly */
    if (!noXFixesExtension) XFixesExtensionInit();
@@ -717,9 +675,6 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XCSECURITY
    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
-#ifdef XPRINT
-    { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
-#endif
 #ifdef PANORAMIX
    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
 #endif

--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -166,7 +166,7 @@ BOOTSTRAPCFLAGS =
 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES)
       INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
-		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes $(NX_INCLUDES)
+		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes $(NX_INCLUDES)
 DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
 		  DependDefines

--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -147,10 +147,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "picture.h"
 #endif

-#ifdef XPRINT
-#include "DiPrint.h"
-#endif
-
 Bool noTestExtensions;
 #ifdef BIGREQS
 Bool noBigReqExtension = FALSE;
@@ -691,9 +687,6 @@ void UseMsg(void)
 #ifdef XCSECURITY
    ErrorF("-sp file               security policy file\n");
 #endif
-#ifdef XPRINT
-    PrinterUseMsg();
-#endif
    ErrorF("-su                    disable any save under support\n");
    ErrorF("-t #                   mouse threshold (pixels)\n");
    ErrorF("-terminate             terminate at server reset\n");
@@ -1102,12 +1095,6 @@ ProcessCommandLine(int argc, char *argv[])
 	    i = skip - 1;
 	}
 #endif
-#ifdef XPRINT
-	else if ((skip = PrinterOptions(argc, argv, i)) != i)
-	{
-	    i = skip - 1;
-	}
-#endif
 #ifdef XCSECURITY
 	else if ((skip = XSecurityOptions(argc, argv, i)) != i)
 	{

--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -952,7 +952,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %{_includedir}/nx/X11/extensions/Xevie.h
 %{_includedir}/nx/X11/extensions/Xinerama.h
 %{_includedir}/nx/X11/extensions/Xrandr.h
-%{_includedir}/nx/X11/extensions/dmxext.h
 %{_includedir}/nx/X11/extensions/lbxbuf.h
 %{_includedir}/nx/X11/extensions/lbxbufstr.h
 %{_includedir}/nx/X11/extensions/lbxdeltastr.h
@@ -1006,8 +1005,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %{_includedir}/nx/X11/ap_keysym.h
 %{_includedir}/nx/X11/keysym.h
 %{_includedir}/nx/X11/keysymdef.h
-%{_includedir}/nx/X11/extensions/Print.h
-%{_includedir}/nx/X11/extensions/Printstr.h
 %{_includedir}/nx/X11/extensions/XI.h
 %{_includedir}/nx/X11/extensions/XIproto.h
 %{_includedir}/nx/X11/extensions/XResproto.h
@@ -1017,7 +1014,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %{_includedir}/nx/X11/extensions/compositeproto.h
 %{_includedir}/nx/X11/extensions/damageproto.h
 %{_includedir}/nx/X11/extensions/damagewire.h
-%{_includedir}/nx/X11/extensions/dmxproto.h
 %{_includedir}/nx/X11/extensions/panoramiXproto.h
 %{_includedir}/nx/X11/extensions/randr.h
 %{_includedir}/nx/X11/extensions/randrproto.h