aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/Amoeba.cf428
-rw-r--r--nx-X11/config/cf/DGUX.cf190
-rw-r--r--nx-X11/config/cf/DragonFly.cf354
-rw-r--r--nx-X11/config/cf/FreeBSD.cf582
-rw-r--r--nx-X11/config/cf/Mips.cf72
-rw-r--r--nx-X11/config/cf/Motif.rules709
-rw-r--r--nx-X11/config/cf/Motif.tmpl573
-rw-r--r--nx-X11/config/cf/NetBSD.cf692
-rw-r--r--nx-X11/config/cf/Oki.cf30
-rw-r--r--nx-X11/config/cf/OpenBSD.cf1017
-rw-r--r--nx-X11/config/cf/OpenBSDLib.rules191
-rw-r--r--nx-X11/config/cf/OpenBSDLib.tmpl531
-rw-r--r--nx-X11/config/cf/QNX4.cf98
-rw-r--r--nx-X11/config/cf/QNX4.rules65
-rw-r--r--nx-X11/config/cf/Win32.cf133
-rw-r--r--nx-X11/config/cf/Win32.rules531
-rw-r--r--nx-X11/config/cf/WinLib.tmpl16
-rw-r--r--nx-X11/config/cf/apollo.cf38
-rw-r--r--nx-X11/config/cf/bsd.cf37
-rw-r--r--nx-X11/config/cf/bsdLib.rules540
-rw-r--r--nx-X11/config/cf/bsdLib.tmpl100
-rw-r--r--nx-X11/config/cf/bsdi.cf364
-rw-r--r--nx-X11/config/cf/bsdiLib.rules239
-rw-r--r--nx-X11/config/cf/bsdiLib.tmpl43
-rw-r--r--nx-X11/config/cf/cde.rules226
-rw-r--r--nx-X11/config/cf/cde.tmpl439
-rw-r--r--nx-X11/config/cf/convex.cf102
-rw-r--r--nx-X11/config/cf/cray.cf49
-rw-r--r--nx-X11/config/cf/cross.def.NX.original45
-rw-r--r--nx-X11/config/cf/cross.def.X.original45
-rw-r--r--nx-X11/config/cf/cygwin.cf469
-rw-r--r--nx-X11/config/cf/cygwin.rules454
-rw-r--r--nx-X11/config/cf/cygwin.tmpl77
-rw-r--r--nx-X11/config/cf/darwin.cf330
-rw-r--r--nx-X11/config/cf/darwinLib.rules167
-rw-r--r--nx-X11/config/cf/darwinLib.tmpl61
-rw-r--r--nx-X11/config/cf/dmx.cf65
-rw-r--r--nx-X11/config/cf/fujitsu.cf95
-rw-r--r--nx-X11/config/cf/generic.cf21
-rw-r--r--nx-X11/config/cf/gnu.cf187
-rw-r--r--nx-X11/config/cf/gnuLib.rules176
-rw-r--r--nx-X11/config/cf/gnuLib.tmpl28
-rw-r--r--nx-X11/config/cf/host.def.NX.original1020
-rw-r--r--nx-X11/config/cf/host.def.X.original0
-rw-r--r--nx-X11/config/cf/hp.cf210
-rw-r--r--nx-X11/config/cf/hpLib.rules144
-rw-r--r--nx-X11/config/cf/hpLib.tmpl39
-rw-r--r--nx-X11/config/cf/iPAQH3600.cf109
-rw-r--r--nx-X11/config/cf/iPAQH3600.cf.NX.original109
-rw-r--r--nx-X11/config/cf/iPAQH3600.cf.X.original0
-rw-r--r--nx-X11/config/cf/ibm.cf198
-rw-r--r--nx-X11/config/cf/ibmLib.rules349
-rw-r--r--nx-X11/config/cf/ibmLib.tmpl96
-rw-r--r--nx-X11/config/cf/isc.cf284
-rw-r--r--nx-X11/config/cf/lnxdoc.rules145
-rw-r--r--nx-X11/config/cf/lnxdoc.tmpl85
-rw-r--r--nx-X11/config/cf/luna.cf115
-rw-r--r--nx-X11/config/cf/lynx.cf421
-rw-r--r--nx-X11/config/cf/macII.cf51
-rw-r--r--nx-X11/config/cf/mach.cf76
-rw-r--r--nx-X11/config/cf/mingw.cf551
-rw-r--r--nx-X11/config/cf/mingw.rules445
-rw-r--r--nx-X11/config/cf/mingw.tmpl77
-rw-r--r--nx-X11/config/cf/minix.cf64
-rw-r--r--nx-X11/config/cf/moto.cf58
-rw-r--r--nx-X11/config/cf/ncr.cf131
-rw-r--r--nx-X11/config/cf/nec.cf131
-rw-r--r--nx-X11/config/cf/necLib.rules131
-rw-r--r--nx-X11/config/cf/necLib.tmpl29
-rw-r--r--nx-X11/config/cf/nto.cf152
-rw-r--r--nx-X11/config/cf/nto.rules240
-rw-r--r--nx-X11/config/cf/oldlib.rules109
-rw-r--r--nx-X11/config/cf/os2.cf212
-rw-r--r--nx-X11/config/cf/os2.rules112
-rw-r--r--nx-X11/config/cf/os2Lib.rules210
-rw-r--r--nx-X11/config/cf/os2Lib.tmpl208
-rw-r--r--nx-X11/config/cf/os2def.db5095
-rw-r--r--nx-X11/config/cf/osf1.cf211
-rw-r--r--nx-X11/config/cf/osfLib.rules163
-rw-r--r--nx-X11/config/cf/osfLib.tmpl53
-rw-r--r--nx-X11/config/cf/pegasus.cf34
-rw-r--r--nx-X11/config/cf/sco.cf206
-rw-r--r--nx-X11/config/cf/sco5.cf380
-rw-r--r--nx-X11/config/cf/scoLib.rules68
-rw-r--r--nx-X11/config/cf/sequent.cf444
-rw-r--r--nx-X11/config/cf/sequentLib.rules323
-rw-r--r--nx-X11/config/cf/sgi.cf318
-rw-r--r--nx-X11/config/cf/sgiLib.rules204
-rw-r--r--nx-X11/config/cf/sgiLib.tmpl18
-rw-r--r--nx-X11/config/cf/site.sample125
-rw-r--r--nx-X11/config/cf/sony.cf100
-rw-r--r--nx-X11/config/cf/sun.cf966
-rw-r--r--nx-X11/config/cf/sun.cf.NX.original966
-rw-r--r--nx-X11/config/cf/sun.cf.X.original957
-rw-r--r--nx-X11/config/cf/sunLib.rules133
-rw-r--r--nx-X11/config/cf/sunLib.tmpl145
-rw-r--r--nx-X11/config/cf/sunLib.tmpl.NX.original145
-rw-r--r--nx-X11/config/cf/sunLib.tmpl.X.original258
-rw-r--r--nx-X11/config/cf/sv3Lib.rules252
-rw-r--r--nx-X11/config/cf/sv3Lib.tmpl70
-rw-r--r--nx-X11/config/cf/sv4Lib.rules206
-rw-r--r--nx-X11/config/cf/sv4Lib.tmpl89
-rw-r--r--nx-X11/config/cf/svr3.cf348
-rw-r--r--nx-X11/config/cf/svr4.cf295
-rw-r--r--nx-X11/config/cf/svr4.cf.NX.original295
-rw-r--r--nx-X11/config/cf/svr4.cf.X.original290
-rw-r--r--nx-X11/config/cf/ultrix.cf82
-rw-r--r--nx-X11/config/cf/usl.cf318
-rw-r--r--nx-X11/config/cf/x386.cf153
-rw-r--r--nx-X11/config/cf/xprint_host.def305
-rwxr-xr-xnx-X11/config/docbook/docbookconv.sh124
-rw-r--r--nx-X11/config/pswrap/Imakefile27
-rw-r--r--nx-X11/config/pswrap/lexer.l814
-rw-r--r--nx-X11/config/pswrap/main.c225
-rw-r--r--nx-X11/config/pswrap/psw.c1961
-rw-r--r--nx-X11/config/pswrap/psw.h92
-rw-r--r--nx-X11/config/pswrap/pswdict.c180
-rw-r--r--nx-X11/config/pswrap/pswdict.h76
-rw-r--r--nx-X11/config/pswrap/pswfile.c87
-rw-r--r--nx-X11/config/pswrap/pswparser.y278
-rw-r--r--nx-X11/config/pswrap/pswpriv.h177
-rw-r--r--nx-X11/config/pswrap/pswrap.man141
-rw-r--r--nx-X11/config/pswrap/pswsemantics.c551
-rw-r--r--nx-X11/config/pswrap/pswsemantics.h63
-rw-r--r--nx-X11/config/pswrap/pswstring.c140
-rw-r--r--nx-X11/config/pswrap/pswtypes.h49
-rw-r--r--nx-X11/config/pswrap/pswversion.h42
-rw-r--r--nx-X11/config/pswrap/sysname_gen.c429
-rw-r--r--nx-X11/config/pswrap/systemnames.c47
-rw-r--r--nx-X11/config/pswrap/yyerror.c77
130 files changed, 0 insertions, 36515 deletions
diff --git a/nx-X11/config/cf/Amoeba.cf b/nx-X11/config/cf/Amoeba.cf
deleted file mode 100644
index 858da13bd..000000000
--- a/nx-X11/config/cf/Amoeba.cf
+++ /dev/null
@@ -1,428 +0,0 @@
-XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10tsi Exp $
-
-/* The presence of this configuration file in the X distribution
- * does not imply full support for the system it describes.
- * Additional patches from The XFree86 Project, Inc. will be required to
- * compile the X distribution on Amoeba. According to them, these patches
- * will also be made available at the regular Amoeba ftp site
- * ftp.am.cs.vu.nl.
- */
-
-/*
- * Configuration file for Amoeba 5.2
- */
-
-#ifndef OSName
-#define OSName Amoeba 5.2
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 2
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 0
-#endif
-#ifndef OSVendor
-#define OSVendor Vrije Universiteit
-#endif
-
-#define AmoebaArchitecture YES
-
-/* Configuration defaults */
-#ifndef AmoebaTop
-#define AmoebaTop __AM_TOP__
-#endif
-#ifndef AmoebaBin
-#define AmoebaBin $(ATOP)/bin.sun4
-#endif
-#ifndef AmoebaConf
-#define AmoebaConf __AM_CONF__
-#endif
-
-#define HasNdbm YES
-#define NeedSdbm YES
-#define HasShm NO
-#define HasSecureRPC NO
-#define SetTtyGroup NO
-#define HasPutenv YES
-#define HasSockets NO
-#define HasStreams NO
-
-#if defined(Sun3Architecture) || defined(SparcArchitecture)
-#define XsunAmoebaServer YES
-#define XsunAmoebaMonoServer YES
-#endif
-
-#define BuildFonts NO
-#define BuildFontServer NO
-#define BuildXIE NO
-
-#define YaccCmd byacc
-#define TermcapLibrary /* in libajax */
-#define LexLib /* not needed */
-
-#define ServerOSDefines XFree86ServerOSDefines
-
-#define UsrLibDir $(DESTDIR)/profile/module/x11/lib
-#define LibDir $(DESTDIR)/profile/module/x11/lib
-#define ManDirectoryRoot $(DESTDIR)/profile/module/x11/man
-#define BinDir $(DESTDIR)/profile/module/x11/bin
-#define IncRoot $(DESTDIR)/profile/module/x11/include
-#define FontDir $(DESTDIR)/profile/module/x11/fonts/$(ARCH)
-#define DefaultRGBDatabase $(DESTDIR)/profile/module/x11/lib/rgb/$(ARCH)/rgb
-
-#define ManSuffix 1
-#define ManPath ManDirectoryRoot
-#define XmanLocalSearchPath ManDirectoryRoot
-
-#define DefaultUserPath :/bin:$(BINDIR)
-#define DefaultSystemPath /bin:$(BINDIR):
-
-#define StandardIncludes -I$(ATOP)/src/h \
- -I$(ATOP)/src/h/posix \
- -I$(ATOP)/src/h/posix/machdep/$(ARCH) \
- -I$(ATOP)/src/h/machdep/arch/$(ARCH) \
- -I$(ATOP)/src/h/toolset/$(TOOLSET)
-
-#define Malloc0ReturnsNull YES
-#define ServerInstallFlags -s 32
-#define FontDefines -DFONT_SNF
-#define ConnectionFlags -DAMTCPCONN -DAMRPCCONN
-#define ServerXdmcpDefines /* no -DXDMCP */
-#define UseRgbTxt YES
-#define NdbmDefines -DSDBM -DNDBM -I$(XINCLUDESRC)
-#define DBMLibrary /* $(LIBSRC)/sdbm/libsdbm.a */
-
-#if defined(i386Architecture)
-#ifndef AckToolset
-#define AckToolset YES
-#define ExtraFPLoadFlags -fp
-#endif
-#define XF86MonoServer YES
-#endif
-
-#if defined(Sun3Architecture)
-#ifndef AckToolset
-#define AckToolset YES
-#endif
-#endif
-
-#if AckToolset
-#define CcCmd ack
-#define ServerCcCmd ack
-#define LdCmd ack
-#define AckArchOption -mam_$(ARCH)
-#define DefaultCCOptions AckArchOption
-#define LibraryCCOptions AckArchOption
-#define LdCombineFlags -Rled-r -c.out
-#define ArCmd aal clrv
-#define RanlibCmd /bin/true
-#define AsCmd AmoebaConf/$(ARCH).$(TOOLSET)/toolset/do_as AckArchOption
-#define AsIncl -I$(ATOP)/src/h/machdep/arch/$(ARCH)
-#define AsmDefines -DACK_ASSEMBLER
-#define LdPreLib /**/
-#define LdPostLib /**/
-#endif
-
-#if defined(SparcArchitecture)
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-#define CcCmd cc
-#define ServerCcCmd cc
-#define LdCmd AmoebaConf/$(ARCH).$(TOOLSET)/toolset/do_gld
-#define DefaultCCOptions -sun4
-#define LibraryCCOptions -sun4
-#define AmoebaCompilerDefs -Usun
-#define ServerExtraDefines AllocateLocalDefines
-#define LdPostLib /**/
-#endif
-
-#ifndef AmoebaCompilerDefs
-#define AmoebaCompilerDefs /**/
-#endif
-
-#define CommonAmoebaDefines -DAMOEBA -D$(ARCH) AmoebaCompilerDefs
-#define StandardDefines CommonAmoebaDefines
-#define StandardCppDefines StandardDefines
-
-#ifndef ExtraFPLoadFlags
-#define ExtraFPLoadFlags
-#endif
-#define MathLibrary $(ALIB)/math/libmath.a
-#define OSLibraries $(ALIB)/ajax/libajax.a \
- $(ALIB)/amoeba/libamoeba.a \
- MathLibrary \
- ExtraFPLoadFlags
-#define ServerExtraSysLibs $(CBRT) OSLibraries
-#define ExtraLoadFlags OSLibraries
-
-ATOP = AmoebaTop
-ALIB = AmoebaConf/$(ARCH).$(TOOLSET)/lib
-#if AckToolset
-/* The ACK toolset already links in the appropriate head.o by default */
-HEAD =
-#else
-HEAD = $(ALIB)/head/head.o
-#endif
-
-ABIN = AmoebaBin
-AINSTALL = /bin/sh $(CONFIGSRC)/util/aminstall.sh $(ABIN)
-AINSTALLFLAGS =
-TOB = /bin/sh $(CONFIGSRC)/util/aminstall.sh $(ABIN)
-MKXDIRHIER = /bin/sh $(CONFIGSRC)/util/ammkdirhier.sh $(ABIN)
-
-/* Make wizardy: */
-COMPILE.c=$(CC) $(CFLAGS) $(CPPFLAGS) -c
-LINK.c=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-
-#if defined(i386Architecture)
-ARCH = i80386
-TOOLSET = ack
-ALDFLAGS = /* -mam_i80386 now in CCopts */ -.c -Rcv-s32
-
-#include <xorg.cf>
-#endif
-
-#if defined(Sun3Architecture)
-ARCH = mc68000
-TOOLSET = ack
-ALDFLAGS = -.c -Rcv-s32
-#endif
-
-#if defined(SparcArchitecture)
-ARCH = sparc
-TOOLSET = sun
-SPARCLIBDIR = AmoebaBin/gnu/sparc
-ALDFLAGS = -mam_sparc -n -Ttext 40000 -Bstatic -e start -L$(SPARCLIBDIR)
-#endif
-
-#define BootstrapCFlags -DAMOEBA -DCROSS_$(ARCH) -DCROSS_COMPILE
-
-/*
- * The rest of this files consists of rules to allow cross-compilation
- * and installation of binaries and data files from the Unix host to
- * the Amoeba file system.
- */
-
-/* #ifdef CROSS_COMPILING */
-#define CrossCompiling YES
-
-#define HostLinkRule(target, flags, src, libs) cc -o target src
-
-#define LinkRule(program,options,objects,libraries) \
-$(LD) $(ALDFLAGS) $(HEAD) -o program options objects libraries $(EXTRA_LOAD_FLAGS)
-
-/* ComplexHostProgramTarget - Compile a program such that we can run
- * it on this host, i.e., don't use the default cross compiler.
- */
-#ifndef ComplexHostProgramTarget
-#define ComplexHostProgramTarget(program) @@\
- CC=cc @@\
- STD_INCLUDES= @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
-EXTRA_LOAD_FLAGS= @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* ComplexHostProgramTarget */
-
-#ifndef SimpleHostProgramTarget
-#define SimpleHostProgramTarget(program) @@\
- OBJS = program.o @@\
- SRCS = program.c @@\
- @@\
-ComplexHostProgramTarget(program)
-#endif /* SimpleHostProgramTarget */
-
-
-#ifndef Concat
-#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
-#define Concat(a,b)a##b
-#else
-#define Concat(a,b)a/**/b
-#endif
-#endif
-
-/*
- * LintLibReferences - variables for lint libraries
- */
-#ifndef LintLibReferences
-#define LintLibReferences(varname,libname,libsource) @@\
-Concat(LINT,varname) = Concat(libsource/llib-,libname.ln)
-#endif
-
-/*
- * UnsharedLibReferences - variables for unshared libraries
- */
-#ifndef UnsharedLibReferences
-#define UnsharedLibReferences(varname,libname,libsource) @@\
-Concat3(DEP,varname,LIB) = Concat($(BUILDLIBDIR)/lib,libname.a) @@\
- Concat(varname,LIB) = Concat($(BUILDLIBDIR)/lib,libname.a) @@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#ifndef InstallLibrary
-#define InstallLibrary(libname,dest) @@\
-install:: Concat(lib,libname.a) @@\
- @echo '** TODO: Install Library ' Concat(lib,libname.a)
-#endif /* InstallLibrary */
-
-#ifndef MergeIntoInstalledLibrary
-#define MergeIntoInstalledLibrary(tolib,fromlib) @@\
-install:: fromlib @@\
- @echo '** TODO: merge ' fromlib into tolib
-#endif /* MergeIntoInstalledLibrary */
-
-#ifndef InstallLibraryAlias
-#define InstallLibraryAlias(libname,alias,dest) @@\
-install:: @@\
- @echo '** TODO: Install lib alias ' libname alias dest
-#endif /* InstallLibraryAlias */
-
-#ifndef InstallLintLibrary
-#define InstallLintLibrary(libname,dest) @@\
-install.ln:: Concat(llib-l,libname.ln) @@\
- @echo '** TODO: Install lintlib ' Concat(llib-l,libname.ln)
-#endif /* InstallLintLibrary */
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest) @@\
-install.man:: file.man @@\
- @echo '** TODO: Install man page ' file.man
-#endif /* InstallManPageLong */
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
-install.man:: file.man @@\
- @echo '** TODO: Install man page ' file.man
-#endif /* InstallGenManPageLong */
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases) @@\
-install.man:: @@\
- @(TMP=/tmp/tmp.$$$$; \ @@\
- $(RM) $${TMP}; \ @@\
- echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\
- for i in aliases; do (set -x; \ @@\
- $(TOB) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
- done; \ @@\
- $(RM) $${TMP})
-#endif /* InstallManPageAliases */
-
-#ifndef InstallGenManPageAliases
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
-install.man:: @@\
- @(TMP=/tmp/tmp.$$$$; \ @@\
- $(RM) $${TMP}; \ @@\
- echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\
- for i in aliases; do (set -x; \ @@\
- $(TOB) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
- done; \ @@\
- $(RM) $${TMP})
-#endif /* InstallGenManPageAliases */
-
-#ifndef InstallNamedNonExec
-#define InstallNamedNonExec(srcname,dstname,dest) @@\
-install:: srcname @@\
- $(MKXDIRHIER) $(DESTDIR)dest @@\
- $(TOB) srcname $(DESTDIR)dest/dstname
-#endif /* InstallNamedNonExec */
-
-#ifndef InstallNonExecFile
-#define InstallNonExecFile(file,dest) @@\
-install:: file @@\
- $(MKXDIRHIER) dest @@\
- $(TOB) file dest/file
-#endif /* InstallNonExecFile */
-
-#ifndef InstallNonExec
-#define InstallNonExec(file,dest) @@\
-install:: file @@\
- $(TOB) file dest/file
-#endif /* InstallNonExec */
-
-#ifndef InstallProgramWithFlags
-#define InstallProgramWithFlags(program,dest,flags) @@\
-install:: program @@\
- $(MKXDIRHIER) dest/program @@\
- $(AINSTALL) $(AINSTALLFLAGS) program dest/program/pd.$(ARCH)
-#endif /* InstallProgramWithFlags */
-
-#ifndef InstallScript
-#define InstallScript(program,dest) @@\
-install:: program.script @@\
- $(TOB) program.script dest/program
-#endif /* InstallScript */
-
-#ifndef InstallNamedScript
-#define InstallNamedScript(srcname,dstname,dest) @@\
-install:: srcname @@\
- $(TOB) srcname dest/dstname
-#endif /* InstallNamedScript */
-
-#ifndef InstallNamedProg
-#define InstallNamedProg(srcname,dstname,dest) @@\
-install:: srcname @@\
- $(MKXDIRHIER) $(DESTDIR)dest/dstname @@\
- $(AINSTALL) $(AINSTALLFLAGS) srcname $(DESTDIR)dest/dstname/pd.$(ARCH)
-#endif /* InstallNamedProg */
-
-#ifndef InstallMultipleDestFlags
-#define InstallMultipleDestFlags(step,list,dest,flags) @@\
-step:: list @@\
- $(MKXDIRHIER) $(DESTDIR)dest @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (set -x; $(TOB) $$i dest/$$i); \ @@\
- done
-#endif /* InstallMultipleDestFlags */
-
-#ifndef InstallMultipleProg
-#define InstallMultipleProg(list,dest) @@\
-install:: list @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- $(MKXDIRHIER) $(DESTDIR)dest/$$i; \ @@\
- $(AINSTALL) $(AINSTALLFLAGS) $$i dest/$$i/pd.$(ARCH));\ @@\
- done
-#endif /* InstallMultipleProg */
-
-#ifndef InstallAppDefaults
-#if InstallAppDefFiles
-#define InstallAppDefaults(class) @@\
-install:: class.ad @@\
- $(MKXDIRHIER) $(XAPPLOADDIR) @@\
- $(TOB) class.ad $(DESTDIR)$(XAPPLOADDIR)/class
-#else
-#define InstallAppDefaults(class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaults */
-
-#ifndef InstallAppDefaultsLong
-#if InstallAppDefFiles
-#define InstallAppDefaultsLong(file,class) @@\
-install:: file.ad @@\
- $(MKXDIRHIER) $(DESTDIR)$(XAPPLOADDIR) @@\
- $(TOB) file.ad $(DESTDIR)$(XAPPLOADDIR)/class
-#else
-#define InstallAppDefaultsLong(file,class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaultsLong */
-
-/* #endif CROSS_COMPILE */
diff --git a/nx-X11/config/cf/DGUX.cf b/nx-X11/config/cf/DGUX.cf
deleted file mode 100644
index 722fe7bc6..000000000
--- a/nx-X11/config/cf/DGUX.cf
+++ /dev/null
@@ -1,190 +0,0 @@
-XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $
-/* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk>
- * This is the DG/ux configuration file of X11R6.3
- */
-#define OSName DG/ux R4.20MU03
-#define i386Architecture
-#ifndef OSVendor
-#define OSVendor Data General Corporation
-#endif
-
-#define OSMajorVersion 4
-#define OSMinorVersion 20
-#define OSTeenyVersion 3
-#define BootstrapCFlags -DDGUX
-
-/* Some stuff that all SVR4s ,so and DG/ux, should have */
-
-#define SystemV4 YES
-#ifndef HasLdRunPath
-#define HasLdRunPath YES
-#endif
-#define HasPoll YES
-#ifndef SVR4Architecture
-#define SVR4Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp YES
-#endif
-#define Malloc0ReturnsNull YES /* in case -lmalloc used */
-
-/*
- * Here are the default paths to use tools for building.
- */
-
-#define ArCmdBase /usr/bin/ar
-#define AsCmd /usr/bin/as
-#define CppCmd /usr/lib/cpp
-#define LdCmd /usr/bin/ld
-#define LexCmd /usr/bin/lex
-#define CcCmd /usr/local/bin/gcc /* ? -fpcc-struct-return */
-#define UNCOMPRESSPATH /usr/bin/uncompress
-#define MakeCmd /usr/local/bin/make
-#define YaccCmd /usr/bin/yacc
-#define InstallCmd /usr/bin/install /* I use gnu install-sh */
-#define LnCmd ln -s
-#define RanlibCmd true /* Or make a link ranlib->true */
-#define CplusplusCmd /usr/local/bin/g++
-
-
-
-
-
-
-#ifndef MkdirHierCmd
-#define MkdirHierCmd mkdir -p
-#endif
-/* Stuff for SVR4 4.0 */
-#ifndef XawI18nDefines
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-
-#define HasPutenv YES
-#define HasVFork YES
-#define HasVoidSignalReturn YES
-#define HasBsearch YES
-#define HasSockets YES
-#define BuildServer YES
-#define HasSharedLibraries YES /* to build shared libs */
-#define HasCplusplus YES
-#define HasGnuMake YES /* Added for 3.2Xc */
-#define UseGnuMalloc YES
-#define GnuMallocLibrary -L/usr/local/lib -lmalloc
-#define Malloc0ReturnsNull YES /* Added for 3.2Xh,i... GNU does return 0 */
-#define Malloc0ReturnsNullDefines -DMALLOC_0_RETURNS_NULL /* define for GNU malloc X3.2i */
-/*******TCL TK DEFINITIONS ***********/
-#define HasTk YES /* Comment out if you dont have this */
-#define TkLibDir /usr/X11R6.3/lib
-#define TkIncDir /usr/X11R6.3/include
-#define TkLibName tk8.0
-#define HasTcl YES
-#define TclLibName tcl8.0
-#define TclLibDir /usr/X11R6.3/lib
-#define TclIncDir /usr/X11R6.3/include
-
-#define SystemManDirectory /usr/local/man/X
-
-#define ExtraLibraries -lelf -lgen -lresolv -lsocket -lnsl -lw
-
-#define StandardDefines -DDGUX -DSVR4 -Di386 -D__ix86 -D_DGUX_SOURCE -D_LITTLE_ENDIAN -D_PENTIUM_CHANGE
-
-#define PositionIndependentCFlags -fpic
-#define PositionIndependentCplusplusFlags -fpic
-
-/*
- * To forceably build static libraries in addition to shared libraries,
- * we put this.
- */
-#define ForceNormalLib YES
-
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions -intelabi -earlyR6bc
-#endif
-
-#ifndef DefaultCCOptions
-#define DefaultCCOptions /* -ansi -pedantic */
-#endif
-#define OptimizedCDebugFlags -O2 /* Add -g -mstandard for full debuging info */
-#define OptimizedCplusplusDebugFlags
-#define DebuggableCDebugFlags -g -mstandard
-#define DebuggableCplusplusDebugFlags
-#define SharedLibraryLoadFlags -G -z text
-#define PositionIndependentCFlags -fpic
-#define PositionIndependentCplusplusFlags -fpic
-
-
-
-/*
- * The default optimisation flags for GCC 2.x. -fno-strength-reduce is
- * here to work around a bug in -O2 for GCC 2.x on i386 platforms.
- * If you are using a version that doesn't have this bug, you can
- * uncomment the following line, and remove '-fno-strength-reduce'
- *
-#define DefaultGcc2i386Opt -O2 -fno-strength-reduce
- */
-
-/* Compress all the Fonts */
-#define CompressAllFonts YES
-
-
-
-/* Manual pages installed under their full names */
-
-#define ExpandManNames YES
-#define CompressManPages YES
-
-
-
-
-/* Install with stripping before ? */
-#define StripInstalledPrograms YES
-
-/* Server to Install */
-#define XserverNeedsSetUID YES
-#define InstallXserverSetUID YES
-
-
-#ifndef ServerOSDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#endif
-#ifndef BuildDynamicLoading
-#define BuildDynamicLoading NO
-#endif
-#if BuildDynamicLoading
-#define ServerExtraSysLibs -ldl
-#endif
-
-/*
- * The TLI interface is more robust on most SVR4s, so it will be the default.
- */
-#ifndef ConnectionFlags
-#define ConnectionFlags -DSTREAMSCONN -DUNIXCONN -DLOCALCONN
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix 1x
-#define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix 3x
-#define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-#define FileManSuffix 4
-#endif
-
-#ifndef StaticLibrary
-#ifndef HasGcc
-#define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
-#endif
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#ifdef i386Architecture
-#include <xorg.cf>
-#endif
-
-#include <sv4Lib.rules>
diff --git a/nx-X11/config/cf/DragonFly.cf b/nx-X11/config/cf/DragonFly.cf
deleted file mode 100644
index feec8a50b..000000000
--- a/nx-X11/config/cf/DragonFly.cf
+++ /dev/null
@@ -1,354 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/DragonFly.cf,v 1.1 2005/03/02 11:20:29 gisburn Exp $
-
-#define UseElfFormat YES
-
-#define OSBinaryFormat [ELF]
-
-#ifndef OSName
-#define OSName DefaultOSName OSBinaryFormat
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-
-#ifndef OSRelVersion
-/* Include this to get finer-grained information about the OS version */
-#include "/usr/include/osreldate.h"
-#define OSRelVersion __DragonFly_version
-#endif
-
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion) (OSRelVersion)
-
-/*
- * Base OS setup
- */
-#define HasCplusplus YES
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define HasBasename YES
-#define HasBSD44Sockets YES
-#define HasDlopen YES
-#define HasGetIfAddrs YES
-#define HasIssetugid YES
-#define HasLibCrypt YES
-#define HasMktemp YES
-#define HasNCurses YES
-#define HasNdbm YES
-#define HasPlugin YES
-#define HasPoll YES
-#define HasPutenv YES
-#define HasUsableFileMmap YES
-#define HasSetProcTitle YES
-#define HasShm YES
-#define HasSnprintf YES
-#define HasStrlcat YES
-#define HasVarDb YES
-#define HasVarRun YES
-#define HasWChar32 YES
-#define HasWeakSymbols UseElfFormat
-#define BuildXaw6 NO /*depreciated*/
-#define BuildXaw7 NO /*depreciated*/
-#define BuildXaw YES /*needed*/
-#ifndef BuildPDFdocs
-#define BuildPDFdocs NO
-#endif
-#define IPv6SocketsAlsoIPv4 NO
-#define InstallXloadSetGID NO
-
-/*
- * Multi-thread safe libs
- */
-#ifndef HasLibPthread
-# define HasLibPthread NO
-#endif
-#define HasPosixThreads YES
-#define ThreadedX YES
-#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
-#define HasThreadSafeAPI YES
-#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-#if HasLibPthread
-# define ThreadsLibraries -lpthread
-#else
-# define ThreadsLibraries -pthread
-#endif
-
-
-#define AvoidNullMakeCommand YES
-#define StripInstalledPrograms YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-
-#define MkdirHierCmd mkdir -p
-
-#define LexCmd flex -l
-#define HasFlex YES
-
-#ifndef CcCmd
-# define CcCmd cc
-#endif
-#ifndef CplusplusCmd
-# define CplusplusCmd c++
-#endif
-#define CppCmd /usr/bin/cpp
-#define PreProcessCmd CppCmd
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#ifndef DefaultCCOptions
-# if defined(UseInstalled)
-# define DefaultCCOptions /**/
-# else
-# if defined(HasGcc3) && HasGcc3
-# define NoSystemWarn -Wno-system-headers
-# else
-# define NoSystemWarn
-# endif
-# define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
-#endif
-#ifndef ExtraLibraries
-/* support for multi-byte locales is in libxpg4 rather than libc */
-#define ExtraLibraries -lxpg4
-#endif
-#define HasSetUserContext YES
-#define HasGetpeereid YES
-#define HasMTRRSupport YES
-
-#ifndef BuildXF86DRI
-# define BuildXF86DRI YES
-#endif
-
-#if defined(i386Architecture)
-#define HasAgpGart YES
-#endif
-
-/*
- * SSE and 3DNow will be autodetected, so binutils is the only
- * requirement for enabling this.
- */
-#if defined(i386Architecture)
-# define HasX86Support YES
-# define HasMMXSupport YES
-# define Has3DNowSupport YES
-# define HasSSESupport YES
-#else
-# define HasX86Support NO
-# define HasMMXSupport NO
-# define Has3DNowSupport NO
-# define HasSSESupport NO
-#endif
-
-#ifndef UseRpath
-# define UseRpath YES
-#endif
-
-#ifndef RpathLoadFlags
-# if UseRpath
-# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-# else
-# define RpathLoadFlags /**/
-# endif
-#endif
-
-#ifndef ExtraLoadFlags
-# if !defined(UseInstalled)
-# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-# else
-# define ExtraLoadFlags RpathLoadFlags
-# endif
-#endif
-
-#endif
-
-#ifndef LibraryRpathLoadFlags
-# if UseRpath
-# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH)
-# else
-# define LibraryRpathLoadFlags /**/
-# endif
-#endif
-
-#ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
-#endif
-
-#ifndef HasZlib
-# define HasZlib YES
-#endif
-
-#ifndef HasPam
-# define HasPam YES
-#endif
-
-/* Take from FreeBSD */
-/* There are two options for building. One is to assume that the system has
- * many of the dependencies provided by the ports tree. The other is to just
- * build everything from this tree.
- */
-
-#ifndef HasStandardPorts
-# define HasStandardPorts YES
-#endif
-
-#ifndef LocalBase
-# define LocalBase /usr/local
-#endif
-#ifndef X11Base
-# define X11Base /usr/X11R6
-#endif
-
-#if HasStandardPorts
-
-#ifndef HasExpat
-# define HasExpat YES
-# define ExpatDir LocalBase
-#endif
-
-#ifndef HasFreetype2
-# define HasFreetype2 NO /* set this to YES once DragonFly ships FT218 */
-# define Freetype2Dir LocalBase
-#endif
-
-#ifndef HasFontconfig
-# define HasFontconfig YES
-# define FontconfigDir X11Base
-#endif
-
-#ifndef HasLibpng
-# define HasLibpng YES
-# define LibpngDir LocalBase
-#endif
-
-#endif /* HasStandardPorts */
-
-#undef InstallCmd
-#define InstallCmd /usr/bin/install
-
-#define AsmElfDefines -D__ELF__
-
-#if GccUsesGas
-# define GccGasOption -DGCCUSESGAS
-# define AsmDefines -DUSE_GAS AsmElfDefines
-#else
-# define GccGasOption /**/
-# define AsmDefines AsmElfDefines
-#endif
-
-#ifdef i386Architecture
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#endif
-#if defined(Sparc64Architecture) || defined(ia64Architecture) || \
- defined(AMD64Architecture)
-#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-#endif
-
-#define StandardDefines -DCSRG_BASED
-
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#define HasMakefileSafeInclude YES
-#define IncludeMakefile(file) @@# dependencies are in .depend
-#define DependFileName .depend
-#ifndef DoLoadableServer
-# define DoLoadableServer YES
-#endif
-#ifndef ForceNormalLib
-# define ForceNormalLib YES
-#endif
-#define HasMkstemp YES
-
-#define OptimizedCDebugFlags -O
-
-#ifndef PreIncDir
-# define PreIncDir /usr/include
-#endif
-
-#define HasGroff YES
-#define NroffCmd env GROFF_NO_SGR=y groff -Tascii
-#define SetTtyGroup YES
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
-#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
-#ifndef SystemManDirectory
-# define SystemManDirectory /usr/share/man
-#endif
-
-#define InstKmemFlags -g kmem -m 2755
-
-/*
- * Compress manual pages
- */
-#ifndef CompressManPages
-# define CompressManPages YES
-#endif
-
-#define HasBsdMake YES
-
-#ifndef StaticLibrary
-# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-#endif
-
-#define DlLibrary -Wl,--export-dynamic
-
-#ifndef PamLibraries
-# define PamLibraries -lpam DlLibrary
-#endif
-
-#ifndef SharedLibXdmGreet
-# define SharedLibXdmGreet NO
-#endif
-
-/*
- * On FreeBSD, the run-time loader will use the built-in "rpath" before
- * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
- * installed libraries (if they exist) in preference to the ones in the
- * build tree, even though LD_LIBRARY_PATH points to the build tree.
- * This can result in the build failing. One way to avoid this is to
- * pre-load the libraries from the build tree.
- *
- * There should be a better way than this hack...
- */
-#if UseElfFormat
-#ifndef PreloadFontSetup
-#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
-#endif
-#ifndef PreloadFreetypeSetup
-#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
-#endif
-#ifndef PreloadXFTSetup
-#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
-#endif
-#endif
-
-#ifndef HasCookieMaker
-# define HasCookieMaker YES
-# define MkCookieCmd \
- 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
-#endif
-
-/*
- * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
- */
-#if (GccMajorVersion == 2 && GccMinorVersion == 95)
-# define GccOptBug295
-#endif
-
-#include <bsdLib.rules>
-
-#include <xorg.cf>
-
-
diff --git a/nx-X11/config/cf/FreeBSD.cf b/nx-X11/config/cf/FreeBSD.cf
deleted file mode 100644
index 80454b792..000000000
--- a/nx-X11/config/cf/FreeBSD.cf
+++ /dev/null
@@ -1,582 +0,0 @@
-XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.11 2005/05/04 04:14:57 anholt Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.147 2004/01/28 01:46:21 dawes Exp $
-
-#ifndef UseElfFormat
-#define UseElfFormat DefaultToElfFormat
-#endif
-
-#if UseElfFormat
-#define OSBinaryFormat [ELF]
-#else
-#define OSBinaryFormat [a.out]
-#endif
-
-#ifndef OSName
-#define OSName DefaultOSName OSBinaryFormat
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-#ifndef OSRelVersion
-/* Include this to get finer-grained information about the OS version */
-#include "/usr/include/osreldate.h"
-#define OSRelVersion __FreeBSD_version
-#endif
-
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion)
-
-
-#define HasCplusplus YES
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasSnprintf YES
-#if OSMajorVersion == 3 && OSMinorVersion >= 3 || OSMajorVersion > 3
-# define HasStrlcat YES
-#endif
-#if OSMajorVersion == 4 && OSMinorVersion >= 2 || OSMajorVersion > 4
-# define HasBasename YES
-#else
-# define HasBasename NO
-#endif
-#define HasBSD44Sockets YES
-#define HasDlopen YES
-#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
-#define HasSetProcTitle YES
-#endif
-#ifndef HasLibCrypt
-# define HasLibCrypt YES
-#endif
-#ifndef HasShm
-# define HasShm YES
-#endif
-#define HasWChar32 YES
-#define HasUsableFileMmap YES
-#define HasNCurses YES
-#define HasVarRun YES
-#define HasVarDb YES
-#ifndef BuildPDFdocs
-# define BuildPDFdocs NO
-#endif
-#if (OSMajorVersion >= 3)
-#define HasIssetugid YES
-#define HasPoll YES
-#endif
-
-#if OSMajorVersion >= 4
-#define HasGetIfAddrs YES
-#endif
-
-/* All versions define AF_INET6. 3.x and earlier don't have IPv6 support. */
-#if OSMajorVersion < 4
-#ifndef BuildIPv6
-#define BuildIPv6 NO
-#endif
-#endif
-
-#define IPv6SocketsAlsoIPv4 NO
-
-#if (OSMajorVersion > 1)
-#define InstallXloadSetGID NO
-#else
-#define InstallXloadSetGID YES
-#endif
-
-#define HasWeakSymbols UseElfFormat
-
-/*
- * Multi-thread safe libs
- */
-/* 2.2.7 and later has libc_r (POSIX threads) */
-#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
- OSMajorVersion >= 3
-# define HasPosixThreads YES
-# define ThreadedX YES
-# define HasThreadSafeAPI YES
-# if OSRelVersion < 501000
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-# else
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API
-# endif
-# if (OSRelVersion < 500043)
-# define NeedUIThrStubs YES
-# endif
-# if (OSRelVersion >= 502102)
-# define ThreadsLibraries -lpthread
-# elif (OSRelVersion >= 500016)
-# define ThreadsLibraries -lc_r
-# else
-# define ThreadsLibraries -pthread
-# endif
-# define SystemMTDefines -D_THREAD_SAFE
-#endif
-
-/* This fixes linking C programs against libGLU on FreeBSD 3.x */
-#if (OSMajorVersion == 3)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc
-#endif
-
-#define AvoidNullMakeCommand YES
-#define StripInstalledPrograms YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-
-#define HasPlugin YES
-#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
-
-#define MkdirHierCmd mkdir -p
-
-#ifndef LexCmd
-#define LexCmd flex -l
-#endif
-#ifndef HasFlex
-#define HasFlex YES
-#endif
-
-#ifndef HasMktemp
-#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7)
-#define HasMktemp YES
-#else
-#define HasMktemp NO
-#endif
-#endif
-
-/*
- * 2.2.x has perl 4 by default, not perl 5.
- */
-#if (OSMajorVersion <= 2)
-#ifndef HasPerl5
-#define HasPerl5 NO
-#endif
-#endif
-
-#ifndef CcCmd
-#define CcCmd cc
-#endif
-#ifndef CplusplusCmd
-#define CplusplusCmd c++
-#endif
-#define CppCmd /usr/bin/cpp
-#define PreProcessCmd CppCmd
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#ifndef DefaultCCOptions
-#if defined(UseInstalled)
-#define DefaultCCOptions /**/
-#else
-#if defined(HasGcc3) && HasGcc3
-#define NoSystemWarn -Wno-system-headers
-#else
-#define NoSystemWarn
-#endif
-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \
- GccWarningOptions
-#endif
-#endif
-#ifndef ExtraLibraries
-/* support for multi-byte locales is in libxpg4 rather than libc */
-#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
- !(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
- !(OSRelVersion >= 500005)
-#define ExtraLibraries -lxpg4
-#else
-#define ExtraLibraries /**/
-#endif
-#endif
-#ifndef UseGnuMalloc
-/* 2.2 doesn't really have GnuMalloc */
-#if OSMajorVersion < 2 || (OSMajorVersion == 2 && OSMinorVersion < 2)
-#define UseGnuMalloc YES
-#else
-#define UseGnuMalloc NO
-#endif
-#endif
-/* 2.2.2 and later has setusercontext() */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2) || \
- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 2)
-#define HasSetUserContext YES
-#endif
-
-#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 6)
-#define HasGetpeereid YES
-#endif
-
-/* 3.3(?) and later has support for setting MTRRs */
-#ifndef HasMTRRSupport
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 3)
-#define HasMTRRSupport YES
-#else
-#define HasMTRRSupport NO
-#endif
-#endif
-
-/*
- * Drivers that don't need AGP can work with 4.0, but we don't have a
- * mechanism for specifying a subset of drivers in the OS.cf files yet.
- */
-#ifndef BuildXF86DRI
-#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
-#define BuildXF86DRI YES
-#endif
-#endif
-
-/*
- * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
- */
-#ifndef HasAgpGart
-#if defined(i386Architecture) && \
- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
-#define HasAgpGart YES
-#endif
-#if (defined(AlphaArchitecture) || defined(ia64Architecture) || \
- defined(AMD64Architecture)) && (OSMajorVersion >= 5)
-#define HasAgpGart YES
-#endif
-#endif
-
-/*
- * SSE and 3DNow will be autodetected, so binutils is the only
- * requirement for enabling this. By 4.2 they were all supported.
- */
-#if defined(AMD64Architecture) || defined(i386Architecture) && \
- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
-# define HasX86Support YES
-# define HasMMXSupport YES
-# define Has3DNowSupport YES
-# define HasSSESupport YES
-#else
-# define HasX86Support NO
-# define HasMMXSupport NO
-# define Has3DNowSupport NO
-# define HasSSESupport NO
-#endif
-
-/*
- * This doesn't work the way it does on every other system. On FreeBSD it's
- * only a "hint, not a demand", whatever that means. Note that this is not
- * what it says in the ld and ld.so man pages, which are rather vague on the
- * matter.
- *
- * But we do know that if a) you do what the X Project team does and set your
- * ProjectRoot to something like "/X11", and b) you have other X libraries,
- * e.g. in /usr/X11R6/lib, and you have added /usr/X11R6/lib to your
- * ld.so.cache with ldconfig, then any programs linked with this "hint" will
- * find that ld.so ignores the "hint" at runtime and loads the libraries in
- * the ld.so.cache, i.e.the wrong ones, instead! Empirically we find that
- * the run-path is only used as a last resort to find the libraries, after
- * the LD_LIBRARY_PATH and ld.so.cache.
- *
- * N. B. to FreeBSD users who are not familiar with the semantics of the run-
- * path on other systems. The run-path is akin to a per-program ld.so.cache.
- * If a program is linked with a run-path, that run-path should take
- * precedence over _everything_ else! In my opinion ldconfig and the
- * ld.so.cache should be deprecated immediately now that FreeBSD has run-
- * paths. Any program that needs libraries that are outside the "well known"
- * locations should be linked with a run-path.
- *
- * All of which begs the question: If this option doesn't work in any useful
- * way, why did they (FreeBSD) bother to add it? It would be nice if FreeBSD
- * would fix ld.so so that run-paths are truly useful.
- *
- * Using run-paths is added with the intent that vendors who ship X for
- * FreeBSD should use it too. Once everyone uses it then there will be no
- * reason for FreeBSD to assume that it knows where X libraries are installed
- * and they can remove it from the list of directories they add to ld.so.cache
- * in their /etc/rc file.
- */
-
-#ifndef UseRpath
-# define UseRpath YES
-#endif
-
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
-
-# ifndef RpathLoadFlags
-# if UseRpath
-# if UseElfFormat
-# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-# else
-# define RpathLoadFlags -Wl,-R,$(USRLIBDIRPATH)
-# endif
-# else
-# define RpathLoadFlags /**/
-# endif
-# endif
-
-# ifndef ExtraLoadFlags
-# if UseElfFormat && !defined(UseInstalled)
-# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-# else
-# define ExtraLoadFlags RpathLoadFlags
-# endif
-# endif
-
-#endif
-
-#ifndef LibraryRpathLoadFlags
-# if UseRpath
-# if UseElfFormat
-# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH)
-# else
-# define LibraryRpathLoadFlags -R $(USRLIBDIRPATH)
-# endif
-# else
-# define LibraryRpathLoadFlags /**/
-# endif
-#endif
-
-#ifndef SharedLibraryLoadFlags
-# if UseElfFormat
-# define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
-# else
-# define SharedLibraryLoadFlags -Bshareable LibraryRpathLoadFlags
-# endif
-#endif
-
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary -lgnumalloc
-#endif
-
-#if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 2) \
- || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6)
-/* 2.1.6 and 2.2 have libz */
-#ifndef HasZlib
-#define HasZlib YES
-#endif
-#endif
-
-/* PAM appeared in FreeBSD 3.1 */
-#if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
-#ifndef HasPam
-#define HasPam YES
-#endif
-#endif
-
-/* There are two options for building. One is to assume that the system has
- * many of the dependencies provided by the ports tree. The other is to just
- * build everything from this tree.
- */
-
-#ifndef HasStandardPorts
-#define HasStandardPorts YES
-#endif
-
-#ifndef LocalBase
-#define LocalBase /usr/local
-#endif
-#ifndef X11Base
-#define X11Base /usr/X11R6
-#endif
-
-#if HasStandardPorts
-
-#ifndef HasExpat
-# define HasExpat YES
-# define ExpatDir LocalBase
-#endif
-
-#ifndef HasFreetype2
-# define HasFreetype2 YES
-# define Freetype2Dir LocalBase
-#endif
-
-#ifndef HasFontconfig
-# define HasFontconfig YES
-# define FontconfigDir X11Base
-#endif
-
-#ifndef HasLibpng
-# define HasLibpng YES
-# define LibpngDir LocalBase
-#endif
-
-#endif /* HasStandardPorts */
-
-#undef InstallCmd
-#define InstallCmd /usr/bin/install
-
-#if UseElfFormat
-# define AsmElfDefines -D__ELF__
-#else
-# define AsmElfDefines /**/
-#endif
-
-#if GccUsesGas
-# define GccGasOption -DGCCUSESGAS
-# define AsmDefines -DUSE_GAS AsmElfDefines
-#else
-# define GccGasOption /**/
-# define AsmDefines AsmElfDefines
-#endif
-
-#ifdef i386Architecture
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#endif
-#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
- defined(ia64Architecture) || defined(AMD64Architecture)
-#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-#endif
-#ifdef Sparc64Architecture
-#define AsVISOption -Av9a
-#define AsOutputArchSize 64
-#endif
-
-#ifdef PpcArchitecture
-#define XF86INT10_BUILD X86INT10_STUB
-#endif
-
-#define StandardDefines -DCSRG_BASED
-
-#if OSMajorVersion > 1
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#define HasMakefileSafeInclude YES
-#define IncludeMakefile(file) @@# dependencies are in .depend
-#define DependFileName .depend
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-#define HasMkstemp YES
-#else
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
-#ifndef DefaultGcc2i386Opt
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
-#endif
-#endif
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O
-#endif
-
-#ifndef PreIncDir
-# define PreIncDir /usr/include
-#endif
-
-#define HasGroff YES
-#define NroffCmd env GROFF_NO_SGR=y groff -Tascii
-#define SetTtyGroup YES
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin
-#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
-#ifndef SystemManDirectory
-#define SystemManDirectory /usr/share/man
-#endif
-
-#define InstKmemFlags -g kmem -m 2755
-
-/*
- * Compress manual pages
- */
-#ifndef CompressManPages
-# define CompressManPages YES
-#endif
-
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
-#define HasBsdMake YES
-#endif
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-#endif
-
-#if UseElfFormat
-#define DlLibrary -rdynamic
-#else
-#define DlLibrary /**/
-#endif
-
-#ifdef AlphaArchitecture
-#define IoLibrary -lio
-#else
-#define IoLibrary /**/
-#endif
-
-#define ServerExtraSysLibs IoLibrary
-
-#ifndef PamLibraries
-#define PamLibraries -lpam DlLibrary
-#endif
-
-#ifndef SharedLibXdmGreet
-# define SharedLibXdmGreet NO
-#endif
-
-/*
- * On FreeBSD, the run-time loader will use the built-in "rpath" before
- * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
- * installed libraries (if they exist) in preference to the ones in the
- * build tree, even though LD_LIBRARY_PATH points to the build tree.
- * This can result in the build failing. One way to avoid this is to
- * pre-load the libraries from the build tree.
- *
- * There should be a better way than this hack...
- */
-#if UseElfFormat
-#ifndef PreloadFontSetup
-#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
-#endif
-#ifndef PreloadFreetypeSetup
-#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
-#endif
-#ifndef PreloadXFTSetup
-#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
-#endif
-#endif
-
-#ifndef HasCookieMaker
-/* Which versions have /dev/urandom? */
-#if OSMajorVersion >= 4
-#define HasCookieMaker YES
-#define MkCookieCmd \
- 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
-#else
-#define HasCookieMaker NO
-#endif
-#endif
-
-/*
- * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
- */
-#if (GccMajorVersion == 2 && GccMinorVersion == 95)
-#define GccOptBug295
-#endif
-
-#include <bsdLib.rules>
-
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/Mips.cf b/nx-X11/config/cf/Mips.cf
deleted file mode 100644
index cf0446510..000000000
--- a/nx-X11/config/cf/Mips.cf
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Set version numbers before making makefiles.
- *
- * X11r5 only builds using the berkeley libraries and compiler. Make
- * sure your path includes /bsd43/bin before /bin/ or /usr/bin.
- */
-
-#ifndef OSName
-#define OSName RISCOS
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 50
-#endif
-
-XCOMM platform: $Xorg: Mips.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM operating system: OSName
-
-/***************************************************************************
- * Platform-specific parameters *
- ***************************************************************************/
-
-#define HasVoidSignalReturn NO
-#define SetTtyGroup YES
-#define UnalignedReferencesAllowed NO /* if arbitrary deref okay */
-#define HasBsearch NO
-
-#define MipsArchitecture
-#define MakeEnv -e
-
-#define DefaultCCOptions -signed -systype bsd43 -Olimit 2000 -Wf,-XNd8400,-XNp12000
-#define StandardDefines -DMips -DBSD43
-#define PostIncDir /usr/include/bsd43
-#define ExtraLibraries -lmld
-#define ArCmd ar clr
-#define BootstrapCFlags -DMips
-#define InstallCmd /etc/mipsinstall -f
-#define MakeCmd make MakeEnv
-#define DoRanlibCmd NO
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/***************************************************************************
- * *
- * DEFINE PARAMETERS FOR BUILDING *
- * *
- ***************************************************************************/
-
-#define XmipsServer YES
-
-/***************************************************************************
- * *
- * OVERRIDE ANY CONFIGURATION PARAMETERS FROM Imake.tmpl *
- * *
- ***************************************************************************/
-
-#define SpecialMalloc NO
-
-#define PrimaryScreenResolution 110
-
-#define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */
-
-#define DefaultUserPath /usr/net:/bin:/usr/bin:$(BINDIR):/usr/ucb
-#define DefaultSystemPath /usr/net:/bin:/usr/bin:/etc:$(BINDIR):/usr/ucb
-
-/* mips manuals are really complicated. This certainly won't work. */
-
-#define ManDirectoryRoot /man/cat
-#define ManSourcePath $(MANPATH)/man
-
-#define InstKmemFlags -g sys -m 2711
diff --git a/nx-X11/config/cf/Motif.rules b/nx-X11/config/cf/Motif.rules
deleted file mode 100644
index 283ce6ca6..000000000
--- a/nx-X11/config/cf/Motif.rules
+++ /dev/null
@@ -1,709 +0,0 @@
-/*
- * @OSF_COPYRIGHT@
- * COPYRIGHT NOTICE
- * Copyright (c) 1990, 1991, 1992, 1993, 1998 The Open Group, Inc.
- * ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- * the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc.
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */
-XCOMM $Xorg: Motif.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-/* Note whether we are the top level project. */
-#ifndef SeenTopLevelProject
-# define SeenTopLevelProject YES
-# define MotifIsTopLevelProject YES
-#else
-# define MotifIsTopLevelProject NO
-#endif
-
-/* Include the X11 project rules file. */
-#include <X11.rules>
-
-
-/* Use the in-tree Motif by default. */
-#ifndef UseInstalledMotif
-# define UseInstalledMotif NO
-#endif
-#ifdef UseInstalled
-# undef UseInstalledMotif
-# define UseInstalledMotif YES
-#endif
-
-#ifndef ImportMotif
-# ifdef UseImports
-# define ImportMotif YES
-# else
-# define ImportMotif NO
-# endif
-#endif
-#if UseInstalledMotif
-# undef ImportMotif
-# define ImportMotif NO
-#endif
-
-#ifndef MSimpleProgramTarget
-#define MSimpleProgramTarget(program) @@\
-AllTarget(program) @@\
- @@\
-program: program.o $(DEPS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ program.o $(LDOPTIONS) $(DEPS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) @@\
- @@\
-clean:: @@\
- $(RM) program
-#endif
-
-#ifndef MSimpleUilTarget
-#define MSimpleUilTarget(program) @@\
-MSimpleProgramTarget(program) @@\
- @@\
-InstallProgram(program,$(BINDIR)) @@\
- @@\
-MSimpleUidTarget(program)
-#endif
-
-/*
- * UILFLAGS contains site/vendor-specific flags
- * defined by UilFlags, which supposed to be set in *.cf or
- * site.def files.
- * LOCAL_UILFLAGS(_n) contains client-specific uil flags set in Imakefile
- */
-
-#ifndef MSimpleUidTarget
-#define MSimpleUidTarget(program) @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: program.uil $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MSimpleUidLocaleTarget
-#define MSimpleUidLocaleTarget(program,locale) @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: program.uil $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(LIBDIR)/locale/uid) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_1
-#define MComplexUidTarget_1(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS1) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_1) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_2
-#define MComplexUidTarget_2(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS2) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_2) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_3
-#define MComplexUidTarget_3(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS3) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_3) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_4
-#define MComplexUidTarget_4(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS4) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_4) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_5
-#define MComplexUidTarget_5(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS5) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_5) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_6
-#define MComplexUidTarget_6(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS6) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_6) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_7
-#define MComplexUidTarget_7(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS7) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_7) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_8
-#define MComplexUidTarget_8(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS8) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_8) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_9
-#define MComplexUidTarget_9(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS9) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_9) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_10
-#define MComplexUidTarget_10(program) @@\
- @@\
-AllTarget(program.uid) @@\
- @@\
-program.uid: $(UILS10) $(DEPUIL) @@\
- RemoveTargetProgram($@) @@\
- $(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_10) -o $@ program.uil $(UIL_INCLUDES) @@\
- @@\
-InstallNonExecFile(program.uid,$(UIDDIR)) @@\
- @@\
-clean:: @@\
- $(RM) program.uid
-#endif
-
-#ifndef MComplexProgramTarget
-#define MComplexProgramTarget(program,locallib,syslib) @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS),$(OBJS),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR)) @@\
- @@\
-install.man:: @@\
- @echo To install documentation for $(PROGRAM), consult the Release Notes @@\
- @echo and/or README file in the current directory. @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- $(RM) $(PROGRAM)
-#endif
-
-#ifndef MComplexProgramTarget_1
-#define MComplexProgramTarget_1(program,locallib,syslib) @@\
- OBJS = $(OBJS1) $(OBJS2) $(OBJS3) @@\
- SRCS = $(SRCS1) $(SRCS2) $(SRCS3) @@\
- @@\
-AllTarget($(PROGRAMS)) @@\
- @@\
-program: $(OBJS1) $(DEPLIBS1) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS1) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS1),$(OBJS1),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR)) @@\
- @@\
-install.man:: @@\
- @echo To install documentation for $(PROGRAMS), consult the Release Notes @@\
- @echo and/or README file in the current directory. @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- $(RM) $(PROGRAMS)
-#endif
-
-#ifndef MComplexProgramTarget_2
-#define MComplexProgramTarget_2(program,locallib,syslib) @@\
-program: $(OBJS2) $(DEPLIBS2) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS2) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS2),$(OBJS2),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_3
-#define MComplexProgramTarget_3(program,locallib,syslib) @@\
- PROGRAM_3 = program @@\
-program: $(OBJS3) $(DEPLIBS3) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS3) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS3),$(OBJS3),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_4
-#define MComplexProgramTarget_4(program,locallib,syslib) @@\
- PROGRAM_4 = program @@\
-program: $(OBJS4) $(DEPLIBS4) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS4) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS4),$(OBJS4),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_5
-#define MComplexProgramTarget_5(program,locallib,syslib) @@\
- PROGRAM_5 = program @@\
-program: $(OBJS5) $(DEPLIBS5) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS5) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS5),$(OBJS5),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_6
-#define MComplexProgramTarget_6(program,locallib,syslib) @@\
- PROGRAM_6 = program @@\
-program: $(OBJS6) $(DEPLIBS6) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS6) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS6),$(OBJS6),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_7
-#define MComplexProgramTarget_7(program,locallib,syslib) @@\
- PROGRAM_7 = program @@\
-program: $(OBJS7) $(DEPLIBS7) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS7) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS7),$(OBJS7),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_8
-#define MComplexProgramTarget_8(program,locallib,syslib) @@\
- PROGRAM_8 = program @@\
-program: $(OBJS8) $(DEPLIBS8) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS8) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS8),$(OBJS8),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_9
-#define MComplexProgramTarget_9(program,locallib,syslib) @@\
- PROGRAM_9 = program @@\
-program: $(OBJS9) $(DEPLIBS9) @@\
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS9) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS9),$(OBJS9),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTarget
-#define TestPPTarget(root) @@\
-all:: root.Scr root.Dat @@\
- @@\
-root.Dat: root.dat @@\
- $(RM) root.Dat @@\
- $(COMMONPP) $(DEFINES) root.dat @@\
-root.Scr: root.scr @@\
- $(RM) root.Scr @@\
- $(COMMONPP) $(DEFINES) root.scr
-#endif
-#else
-#ifndef TestPPTarget
-#define TestPPTarget(root) @@\
-all:: root.Dat @@\
- @@\
-root.Dat: root.dat @@\
- $(RM) root.Dat @@\
- $(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTargetScr
-#define TestPPTargetScr(root) @@\
-all:: root.Scr @@\
- @@\
-root.Scr: root.scr @@\
- $(RM) root.Scr @@\
- $(COMMONPP) $(DEFINES) root.scr
-#endif
-#else
-#ifndef TestPPTargetScr
-#define TestPPTargetScr(root) /**/
-#endif
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTargetDat
-#define TestPPTargetDat(root) @@\
-all:: root.Dat @@\
- @@\
-root.Dat: root.dat @@\
- $(RM) root.Dat @@\
- $(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-#ifndef AUTOMATION
-#ifndef TestPPTargetDat
-#define TestPPTargetDat(root) @@\
-all:: root.Dat @@\
- @@\
-root.Dat: root.dat @@\
- $(RM) root.Dat @@\
- $(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-
-
-#ifndef NO_AUTOMATION
-#ifndef RunTarget
-#define RunTarget() @@\
-all:: RUN @@\
- @@\
-RUN: always @@\
- $(GENRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES) @@\
- @@\
-always: @@\
- $(RM) RUN
-#endif
-#else
-#ifdef UseVista
-#ifndef RunTarget
-#define RunTarget() @@\
-all:: RUN @@\
- @@\
-RUN: always @@\
- $(MANRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES) @@\
- @@\
-always: @@\
- $(RM) RUN
-#endif
-#else
-#ifdef UsePurify
-#ifndef RunTarget
-#define RunTarget() @@\
-all:: RUN @@\
- @@\
-RUN: always @@\
- $(MANRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES) @@\
- @@\
-always: @@\
- $(RM) RUN
-#endif
-#else
-#ifndef RunTarget
-#define RunTarget() @@\
-all:: RUN @@\
- @@\
-RUN: always @@\
- @@\
-always: @@\
-
-#endif
-#endif
-#endif
-#endif
-#ifdef UseVista
-#ifndef VistaMapRule
-#define VistaMapRule(targetmap,depend) @@\
-all:: targetmap @@\
- @@\
-targetmap: depend @@\
- $(RM) $(MTOP)/tests/Vista/targetmap @@\
- CATCMD *.M > $(MTOP)/tests/Vista/targetmap
-#endif
-#ifndef ComplexVistaMapRule
-#define ComplexVistaMapRule(program,filelist) @@\
-all:: program.M @@\
- @@\
-program.M: filelist @@\
- $(RM) program.vista.tmpfile @@\
- touch program.vista.tmpfile @@\
- @case '${MFLAGS}' in *[ik]*) set +e;; esac; @@\
- @for i in filelist; do \ @@\
- cat `basename $$i .o`.M >> program.vista.tmpfile ; done @@\
- $(RM) program.M @@\
- $(MV) program.vista.tmpfile program.M @@\
- @@\
-clean:: @@\
- $(RM) *.M
-#endif
-
-#endif
-
-/* Rule for making shadow trees. */
-#ifndef MakeShadowTree
-#define MakeShadowTree(name,dirs) @@\
-all:: @@\
- @case '${MFLAGS}' in *[ik]*) set +e;; esac; @@\
- MakeDir(name) @@\
- @for i in dirs; \ @@\
- do if [ -d $$i/name ]; then \ @@\
- exit 0; else set -x; mkdir $$i/name; fi \ @@\
- done @@\
- @for i in dirs; \ @@\
- do if [ -r name/$$i ]; then \ @@\
- set +x; \ @@\
- else (set -x; $(LN) ../$$i/name name/$$i); fi \@@\
- done
-#endif
-
-#ifdef BuildPlusPlus
-
-/* Rules for C++ */
-
-/*
- * "CPlusPlusObjectCompile" - compile fragment for a normal C++ object file
-*/
-#ifndef CPlusPlusObjectCompile
-#define CPlusPlusObjectCompile(options) $(RM) $@ @@\
- $(CPLUSPLUSCOM) -c $(CPLUSPLUSFLAGS) options $*.cxx
-#endif
-
-#ifndef CPlusPlusObjectRule
-#define CPlusPlusObjectRule() @@\
-.cxx.o: @@\
- CPlusPlusObjectCompile($(_NOOP_))
-#endif /* CPlusPlusObjectRule */
-
-#ifndef MCPlusPlusSimpleProgramTarget
-#define MCPlusPlusSimpleProgramTarget(program) @@\
-AllTarget(program) @@\
- @@\
-program: program.o $(DEPS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- $(CPLUSPLUSLINKCOM) -o $@ program.o $(LDOPTIONS) $(DEPS) $(LOCAL_LIBRARIES) $(CPLUSPLUSLIBS) $(LDLIBS) $(EXTRA_LOAD_FLAGS) @@\
- @@\
-clean:: @@\
- $(RM) program
-#endif
-
-#ifndef MCPlusPlusComplexProgramTarget
-#define MCPlusPlusComplexProgramTarget(program,locallib,syslib) @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- $(CPLUSPLUSLINKCOM) -o $@ $(LDOPTIONS) $(OBJS) locallib $(CPLUSPLUSLIBS) $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
-CenterProgramTarget(program,$(SRCS),$(OBJS),locallib,syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR)) @@\
- @@\
-install.man:: @@\
- @echo To install documentation for $(PROGRAM), consult the Release Notes @@\
- @echo and/or README file in the current directory. @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- $(RM) $(PROGRAM)
-#endif
-
-#endif /* BuildPlusPlus */
-
-/* Rules for message catalog building */
-#ifndef Real_MessageCatalogRule
-#define Real_MessageCatalogRule(prefix) @@\
-prefix.cat Concat(prefix,MsgCatI.h): @@\
- $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\
- $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\
- $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\
- @@\
-includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\
- @@\
-depend:: prefix.cat Concat(prefix,MsgCatI.h) @@\
- @@\
-all:: prefix.cat @@\
- @@\
-clean:: @@\
- $(RM) prefix.cat Concat(prefix,MsgCatI.h)
-#endif
-#define Stub_MessageCatalogRule(prefix) /**/
-
-
-/* The X BuildLibDir is now an import, not an export. */
-#if UseImports || ImportX11
-# ifndef XBuildLibDir
-# define XBuildLibDir $(TOP)/imports/x11/lib
-# endif
-#endif
-
-
-/* Search the Motif ProjectRoot too if it is different. */
-#ifdef MotifProjectRoot
-# define MUsrLibDirPath Concat(XUsrLibDirPath,:$(MPROJECTROOT)/lib)
-#else
-# define MUsrLibDirPath XUsrLibDirPath
-#endif
-#ifdef UsrLibDirPath
-# undef UsrLibDirPath
-#endif
-#define UsrLibDirPath MUsrLibDirPath
-
-#if ImportMotif
-# define MLdPreLibs -L$(MLIBSRC)
-#elif defined(UseInstalledMotif) && defined(MotifProjectRoot)
-# define MLdPreLibs -L$(MPROJECTROOT)/lib
-#else
-# define MLdPreLibs /**/
-#endif
-#ifdef LdPreLibs
-# undef LdPreLibs
-#endif
-#define LdPreLibs LdPreLib MLdPreLibs XLdPreLibs
-
-#ifdef LdPostLibs
-# undef LdPostLibs
-#endif
-#ifdef MotifProjectRoot
-# define MLdPostLibs -L$(MPROJECTROOT)/lib
-#else
-# define MLdPostLibs /**/
-#endif
-#define LdPostLibs LdPostLib MLdPostLibs XLdPostLibs
-
-#ifdef TopIncludes
-# undef TopIncludes
-#endif
-#define TopIncludes TopInclude $(TOP_MOTIF_INCLUDES) $(TOP_X_INCLUDES)
-
-#if UseInstalledMotif && defined(MotifProjectRoot)
-# define MotifBuildLibPath $(MPROJECTROOT)/lib
-#elif UseInstalledMotif
-# define MotifBuildLibPath $(USRLIBDIR)
-#elif ImportMotif
-# define MotifBuildLibPath $(MLIBSRC)
-#else
-# define MotifBuildLibPath $(TOP)/exports/lib
-#endif
-#ifdef BuildLibPath
-# undef BuildLibPath
-#endif
-#ifdef SystemBuildLibPath
-# define BuildLibPath $(MOTIFENVLIBDIR):$(XENVLIBDIR):$(SYSTEMENVLIBDIR)
-#else
-# define BuildLibPath $(MOTIFENVLIBDIR):$(XENVLIBDIR)
-#endif
-
-#ifndef MotifProjectDefines
-# define MotifProjectDefines MotifDefines MessageCatalogDefines
-#endif
-#ifdef ProjectDefines
-# undef ProjectDefines
-#endif
-#define ProjectDefines X11ProjectDefines MotifProjectDefines
-
-#ifndef MotifCplusplusProjectDefines
-# define MotifCplusplusProjectDefines MotifProjectDefines
-#endif
-#ifdef CplusplusProjectDefines
-# undef CplusplusProjectDefines
-#endif
-#define CplusplusProjectDefines \
- X11CplusplusProjectDefines MotifCplusplusProjectDefines
diff --git a/nx-X11/config/cf/Motif.tmpl b/nx-X11/config/cf/Motif.tmpl
deleted file mode 100644
index d4b7d3a49..000000000
--- a/nx-X11/config/cf/Motif.tmpl
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * @OSF_COPYRIGHT@
- * COPYRIGHT NOTICE
- * Copyright (c) 1990, 1991, 1992, 1993, 1998 The Open Group, Inc.
- * ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- * the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc.
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */
-XCOMM $Xorg: Motif.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-/* Include the X11 project template file. */
-#include <X11.tmpl>
-
-#ifdef AUTOMATION
-# ifndef Automation
-# define Automation YES
-# endif
-#else
-# define NO_AUTOMATION
-#endif
-
-#ifdef USE_VISTACC
-# ifndef UseVista
-# define UseVista
-# endif
-# ifndef CATCMD
-# define CATCMD cat
-# endif
-#endif
-
-#ifdef USE_PURIFY
-# ifndef UsePurify
-# define UsePurify
-# endif
-#endif
-
-#ifdef DEBUG_GEOMETRY
-# ifndef DebugGeometry
-# define DebugGeometry YES
-# endif
-#endif
-
-
-#ifndef _MUse
-# if UseInstalledMotif
-# define _MUse(a,b) a
-# else
-# define _MUse(a,b) b
-# endif
-#endif
-
-#ifndef _MUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
-# if UseInstalledMotif
-# define _MUseCat(a,b,c) a##c
-# else
-# define _MUseCat(a,b,c) b##c
-# endif
-# else
-# if UseInstalledMotif
-# define _MUseCat(a,b,c) a/**/c
-# else
-# define _MUseCat(a,b,c) b/**/c
-# endif
-# endif
-#endif
-
-#ifndef MTop
-# if ImportMotif
-# define MTop $(TOP)/imports/motif
-# else
-# define MTop $(TOP)
-# endif
-#endif
-
-#ifndef BuildDocDir
-# define BuildDocDir $(BUILDINCROOT)/doc
-#endif
-#ifndef BuildLocDir
-# define BuildLocDir $(BUILDINCROOT)/localized
-#endif
-
-#ifndef MotifDefines
-# define MotifDefines /**/
-#endif
-
-#ifndef XmDefines
-# define XmDefines /**/
-#endif
-
-/* To compile without SHAPE extension, set this to -DNO_SHAPE */
-#ifndef MwmDefines
-# define MwmDefines /**/
-#endif
-
-#ifndef UilFlags
-# define UilFlags /**/
-#endif
-
-#ifndef TestDefines
-# define TestDefines /**/
-#endif
-
-#ifndef AutoDefines
-# if Automation
-# define AutoDefines -DAUTOMATION
-# else
-# define AutoDefines /**/
-# endif
-#endif
-
-#ifndef AutoIncludes
-# if Automation
-# define AutoIncludes -I$(AUTOSCRIPTSRC)
-# else
-# define AutoIncludes /**/
-# endif
-#endif
-
-#ifdef UsePurify
-# define PurifyFilesToClean *.pure_linkinfo *.pure_hardlink
-#else
-# define PurifyFilesToClean
-#endif
-#if Automation
-# define TestExtraFilesToClean *.Dat *.Scr PurifyFilesToClean
-#else
-# define TestExtraFilesToClean *.Dat PurifyFilesToClean
-#endif
-
-#ifndef UsrIncDir
-# define UsrIncDir IncRoot
-#endif
-
-/* Place to install .uid files */
-#ifndef UidDir
-# define UidDir $(LIBDIR)/uid
-#endif
-
-#ifndef XmExtraLibraries
-# define XmExtraLibraries /**/
-#endif
-
-#ifndef YaccFlags
-# define YaccFlags /**/
-#endif
-
-#define MotifSharedRev 2.1
-
-#ifndef SharedLibXm
-# define SharedLibXm HasSharedLibraries
-#endif
-#ifndef NormalLibXm
-# define NormalLibXm (!SharedLibXm | ForceNormalLib)
-#endif
-#ifndef DebugLibXm
-# define DebugLibXm NO
-#endif
-#ifndef ProfileLibXm
-# define ProfileLibXm NO
-#endif
-#ifndef SharedXmRev
-# define SharedXmRev MotifSharedRev
-#endif
-
-#ifndef SharedLibMrm
-# define SharedLibMrm HasSharedLibraries
-#endif
-#ifndef NormalLibMrm
-# define NormalLibMrm (!SharedLibMrm | ForceNormalLib)
-#endif
-#ifndef DebugLibMrm
-# define DebugLibMrm NO
-#endif
-#ifndef ProfileLibMrm
-# define ProfileLibMrm NO
-#endif
-#ifndef SharedMrmRev
-# define SharedMrmRev MotifSharedRev
-#endif
-
-#ifndef SharedLibUil
-# define SharedLibUil HasSharedLibraries
-#endif
-#ifndef NormalLibUil
-# define NormalLibUil (!SharedLibUil | ForceNormalLib)
-#endif
-#ifndef DebugLibUil
-# define DebugLibUil NO
-#endif
-#ifndef ProfileLibUil
-# define ProfileLibUil NO
-#endif
-#ifndef SharedUilRev
-# define SharedUilRev MotifSharedRev
-#endif
-
-#ifndef SharedLibACommon
-# define SharedLibACommon HasSharedLibraries
-#endif
-#ifndef NormalLibACommon
-# define NormalLibACommon (!SharedLibACommon | ForceNormalLib)
-#endif
-#ifndef DebugLibACommon
-# define DebugLibACommon NO
-#endif
-#ifndef ProfileLibACommon
-# define ProfileLibACommon NO
-#endif
-#ifndef SharedACommonRev
-# define SharedACommonRev MotifSharedRev
-#endif
-
-#ifndef SharedLibScript
-# define SharedLibScript HasSharedLibraries
-#endif
-#ifndef NormalLibScript
-# define NormalLibScript (!SharedLibScript | ForceNormalLib)
-#endif
-#ifndef DebugLibScript
-# define DebugLibScript NO
-#endif
-#ifndef ProfileLibScript
-# define ProfileLibScript NO
-#endif
-#ifndef SharedScriptRev
-# define SharedScriptRev MotifSharedRev
-#endif
-
-#ifndef SharedLibUtil
-# define SharedLibUtil HasSharedLibraries
-#endif
-#ifndef NormalLibUtil
-# define NormalLibUtil (!SharedLibUtil | ForceNormalLib)
-#endif
-#ifndef DebugLibUtil
-# define DebugLibUtil NO
-#endif
-#ifndef ProfileLibUtil
-# define ProfileLibUtil NO
-#endif
-#ifndef SharedUtilRev
-# define SharedUtilRev MotifSharedRev
-#endif
-
-#ifndef SharedLibCreate
-# define SharedLibCreate HasSharedLibraries
-#endif
-#ifndef NormalLibCreate
-# define NormalLibCreate (!SharedLibCreate | ForceNormalLib)
-#endif
-#ifndef DebugLibCreate
-# define DebugLibCreate NO
-#endif
-#ifndef ProfileLibCreate
-# define ProfileLibCreate NO
-#endif
-#ifndef SharedCreateRev
-# define SharedCreateRev MotifSharedRev
-#endif
-
-#ifndef SharedLibVisual
-# define SharedLibVisual HasSharedLibraries
-#endif
-#ifndef NormalLibVisual
-# define NormalLibVisual (!SharedLibVisual | ForceNormalLib)
-#endif
-#ifndef DebugLibVisual
-# define DebugLibVisual NO
-#endif
-#ifndef ProfileLibVisual
-# define ProfileLibVisual NO
-#endif
-#ifndef SharedVisualRev
-# define SharedVisualRev MotifSharedRev
-#endif
-
-#ifndef SharedLibSynth
-# define SharedLibSynth HasSharedLibraries
-#endif
-#ifndef NormalLibSynth
-# define NormalLibSynth (!SharedLibSynth | ForceNormalLib)
-#endif
-#ifndef DebugLibSynth
-# define DebugLibSynth NO
-#endif
-#ifndef ProfileLibSynth
-# define ProfileLibSynth NO
-#endif
-#ifndef SharedSynthRev
-# define SharedSynthRev MotifSharedRev
-#endif
-
-#ifndef SharedLibMCommon
-# define SharedLibMCommon HasSharedLibraries
-#endif
-#ifndef NormalLibMCommon
-# define NormalLibMCommon (!SharedLibMCommon | ForceNormalLib)
-#endif
-#ifndef DebugLibMCommon
-# define DebugLibMCommon NO
-#endif
-#ifndef ProfileLibMCommon
-# define ProfileLibMCommon NO
-#endif
-#ifndef SharedMCommonRev
-# define SharedMCommonRev MotifSharedRev
-#endif
-
-#ifndef XmClientLibs
-# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef XmClientDepLibs
-# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef MrmClientLibs
-# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef MrmClientDepLibs
-# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef UilClientLibs
-# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef UilClientDepLibs
-# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef TestClientLibs
-# define TestClientLibs $(PURIFYLIBS) $(TESTCOMLIB) \
- $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
- $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
- $(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \
- $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
-#endif
-#ifndef TestUilClientLibs
-# define TestUilClientLibs $(PURIFYLIBS) $(TESTUILCOMLIB) $(TESTCOMLIB) \
- $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
- $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
- $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(TESTGEOLIB) \
- $(XTOOLLIB) $(XPLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
-#endif
-#ifndef TestClientDepLibs
-# define TestClientDepLibs XmClientDepLibs
-#endif
-#ifndef TestUilClientDepLibs
-# define TestUilClientDepLibs UilClientDepLibs
-#endif
-
-/* hardcoded default path. Contrary to the original duplicate of USRLIBDIR
- in the Imakefiles. */
-#ifndef VirtualBindingsPath
-# define VirtualBindingsPath /usr/lib/Xm/bindings
-#endif
-
- MTOP = MTop
-TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
-#if defined(UseInstalled) || (UseInstalledMotif && UseInstalledX11)
- UIL_INCLUDES = -I$(USRINCDIR)/uil
-#else
- UIL_INCLUDES = -I$(UILSRC)
-#endif
-#ifdef BuildLibPathVar
- MOTIFENVLIBDIR = MotifBuildLibPath
-#endif
-
-/* Message catalog usage */
-#ifndef GencatCmd
-# define GencatCmd gencat
-#endif
-#ifndef GencatFlags
-# define GencatFlags /**/
-#endif
-#if defined(NoMessageCatalog)
-# define BuildMessageCatalog NO
-# define MessageCatalogDefines -DNO_MESSAGE_CATALOG
-#else
-# define BuildMessageCatalog YES
-# define MessageCatalogDefines /**/
-#endif
-#ifndef MessageCatalogRule
-# if BuildMessageCatalog
-# define MessageCatalogRule(prefix) Real_MessageCatalogRule(prefix)
-# else
-# define MessageCatalogRule(prefix) Stub_MessageCatalogRule(prefix)
-# endif
-#endif
-
- USRINCDIR = UsrIncDir
- UIDDIR = UidDir
- TESTSRC = $(MTOP)/tests
- TESTLIB = $(TESTSRC)/lib
- GENERALSRCLIB = $(TESTSRC)/General/lib
- GENERALSRCBIN = $(TESTSRC)/General/bin
- MANUALSRCLIB = $(TESTSRC)/Manual/lib
- MANUALSRCBIN = $(TESTSRC)/Manual/bin
- AUTOSRCLIB = $(TESTSRC)/Auto/lib
- AUTOSRCBIN = $(TESTSRC)/Auto/bin
- COMMONPP = $(GENERALSRCBIN)/Commonpp
- GENRUN = $(GENERALSRCBIN)/Genrun
- MANRUN = $(GENERALSRCBIN)/Manrun
-#ifdef DebugLib
- TESTMALLOCSRC = $(GENERALSRCLIB)/Malloc
-#endif
-#ifdef DebugGeometry
- TESTGEOSRC = $(TESTLIB)/Geometry
-#endif
-#ifdef Automation
- TESTCOMSRC = $(AUTOSRCLIB)/Common
- AUTOSCRIPTSRC = $(AUTOSRCLIB)/Script
- AUTOSYNTHSRC = $(AUTOSRCLIB)/Synth
- AUTOCREATESRC = $(AUTOSRCLIB)/Create
- AUTOVISUALSRC = $(AUTOSRCLIB)/Visual
- AUTOUTILSRC = $(AUTOSRCLIB)/Util
- AUTOEXTRALIBS = -ll -ly -lm
-#else
- TESTCOMSRC = $(MANUALSRCLIB)/Common
-#endif
-
- BUILDDOCDIR = BuildDocDir
- BUILDLOCDIR = BuildLocDir
-
-/* MTOOLKITSRC should be removed */
- MTOOLKITSRC = $(TOOLKITSRC)
-#if ImportMotif || UseInstalledMotif
- MINCLUDESRC = $(MTOP)/include
- MDOCSRC = $(MTOP)/doc
- MLOCSRC = $(MTOP)/localized
-#else
- MINCLUDESRC = $(MTOP)/exports/include
- MLOCSRC = $(MTOP)/exports/localized
-#endif
- MLIBSRC = $(MTOP)/lib
- MCLIENTSRC = $(MTOP)/clients
- MDEMOSRC = $(MTOP)/demos
- MWIDGETSRC = $(MLIBSRC)/Xm
- MRESOURCESRC = $(MLIBSRC)/Mrm
- UILSRC = $(MCLIENTSRC)/uil
-#ifdef MotifProjectRoot
- MPROJECTROOT = MotifProjectRoot
-#endif
-
- UIL = _MUse(uil,$(UILSRC)/uil)
- DEPUIL = _MUseCat($(BINDIR),$(UILSRC),/uil)
-
- XMEXTRA_LIBS = XmExtraLibraries
-
-/* These libraries use UseInstalledMotif instead of UseInstalled. */
-#undef _Use
-#undef _UseCat
-#define _Use _MUse
-#define _UseCat _MUseCat
-
-#ifndef MBuildLibDir
-# define MBuildLibDir BuildLibDir
-#endif
-
-#if SharedLibXm
-SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
-#else
-ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir)
-#endif
-
-#if SharedLibMrm
-SharedLibReferences(MRESOURCE,Mrm,$(MRESOURCESRC),SOMRMREV,SharedMrmRev)
-#else
-ProjectUnsharedLibReferences(MRESOURCE,Mrm,$(MRESOURCESRC),MBuildLibDir)
-#endif
-
-#if SharedLibUil
-SharedLibReferences(UIL,Uil,$(UILSRC),SOUILREV,SharedUilRev)
-#else
-ProjectUnsharedLibReferences(UIL,Uil,$(UILSRC),MBuildLibDir)
-#endif
-
-#ifdef DebugGeometry
-ProjectUnsharedLibReferences(TESTGEO,XtGeo,$(TESTGEOSRC),MBuildLibDir)
-#endif
-
-#if Automation
-
-# if SharedLibACommon
-SharedLibReferences(TESTCOM,ACommon,$(TESTCOMSRC),SOACOMMONREV,SharedACommonRev)
-# else
-ProjectUnsharedLibReferences(TESTCOM,ACommon,$(TESTCOMSRC),MBuildLibDir)
-# endif
-
-TESTUILCOMLIB = $(TESTCOMSRC)/libACommonUil.a
-
-# if SharedLibScript
-SharedLibReferences(AUTOSCRIPT,Script,$(AUTOSCRIPTSRC),SOSCRIPTREV,SharedScriptRev)
-# else
-ProjectUnsharedLibReferences(AUTOSCRIPT,Script,$(AUTOSCRIPTSRC),MBuildLibDir)
-# endif
-
-# if SharedLibSynth
-SharedLibReferences(AUTOSYNTH,Synth,$(AUTOSYNTHSRC),SOSYNTHREV,SharedSynthRev)
-# else
-ProjectUnsharedLibReferences(AUTOSYNTH,Synth,$(AUTOSYNTHSRC),MBuildLibDir)
-# endif
-
-# if SharedLibCreate
-SharedLibReferences(AUTOCREATE,Create,$(AUTOCREATESRC),SOCREATEREV,SharedCreateRev)
-# else
-ProjectUnsharedLibReferences(AUTOCREATE,Create,$(AUTOCREATESRC),MBuildLibDir)
-# endif
-
-# if SharedLibVisual
-SharedLibReferences(AUTOVISUAL,Visual,$(AUTOVISUALSRC),SOVISUALREV,SharedVisualRev)
-# else
-ProjectUnsharedLibReferences(AUTOVISUAL,Visual,$(AUTOVISUALSRC),MBuildLibDir)
-# endif
-
-# if SharedLibUtil
-SharedLibReferences(AUTOUTIL,Util,$(AUTOUTILSRC),SOUTILREV,SharedUtilRev)
-# else
-ProjectUnsharedLibReferences(AUTOUTIL,Util,$(AUTOUTILSRC),MBuildLibDir)
-# endif
-
-#else /* Manual */
-
-# if SharedLibMCommon
-SharedLibReferences(TESTCOM,MCommon,$(TESTCOMSRC),SOMCOMMONREV,SharedMCommonRev)
-# else
-ProjectUnsharedLibReferences(TESTCOM,MCommon,$(TESTCOMSRC),MBuildLibDir)
-# endif
-TESTUILCOMLIB = $(TESTCOMSRC)/libMCommonUil.a
-
-#endif /* Automation */
-
-
-/* Revert to the normal library rules. */
-#undef _Use
-#undef _UseCat
-#define _Use _XUse
-#define _UseCat _XUseCat
-
-
-#ifdef UsePurify
- PURIFYLIBS = $(PURIFYHOME)/purify_stubs.a
-#endif
- LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a
-LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
- LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln
- LINTUILLIB = $(UILSRC)/llib-lUil.ln
-
- YACCFLAGS = YaccFlags
- UILFLAGS = UilFlags
- GENCATFLAGS = GencatFlags
- GENCAT = GencatCmd $(GENCATFLAGS)
- MKCATTOOL = $(MLOCSRC)/util/mkcatdefs
-
- RM_CMD = $(RM) FilesToClean ExtraFilesToClean TestExtraFilesToClean
-
-#if NeedDefaultDepLibs
-# if HasSharedLibraries || defined(UseInstalled)
- DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-# else
- DEPLIBS = $(LOCAL_LIBRARIES)
-# endif
- DEPLIBS1 = $(DEPLIBS)
- DEPLIBS2 = $(DEPLIBS)
- DEPLIBS3 = $(DEPLIBS)
-#endif /* NeedDefaultDepLibs */
diff --git a/nx-X11/config/cf/NetBSD.cf b/nx-X11/config/cf/NetBSD.cf
deleted file mode 100644
index b41828059..000000000
--- a/nx-X11/config/cf/NetBSD.cf
+++ /dev/null
@@ -1,692 +0,0 @@
-XCOMM platform: $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.122 2003/11/18 18:09:45 dawes Exp $
-
-
-#ifndef OSName
-#define OSName DefaultOSName OSBinaryType
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-
-#ifndef OSVendor
-#define OSVendor The NetBSD Foundation, Inc.
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * C library features
- */
-#if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 2) || \
- (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
-# define HasPoll YES
-#endif
-#define HasNdbm YES
-#define HasPutenv YES
-#if OSMajorVersion == 1 && OSMinorVersion > 4 || OSMajorVersion > 1
-# define HasStrlcat YES
-#endif
-#define HasSnprintf YES
-#define HasBSD44Sockets YES
-#define Malloc0ReturnsNull NO
-#define SetTtyGroup YES
-#define DBMLibrary /**/
-#define HasDlopen YES
-#define HasSetProcTitle YES
-#ifndef HasLibCrypt
-# define HasLibCrypt YES
-#endif
-#ifndef BuildPDFdocs
-# define BuildPDFdocs NO
-#endif
-#ifndef HasShm
-# if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2
-/*
- * Shm memory was removed in 0.9B because it was encumbered.
- * A free version was added in 0.9C
- */
-# define HasShm NO
-# else
-# define HasShm YES
-# endif
-#endif
-#define HasWChar32 YES
-/*
- * There's a bug in NetBSD 1.0, 1.1 and 1.2 dlsym()
- */
-#if ((OSMajorVersion == 1 && OSMinorVersion < 2) || \
- (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2))
-# define HasDlsymBug YES
-#endif
-/* Mkstemp is there since 1.2 (at least) */
-#if (!(OSMajorVersion == 0 || \
- (OSMajorVersion == 1 && OSMinorVersion < 2)))
-#define HasMkstemp YES
-#endif
-/* But the standalone mktemp doesn't exist before NetBSD 1.5*/
-#if (OSMajorVersion ==0 || (OSMajorVersion == 1 && OSMinorVersion <= 4))
-# define HasMktemp NO
-#else
-# define HasMktemp YES
-#endif
-
-#ifndef HasIssetugid
-# if (OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion >= 5))
-# define HasIssetugid YES
-# endif
-#endif
-
-#if (OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1)
-#define HasGetIfAddrs YES
-#endif
-
-#define HasUsableFileMmap YES
-
-#define HasVarRun YES
-#define HasVarDb YES
-
-#define HasShadowPasswd NO
-
-#define InstallXloadSetGID NO
-
-#if OSMajorVersion < 1 || (OSMajorVersion == 1 && OSMinorVersion < 5)
-#define BuildIPv6 NO
-#endif
-
-#define IPv6SocketsAlsoIPv4 NO
-
-/*
- * NetBSD 1.6M and newer supports POSIX Threads.
- */
-
-#ifndef NetBSDThreads
-# define NetBSDThreads YES
-#endif
-
-#if NetBSDThreads && \
- ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 6) || \
- (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13))
-
-# define HasPosixThreads YES
-# define ThreadedX YES
-# define HasThreadSafeAPI YES
-# define ThreadsLibraries -lpthread
-# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
- (OSMajorVersion == 2 && OSMinorVersion < 99) || \
- (OSMajorVersion < 2))
-# define LibraryMTDefines -DUSE_NBSD_THREADLIB
-# endif
-# define SystemMTDefines -D_REENTRANT
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-#else
-# define ThreadedX NO
-#endif
-
-/*
- * Compiler Features
- */
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-
-#define MkdirHierCmd mkdir -p
-
-#undef CcCmd
-#define CcCmd gcc
-#ifndef DefaultCCOptions
-#if defined(UseInstalled)
-#define DefaultCCOptions /**/
-#else
-#ifdef Arm32Architecture
-#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char \
- -fomit-frame-pointer
-#elif defined(PpcArchitecture)
-# define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char
-#else
-#define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions
-#endif
-#endif
-#endif
-
-#define CppCmd cpp
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#define PreProcessCmd CcCmd -E
-#define PostIncDir /usr/include
-
-#define GccGasOption -DGCCUSESGAS
-#define AsmDefines -DUSE_GAS
-
-/* UseElfFormat defaults to YES if __ELF__ set */
-#ifndef UseElfFormat
-# ifdef __ELF__
-# undef __ELF__ /* other imake files shouldn't care */
-# define UseElfFormat YES
-# else
-# define UseElfFormat NO
-# endif
-#endif
-
-/*
- * Dynamic loading supported starting in 1.0 on a.out platforms,
- * and on all ELF platforms.
- *
- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
- * working shared libs).
- *
- * Disabled for NetBSD/vax until I figure out the scheme. --CS
- */
-#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
- defined(PpcArchitecture)
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-#else
-# ifndef DoLoadableServer
-# define DoLoadableServer NO
-# endif
-#endif
-
-#if UseElfFormat
-#define DlLibrary -rdynamic /* no -ldl yet */
-#else
-#define DlLibrary /**/
-#endif
-
-/* All ELF NetBSD systems support Weak symbols */
-#define HasWeakSymbols UseElfFormat
-
-#ifdef i386Architecture
-# ifndef DefaultGcc2i386Opt
-# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
-# define DefaultGcc2i386Opt -O2 GccAliasingArgs
-# endif
-# endif
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# if OSMajorVersion < 1
-# define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF
-# else
-# define ServerOSDefines XFree86ServerOSDefines
-# endif
-# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2
-# define ServerExtraSysLibs -li386
-# endif
-#else
-# define OptimizedCDebugFlags -O2
-# if defined(SparcArchitecture)
-# define ServerOSDefines -DDDXOSINIT
-# elif defined(AlphaArchitecture)
-# define ServerOSDefines XFree86ServerOSDefines
-# elif defined(Arm32Architecture)
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# elif defined(PpcArchitecture)
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
-# else
-# define ServerOSDefines /**/
-# endif
-# if defined(AlphaArchitecture)
-# define ServerExtraSysLibs -lalpha
-# else
-# define ServerExtraSysLibs /**/
-# endif
-#endif
-#ifdef i386Architecture
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
- || OSMinorVersion >= 4) \
- || OSMajorVersion >= 2)
-# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -DWSCONS_SUPPORT
-# else
-# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-# endif
-#elif defined(SparcArchitecture)
-# if defined(Sparc64Architecture)
-# define ServerExtraDefines XFree86ServerDefines -D_XSERVER64
-# else
-# define ServerExtraDefines XFree86ServerDefines
-# endif
-# elif defined(AlphaArchitecture)
- /* XXX for the following */
-# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-#elif defined(AlphaArchitecture)
-# define ServerExtraDefines GccGasOption -D_XSERVER64
-#elif defined(Arm32Architecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DPCCONS_SUPPORT
-# endif
-#elif defined(PpcArchitecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT
-# endif
-#else
-# define ServerExtraDefines GccGasOption
-#endif
-
-#define StandardDefines -DCSRG_BASED
-/* Citrus mb locale were added in 1.5P */
-#if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 5) || \
- (OSMajorVersion == 1 && OSMinorVersion == 5 && OSTeenyVersion >= 15))
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-#else
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#ifndef ExtraLibraries
-#define ExtraLibraries /**/
-#endif
-#ifndef UseGnuMalloc
-/*
- * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped
- * to OSTeenyVersion == 9. That should be safe, since there will never
- * be a release for 1.4.9.
- */
-# if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 4) || \
- (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 9))
-# define UseGnuMalloc NO
-# else
-# define UseGnuMalloc YES
-#endif
-#endif
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary -lgnumalloc
-#endif
-
-#if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 2) || \
- (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
-#ifndef HasZlib
-#define HasZlib YES
-#endif
-#endif
-
-#define AdmDir /var/log
-
-#define HasFlex YES
-
-/* NetBSD doesn't have gperf in the base install */
-#define DontRebuildGperfOutput YES
-
-/*
- * NetBSD doesn't have perl in default system
- * you may override this in host.def if you installed perl from the packages
- */
-#ifndef HasPerl
-#define HasPerl NO
-#endif
-
-/*
- * NetBSD doesn't have gperf in default system
- * you may override this in host.def if you installed perl from the packages
- */
-#ifndef HasGperf
-#define HasGperf NO
-#endif
-
-/*
- * Make & install Features
- */
-#define HasBsdMake YES
-#define CompressAllFonts YES
-#define GzipFontCompression YES
-#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#ifdef InstallCmd
-# undef InstallCmd
-# define InstallCmd /usr/bin/install
-#endif
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-/*
- * Documentation formatting
- */
-#define NeqnCmd neqn -Tlatin1
-#define NroffCmd nroff -Tlatin1
-#define EqnCmd eqn -Tps
-#define HasGroff YES
-
-/*
- * To use the NetBSD Aperture driver
- */
-#if defined(i386Architecture)
-# ifndef HasNetBSDApertureDriver
-# define HasNetBSDApertureDriver YES
-# endif
-
-/*
- * Builtin MTRR support (NetBSD 1.5Y and up)
- */
-# if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion >= 6) || \
- (OSMajorVersion == 1 && OSMinorVersion == 5 && \
- OSTeenyVersion >= 25))
-# define HasMTRRBuiltin YES
-# else
- /*
- * MTRR support provided by the Aperture driver
- */
-# if HasNetBSDApertureDriver
-# ifndef HasMTRRSupport
-# define HasMTRRSupport YES
-# endif
-# endif
-# endif /* MTRRBuiltin */
-#endif /* i386Architecture */
-
-/*
- * agpgart support (NetBSD 1.5Y and up)
- */
-#if ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion >= 6) || \
- (OSMajorVersion == 1 && OSMinorVersion == 5 && \
- OSTeenyVersion >= 25))
-# ifndef HasAgpGart
-# define HasAgpGart YES
-# endif
-#endif
-
-/*
- * MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the
- * necessary kernel and toolchain support.
- */
-#if defined(i386Architecture) && \
- ((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5))
-# define HasX86Support YES
-# define HasMMXSupport YES
-# define Has3DNowSupport YES
-# define HasSSESupport YES
-#else
-# define HasX86Support NO
-# define HasMMXSupport NO
-# define Has3DNowSupport NO
-# define HasSSESupport NO
-#endif
-
-#ifndef HasCookieMaker
-# if OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion >= 2
- /* NetBSD 1.5 and later have /dev/urandom */
-# define HasCookieMaker YES
-# define MkCookieCmd \
- 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
-# else
-# define HasCookieMaker NO
-# endif
-#endif
-
-
-/*
- * ForceSubdirs - force make to build subdirectories
- *
- * For BSD 4.4 make
- */
-#define ForceSubdirs(dirs) @@\
-dirs: .EXEC @@\
- @cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \ @@\
- $(MAKE) $(MFLAGS) PassCDebugFlags all @@\
- @@\
-.EXEC:
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define ManSuffix 1
-#define FileManSuffix 5
-#define ManSourcePath $(MANPATH)/cat
-
-#define InstallManPageLongBase(file,destdir,dest) @@\
- @@\
-all:: file.0 @@\
- @@\
-file.0:: file.$(MANNEWSUFFIX) @@\
- @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
- then \ @@\
- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
- fi @@\
- @@\
-install.man:: @@\
- MakeDir($(DESTDIR)destdir) @@\
- -@if [ -f file.0 ]; \ @@\
- then \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
- fi @@\
- @@\
-clean:: @@\
- RemoveFile(file.0)
-
-#define InstallManPageLong(file,destdir,dest) @@\
-BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-InstallManPageLongBase(file,destdir,dest)
-
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
-BuildInstallHtmlManPage(file,dest,suffix) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-InstallManPageLongBase(file,destdir,dest)
-
-#define InstallMultipleMan(list,dest) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (MNAME=`echo $$i | cut -f1 -d.`; \ @@\
- set -x; \ @@\
- cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
- | $(COL) > $${MNAME}.0; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\
- $(DESTDIR)dest/$${MNAME}.0; \ @@\
- $(RM) $${MNAME}.0); \ @@\
- done
-
-#define InstallMultipleManSuffix(list,dest,suff) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
- | $(COL) > $$i.0; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) $$i.0 \ @@\
- $(DESTDIR)dest/$$i.0; \ @@\
- $(RM) $$i.0 ); \ @@\
- done
-
-#define InstallManPageAliasesBase(file,destdir,aliases) @@\
-install.man:: @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in aliases; do \ @@\
- (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.0;\ @@\
- (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\
- ); \ @@\
- done
-
-#define InstallManPageAliases(file,destdir,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,suffix) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-
-/*
- * Shared libraries supported starting in 1.0 on a.out platforms,
- * and on all ELF platforms.
- *
- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
- * working shared libs).
- */
-#if ((OSMajorVersion > 0) && \
- !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
- UseElfFormat
-# ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-# endif
-#endif
-
-#ifndef OSBinaryType
-#if UseElfFormat
-#define OSBinaryType [ELF]
-#else
-#define OSBinaryType /**/
-#endif
-#endif
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries NO
-#endif
-
-/*
- * Unresolved references are fatal on NetBSD 1.5 for libGL, which is
- * built with -Bsymbolic.
- */
-#if UseElfFormat && OSMajorVersion == 1 && OSMinorVersion == 5
-#define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc
-#endif
-
-#if HasSharedLibraries
-#include <bsdLib.rules>
-#endif /* HasSharedLibraries */
-
-/* Always build the XInput library, regardless of server support on this plattform */
-#if !defined(BuildXInputLib) && !defined(BuildServersOnly)
-# define BuildXInputLib YES
-#endif
-
-#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture)
-# include <xorg.cf>
-#endif
-
-/*
- * Definitions for the SUN server on NetBSD/sparc
- */
-#ifdef SparcArchitecture
-#ifndef Xsun24Server
-#define Xsun24Server YES
-#endif
-#ifndef XsunServer
-#define XsunServer YES
-#endif
-#ifndef XsunMonoServer
-#define XsunMonoServer NO /* XXX: does not link */
-#endif
-#ifndef BuildScreenSaverLibrary
-#define BuildScreenSaverLibrary YES
-#endif
-
-/*
- * XFree86 uses its own (more portable) database routines to speed up
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in
- * site.def
- */
-#ifndef UseRgbTxt
-#define UseRgbTxt YES
-#endif
-#define BuildXF86VidModeExt NO
-#define BuildXF86DGA NO
-#define BuildXInputExt NO
-#include <xorg.cf>
-#endif
-
-/*
- * Definition for compiling on MIPS machines
- */
-#ifdef MipsArchitecture
-#define PositionIndependentCFlags
-#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ |
-sed 's/\.[0-9]*$$//'`
-#define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB)
-#endif
-
-/*
- * Definition for compiling on Alpha machines
- */
-#ifdef AlphaArchitecture
-
-/* Build the shared XDM greeter on Alpha if it supports shared libs */
-#define SharedLibXdmGreet HasSharedLibraries
-#endif
-
-/*
- * Definition for compile on macppc machines
- */
-#ifdef PpcArchitecture
-
-# define OptimizedCDebugFlags -O2
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-
-# define UseElfFormat YES
-
-#endif
-
-/*
- * Definition for compiling on VAX machines
- */
-#ifdef VaxArchitecture
-#define BuildServer NO
-#endif
-
-/*
- * General settings for all platforms
- */
-#ifndef SharedLibXdmGreet
-#define SharedLibXdmGreet NO
-#endif
-
-#ifndef BuildHtmlManPages
-#define BuildHtmlManPages NO /* We don't want HTML manpages */
-#endif
-
-#ifndef UseSeparateConfDir
-#define UseSeparateConfDir NO /* We don't want appdefs in "/etc/X11". */
-#endif
-
-#if defined(NetBSDArchitecture) && \
- ((OSMajorVersion > 1) || \
- (OSMajorVersion == 1 && OSMinorVersion > 3))
-#define HasDevRandom YES
-#define RandomDeviceFile /dev/urandom
-#endif
diff --git a/nx-X11/config/cf/Oki.cf b/nx-X11/config/cf/Oki.cf
deleted file mode 100644
index 79992e5ed..000000000
--- a/nx-X11/config/cf/Oki.cf
+++ /dev/null
@@ -1,30 +0,0 @@
-XCOMM platform: $Xorg: Oki.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-#ifndef OSName
-#define OSName Unix System V/860 Release 4.0 Version 3
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 3
-#endif
-
-#define BootstrapCFlags -DOki
-#define SystemV4 YES
-#define HasLdRunPath YES
-#define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN
-#define SetTtyGroup YES
-#define HasPutenv YES
-#define HasPoll YES
-#define PatheticCpp YES
-#define CcCmd /usr/bin/cc
-#define StandardDefines -DSVR4 -Di860
-#define DefaultCCOptions -Xa
-#define BuildServer NO
-#define ToolkitStringsABIOptions -intelabi
-#include <sv4Lib.rules>
diff --git a/nx-X11/config/cf/OpenBSD.cf b/nx-X11/config/cf/OpenBSD.cf
deleted file mode 100644
index d5b88daf3..000000000
--- a/nx-X11/config/cf/OpenBSD.cf
+++ /dev/null
@@ -1,1017 +0,0 @@
-XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.100 2004/01/08 22:51:41 herrb Exp $
-XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.12 2005/10/01 16:42:11 herrb Exp $
-XCOMM
-
-#ifndef OSName
-#define OSName DefaultOSName OSBinaryType
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#ifdef Ports
-
-#define BinDir /usr/local/bin
-#define LibDir /usr/local/lib/X11
-#define UsrLibDir /usr/local/lib
-#define ManDirectoryRoot /usr/local/man
-#define LdPreLib -L/usr/X11R6/lib -L/usr/local/lib
-#define XpmLibDir /usr/X11R6/lib
-#define XpmIncDir /usr/X11R6/include
-#define ConfigDir /usr/X11R6/lib/X11/config
-#define IncRoot /usr/local/include
-#define TopXInclude -I/usr/X11R6/include
-#define ImakeCmd imake -DPorts
-#define DocDir /usr/local/share/doc
-#define BuildHtmlManPages NO
-
-#endif
-
-/*
- * C library features
- */
-#define HasPoll YES
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasSnprintf YES
-#if OSMajorVersion == 2 && OSMinorVersion >= 4 || OSMajorVersion >= 3
-# define HasStrlcat YES
-#endif
-#define HasBSD44Sockets YES
-#define Malloc0ReturnsNull NO
-#define SetTtyGroup YES
-#define DBMLibrary /**/
-#define HasLibCrypt NO
-#define HasShm YES
-#define HasWChar32 YES
-#define HasMkstemp YES
-#define HasSetProcTitle YES
-#define HasZlib YES
-#ifndef HasLibpng
-# define HasLibpng NO
-#endif
-#ifndef HasKrbIV
-# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 3
-# define HasKrbIV YES
-# if OSMajorVersion == 2 && OSMinorVersion <= 8
-# define KrbIVLibraries -lkrb -lkafs -ldes
-# endif
-# else
- /* Kerberos IV was removed after OpenBSD 3.3 */
-# define HasKrbIV NO
-# endif
-#endif
-#define HasUsableFileMmap YES
-#define HasShadowPasswd NO
-#define IPv6SocketsAlsoIPv4 NO
-
-#define HasArc4Random YES
-
-#define HasNCurses YES
-#define NCursesLibName -lcurses
-#if defined(TermcapLibrary)
-#undef TermcapLibrary
-#endif
-#define TermcapLibrary -lcurses
-
-#define HasVarRun YES
-#define HasVarDb YES
-#define VarLibDir VarDbDirectory
-
-#define InstallXloadSetGID NO
-
-#ifndef HasIssetugid
-# if (OSMajorVersion >= 2)
-# define HasIssetugid YES
-# endif
-#endif
-
-#ifndef HasMktemp
-# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1)
-# define HasMktemp YES
-# else
-# define HasMktemp NO
-# endif
-#endif
-
-/* OpenBSD >= 2.7 has getifaddrs() */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 7)
-#define HasGetIfAddrs YES
-#endif
-
-/* OpenBSD >= 2.8 has setusercontext() */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 7)
-#define HasSetUserContext YES
-#endif
-
-/* OpenBSD after 2.9 has BSD authentication */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 9)
-# define HasBSDAuth YES
-#endif
-
-/* OpenBSD 3.0 and later has getpeereid() */
-#if OSMajorVersion >= 3
-# define HasGetpeereid YES
-#endif
-
-/* OpenBSD 3.0 has APM with kqueue interface */
-#if OSMajorVersion >= 3
-# define HasApmKqueue YES
-#endif
-
-/* OpenBSD 3.0 has libusb, next versions have libusbhid */
-#if OSMajorVersion >= 3
-# define HasLibUsb YES
-# ifndef HasLibUsbHid
-# if OSMajorVersion == 3 && OSMinorVersion > 0 || OSMajorVersion > 3
-# define HasLibUsbHid YES
-# define UsbHidLib -lusbhid
-# else
-# define HasLibUsbHid NO
-# define UsbHidLib -lusb
-# endif
-# endif
-#endif
-
-/*
- * Compiler Features
- */
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-
-#define UseGnuMalloc NO
-
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-
-#define MkdirHierCmd mkdir -p
-
-#ifndef CppCmd
-#define CppCmd /usr/libexec/cpp
-#endif
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#define PreProcessCmd CppCmd
-#define PreIncDir DefaultGccIncludeDir
-
-#ifndef CcCmd
-#define CcCmd cc
-#endif
-#ifndef AsCmd
-#define AsCmd cc -c -x assembler
-#endif
-#ifndef DefaultCCOptions
-#if defined(UseInstalled)
- /* conform to OpenBSD's habits */
-# define DefaultCCOptions $(COPTS)
-#else
-# ifdef PpcArchitecture
-# define DefaultCCOptions -pipe -fsigned-char GccWarningOptions
-# else
-# define DefaultCCOptions -pipe GccWarningOptions
-# endif
-#endif
-#endif
-
-#define GccGasOption -DGCCUSESGAS
-#define AsmDefines -DUSE_GAS
-
-/* UseElfFormat defaults to YES if __ELF__ set */
-#ifndef UseElfFormat
-# ifdef __ELF__
-# undef __ELF__ /* other imake files shouldn't care */
-# define UseElfFormat YES
-# else
-# define UseElfFormat NO
-# endif
-#endif
-
-/*
- * Increment shared libraries major numbers if using Gcc Stack Protector
- * (This introduces an ABI change)
- */
-#ifndef OverrideShlibRevs
-# define OverrideShlibRevs ProPoliceSupport
-#endif
-
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-
-#define AdmDir /var/log
-
-#define HasFlex YES
-
-/* OpenBSD doesn't have gperf in the base install */
-#define DontRebuildGperfOutput YES
-
-/*
- * Make & install Features
- */
-
-#define HasBsdMake YES
-
-#define BuildCyrillicFonts YES
-#define GzipFontCompression YES
-#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#define InstUidFlags -m 4755
-
-#ifdef InstallCmd
-# undef InstallCmd
-# define InstallCmd /usr/bin/install
-#endif
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-/*
- * Documentation formatting
- */
-#define NeqnCmd neqn -Tlatin1
-#define NroffCmd nroff -Tlatin1
-#define EqnCmd eqn -Tps
-#define HasGroff YES
-
-#ifndef HasCookieMaker
-# define HasCookieMaker YES
-# define MkCookieCmd \
- 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
-#endif
-
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define ManSuffix 1
-#define FileManSuffix 5
-#define ManSourcePath $(MANPATH)/cat
-
-#define InstallManPageLongBase(file,destdir,dest) @@\
-all:: file.0 @@\
- @@\
-file.0:: file.$(MANNEWSUFFIX) @@\
- @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
- then \ @@\
- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \ @@\
- $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
- fi @@\
- @@\
-install.man:: @@\
- MakeDir($(DESTDIR)destdir) @@\
- -@if [ -f file.0 ]; \ @@\
- then \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
- fi @@\
- @@\
-clean:: @@\
- RemoveFile(file.0)
-
-#define InstallManPageLong(file,destdir,dest) @@\
-BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-InstallManPageLongBase(file,destdir,dest)
-
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
-BuildInstallHtmlManPage(file,dest,suffix) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-InstallManPageLongBase(file,destdir,dest)
-
-#define InstallMultipleMan(list,dest) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (MNAME=`echo $$i | cut -f1 -d.`; \ @@\
- set -x; \ @@\
- cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
- | $(COL) > $${MNAME}.0; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\
- $(DESTDIR)dest/$${MNAME}.0; \ @@\
- $(RM) $${MNAME}.0); \ @@\
- done
-
-#define InstallMultipleManSuffix(list,dest,suff) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
- | $(COL) > $$i.0; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) $$i.0 \ @@\
- $(DESTDIR)dest/$$i.0; \ @@\
- $(RM) $$i.0 ); \ @@\
- done
-
-#define InstallManPageAliasesBase(file,destdir,aliases) @@\
-install.man:: @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in aliases; do \ @@\
- (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.0;\ @@\
- (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\
- ); \ @@\
- done
-
-#define InstallManPageAliases(file,destdir,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,suffix) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-
-
-/*
- * InstallFontAliases - generate rules to install font aliases
- * databases without comments for X11R5 servers
- */
-#ifndef InstallFontAliasesNoComment
-#define InstallFontAliasesNoComment(dest) @@\
-install:: fonts.alias @@\
- $(RM) _fonts.alias @@\
- sed -e '/^!/d' -e '/^$$/d' < fonts.alias > _fonts.alias @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTALLDATFLAGS) _fonts.alias \ @@\
- $(DESTDIR)dest/fonts.alias @@\
- $(RM) _fonts.alias
-#endif /* InstallFontAliasesNoComment */
-
-/*
- * OpenBSD specific Imake Config files
- */
-#ifndef LocalConfigFiles
-#define LocalConfigFiles \
- OpenBSDLib.rules OpenBSDLib.tmpl
-#endif
-
-/*
- * Architecture specific sections - put all architecture dependent
- * options and setting here into the correct section
- */
-
-
-/*
- * Definitions for the alpha architecture
- */
-#ifdef AlphaArchitecture
-
-# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
-# define HasWeakSymbols YES
-# endif
-
-/* XXX Xvfb currently causes a linker error: */
-/* XXX crtbegin.c(.fini+0x10): relocation truncated to fit: BRADDR text */
-# ifdef XVirtualFramebufferServer
-# undef XVirtualFramebufferServer
-# endif
-# define XVirtualFramebufferServer NO
-# ifdef XnestServer
-# undef XnestServer
-# endif
-# define XnestServer NO
-
-# if (OSMajorVersion < 3)
-# define HasSharedLibraries NO
-# endif
-
-# ifndef XorgServer
-# if OSMajorVersion == 3 && OSMinorVersion >= 2 || OSMajorVersion > 3
-# define XorgServer YES
-# else
-# define XorgServer NO
-# endif
-# endif
-
-/* Definitions for building the XFree86 server */
-# if XorgServer
-# ifndef HasNetBSDApertureDriver
-# define HasNetBSDApertureDriver YES
-# endif
-# define ServerOSDefines XFree86ServerOSDefines -DDDXOSINIT
-# define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines
-# define ServerExtraSysLibs -lalpha
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-# define XF86OSCardDrivers wsfb
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-# define UseMatroxHal NO /* Matrox HAL is i386 only */
-
-# endif /* XorgServer */
-
-# include <xorg.cf>
-
-#endif /* AlphaArchitecture */
-
-/*
- * Definitions for the AMD64 architecture
- */
-#ifdef AMD64Architecture
-
-# define HasWeakSymbols YES
-# define HasSharedLibraries YES
-# define HasDlopen YES
-
-# define XorgServer YES
-
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-
-# ifndef HasNetBSDApertureDriver
-# define HasNetBSDApertureDriver YES
-# endif
-
-# define HasAgpGart YES
-
-# define ServerExtraSysLibs -lamd64
-# define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines
-
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-
-# ifndef HasMMXSupport
-# define HasMMXSupport YES
-# endif
-
-# ifndef HasX86Support
-# define HasX86Support YES
-# endif
-# include <xorg.cf>
-
-#endif /* AMD64Architecture */
-
-/*
- * Definitions for the i386 architecture
- */
-#ifdef i386Architecture
-
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-
-/* Direct rendering (OpenBSD 3.3 and up). */
-# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
-# ifndef BuildXF86DRI
-# define BuildXF86DRI NO
-# endif
-# endif
-
-# define HasWeakSymbols YES
-
-/* To use the NetBSD Aperture driver */
-# ifndef HasNetBSDApertureDriver
-# define HasNetBSDApertureDriver YES
-# endif
-
-/* 2.7 and later have support for setting MTRRs */
-# ifndef HasMTRRSupport
-# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
-# define HasMTRRSupport YES
-# else
-# define HasMTRRSupport NO
-# endif
-# endif
-
-/*
- * agpgart support (OpenBSD 3.2 and up)
- */
-# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 1)
-# ifndef HasAgpGart
-# define HasAgpGart YES
-# endif
-# endif
-
-
-# ifndef DefaultGcc2i386Opt
-# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
- /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-# define DefaultGcc2i386Opt -O2 GccAliasingArgs
-# endif
-# endif
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraSysLibs -li386
-# define LdPostLib /**/
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-
-# define JoystickSupport NO
-
-/* A hack to work around an optimization problem with gcc 2.95.2 */
-# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
-# define GccOptBug295
-# endif
-
-/* No MMX support in OpenBSD/a.out gas */
-# ifndef HasMMXSupport
-# define HasMMXSupport UseElfFormat
-# endif
-
-/* for DRI */
-# ifndef HasX86Support
-# define HasX86Support UseElfFormat
-# endif
-
-# include <xorg.cf>
-
-#endif /* i386Architecture */
-
-
-/*
- * Definitions for the m68k architecture (currently amiga, hp300,
- * mac68k, mvme68k, sun3)
- */
-#ifdef Mc68020Architecture
-
-/*
- * Function CSE makes gas -k not recognize external function calls as lazily
- * resolvable symbols, thus sometimes making ld.so report undefined symbol
- * errors on symbols found in shared library members that would never be
- * called. Ask niklas@openbsd.org for details.
- */
-
-# define PositionIndependentCFlags -fpic -fno-function-cse
-# define BuildGlxExt NO
-# define BuildGLXLibrary YES
-
-#endif /* Mc68020Architecture */
-
-
-/*
- * Definitions for the amiga architecture
- */
-#ifdef AmigaArchitecture
-
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-
-# define ServerExtraDefines -DXFree86Server
-
-# include <xorg.cf>
-
-#endif /* AmigaArchitecture */
-
-
-/*
- * Definitions for the hp300 architecture
- */
-#ifdef Hp300Architecture
-
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-/* For the X11R5 server */
-# define CompressAllFonts NO
-# define InstallFontAliases InstallFontAliasesNoComment
-# define UseRgbTxt NO
-# define UseRgb YES
-
-# define ServerExtraDefines -DXFree86Server
-
-#include <xorg.cf>
-
-#endif /* Hp300Architecture */
-
-
-/*
- * Definitions for the mac68k architecture
- */
-#ifdef Mac68kArchitecture
-
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-
-# define ServerExtraDefines -DXFree86Server
-
-# include <xorg.cf>
-
-#endif /* mac68kArchitecture */
-
-
-/*
- * Definitions for the mvme68k architecture
- */
-#ifdef Mvme68kArchitecture
-
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-
-# define ServerExtraDefines -DXFree86Server
-
-# include <xorg.cf>
-
-#endif /* Mvme68kArchitecture */
-
-
-/*
- * Definitions for the sun3 architecture
- */
-#ifdef Sun3Architecture
-
-# include <xf86.rules>
-
-# define ServerOSDefines -DDDXOSINIT
-# define BootstrapCFlags -Dsun3
-# define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */
-# define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 \
- -DXFree86Server -DINCLUDE_CG2_HEADER
-
-# ifndef Xsun24Server
-# define Xsun24Server NO
-# endif
-# ifndef XsunServer
-# define XsunServer YES
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer NO
-# endif
-
-#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-#endif /* Sun3Architecture */
-
-
-/*
- * Definitions for the mips architecture (currently arc, pmax)
- */
-#ifdef MipsArchitecture
-
- /*
- * Mips ELF shared libs need some special handling.
- */
-# define PositionIndependentCFlags
-# define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | sed 's/\.[0-9]*$$//'`
-# define SharedXtReqs -L$(BUILDLIBDIR) $(XONLYLIB) $(SMLIB) $(ICELIB)
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB)
-
-#endif /* MipsArchitecture */
-
-
-/*
- * Definitions for the arc architecture
- */
-#ifdef ArcArchitecture
-
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DPCCONS_SUPPORT
-# endif
-
-# include <xorg.cf>
-
-#endif /* ArcArchitecture */
-
-
-/*
- * Definitions for the pmax architecture
- */
-#ifdef PmaxArchitecture
-
-# include <xf86.rules>
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-/* For the X11R5 server */
-# define CompressAllFonts NO
-# define InstallFontAliases InstallFontAliasesNoComment
-# define UseRgbTxt NO
-
-#endif /* PmaxArchitecture */
-
-/*
- * Definitions for the PowerPC architecture
- */
-#ifdef PpcArchitecture
-
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-# ifndef XFree86ConsoleDefines
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT
-# endif
-
-# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
-# define HasWeakSymbols YES
-# endif
-# ifndef GccWarningOptions
-# if defined(XFree86Devel) && XFree86Devel
-# define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
-# else
-# define GccWarningOptions -Wall -Wpointer-arith
-# endif
-# endif
-
-# ifndef XorgServer
-# define XorgServer YES
-# endif
-
-/* Definitions for building the X server */
-# if XorgServer
-# define ServerOSDefines XFree86ServerOSDefines -DDDXOSINIT
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-# define XF86OSCardDrivers wsfb
-# ifndef XF86CardDrivers
-# define XF86CardDrivers ati mga glint s3virge sis savage\
- trident chips tdfx \
- DevelDrivers vga \
- XF86OSCardDrivers XF86ExtraCardDrivers
-# endif
-# ifndef DevelDrivers
-# define DevelDrivers nv
-# endif
-
-# endif /* XorgServer */
-
-# include <xorg.cf>
-
-#endif /* PpcArchitecture */
-
-/*
- * Definitions for the sparc architecture
- */
-#ifdef SparcArchitecture
-
-# define BuildXF86MiscExt NO
-# define BuildMITMiscExt NO
-
-# if OSMajorVersion > 3 || OSMajorVersion == 3 && OSMinorVersion >= 2
-# define HasWeakSymbols YES
-#endif
-
-# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 2
-# define ServerOSDefines -DDDXOSINIT
-# define ServerExtraDefines -DAVOID_GLYPHBLT -DPIXPRIV -DXFree86Server \
- DebugDefines -DINCLUDE_CG2_HEADER \
- -DX_BYTE_ORDER=$(X_BYTE_ORDER)
-# define XOrgServer NO
-# else
-# define XorgServer YES
-# endif
-
-# if !XorgServer
-
-# ifndef Xsun24Server
-# define Xsun24Server YES
-# endif
-# ifndef XsunServer
-# define XsunServer YES
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer YES
-# endif
-# ifndef InstallXserverSetUID
-# define InstallXserverSetUID NO
-# endif
-
-# else /* XF86Server */
-
-# ifndef Xsun24Server
-# define Xsun24Server NO
-# endif
-# ifndef XsunServer
-# define XsunServer NO
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer NO
-# endif
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-
-# define XF86CardDrivers wsfb
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT
-# define BuildXInputExt YES
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-
-# endif
-
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-# define BuildXF86VidModeExt NO
-# define BuildXF86DGA NO
-# ifndef BuildXInputExt
-# define BuildXInputExt NO
-# endif
-# include <xorg.cf>
-
-#endif /* SparcArchitecture */
-
-/*
- * Definitions for the sparc64 architecture
- */
-
-#ifdef Sparc64Architecture
-
-# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
-# define HasWeakSymbols YES
-# endif
-
-# ifndef XorgServer
-# define XorgServer YES
-# endif
-
-# define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines
-# define ServerOSDefines XFree86ServerOSDefines -DDDXOSINIT
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-# if XorgServer
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-# define XF86OSCardDrivers wsfb
-# define XFree86ConsoleDefines -DWSCONS_SUPPORT
-# endif
-
-# include <xorg.cf>
-
-#endif /* Sparc64Architecture */
-
-/*
- * Definitions for the vax architecture
- */
-#ifdef VaxArchitecture
-
-# ifndef BuildServer
-# define BuildServer NO
-# endif
-
-/* For the X11R5 server */
-# define CompressAllFonts NO
-# define InstallFontAliases InstallFontAliasesNoComment
-# define UseRgbTxt NO
-# define UseRgb YES
-
-# define ServerExtraDefines -DXFree86Server
-# define UnalignedReferencesAllowed YES
-# define HasSharedLibraries NO
-# define HasDlopen NO
-
-# define BuildGlxExt NO
-# define BuildGLXLibrary NO
-
-# include <xorg.cf>
-
-#endif /* VaxArchitecture */
-
-/* End or architecture specific section */
-
-/*
- * Generic settings for all architectures
- * which can be overridden by architecture specific sections above
- */
-
-#ifndef StandardDefines
-# define StandardDefines -DCSRG_BASED
-#endif
-
-#if !defined(OptimizedCDebugFlags)
-# define OptimizedCDebugFlags -O2
-#endif
-
-#ifndef ServerOSDefines
-# define ServerOSDefines /**/
-#endif
-
-#ifndef ServerExtraDefines
-# define ServerExtraDefines GccGasOption
-#endif
-
-#ifndef HasWeakSymbols
-# define HasWeakSymbols NO
-#endif
-
-/*
- * Multi-thread safe libs
- */
-#if HasWeakSymbols == YES && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
-# define HasPosixThreads YES
-# define ThreadedX YES
-# define NeedUIThrStubs YES
-# define ThreadsCompileFlag -pthread
-# define ThreadsLibraries -pthread
-#else
-# define ThreadedX NO
-#endif
-
-
-/* Set this to YES when getpwuid_r is added to libc_r */
-#define HasThreadSafeAPI NO
-
-#ifndef ExtraLibraries
-# define ExtraLibraries /**/
-#endif
-
-#ifndef DoLoadableServer
-#define DoLoadableServer NO
-#endif
-
-#ifndef XVirtualFramebufferServer
-# undef BuildServer
-# define BuildServer YES
-# define XVirtualFramebufferServer YES
-#endif
-
-#ifndef XnestServer
-# undef BuildServer
-# define BuildServer YES
-# define XnestServer YES
-#endif
-
-#ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary YES
-#endif
-
-#ifndef CompressAllFonts
-# define CompressAllFonts YES
-#endif
-
-#ifndef SharedLibXdmGreet
-# define SharedLibXdmGreet NO
-#endif
-
-#define HasFreetype2 NO
-#define HasExpat NO
-#define BuildXterm BuildClients
-
-/*
- * XFree86 uses its own (more portable) database routines to speed up
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in
- * host.def
- */
-#ifndef UseRgbTxt
-# define UseRgbTxt YES
-#endif
-
-#ifndef OSBinaryType
-# if UseElfFormat
-# define OSBinaryType [ELF]
-# else
-# define OSBinaryType /**/
-# endif
-#endif
-
-#ifndef HasDlopen
-# define HasDlopen YES
-#endif
-
-#ifndef DlLibrary
-# if UseElfFormat
-# if (OSMajorVersion < 3 || OSMajorVersion == 3 && OSMinorVersion == 0)
-# define DlLibrary -ldl
-# else
-# define DlLibrary -Wl,--export-dynamic
-# endif
-# else
-# define DlLibrary /**/
-# endif
-#endif
-
-#if !defined(GccWarningOptions)
-# define GccWarningOptions -Wall -Wpointer-arith
-#endif
-
-/* This must come last */
-#if OSMajorVersion == 2 && OSMinorVersion >= 8 || OSMajorVersion > 2
-# include <OpenBSDLib.rules>
-#else
-# include <bsdLib.rules>
-#endif
diff --git a/nx-X11/config/cf/OpenBSDLib.rules b/nx-X11/config/cf/OpenBSDLib.rules
deleted file mode 100644
index 5bb9a4761..000000000
--- a/nx-X11/config/cf/OpenBSDLib.rules
+++ /dev/null
@@ -1,191 +0,0 @@
-XCOMM $OpenBSD: OpenBSDLib.rules,v 1.1 2000/10/09 20:43:58 matthieu Exp $
-
-
-
-
-/*
- * OpenBSD shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb Exp $
-
-#ifndef UseElfFormat
-#define UseElfFormat NO
-#endif
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef UseRpath
-#define UseRpath YES
-#endif
-
-#ifndef BaseShLibReqs
-#define BaseShLibReqs /* -lc implied by $(CC) */
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <OpenBSDLib.tmpl>
-#endif
-#ifndef RpathLoadFlags
-#if UseRpath
-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#else
-#define RpathLoadFlags /**/
-#endif
-#endif
-#ifndef LibraryRpathLoadFlags
-#define LibraryRpathLoadFlags RpathLoadFlags
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared PositionIndependentCFlags LibraryRpathLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#if UseElfFormat
-#ifndef ExtraLoadFlags
-#ifdef UseInstalled
-#define ExtraLoadFlags RpathLoadFlags
-#else
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-#endif
-#endif
-#ifndef HardCodeLibdirFlag
-#define HardCodeLibdirFlag RpathLoadFlags
-#endif
-#endif /* UseElfFormat */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist @@\
- $(RM) $@~ @@\
- set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$@\ @@\
- solist $(REQUIREDLIBS) BaseShLibReqs); @@\
- LinkBuildSonameLibrary($@) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedDepLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-#ifndef SharedDriModuleTarget
-#define SharedDriModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ $@.map @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ $@.map @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name @@\
- $(RM) name.map
-
-#endif /* SharedDriModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-/*
- * DynamicModuleTarget - build a module to be dynamically loaded
- */
-#ifdef DynamicModuleTarget
-#undef DynamicModuleTarget
-#define DynamicModuleTarget(module,modlist) @@\
-AllTarget(module) @@\
- @@\
-module: modlist @@\
- RemoveFile($@) @@\
- $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\
- @@\
-clean:: @@\
- RemoveFile(module)
-#endif /* DynamicModuleTarget */
-
diff --git a/nx-X11/config/cf/OpenBSDLib.tmpl b/nx-X11/config/cf/OpenBSDLib.tmpl
deleted file mode 100644
index db6da5548..000000000
--- a/nx-X11/config/cf/OpenBSDLib.tmpl
+++ /dev/null
@@ -1,531 +0,0 @@
-XCOMM platform: $OpenBSD: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
-XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.10 2004/06/29 22:57:46 herrb Exp $
-XCOMM
-
-/* Shared libraries dependencies */
-#if HasGcc && GccMajorVersion >= 3
-# define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lsupc++
-#endif
-
-/* Shared Library Revisions. Crank major on API Changes */
-
-#if OverrideShlibRevs
-
-# if OSMajorVersion == 3 && OSMinorVersion > 1 && OSMinorVersion <= 5
-# ifndef SharedX11Rev
-# define SharedX11Rev 7.0
-# endif
-# ifndef SharedXThrStubRev
-# define SharedXThrStubRev 7.0
-# endif
-# ifndef SharedXextRev
-# define SharedXextRev 7.0
-# endif
-# ifndef SharedXssRev
-# define SharedXssRev 2.0
-# endif
-# ifndef SharedXxf86miscRev
-# define SharedXxf86miscRev 2.0
-# endif
-# ifndef SharedXxf86vmRev
-# define SharedXxf86vmRev 2.0
-# endif
-# ifndef SharedXxf86dgaRev
-# define SharedXxf86dgaRev 2.0
-# endif
-# ifndef SharedXxf86rushRev
-# define SharedXxf86rushRev 2.0
-# endif
-# ifndef SharedXvRev
-# define SharedXvRev 2.0
-# endif
-# ifndef SharedXvMCRev
-# define SharedXvMCRev 2.0
-# endif
-# ifndef SharedXineramaRev
-# define SharedXineramaRev 2.0
-# endif
-# ifndef SharedDpsRev
-# define SharedDpsRev 2.0
-# endif
-# ifndef SharedDpsTkRev
-# define SharedDpsTkRev 2.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 2.0
-# endif
-# ifndef SharedGluRev
-# if HasGcc && GccMajorVersion >= 3
- /* Gcc 3 changes the name mangling scheme on OpenBSD */
-# define SharedGluRev 3.0
-# else
-# define SharedGluRev 2.0
-# endif
-# endif
-# ifndef SharedGlxRev
-# define SharedGlxRev 2.0
-# endif
-# ifndef SharedGLwRev
-# define SharedGLwRev 2.0
-# endif
-# ifndef SharedXrenderRev
-# define SharedXrenderRev 2.1
-# endif
-# ifndef SharedXrandrRev
-# define SharedXrandrRev 3.0
-# endif
-# ifndef SharedXcursorRev
-# define SharedXcursorRev 1.0
-# endif
-# ifndef SharedXfontcacheRev
-# define SharedXfontcacheRev 2.0
-# endif
-# ifndef SharedXauRev
-# define SharedXauRev 7.0
-# endif
-# ifndef SharedXdmcpRev
-# define SharedXdmcpRev 7.0
-# endif
-# ifndef SharedXmuRev
-# define SharedXmuRev 7.0
-# endif
-# ifndef SharedXmuuRev
-# define SharedXmuuRev 2.0
-# endif
-# ifndef SharedOldXRev
-# define SharedOldXRev 7.0
-# endif
-# ifndef SharedXpRev
-# define SharedXpRev 7.0
-# endif
-# ifndef SharedXtRev
-# define SharedXtRev 7.0
-# endif
-# ifndef SharedXaRev
-# define SharedXaRev 2.0
-# endif
-# ifndef SharedXawRev
-# define SharedXawRev 9.0
-# endif
-# ifndef SharedXaw7Rev
-# define SharedXaw7Rev 8.0
-# endif
-# ifndef SharedXaw6Rev
-# define SharedXaw6Rev 7.1
-# endif
-# ifndef SharedXiRev
-# define SharedXiRev 7.0
-# endif
-# ifndef SharedXtstRev
-# define SharedXtstRev 7.0
-# endif
-# ifndef SharedICERev
-# define SharedICERev 7.1
-# endif
-# ifndef SharedSMRev
-# define SharedSMRev 7.0
-# endif
-# ifndef SharedXkeyRev
-# define SharedXkeyRev 7.0
-# endif
-# ifndef SharedFSRev
-# define SharedFSRev 7.0
-# endif
-# ifndef SharedFontRev
-# define SharedFontRev 2.0
-# endif
-# ifndef SharedFontEncRev
-# define SharedFontEncRev 2.0
-# endif
-# ifndef SharedXpmRev
-# define SharedXpmRev 5.0
-# endif
-# ifndef SharedFreetype2Rev
-# define SharedFreetype2Rev 11.1
-# endif
-# ifndef SharedExpatRev
-# define SharedExpatRev 4.0
-# endif
-# ifndef SharedXft1Rev
-# define SharedXft1Rev 1.2
-# endif
-# ifndef SharedXftRev
-# define SharedXftRev 3.0
-# endif
-# ifndef SharedFontconfigRev
-# define SharedFontconfigRev 1.0
-# endif
-# ifndef SharedXTrapRev
-# define SharedXTrapRev 7.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 2.0
-# endif
-# ifndef SharedXfixesRev
-# define SharedXfixesRev 3.0
-# endif
-# ifndef SharedXdamageRev
-# define SharedXdamageRev 1.0
-# endif
-# ifndef SharedXcompositeRev
-# define SharedXcompositeRev 1.0
-# endif
-
-
-# elif OSMajorVersion == 3 && OSMinorVersion >= 6 && OSMinorVersion <= 7
-
-# ifndef SharedX11Rev
-# define SharedX11Rev 8.1
-# endif
-# ifndef SharedXThrStubRev
-# define SharedXThrStubRev 8.0
-# endif
-# ifndef SharedXextRev
-# define SharedXextRev 8.0
-# endif
-# ifndef SharedXssRev
-# define SharedXssRev 3.0
-# endif
-# ifndef SharedXxf86miscRev
-# define SharedXxf86miscRev 3.0
-# endif
-# ifndef SharedXxf86vmRev
-# define SharedXxf86vmRev 3.0
-# endif
-# ifndef SharedXxf86dgaRev
-# define SharedXxf86dgaRev 3.0
-# endif
-# ifndef SharedXxf86rushRev
-# define SharedXxf86rushRev 3.0
-# endif
-# ifndef SharedXvRev
-# define SharedXvRev 3.0
-# endif
-# ifndef SharedXvMCRev
-# define SharedXvMCRev 3.0
-# endif
-# ifndef SharedXineramaRev
-# define SharedXineramaRev 3.0
-# endif
-# ifndef SharedDpsRev
-# define SharedDpsRev 3.0
-# endif
-# ifndef SharedDpsTkRev
-# define SharedDpsTkRev 3.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 3.0
-# endif
-# ifndef SharedGluRev
-# if HasGcc && GccMajorVersion >= 3
- /* Gcc 3 changes the name mangling scheme on OpenBSD */
-# define SharedGluRev 4.0
-# else
-# define SharedGluRev 3.0
-# endif
-# endif
-# ifndef SharedGlxRev
-# define SharedGlxRev 3.1
-# endif
-# ifndef SharedOSMesaRev
-# define SharedOSMesaRev 6.0
-# endif
-# ifndef SharedGLwRev
-# define SharedGLwRev 3.0
-# endif
-# ifndef SharedXrenderRev
-# define SharedXrenderRev 3.1
-# endif
-# ifndef SharedXrandrRev
-# define SharedXrandrRev 4.0
-# endif
-# ifndef SharedXcursorRev
-# define SharedXcursorRev 2.2
-# endif
-# ifndef SharedXfontcacheRev
-# define SharedXfontcacheRev 3.0
-# endif
-# ifndef SharedXauRev
-# define SharedXauRev 8.0
-# endif
-# ifndef SharedXdmcpRev
-# define SharedXdmcpRev 8.0
-# endif
-# ifndef SharedXmuRev
-# define SharedXmuRev 8.0
-# endif
-# ifndef SharedXmuuRev
-# define SharedXmuuRev 3.0
-# endif
-# ifndef SharedOldXRev
-# define SharedOldXRev 8.0
-# endif
-# ifndef SharedXpRev
-# define SharedXpRev 8.0
-# endif
-# ifndef SharedXtRev
-# define SharedXtRev 8.0
-# endif
-# ifndef SharedXaRev
-# define SharedXaRev 3.0
-# endif
-# ifndef SharedXawRev
-# define SharedXawRev 10.0
-# endif
-# ifndef SharedXaw7Rev
-# define SharedXaw7Rev 9.0
-# endif
-# ifndef SharedXaw6Rev
-# define SharedXaw6Rev 8.1
-# endif
-# ifndef SharedXiRev
-# define SharedXiRev 8.0
-# endif
-# ifndef SharedXtstRev
-# define SharedXtstRev 8.0
-# endif
-# ifndef SharedICERev
-# define SharedICERev 8.1
-# endif
-# ifndef SharedSMRev
-# define SharedSMRev 8.0
-# endif
-# ifndef SharedXkeyRev
-# define SharedXkeyRev 8.0
-# endif
-# ifndef SharedFSRev
-# define SharedFSRev 8.0
-# endif
-# ifndef SharedFontRev
-# define SharedFontRev 4.0
-# endif
-# ifndef SharedFontEncRev
-# define SharedFontEncRev 3.0
-# endif
-# ifndef SharedXpmRev
-# define SharedXpmRev 6.0
-# endif
-# ifndef SharedFreetype2Rev
-# define SharedFreetype2Rev 13.1
-# endif
-# ifndef SharedExpatRev
-# define SharedExpatRev 5.0
-# endif
-# ifndef SharedXft1Rev
-# define SharedXft1Rev 3.0
-# endif
-# ifndef SharedXftRev
-# define SharedXftRev 5.0
-# endif
-# ifndef SharedFontconfigRev
-# define SharedFontconfigRev 2.0
-# endif
-# ifndef SharedXTrapRev
-# define SharedXTrapRev 8.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 3.0
-# endif
-# ifndef SharedXResRev
-# define SharedXResRev 2.0
-# endif
-# ifndef SharedxkbfileRev
-# define SharedxkbfileRev 2.0
-# endif
-# ifndef SharedxkbuiRev
-# define SharedxkbuiRev 2.0
-# endif
-# ifndef SharedXfixesRev
-# define SharedXfixesRev 3.0
-# endif
-# ifndef SharedXdamageRev
-# define SharedXdamageRev 1.0
-# endif
-# ifndef SharedXcompositeRev
-# define SharedXcompositeRev 1.0
-# endif
-
-#elif OSMajorVersion > 3 || OSMajorVersion == 3 && OSMinorVersion == 8
-
-# ifndef SharedX11Rev
-# define SharedX11Rev 9.0
-# endif
-# ifndef SharedXThrStubRev
-# define SharedXThrStubRev 8.0
-# endif
-# ifndef SharedXextRev
-# define SharedXextRev 9.0
-# endif
-# ifndef SharedXssRev
-# define SharedXssRev 4.0
-# endif
-# ifndef SharedXxf86miscRev
-# define SharedXxf86miscRev 4.0
-# endif
-# ifndef SharedXxf86vmRev
-# define SharedXxf86vmRev 4.0
-# endif
-# ifndef SharedXxf86dgaRev
-# define SharedXxf86dgaRev 4.0
-# endif
-# ifndef SharedXxf86rushRev
-# define SharedXxf86rushRev 4.0
-# endif
-# ifndef SharedXvRev
-# define SharedXvRev 4.0
-# endif
-# ifndef SharedXvMCRev
-# define SharedXvMCRev 4.0
-# endif
-# ifndef SharedXineramaRev
-# define SharedXineramaRev 4.0
-# endif
-# ifndef SharedDpsRev
-# define SharedDpsRev 4.0
-# endif
-# ifndef SharedDpsTkRev
-# define SharedDpsTkRev 4.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 3.0
-# endif
-# ifndef SharedGluRev
-# if HasGcc && GccMajorVersion >= 3
- /* Gcc 3 changes the name mangling scheme on OpenBSD */
-# define SharedGluRev 5.0
-# else
-# define SharedGluRev 4.0
-# endif
-# endif
-# ifndef SharedGlxRev
-# define SharedGlxRev 4.0
-# endif
-# ifndef SharedOSMesaRev
-# define SharedOSMesaRev 7.0
-# endif
-# ifndef SharedGLwRev
-# define SharedGLwRev 4.0
-# endif
-# ifndef SharedXrenderRev
-# define SharedXrenderRev 4.0
-# endif
-# ifndef SharedXrandrRev
-# define SharedXrandrRev 5.0
-# endif
-# ifndef SharedXcursorRev
-# define SharedXcursorRev 3.0
-# endif
-# ifndef SharedXfontcacheRev
-# define SharedXfontcacheRev 4.0
-# endif
-# ifndef SharedXauRev
-# define SharedXauRev 9.0
-# endif
-# ifndef SharedXdmcpRev
-# define SharedXdmcpRev 9.0
-# endif
-# ifndef SharedXmuRev
-# define SharedXmuRev 9.0
-# endif
-# ifndef SharedXmuuRev
-# define SharedXmuuRev 4.0
-# endif
-# ifndef SharedOldXRev
-# define SharedOldXRev 9.0
-# endif
-# ifndef SharedXpRev
-# define SharedXpRev 9.0
-# endif
-# ifndef SharedXtRev
-# define SharedXtRev 9.0
-# endif
-# ifndef SharedXaRev
-# define SharedXaRev 4.0
-# endif
-# ifndef SharedXawRev
-# define SharedXawRev 11.0
-# endif
-# ifndef SharedXaw7Rev
-# define SharedXaw7Rev 10.0
-# endif
-# ifndef SharedXaw6Rev
-# define SharedXaw6Rev 9.0
-# endif
-# ifndef SharedXiRev
-# define SharedXiRev 9.0
-# endif
-# ifndef SharedXtstRev
-# define SharedXtstRev 9.0
-# endif
-# ifndef SharedICERev
-# define SharedICERev 8.0
-# endif
-# ifndef SharedSMRev
-# define SharedSMRev 8.0
-# endif
-# ifndef SharedXkeyRev
-# define SharedXkeyRev 9.0
-# endif
-# ifndef SharedFSRev
-# define SharedFSRev 8.0
-# endif
-# ifndef SharedFontRev
-# define SharedFontRev 4.0
-# endif
-# ifndef SharedFontEncRev
-# define SharedFontEncRev 3.0
-# endif
-# ifndef SharedXpmRev
-# define SharedXpmRev 7.0
-# endif
-# ifndef SharedFreetype2Rev
-# define SharedFreetype2Rev 13.0
-# endif
-# ifndef SharedExpatRev
-# define SharedExpatRev 5.0
-# endif
-# ifndef SharedXft1Rev
-# define SharedXft1Rev 4.0
-# endif
-# ifndef SharedXftRev
-# define SharedXftRev 6.0
-# endif
-# ifndef SharedFontconfigRev
-# define SharedFontconfigRev 2.0
-# endif
-# ifndef SharedXTrapRev
-# define SharedXTrapRev 9.0
-# endif
-# ifndef SharedPSResRev
-# define SharedPSResRev 3.0
-# endif
-# ifndef SharedXResRev
-# define SharedXResRev 3.0
-# endif
-# ifndef SharedxkbfileRev
-# define SharedxkbfileRev 3.0
-# endif
-# ifndef SharedxkbuiRev
-# define SharedxkbuiRev 3.0
-# endif
-# ifndef SharedXfixesRev
-# define SharedXfixesRev 4.0
-# endif
-# ifndef SharedXdamageRev
-# define SharedXdamageRev 2.0
-# endif
-# ifndef SharedXcompositeRev
-# define SharedXcompositeRev 2.0
-# endif
-# ifndef SharedxrxRev
-# define SharedxrxRev 7.0
-# endif
-# ifndef SharedxrxnestRev
-# define SharedxrxnestRev 7.0
-# endif
-
-#endif /* OSMajorVersion .. */
-
-#endif /* OverrideShlibRevs */
-
-#include <bsdLib.tmpl>
diff --git a/nx-X11/config/cf/QNX4.cf b/nx-X11/config/cf/QNX4.cf
deleted file mode 100644
index b38738c46..000000000
--- a/nx-X11/config/cf/QNX4.cf
+++ /dev/null
@@ -1,98 +0,0 @@
-XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $
-
-#define StripInstalledPrograms NO
-#define BuildServer YES
-#define DoLoadableServer NO /* sorry, are u listenning QSSL? */
-#define BuildLBX YES /* For now */
-#define ExpandManNames YES
-#define ByteOrder X_LITTLE_ENDIAN
-
-#ifndef OSName
-#define OSName QNX4
-#endif
-
-#ifndef OSVendor
-#define OSVendor QNX Corp.
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 25
-#endif
-
-/* Use a non-broken shell ... */
-#define BourneShell /usr/local/bin/pdksh
-#define OSDefines -DQNX4 -DQNX -D__QNX__ -DNO_REGEX -DSTRINGS_ALIGNED -D__i386__
-
-#define SourceDefines -D_POSIX_SOURCE
-#define DoRanlibCmd NO
-#undef ArCmd
-#define ArCmd wlib -b -c -p=256
-#define MkdirHierCmd mkdir -p
-#ifdef UseInstalled
-#define InstallCmd install
-#else
-#define InstallCmd $(SHELL) $(CONFIGSRC)/util/install.sh
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#define DefaultCCOptions -5s -Otx -Wc,-r -b -j -Wc,-ei -N128000 -zp4 -mf
-#define LibraryCCOptions -5s -Otx -Wc,-r -b -j -Wc,-ei -zp4 -mf
-#define ServerCCOptions -5s -Otx -Wc,-r -T1 -M -N4096000 -j -b -mf -Wc,-ei -Wc,-s -zp4 -llibmalloc
-#define LocalLibraries
-#define ExtraLibraries -lsocket -lunix
-#define CLibrary
-#define PosixLibraries
-#define ConnectionFlags -DUNIXCONN -DTCPCONN
-#define CppCmd /usr/X11R6/bin/cpp
-
-#define HasShadowPasswd YES
-#define HasLibCrypt YES
-#define SharedLibXdmGreet NO
-#define HasShm NO /* For now as well */
-#define HasSockets YES
-#define HasPutenv YES
-#define HasCbrt NO
-#define HasVarDirectory NO
-#define HasSnprintf YES
-#define HasBSD44Sockets YES
-#define HasPerl NO
-#define LogDirectory /usr/adm
-#define XLogFile XFree86
-
-#define BuildHtmlManPages NO /* We don't want HTML manpages */
-#define BuildRman NO
-
-#define AvoidNullMakeCommand YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull YES
-#define UseInternalMalloc NO
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-
-#ifndef NeedWidePrototypes
-#define NeedWidePrototypes NO
-#endif
-
-#define LexCmd flex -l
-#define LexLib -lfl
-#define TermcapLibrary -lncurses
-#ifndef UseStaticTermcapLib
-#define UseStaticTermcapLib NO
-#endif
-
-#define StandardCppDefines -traditional StandardDefines
-#define StandardDefines OSDefines SourceDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#define ServerExtraDefines XFree86ServerDefines
-#define ExtraFilesToClean *.err *.map
-
-#include <QNX4.rules>
-#include <xorg.cf>
-
diff --git a/nx-X11/config/cf/QNX4.rules b/nx-X11/config/cf/QNX4.rules
deleted file mode 100644
index 3ae8fe256..000000000
--- a/nx-X11/config/cf/QNX4.rules
+++ /dev/null
@@ -1,65 +0,0 @@
-XCOMM platform: $XFree86: xc/config/cf/QNX4.rules,v 1.1 1999/12/27 00:45:43 robin Exp $
-
-XCOMM Rules to work around wlib for QNX...
-
-#define LinkFile(tofile, fromfile) @@\
-tofile:: fromfile @@\
- $(CP) fromfile tofile @@\
- @@\
-includes:: tofile @@\
- @@\
-depend:: tofile @@\
- @@\
-clean:: @@\
- RemoveFile(tofile)
-
-#define ObjectFromSpecialSource(dst, src, flags) @@\
-NoConfigRec(dst.c) @@\
- @@\
-dst.c: src.c @@\
- RemoveFile($@) @@\
- $(CP) $? $@ @@\
- @@\
-SpecialCObjectRule(dst,NullParameter,flags) @@\
- @@\
-includes:: dst.c @@\
- @@\
-depend:: dst.c @@\
- @@\
-clean:: @@\
- RemoveFile(dst.c)
-
-
-#define ObjectFromSpecialAsmSource(dst, src, flags) @@\
-dst.S: src.S @@\
- RemoveFile($@) @@\
- $(CP) $? $@ @@\
- @@\
-dst.o: dst.S @@\
- AssembleObject(dst,flags) @@\
- @@\
-dst.i: dst.S @@\
- CPPOnlyAsm(dst,flags) @@\
- @@\
-depend:: dst.S @@\
- @@\
-clean:: @@\
- RemoveFile(dst.S)
-
-/* This is the rule to make reloc. OMF objects. We use a little
- * trick which works only for OMF....
- * "catomf" can be downloaded from
- * http://prdownloads.sourceforge.net/openqnx/catomf.tar.gz
- * or contact Rick Lake <rick@anp.nl>
- */
-#define NormalRelocatableTarget(objname,objlist) @@\
-AllTarget(objname.Osuf) @@\
- @@\
-objname.Osuf: objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- /usr/local/bin/catomf -O $@ objlist
-
-
-
-
-
diff --git a/nx-X11/config/cf/Win32.cf b/nx-X11/config/cf/Win32.cf
deleted file mode 100644
index af864a93f..000000000
--- a/nx-X11/config/cf/Win32.cf
+++ /dev/null
@@ -1,133 +0,0 @@
-XCOMM platform: $Xorg: Win32.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName OSMajorVersion./**/OSMinorVersion
-
-#ifndef CompilerMajorVersion
-/* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
-#define CompilerMajorVersion 4
-#endif
-
-#define BootstrapCFlags -DWIN32
-#ifdef _M_IX86
-#define CpuDefines -D_X86_
-#endif
-/* brain-damaged windows headers will not compile with -Za */
-#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines
-#if CompilerMajorVersion < 4
-#define DefaultCCOptions -nologo -batch -G4 -W2
-#else
-#define DefaultCCOptions -nologo -G4 -W2
-#endif
-#if CompilerMajorVersion < 4
-#define DebuggableCDebugFlags -Zi
-#else
-#define DebuggableCDebugFlags -Zi -Od
-#endif
-#define ThreadedX YES
-#define HasThreadSafeAPI NO
-#define CpCmd copy
-#define LnCmd copy
-#define MvCmd ren
-#define RmCmd del
-#ifndef RmTreeCmd
-XCOMM choices here include:
-XCOMM o `del /q /s` and live with pressing the "any" key
-XCOMM o `deltree, copied from MS-DOS 5
-XCOMM o `rm -rfx` from the SDK Subscription (MSTOOLS in your Path)
-XCOMM o `rm -rf` from the GNU file utilities
-XCOMM We're using the GNU file utilities
-#define RmTreeCmd rm -rf
-#endif
-#define CcCmd cl
-#define HasCplusplus YES
-#define CplusplusCmd cl
-#if CompilerMajorVersion < 4
-#define PreProcessCmd CcCmd -nologo -batch -EP
-#define CppCmd CcCmd -nologo -batch -E
-#else
-#define PreProcessCmd CcCmd -nologo -EP
-#define CppCmd CcCmd -nologo -E
-#endif
-#define PatheticCpp YES
-#define ConstructMFLAGS YES
-#if (CompilerMajorVersion == 0)
-#define ArCmdBase lib32
-#else
-#define ArCmdBase lib
-#endif
-#define ArCmd ArCmdBase
-#define CplusplusCmd cl
-#define MkdirHierCmd $(CONFIGSRC:/=\)\util\mkdirhier
-#define InstallCmd copy
-#define InstPgmFlags /**/
-#define InstBinFlags /**/
-#define InstUidFlags /**/
-#define InstLibFlags /**/
-#define InstIncFlags /**/
-#define InstManFlags /**/
-#define InstDatFlags /**/
-#define InstallFlags /**/
-#if (CompilerMajorVersion == 0)
-#define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
-#elif (CompilerMajorVersion < 4)
-#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
-#else
-#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
-#endif
-#define MakeCmd nmake -nologo
-#if (CompilerMajorVersion == 0)
-#define LdCmd link32
-#else
-#define LdCmd link
-#endif
-#define MathLibrary
-#define HasSymLinks NO
-#define HasVarDirectory NO
-#define HasPutenv YES
-#define Osuf obj
-#ifndef CCsuf
-#define CCsuf cxx
-#endif
-#define BuildServer NO
-#define ConnectionFlags -DTCPCONN
-
-/* override as necessary in site.def/host.def */
-#ifndef StdIncDir
-#define StdIncDir C:/MSDEVSTD/INCLUDE
-#endif
-#define LdPreLib /**/
-#define LdPostLib /**/
-#ifndef UseInstalled
-#define ImakeCmd $(IMAKESRC:/=\)\imake
-#define DependCmd $(DEPENDSRC:/=\)\makedepend
-#endif
-#define DependFlags -D_WIN32
-#define FilesToClean *.bak *.obj *.lib make.log
-#define ShLibDir $(BINDIR)
-
-#define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
-
-#define XawI18nDefines -DHAS_WCHAR_H
-#define UseRgbTxt YES
-#define HasCbrt NO
-#define HasFfs NO
-#define HasXdmAuth NO
-
-/* the following components haven't been ported yet */
-#define BuildLBX NO
-#define BuildXprint NO
-#define XprtServer NO
-
-#include <Win32.rules>
diff --git a/nx-X11/config/cf/Win32.rules b/nx-X11/config/cf/Win32.rules
deleted file mode 100644
index f284ad207..000000000
--- a/nx-X11/config/cf/Win32.rules
+++ /dev/null
@@ -1,531 +0,0 @@
-XCOMM platform: $Xorg: Win32.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86$
-
-#define HasSharedLibraries YES
-#define NeedLibInsideFlag YES
-#define SharedLibXaw NO
-#define SharedLibXmu NO
-#define SharedLibXt NO
-#define SharedDataSeparation NO
-#define SharedCodeDef /**/
-#define SharedLibraryDef /**/
-#define ShLibIncludeFile <WinLib.tmpl>
-#define SharedLibraryLoadFlags -dll
-#define PositionIndependentCFlags /**/
-
-.c.obj:
- $(CC) -c $*.c @<<
- $(CFLAGS)
-<<
-
-#if HasCplusplus
-.CCsuf.obj:
- $(CXX) -c $*.CCsuf @<<
- $(CFLAGS)
-<<
-#endif
-
-#define ProgramTargetName(target) target.exe
-
-#define RunProgram(progvar,options) $(progvar:/=\) options
-
-#define RemoveFile(file) if exist file $(RM) file
-
-#define RemoveFiles(files) @$(MAKE) $(MFLAGS) -f << @@\
-.SUFFIXES: @@\
- @@\
-all: files @@\
- !for %%i in ( Avoid.Error $$** ) do if exist %%i $(RM) %%i @@\
- @@\
-Avoid.Error files: @@\
-<<
-
-#define MakeDir(dir) -$(MKDIRHIER) dir
-
-#define ObjectCompile(options) RemoveFile($@) @@\
- $(CC) -c $*.c @<< @@\
- $(CFLAGS) options @@\
-<<
-
-#define LibObjCompile(dir,options) RemoveFiles($@ dir\$@) @@\
- $(CC) -c $*.c @<< @@\
- $(CCOPTIONS) $(ALLDEFINES) options @@\
-<< @@\
- $(MV) $@ dir\$@
-
-#define BuildIncludesTop(srclist,dstsubdir,dstupdir) @@\
-includes:: srclist @@\
- MakeDir($(BUILDINCDIR:/=\)) @@\
- @$(MAKE) $(MFLAGS) -f << @@\
-.SUFFIXES: @@\
- @@\
-all: srclist @@\
- cd $(BUILDINCDIR:/=\) @@\
- !RemoveFile($$**) @@\
- !$(LN) $(BUILDINCTOP:/=\)\$(CURRENT_DIR:/=\)\$$** . @@\
- @@\
-Avoid.Error srclist: @@\
-<<
-
-#define BuildIncludes(srclist,dstsubdir,dstupdir) @@\
-XVARdef0 = $(BUILDINCDIR)/dstsubdir @@\
-XVARdef1 = $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR) @@\
- @@\
-includes:: srclist @@\
- MakeDir($(XVARuse0:/=\)) @@\
- @$(MAKE) -A $(MFLAGS) -f << @@\
-.SUFFIXES: @@\
- @@\
-all: srclist @@\
- cd $(XVARuse0:/=\) @@\
- !RemoveFile($$**) @@\
- !$(LN) $(XVARuse1:/=\)\$$** . @@\
- @@\
-Avoid.Error srclist: @@\
-<<
-
-#define LinkFileList(step,list,dir,sub) @@\
-XVARdef0 = dir @@\
-XVARdef1 = sub @@\
-XVARdef2 = list @@\
- @@\
-step:: $(XVARuse2:/=\) @@\
- cd $(XVARuse0:/=\) @@\
- !RemoveFile($**) @@\
- !$(LN) $(XVARuse1:/=\)\\$** .
-
-#define LinkRule(program,options,objects,libraries) \
-$(CCLINK) Concat(-Fe,program) options objects libraries $(EXTRA_LOAD_FLAGS)
-
-#define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\
-XVARdef0 = objects @@\
- @@\
-ProgramTargetName(program): $(XVARuse0:.o=.obj) deplibs @@\
- RemoveTargetProgram($@) @@\
- LinkRule($@,$(LDOPTIONS),$(XVARuse0:.o=.obj),locallibs $(LDLIBS) syslibs) @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-
-#define ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\
-ProgramTargetName(program): $(objs:.o=.obj) $(deplib) @@\
- RemoveTargetProgram($@) @@\
- LinkRule($@,$(LDOPTIONS),$(objs:.o=.obj),locallib $(LDLIBS) syslib) @@\
- @@\
-InstallProgram(program,$(BINDIR)) @@\
-InstallManPage(program,$(MANDIR))
-
-#define ComplexProgramTarget(program) @@\
-PROGRAM = ProgramTargetName(program) @@\
- @@\
-AllTarget(ProgramTargetName(program)) @@\
- @@\
-ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
- @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile($(PROGRAM))
-
-#define ComplexProgramTarget_1(program,locallib,syslib) @@\
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3) @@\
-SRCS = $(SRCS1) $(SRCS2) $(SRCS3) @@\
-PROGRAM1 = ProgramTargetName(program) @@\
- @@\
-AllTarget($(PROGRAM1) $(PROGRAM2) $(PROGRAM3)) @@\
- @@\
-ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib) @@\
- @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- for %%i in ($(PROGRAMS)) do $(RM) ProgramTargetName(%%i)
-
-#define ComplexProgramTarget_2(program,locallib,syslib) @@\
-PROGRAM2 = ProgramTargetName(program) @@\
- @@\
-ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
-
-#define ComplexProgramTarget_3(program,locallib,syslib) @@\
-PROGRAM3 = ProgramTargetName(program) @@\
- @@\
-ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
-
-#define MoveToBakFile(file) -@if exist file $(MV) file file.bak
-
-#define RMoveToBakFile(file) -RemoveFile(file.bak) @@\
- -@if exist file $(MV) file file.bak
-
-#define InstallMultipleDestFlags(step,list,dest,flags) @@\
-XVARdef0 = $(DESTDIR)dest @@\
- @@\
-step:: list @@\
- MakeDir($(XVARuse0:/=\)) @@\
- !$(INSTALL) $(INSTALLFLAGS) flags $** $(XVARuse0:/=\)
-
-#define CleanTarget() @@\
-clean:: @@\
- RemoveFiles(FilesToClean ExtraFilesToClean)
-
-#define LibraryTargetName(libname)libname.lib
-
-#define LibraryTargetNameSuffix(libname,suffix)Concat(libname,suffix.lib)
-
-#define MakeLibrary(libname,objlist) $(AR) @<< @@\
--out:libname objlist @@\
-<<
-
-#define LinkSourceFile(src,dir) @@\
-XVARdef0 = dir/src @@\
- @@\
-src: $(XVARuse0:/=\) @@\
- RemoveFile($@) @@\
- $(LN) $? $@ @@\
- @@\
-includes:: src @@\
- @@\
-depends:: src @@\
- @@\
-clean:: @@\
- RemoveFile(src)
-
-#define LinkFile(tofile,fromfile) @@\
-XVARdef0 = fromfile @@\
-tofile:: $(XVARuse0:/=\) @@\
- RemoveFile($@) @@\
- $(LN) $? $@ @@\
- @@\
-includes:: tofile @@\
- @@\
-depend:: tofile @@\
- @@\
-clean:: @@\
- RemoveFile(tofile)
-
-
-#define NormalLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetName(libname)) @@\
- @@\
-XVARdef0 = objlist @@\
- @@\
-LibraryTargetName(libname): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- MakeLibrary($@,$(XVARuse0:.o=.obj)) @@\
- LinkBuildLibrary($@)
-
-#define NormalLibraryTarget2(libname,objlist1,objlist2) @@\
-NormalLibraryTarget(libname,objlist1 objlist2)
-
-#define NormalLibraryTarget3(libname,objlist1,objlist2,objlist3) @@\
-NormalLibraryTarget(libname,objlist1 objlist2 objlist3)
-
-#define NormalDepLibraryTarget(libname,deplist,objlist) @@\
-AllTarget(LibraryTargetName(libname)) @@\
- @@\
-XVARdef0 = deplist @@\
-XVARdef1 = objlist @@\
-XVARdef2 = $(XVARuse1:/=\) @@\
- @@\
-LibraryTargetName(libname): $(XVARuse0:/=\) $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- MakeLibrary($@,$(XVARuse2:.o=.obj)) @@\
- LinkBuildLibrary($@)
-
-#define ProfiledLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_p)) @@\
- @@\
-XVARdef0 = objlist @@\
- @@\
-LibraryTargetNameSuffix(libname,_p): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- cd profiled @@\
- MakeLibrary(..\$@,$(XVARuse0:.o=.obj)) @@\
- cd ..
-
-#define DebuggedLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_d)) @@\
- @@\
-XVARdef0 = objlist @@\
- @@\
-LibraryTargetNameSuffix(libname,_d): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- cd debugger @@\
- MakeLibrary(..\$@,$(XVARuse0:.o=.obj)) @@\
- cd ..
-
-#ifndef UseInstalled
-#define ImakeDependency(target) @@\
-target:: ProgramTargetName($(IMAKE)) @@\
- @@\
-ProgramTargetName($(IMAKE)): @@\
- <<tmp.bat @@\
- cd $(IMAKESRC:/=\) @@\
- if exist Makefile $(MAKE) all @@\
- if not exist Makefile $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" @@\
-<<
-#endif
-
-#ifndef UseInstalled
-#define DependDependency() @@\
-depend:: ProgramTargetName($(DEPEND)) @@\
- @@\
-ProgramTargetName($(DEPEND)): @@\
- <<tmp.bat @@\
- cd $(DEPENDSRC:/=\) @@\
- $(MAKE) @@\
-<<
-#endif
-
-#define DependTarget() @@\
-DependDependency() @@\
- @@\
-depend:: @@\
- $(DEPEND:/=\) @<< @@\
-$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) @@\
-<<
-
-#define DependTarget3(srcs1,srcs2,srcs3) @@\
-DependDependency() @@\
- @@\
-depend:: @@\
- $(DEPEND:/=\) @<< @@\
-$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1 srcs2 srcs3 @@\
-<<
-
-#define ForceSubdirs(dirs) @@\
-Avoid.Error dirs: FRC @@\
- @cd $@ @@\
- @echo making all in $(CURRENT_DIR)/$@... @@\
- $(MAKE) $(MFLAGS) PassCDebugFlags all @@\
- cd .. @@\
- @@\
-FRC:
-
-#define MakeMakeSubdirs(dirs,target) @@\
-XVARdef0 = dirs @@\
-XVARdef1 = $$ @@\
- @@\
-target:: @@\
- @$(MAKE) -A $(MFLAGS) -f << @@\
-.SUFFIXES: @@\
- @@\
-all: $(XVARuse0:/=\) @@\
- @@\
-Avoid.Error $(XVARuse0:/=\): @@\
- cd $(XVARuse1)@ @@\
- RMoveToBakFile(Makefile) @@\
- ImakeSubCmdHelper -DTOPDIR=../$(TOP) -DCURDIR=$(CURRENT_DIR)/$(XVARuse1)@ @@\
- $(MAKE) $(MFLAGS) Makefiles @@\
- cd .. @@\
-<<
-
-#ifdef UseInstalled
-# define ImakeSubCmdHelper $(IMAKE_CMD)
-#else
-# define ImakeSubCmdHelper ..\$(IMAKE) -I../$(IRULESRC) \
- $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
-#endif
-
-#define NamedTargetSubdirs(name,dirs,verb,flags,subname) @@\
-XVARdef0 = dirs @@\
-XVARdef1 = $$ @@\
- @@\
-name:: @@\
- @$(MAKE) -A $(MFLAGS) -f << @@\
-.SUFFIXES: @@\
- @@\
-all: $(XVARuse0:/=\) @@\
- @@\
-Avoid.Error $(XVARuse0:/=\): @@\
- cd $(XVARuse1)@ @@\
- @echo verb in $(CURRENT_DIR)/$(XVARuse1)@... @@\
- $(MAKE) $(MFLAGS) flags subname @@\
- cd .. @@\
-<<
-
-#define UnsharedLibReferences(varname,libname,libsource) @@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,libsource/,libname.lib) @@\
-Concat(varname,LIB) = LoaderLibPrefix _Use(libname.lib,$(Concat3(DEP,varname,LIB))) @@\
-LintLibReferences(varname,libname,libsource)
-
-#define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-revname = rev @@\
-UnsharedLibReferences(varname,libname,libsource)
-
-#define SubdirLibraryRule(objlist) @@\
-XVARdef0 = objlist @@\
- @@\
-all:: DONE @@\
- @@\
-DONE: $(XVARuse0:.o=.obj) @@\
- RemoveFile($@) @@\
- echo - > $@ @@\
- @@\
-clean:: @@\
- RemoveFile(DONE)
-
-#define CppScriptTarget(dst,src,defs,deplist) @@\
-dst:: @@\
- @echo sorry, unable to make $@
-
-#define CppFileTarget(dst,src,defs,deplist) @@\
-XFAKEVAR = X @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- $(PREPROCESSCMD) -I. <<CppTmpFile.c @<< >$@ @@\
- XCOMM define $(XFAKEVAR)COMM XCOMM @@\
- XCOMM include <src> @@\
-<< @@\
- defs @@\
-<< @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-
-#define InstallNamedTarget(step,srcname,flags,dest,dstname) @@\
-XVARdef0 = $(DESTDIR)dest @@\
- @@\
-step:: srcname @@\
- MakeDir($(XVARuse0:/=\)) @@\
- $(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
-
-#define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname) @@\
-XVARdef0 = $(DESTDIR)dest @@\
- @@\
-step:: srcname @@\
- MakeDir($(XVARuse0:/=\)) @@\
- @if exist $(XVARuse0:/=\)\\dstname echo Not overwriting existing $(XVARuse0:/=\)\\dstname @@\
- if not exist $(XVARuse0:/=\)\\dstname $(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
-
-
-#define InstallLibrary(libname,dest) @@\
-InstallTarget(install,LibraryTargetName(libname),$(INSTLIBFLAGS),dest)
-
-#define InstallScript(program,dest) /**/
-
-#define InstallNamedProg(srcname,dstname,dest) @@\
-install:: srcname @@\
- @echo sorry, unable to install srcname
-
-#define InstallSharedLibrary(libname,rev,dest) @@\
-InstallTarget(install,LibraryTargetName(libname),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
-InstallTarget(install,libname.dll,$(INSTLIBFLAGS),dest)
-
-#define InstallSharedLibraryData(libname,rev,dest)
-
-#define MakeDLL(libname,solist) $(LD) @<< @@\
-$(SHLIBLDFLAGS) -out:libname.dll libname.exp solist @@\
-<<
-
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(libname.dll) @@\
- @@\
-CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\
- @@\
-XVARdef0 = solist @@\
- @@\
-LibraryTargetName(libname): $(XVARuse0:.o=.obj) libname.def $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- MakeLibrary($@,-def:libname.def $(XVARuse0:.o=.obj)) @@\
- LinkBuildLibrary($@) @@\
- @@\
-libname.dll: LibraryTargetName(libname) $(EXTRALIBRARYDEPS) @@\
- RemoveFile(libname.dll) @@\
- MakeDLL(libname,$(XVARuse0:.o=.obj) $(REQUIREDLIBS) $(EXTRA_LIBRARIES)) @@\
- LinkBuildDLL(libname.dll) @@\
- @@\
-clean:: @@\
- RemoveFile(LibraryTargetName(libname)) @@\
- RemoveFile(libname.dll)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-#define ObjectCplusplusCompile(options) RemoveFile($@) @@\
- $(CXX) -c $*.CCsuf @<< @@\
- $(CFLAGS) options @@\
-<<
-
-#define CplusplusLinkRule LinkRule
-
-#define CplusplusProgramTargetHelper ProgramTargetHelper
-
-#ifndef ComplexCplusplusProgramTarget
-#define ComplexCplusplusProgramTarget(program) @@\
- PROGRAM = ProgramTargetName(program) @@\
- @@\
-AllTarget(ProgramTargetName(program)) @@\
- @@\
-CplusplusProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
- @@\
-DependTarget() @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* ComplexCplusplusProgramTarget */
-
-#ifndef UseInstalled
-# define LinkBuildDLL(binary) MakeDir($(BUILDBINDIR:/=\)) @@\
- RemoveFile(Concat($(BUILDBINDIR:/=\)\,binary)) @@\
- cd $(BUILDBINDIR:/=\) && $(LN) Concat($(BUILDBINTOP:/=\)\$(CURRENT_DIR:/=\)\,binary) .
-
-# ifdef LinkBuildBinary
-# undef LinkBuildBinary
-# endif
-# define LinkBuildBinary(binary) @@\
-all:: $(BUILDBINDIR)\ProgramTargetName(binary) ProgramTargetName(binary) @@\
- @@\
-$(BUILDBINDIR)\ProgramTargetName(binary): ProgramTargetName(binary) @@\
- MakeDir($(BUILDBINDIR:/=\)) @@\
- RemoveFile($(BUILDBINDIR:/=\)\ProgramTargetName(binary))) @@\
- cd $(BUILDBINDIR:/=\) && $(LN) $(BUILDBINTOP:/=\)\$(CURRENT_DIR:/=\)\ProgramTargetName(binary) .
-
-# ifdef LinkBuildLibrary
-# undef LinkBuildLibrary
-# endif
-# define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR:/=\)) @@\
- RemoveFile(Concat($(BUILDLIBDIR:/=\)\,lib)) @@\
- cd $(BUILDLIBDIR:/=\) && $(LN) Concat($(BUILDLIBTOP:/=\)\$(CURRENT_DIR:/=\)\,lib) .
-
-#endif
-
-#ifndef ProjectUnsharedLibReferences
-#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/lib,buildlibdir/,libname.lib) @@\
-Concat(varname,LIB) = $(Concat3(DEP,varname,LIB)) @@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-
-/*
- * ServerTargetWithFlags - generate rules to compile, link, and relink a server
- */
-#ifndef ServerTargetWithFlags
-#define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
-XVARdef0 = objects @@\
- @@\
-AllTarget(ProgramTargetName(server)) @@\
-ProgramTargetName(server): subdirs $(XVARuse0:.o=.obj) libs @@\
- MoveToBakFile($@) @@\
- LinkRule($@,$(LDOPTIONS),$(XVARuse0:.o=.obj),libs $(LDLIBS) syslibs) @@\
- @@\
-Concat(load,server): @@\
- MoveToBakFile(ProgramTargetName(server)) @@\
- LinkRule(ProgramTargetName(server),$(LDOPTIONS),$(XVARuse0:.o=.obj),libs $(LDLIBS) syslibs) @@\
- @@\
-loadX:: Concat(load,server) @@\
- @@\
-ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
- @@\
-InstallProgramWithFlags(server,$(BINDIR),flags) @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(server))
-#endif /* ServerTargetWithFlags */
diff --git a/nx-X11/config/cf/WinLib.tmpl b/nx-X11/config/cf/WinLib.tmpl
deleted file mode 100644
index b4c9b8006..000000000
--- a/nx-X11/config/cf/WinLib.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-XCOMM $Xorg: WinLib.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.4tsi Exp $
-
-#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#define SharedXpReqs $(LDPRELIBS) $(XAUTHLIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIBS) $(XLIB)
diff --git a/nx-X11/config/cf/apollo.cf b/nx-X11/config/cf/apollo.cf
deleted file mode 100644
index 8a5196295..000000000
--- a/nx-X11/config/cf/apollo.cf
+++ /dev/null
@@ -1,38 +0,0 @@
-XCOMM platform: $Xorg: apollo.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-/*
- * Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not
- * in Xosdefs.h, because we suspect someone might want to try building with
- * POSIX support in the sysv environment (the OS doc seems to imply that
- * POSIX is supported in sysv).
- */
-
-#ifndef OSName
-#define OSName Domain/OS SR10.3
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 10
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 3
-#endif
-
-#ifndef CCompilerMajorVersion
-#define CCompilerMajorVersion 6
-#endif
-#ifndef CCompilerMinorVersion
-#define CCompilerMinorVersion 8
-#endif
-
-#define StandardDefines -DX_NOT_POSIX
-#define BuildServer NO
-#define HasNdbm YES
-#define ConnectionFlags -DTCPCONN
-
-#define InstallManPageLong(file,destdir,dest) @@\
-install.man:: file.man @@\
- MakeDir($(DESTDIR)destdir) @@\
- $(NROFF) $(MANMACROS) file.man > file.mantxt @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.mantxt $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
- $(RM) file.mantxt
diff --git a/nx-X11/config/cf/bsd.cf b/nx-X11/config/cf/bsd.cf
deleted file mode 100644
index d47839341..000000000
--- a/nx-X11/config/cf/bsd.cf
+++ /dev/null
@@ -1,37 +0,0 @@
-XCOMM platform: $Xorg: bsd.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.2 1998/09/06 04:46:50 dawes Exp $
-
-#ifndef OSName
-#define OSName 4.3bsd
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 3
-#endif
-
-#define BootstrapCFlags -DNOSTDHDRS
-#define StandardDefines -DNOSTDHDRS -DCSRG_BASED
-#define HasVoidSignalReturn NO
-#define HasBsearch NO
-#define DirFailPrefix -
-#define AvoidNullMakeCommand YES
-
-#define BuildServer NO
-
-#ifdef VaxArchitecture
-#define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */
-#endif
-
-#if OSMajorVersion >= 4 && OSMinorVersion >= 3
-#define SetTtyGroup YES
-#endif
-
-#if OSMajorVersion==4 && OSMinorVersion>=2
-#define HasUsableFileMmap YES
-#endif
diff --git a/nx-X11/config/cf/bsdLib.rules b/nx-X11/config/cf/bsdLib.rules
deleted file mode 100644
index b293b3fa2..000000000
--- a/nx-X11/config/cf/bsdLib.rules
+++ /dev/null
@@ -1,540 +0,0 @@
-XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-
-
-XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.27 2003/11/20 00:41:37 dawes Exp $
-/*
- * NetBSD/FreeBSD shared library rules
- */
-
-#ifndef UseElfFormat
-#define UseElfFormat NO
-#endif
-
-#if !UseElfFormat
-/* a.out shared libs */
-#ifndef HasSharedLibraries
-# ifndef Arm32Architecture
-# define HasSharedLibraries YES
-# endif
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DBSDSHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <bsdLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -Bshareable
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fpic
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest
-@@\
-
-#endif /* InstallSharedLibrary */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedDepLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(LD) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryDataTarget */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibReferences - variables for shared libraries
- */
-#ifndef SharedLibReferences
-#define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-revname = rev @@\
-Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
- /*
- * SharedFontLibReferences - shared font libraries
- */
-#ifndef SharedFontLibReferences
-#define SharedFontLibReferences() @@\
-SOFONTREV = SharedFontRev @@\
-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
-#endif
-
-/*
- * SharedDSLibReferences - variables for shared libraries
- */
-#ifndef SharedDSLibReferences
-#define SharedDSLibReferences(varname,libname,libsource,revname,rev) @@\
-revname = rev @@\
-Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs) @@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#else /* UseElfFormat */
-
-/*
- * NetBSD/FreeBSD (ELF) shared library rules
- * Cloned from Linux ELF rules, with the following major change:
- *
- * Shared libraries depend on -lc. Since we don't have to worry
- * about libc vs. libg, etc., this is a good idea. (This is actually
- * implied by using $(CC) to build the shared libraries.) Adding it
- * explicitly will break threaded applications on platforms that use
- * libc_r for thread support.
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef UseRpath
-#define UseRpath YES
-#endif
-
-#ifndef BaseShLibReqs
-#define BaseShLibReqs /* -lc */
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <bsdLib.tmpl>
-#endif
-#ifndef RpathLoadFlags
-#if UseRpath
-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#else
-#define RpathLoadFlags /**/
-#endif
-#endif
-#ifndef LibraryRpathLoadFlags
-#define LibraryRpathLoadFlags RpathLoadFlags
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#ifndef ExtraLoadFlags
-#ifdef UseInstalled
-#define ExtraLoadFlags RpathLoadFlags
-#else
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-#endif
-#endif
-
-#ifndef HardCodeLibdirFlag
-#define HardCodeLibdirFlag RpathLoadFlags
-#endif
-
-#if !defined(ShlibGlobalsFlags)
-#define ShlibGlobalsFlags -Wl,-Bsymbolic
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef FreeBSDArchitecture
-INSTALLMINORREV = true
-#else
-INSTALLMINORREV = false
-#endif
-
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- @T=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ @@\
- if $(INSTALLMINORREV); then \ @@\
- INST=Concat(lib,libname.so.rev); \ @@\
- LINK=$$T; \ @@\
- else \ @@\
- INST=$$T; \ @@\
- fi; \ @@\
- (set -x; \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) $$INST $(DESTDIR)dest); \ @@\
- if [ X"$$LINK" != X ]; then (set -x; \ @@\
- $(RM) $(DESTDIR)dest/$$LINK; \ @@\
- $(LN) $$INST $(DESTDIR)dest/$$LINK); \ @@\
- fi; \ @@\
- if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- $(LN) $$T Concat($(DESTDIR)dest/lib,libname.so)); \ @@\
- fi
-#endif /* InstallSharedLibrary */
-
-#ifndef InstallSharedLibtoolLibrary
-
-#define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \ @@\
- R=`expr rev : '.*:\([^:]*\):'`; \ @@\
- A=`expr rev : '.*:\([^:]*\)'`; \ @@\
- REV=$$V; \ @@\
- REVLIST=""; \ @@\
- i=$$A; \ @@\
- while [ $$i -gt 0 ]; do \ @@\
- REVLIST="$$REVLIST `expr $$REV - $$i`"; \ @@\
- i=`expr $$i - 1`; \ @@\
- done
-
-#define InstallSharedLibtoolLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so) @@\
- MakeDir($(DESTDIR)dest) @@\
- @set +e; SetRevisions(rev); \ @@\
- set -e; \ @@\
- T=Concat(lib,libname.so.$$REV); \ @@\
- if $(INSTALLMINORREV); then \ @@\
- INST=$$T.0; \ @@\
- LINK=$$T; \ @@\
- else \ @@\
- INST=$$T; \ @@\
- fi; \ @@\
- (set -x; \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) $$INST $(DESTDIR)dest); \ @@\
- if [ X"$$LINK" != X ]; then (set -x; \ @@\
- $(RM) $(DESTDIR)dest/$$LINK; \ @@\
- $(LN) $$INST $(DESTDIR)dest/$$LINK); \ @@\
- fi; \ @@\
- for i in $$REVLIST; do (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so.$$i); \ @@\
- $(LN) Concat(lib,libname.so.$$REV) Concat($(DESTDIR)dest/lib,libname.so.$$i)); \ @@\
- done; \ @@\
- if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- $(LN) Concat(lib,libname.so.$$REV) Concat($(DESTDIR)dest/lib,libname.so)); \ @@\
- fi
-#endif /* InstallSharedLibtoolLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- (set -x; cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- (set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) $$SONAME @@\
- $(RM) Concat(lib,libname.so) @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-#ifndef SharedLibtoolLibraryTarget
-#define SharedLibtoolLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so)) @@\
- @@\
-Concat(lib,libname.so): solist @@\
- $(RM) $@~ @@\
- @set +e; SetRevisions(rev); \ @@\
- SONAME=$@.$$REV; \ @@\
- set -e; \ @@\
- (set -x; cd down; $(CC) -o up/$$SONAME~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- (set -x; $(RM) $$SONAME; $(MV) $$SONAME~ $$SONAME); \ @@\
- LinkBuildSonameLibrary($$SONAME); \ @@\
- if $(INSTALLMINORREV); then (set -x; \ @@\
- $(RM) $$SONAME.0; \ @@\
- $(LN) $$SONAME $$SONAME.0); \ @@\
- fi; \ @@\
- if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) $@; \ @@\
- $(LN) $$SONAME $@); \ @@\
- LinkBuildLibraryInline($@); \ @@\
- fi @@\
- @@\
-clean:: @@\
- @set +e; SetRevisions(rev); \ @@\
- set -xe; \ @@\
- $(RM) Concat(lib,libname.so.$$REV); \ @@\
- $(RM) Concat(lib,libname.so.$$REV.0) @@\
- $(RM) Concat(lib,libname.so)
-
-#endif /* SharedLibtoolLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) $$SONAME @@\
- $(RM) Concat(lib,libname.so) @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepCplusplusLibraryTarget
-#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) $$SONAME @@\
- $(RM) Concat(lib,libname.so) @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedDepCplusplusLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-#ifndef SharedDriModuleTarget
-#define SharedDriModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ $@.map @@\
- @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\
- $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ $@.map @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name @@\
- $(RM) name.map
-
-#endif /* SharedDriModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#if defined(FreeBSDArchitecture)
-
-/*
- * Support for building a.out compatibility libraries on a FreeBSD/ELF system.
- */
-#ifndef BuildAoutLibraries
-#define BuildAoutLibraries NO
-#endif
-
-#if BuildAoutLibraries
-
-#define ExtraLibRules
-
-#ifndef AoutSharedLibraryDef
-#define AoutSharedLibraryDef -DBSDSHLIB
-#endif
-#ifndef AoutSharedLibraryLoadFlags
-#define AoutSharedLibraryLoadFlags -aout -Bshareable
-#endif
-#ifndef AoutPositionIndependentCFlags
-#define AoutPositionIndependentCFlags -fpic
-#endif
-
-/*
- * InstallAoutSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallAoutSharedLibrary
-#define InstallAoutSharedLibrary(libname,rev,dest) @@\
-install:: Concat(aout/lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat(aout/lib,libname.so.rev) $(DESTDIR)dest
-@@\
-
-#endif /* InstallAoutSharedLibrary */
-
-/*
- * AoutSharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef AoutSharedLibraryTarget
-#define AoutSharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(down/lib,libname.so.rev)) @@\
- @@\
-Concat(down/lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ AoutSharedLibraryLoadFlags solist) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) Concat(down/lib,libname.so.rev)
-
-#endif /* AoutSharedLibraryTarget */
-
-#define AoutCDebugFlags -aout DefaultCDebugFlags
-#define AoutCplusplusDebugFlags -aout DefaultCplusplusDebugFlags
-
-#define AoutLibObjCompile(options) LibObjCompile(aout,AoutCDebugFlags AoutSharedLibraryDef AoutPositionIndependentCFlags options)
-#define AoutLibObjCplusplusCompile(options) LibObjCompile(aout,AoutCplusplusDebugFlags options)
-
-#define ExtraLibMkdir() _LibMkdir(aout)
-#define ExtraObjCompile(options) AoutLibObjCompile(options)
-#define ExtraObjCplusplusCompile(options) AoutLibObjCplusplusCompile(options)
-#define ExtraCleanDir() LibCleanDir(aout)
-
-#define ExtraLibraryTarget(libname,so,objs) AoutSharedLibraryTarget(libname,so,objs,aout,..)
-#define ExtraInstallLibrary(libname,so) InstallAoutSharedLibrary(libname,so,$(SHLIBDIR)/aout)
-
-#endif
-#endif
-
-
-#endif /* UseElfFormat */
diff --git a/nx-X11/config/cf/bsdLib.tmpl b/nx-X11/config/cf/bsdLib.tmpl
deleted file mode 100644
index 8d55581e3..000000000
--- a/nx-X11/config/cf/bsdLib.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.23 2003/11/04 01:59:31 dawes Exp $
-
-/*
- * NetBSD/FreeBSD/OpenBSD shared library template
- */
-
-#if !UseElfFormat
-
-#ifndef SharedXlibi18nReqs
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#endif
-
-#ifndef SharedXtReqs
-#define SharedXtReqs /**/
-#endif
-#ifndef SharedXawReqs
-#define SharedXawReqs /**/
-#endif
-#ifndef SharedXmuReqs
-# if !defined(Mc68020Architecture) || !defined(OpenBSDArchitecture)
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB)
-# else
- /* At least the hp300 and the sun3 OpenBSD ports need that */
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# endif
-#endif
-#ifndef SharedXcursorReqs
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#endif
-
-#else /* UseElfFormat */
-
-/*
- * NetBSD/FreeBSD/OpenBSD (ELF) shared library template
- * Cloned from Linux ELF rules, but with a minor number.
- */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-/* Allow for libpthread, as overridden by OS definitions */
-#if !defined(SharedX11Reqs)
-#define SharedX11Reqs
-#endif
-
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
-#ifndef SharedXtReqs
-#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#endif
-#ifndef SharedXawReqs
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#endif
-#define SharedXaw7Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-#define SharedXpReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#ifndef SharedGLReqs
-#define SharedGLReqs $(LDPRELIBS) $(XLIB)
-#endif
-#ifndef SharedGLUReqs
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#endif
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-#define SharedXssReqs $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXfixesReqs $(LDPRELIB) $(XLIB)
-#define SharedXdamageReqs $(LDPRELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXevieReqs $(LDPRELIB) $(XLIB)
-#endif /* UseElfFormat */
diff --git a/nx-X11/config/cf/bsdi.cf b/nx-X11/config/cf/bsdi.cf
deleted file mode 100644
index d0d78ee3d..000000000
--- a/nx-X11/config/cf/bsdi.cf
+++ /dev/null
@@ -1,364 +0,0 @@
-XCOMM platform: $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.37 2003/04/24 22:14:53 herrb Exp $
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSVendor
-#define OSVendor BSDI
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#define HasBSD44Sockets YES
-#define HasBsdMake YES
-#define HasDlopen YES
-#define HasPutenv YES
-#define HasSnprintf YES
-#define HasMkstemp YES
-#define HasUsableFileMmap YES
-#define HasZlib YES
-#define HasSetUseContext YES
-#define HasBSDAuth YES
-#define HasSetProcTitle YES
-#define HasBasename NO
-
-#if 0
-#define HasKrb5 YES
-#define Krb5Include -I/usr/include/krb5
-#define Krb5Libraries -lkrb5 -lk5crypto -lprofile -lcom_err
-#endif
-
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++
-
-#if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
-#define HasNCurses YES
-#else
-#define HasNCurses NO
-#endif
-#if (OSMajorVersion == 4 && OSMinorVersion >= 3) || (OSMajorVersion > 4)
-#define HasStrlcat YES
-#else
-#define HasStrlcat NO
-#endif
-
-#define BuildLBX YES
-#define GzipFontCompression YES
-#define BuildXaw6 NO
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-XCOMM BSD/OS 5.1 (intel) comes with gcc 3.2.2 installed as gcc and cc.
-
-XCOMM BSD/OS 5.0 (intel) comes with gcc 2.95.3 installed as gcc and cc.
-
-XCOMM BSD/OS 4.3/4.3.1 (intel) comes with gcc 2.95.3 installed as gcc and cc.
-
-XCOMM BSD/OS 4.2 (intel) comes with gcc 2.95.2 installed as gcc and cc.
-XCOMM BSD/OS 4.2 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
-
-XCOMM BSD/OS 4.1 (intel) comes with gcc 2.91.66 installed as gcc and cc.
-XCOMM BSD/OS 4.1 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
-
-XCOMM BSD/OS 4.0.1 (intel) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc.
-XCOMM BSD/OS 4.0.1 (sparc) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc.
-XCOMM Punt on OS revs earlier than 4.0.1
-
-XCOMM BSDI uses shlicc for compiling C and shlic++ for compiling C++
-XCOMM using static shared libraries. We also build ELF dynamic shared
-XCOMM libraries as well as normal archive libraries.
-
-XCOMM BSD/OS 3.0 comes with gcc 2.7.2 installed as gcc2 and gcc.
-XCOMM gcc 1.42 is installed as cc.
-
-XCOMM BSD/OS 2.1 comes with gcc 2.7.1 installed as gcc2 and gcc.
-XCOMM gcc 1.42 is installed as cc.
-
-XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc.
-XCOMM gcc 1.42 is installed as cc.
-
-XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2.
-XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler.
-XCOMM The default is to use gcc2 on release 2.1, 2.0 and 1.1 and gcc1 on 1.0
-XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in
-XCOMM xf86site.def
-
-#ifndef HasGcc
-# define HasGcc YES
-#endif
-#if OSMajorVersion > 1 || OSMinorVersion >= 1
-# ifndef HasGcc2
-# define HasGcc2 YES
-# endif
-#endif
-#if HasGcc2
-# ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus YES
-# endif
-# ifdef i386Architecture
-# define CcCmd gcc /* shlicc */
-# define CplusplusCmd g++ /* shlicc++ */
-# if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
-# define OptimizedCDebugFlags -O3 -mcpu=pentiumpro -march=pentium
-# else
-# define OptimizedCDebugFlags -O2 -m486
-# endif
-# endif
-# ifdef PpcArchitecture
-# define CcCmd gcc
-# define CplusplusCmd g++
-# define OptimizedCDebugFlags -O2
-# endif
-# ifdef SparcArchitecture
-# define CcCmd gcc
-# define CplusplusCmd g++
-# define OptimizedCDebugFlags -O2 -cpu=v8 -mtune=v8
-# endif
-#else
-# define CcCmd cc
-# define OptimizedCDebugFlags -O
-#endif
-
-/*
- * A hack to work around an optimization problem with GCC 2.95.2 - 2.95.4
- */
-#if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
-#define GccOptBug295
-#endif
-
-#define CppCmd /usr/bin/cpp
-#define HasGroff YES
-#define MkdirHierCmd mkdir -p
-#define SetTtyGroup YES
-#define HasNdbm YES
-#define DBMLibrary /**/
-#define HasWChar32 YES
-#define DirFailPrefix -
-#define AvoidNullMakeCommand YES
-#define HasVarRun YES
-#define HasVarDb YES
-
-# ifndef GccUsesGas
-# define GccUsesGas YES
-# endif
-#if HasGcc
-#ifndef DefaultCCOptions
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions /**/
-#else
-#define DefaultCCOptions /* -ansi */
-#endif
-#endif
-#endif
-
-#if GccUsesGas
-# define GccGasOption -DGCCUSESGAS
-#else
-# define GccGasOption /**/
-#endif
-
-/*
- * Build a threaded X server on BSD/OS 4.1 and newer releases
- */
-#if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
-#define HasPosixThreads YES /* this will autodefine HasThreadedX */
-#define HasThreadSafeAPI YES
-/*
- * Heck, build a server that can load modules too...
- */
-#define DoLoadableServer Yes
-#endif
-
-XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
-#if (OSMajorVersion >= 5)
-#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -D_POSIX_THREAD_SAFE_FUNCTIONS
-#elif (OSMajorVersion == 4 && OSMinorVersion >= 1)
-#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
-#endif
-
-
-#ifdef i386Architecture
-#ifndef BuildXF86DRI
-#define BuildXF86DRI NO
-#endif
-#endif
-
-#ifdef i386Architecture
-# define HasTk YES
-# define TkLibName tk4.2
-# define TkLibDir /usr/contrib/lib
-# define TkIncDir /usr/include
-# define XF86SetupUsesStaticTk NO
-# define HasTcl YES
-# define TclLibName tcl7.6
-# define TclLibDir /usr/contrib/lib
-# define TclIncDir /usr/include
-# define XF86SetupUsesStaticTcl NO
-# define SharedLibXv YES
-# define SharedLibXinerama YES
-# define ServerExtraDefines GccGasOption XFree86ServerDefines -I/sys
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define XFree86ConsoleDefines -DBSDI_VT
-# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 1)
-# include <bsdiLib.rules>
-# define DontUseLibPathVar
-# define BuildDynamicLoading YES
-# define ServerCcCmd cc
-# define ServerExtraSysLibs DlLibrary
-# endif
-# define XConfigDir /etc/X11
-#endif
-
-#ifdef PpcArchitecture
-# define BuildServer NO
-# define BuildFonts NO
-# define XConfigDir /etc/X11
-# include <bsdiLib.rules>
-# define DontUseLibPathVar
-# define BuildDynamicLoading YES
-# define ServerCcCmd cc
-# define ServerExtraSysLibs DlLibrary
-#endif
-
-#ifdef SparcArchitecture
-# define ServerExtraDefines
-# define ServerOSDefines -DDDXOSINIT
-#endif
-
-#define HasShm YES
-#define AsmDefines -DUSE_GAS
-
-#ifndef LdPreLib
-#define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
-#endif
-
-#if OSMajorVersion >= 4
-#define StandardDefines -D__ELF__ -DCSRG_BASED
-#else
-#define StandardDefines -DCSRG_BASED
-#endif
-
-#define InstallCmd /usr/bin/install
-#define EqnCmd eqn -Tps
-#define NeqnCmd eqn -Tascii
- COL = col
- NEQN = NeqnCmd
- NROFF = nroff
-
-#define DefaultUserPath :/bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#define StripInstalledPrograms YES
-#define InstPgmFlags -s -m 0555 -o bin -g bin
-#define InstBinFlags -m 0555 -o bin -g bin
-#define InstUidFlags -m 4555 -o root -g bin
-#define InstLibFlags -m 0444 -o bin -g bin
-#define InstIncFlags -m 0444 -o bin -g bin
-#define InstManFlags -m 0444 -o bin -g bin
-#define InstDatFlags -m 0444 -o bin -g bin
-
-XCOMM Man pages need to be formatted when installed, so override the default
-XCOMM imake rules.
-
-#define ManSuffix 1
-#define ManSourcePath $(MANPATH)/cat
-
-#define InstallManPageLong(file,destdir,dest) @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-all:: file.0 @@\
- @@\
-file.0:: file.$(MANNEWSUFFIX) @@\
- @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
- then \ @@\
- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\
- cp /tmp/$$$$.man file.0; \ @@\
- $(RM) /tmp/$$$$.man; \ @@\
- fi @@\
- @@\
-install.man:: @@\
- MakeDir($(DESTDIR)destdir) @@\
- -@if [ -f file.0 ]; \ @@\
- then \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
- fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
- InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \ @@\
- $(RM) /tmp/$$$$.suff); \ @@\
- done
-
-#define InstallMultipleMan(list,dest) @@\
- InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases) @@\
-install.man:: @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in aliases; do \ @@\
- (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.0;\ @@\
- (cd $(DESTDIR)destdir; $(LN) file.0 $$i.0);\ @@\
- ); \ @@\
- done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
- InstallManPageAliases(file,destdir,aliases)
-
-/*
- * These seem redundant, but leave them in for now.
- */
-#ifdef i386Architecture
-#define i386Bsd 1
-#define i386Bsdi 1
-#include <xorg.cf>
-#endif
-
-#ifdef SparcArchitecture
-#ifndef XsunMonoServer
-#define XsunMonoServer NO /* monochrome only */
-#endif
-#ifndef XsunServer
-#define XsunServer YES /* mono + 8 bit color */
-#endif
-#ifndef Xsun24Server
-#define Xsun24Server NO /* mono + 8 bit color + 24 bit c
-olor */
-#endif
-
-#ifndef NeedConstPrototypes
-#define NeedConstPrototypes YES
-#endif
-#ifndef NeedNestedPrototypes
-#define NeedNestedPrototypes YES
-#endif
-#ifndef NeedVarargsPrototypes
-#define NeedVarargsPrototypes YES
-#endif
-
-#ifndef BuildXKB
-#define BuildXKB YES
-#endif
-
-#endif /* SparcArchitecture */
-
diff --git a/nx-X11/config/cf/bsdiLib.rules b/nx-X11/config/cf/bsdiLib.rules
deleted file mode 100644
index 85a99521f..000000000
--- a/nx-X11/config/cf/bsdiLib.rules
+++ /dev/null
@@ -1,239 +0,0 @@
-XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.3 2003/10/09 22:43:18 herrb Exp $
-
-/*
- * BSDI shared library rules (converted from SVr4/Linux rules)
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <bsdiLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#ifndef BaseShLibReqs
-#define BaseShLibReqs -lc
-#endif
-#ifndef RanlibInstFlags
-#define RanlibInstFlags -t
-#endif
-#ifndef SharedCCLdCmd
-/* NOT $(CC), which is probably 'shlicc'. */
-#define SharedCCLdCmd cc
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
- $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \
- -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) $$SONAME @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \
- -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) $$SONAME @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedDepLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CCENVSETUP) SharedCCLdCmd -o $@~ $(SHLIBLDFLAGS) \
- solist $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-/*
- * Hacks for BSD/OS static shared libraries.
- * We replace the normal library build and install rules.
- */
-
-SHLIB_MAP=$${SHLIB_MAP-/etc/shlib.map}
-
-#define BsdiStaticLibraryName(libname)Concat(Concat(lib,libname),_s)
-#define BsdiStaticStubLibraryName(libname)BsdiStaticLibraryName(libname).a
-
-#define MakeBsdiStaticSharedLibrary(libname) \
- @SHARED=; \
- eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
- 'echo "TADDR=$$2;";' \
- 'echo "DADDR=$$3;";' \
- 'echo "SHARED=$$5;";' \
- 'shift 5; echo "ARGS='"'"'"$$@"'"'"';";' \
- 'exit 0; }'; cat $(SHLIB_MAP)) | sh); \
- [ -n "$$SHARED" ] || exit 0; \
- echo building static shared libname library; \
- shlib -m $(SHLIB_MAP) -t $$TADDR -d $$DADDR \
- -n BsdiStaticLibraryName(libname) \
- -s BsdiStaticStubLibraryName(libname) \
- $$( [ -f 'loader.lib'libname'.c' ] && \
- echo -b 'loader.lib'libname'.c') \
- $$( [ -f 'lib'libname'.const' ] && \
- echo -c 'lib'libname'.const') \
- $$( [ -f 'lib'libname'.except' ] && \
- echo -e 'lib'libname'.except') \
- $$( [ -f $$SHARED ] && echo -i $$SHARED) \
- $$ARGS LibraryTargetName(libname)
-
-#define InstallBsdiStaticSharedLibrary(libname) \
- @SHARED=; \
- eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
- 'echo "SHARED=$$5;";' \
- 'echo "STUB=$$(dirname $$4)/$$(basename $$5).a;";' \
- 'exit 0; }'; cat $(SHLIB_MAP)) | sh); \
- [ -n "$$SHARED" ] || exit 0; \
- echo installing static shared libname library; \
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- BsdiStaticLibraryName(libname) $(DESTDIR)$$SHARED; \
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- BsdiStaticStubLibraryName(libname) $(DESTDIR)$$STUB; \
- RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)$$STUB) @@\
- -@eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
- 'echo "LDIR=$$(dirname $$4)"; exit 0; }'; \
- cat $(SHLIB_MAP)) | sh); \
- [ -f Concat(loader.lib,libname.c) ] && \
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- Concat(loader.lib,libname.c) \
- $(DESTDIR)$$LDIR/Concat(loader.lib,libname.c); \
- [ -f Concat(lib,libname.const) ] && \
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- Concat(lib,libname.const) \
- $(DESTDIR)$$LDIR/Concat(lib,libname.const); \
- [ -f Concat(lib,libname.except) ] && \
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- Concat(lib,libname.except) \
- $(DESTDIR)$$LDIR/Concat(lib,libname.except); exit 0
-
-#ifndef UnsharedLibraryTarget
-#define UnsharedLibraryTarget(libname,objlist,down,up) @@\
-AllTarget(LibraryTargetName(libname)) @@\
- @@\
-LibraryTargetName(libname): objlist @@\
- RemoveFile($@) @@\
- (cd down; MakeLibrary(up/$@,objlist)) @@\
- RanLibrary($@) @@\
- _LinkBuildLibrary($@) @@\
- MakeBsdiStaticSharedLibrary(libname) @@\
- @@\
-clean:: @@\
- $(RM) BsdiStaticLibraryName(libname) BsdiStaticStubLibraryName(libname)
-#endif /* UnsharedLibraryTarget */
-
-#ifndef UnsharedLibraryTarget3
-#define UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\
- UnsharedLibraryTarget(libname,objlist1 objlist2 objlist3,down,up)
-#endif /* UnsharedLibraryTarget3 */
-
-#ifndef InstallLibrary
-#define InstallLibrary(libname,dest) @@\
-install:: LibraryTargetName(libname) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \
- LibraryTargetName(libname) $(DESTDIR)dest @@\
- RanLibrary($(RANLIBINSTFLAGS) \
- $(DESTDIR)dest/LibraryTargetName(libname)) @@\
- InstallBsdiStaticSharedLibrary(libname)
-#endif /* InstallLibrary */
diff --git a/nx-X11/config/cf/bsdiLib.tmpl b/nx-X11/config/cf/bsdiLib.tmpl
deleted file mode 100644
index 28087bfb0..000000000
--- a/nx-X11/config/cf/bsdiLib.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.3 2003/05/29 21:56:57 herrb Exp $
-
-/*
- * BSDI shared library template (converted from Linux template)
- */
-
-/*
- * Linux ELF shared libraries (which BSDI uses)
- * are deficient in link semantics...
- */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-#define FrescoSysLibs CplusplusLibC MathLibrary
-
-#define SharedX11Reqs
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedFrescoReqs $(LDPRELIB) $(XONLYLIB) FrescoSysLibs
-#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
-
-/* Motif lib requirements */
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB)
-#define SharedXmReqs $(LDPRELIB) SharedXReqs
-#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIB) $(XMLIB) SharedXReqs
diff --git a/nx-X11/config/cf/cde.rules b/nx-X11/config/cf/cde.rules
deleted file mode 100644
index 315047207..000000000
--- a/nx-X11/config/cf/cde.rules
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * @OSF_COPYRIGHT@
- * COPYRIGHT NOTICE
- * Copyright (c) 1990, 1991, 1992, 1993, 1998 The Open Group , Inc.
- * ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- * the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc.
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */
-XCOMM $Xorg: cde.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-/* Note whether we are the top level project. */
-#ifndef SeenTopLevelProject
-# define SeenTopLevelProject YES
-# define CDEIsTopLevelProject YES
-#else
-# define CDEIsTopLevelProject NO
-#endif
-
-/* Include the Motif project rules file. */
-#include <Motif.rules>
-
-
-/* Use the in-tree CDE by default. */
-#ifndef UseInstalledCDE
-# define UseInstalledCDE NO
-#endif
-#ifdef UseInstalled
-# undef UseInstalledCDE
-# define UseInstalledCDE YES
-#endif
-
-#ifndef ImportCDE
-# ifdef UseImports
-# define ImportCDE YES
-# else
-# define ImportCDE NO
-# endif
-#endif
-#if UseInstalledCDE
-# undef ImportCDE
-# define ImportCDE NO
-#endif
-
-/* If CDE has a different ProjectRoot we need to search the regular ones too. */
-#ifdef CDEProjectRoot
-# define CUsrLibDirPath Concat(MUsrLibDirPath,:$(CDEPROJECTROOT)/lib)
-#else
-# define CUsrLibDirPath MUsrLibDirPath
-#endif
-#ifdef UsrLibDirPath
-# undef UsrLibDirPath
-#endif
-#define UsrLibDirPath CUsrLibDirPath
-
-#if ImportCDE
-# define CLdPreLibs -L$(CDELIBSRC)
-#elif defined(UseInstalledCDE) && defined(CDEProjectRoot)
-# define CLdPreLibs -L$(CDEPROJECTROOT)/lib
-#else
-# define CLdPreLibs /**/
-#endif
-#ifdef LdPreLibs
-# undef LdPreLibs
-#endif
-#define LdPreLibs LdPreLib CLdPreLibs MLdPreLibs XLdPreLibs
-
-#ifdef CDEProjectRoot
-# define CLdPostLibs -L$(CDEPROJECTROOT)/lib
-#else
-# define CLdPostLibs /**/
-#endif
-#ifdef LdPostLibs
-# undef LdPostLibs
-#endif
-#define LdPostLibs LdPostLib CLdPostLibs MLdPostLibs XLdPostLibs
-
-#ifdef TopIncludes
-# undef TopIncludes
-#endif
-#define TopIncludes TopInclude $(TOP_CDE_INCLUDES) $(TOP_MOTIF_INCLUDES) $(TOP_X_INCLUDES)
-
-#if UseInstalledCDE && defined(CDEProjectRoot)
-# define CDEBuildLibPath $(CDEPROJECTROOT)/lib
-#elif UseInstalledCDE
-# define CDEBuildLibPath $(USRLIBDIR)
-#elif ImportCDE
-# define CDEBuildLibPath $(CDELIBSRC)
-#else
-# define CDEBuildLibPath $(TOP)/exports/lib
-#endif
-#ifdef BuildLibPath
-# undef BuildLibPath
-#endif
-#ifdef SystemBuildLibPath
-# define BuildLibPath \
-$(DTENVLIBDIR):$(MOTIFENVLIBDIR):$(XENVLIBDIR):$(SYSTEMENVLIBDIR)
-#else
-# define BuildLibPath $(DTENVLIBDIR):$(MOTIFENVLIBDIR):$(XENVLIBDIR)
-#endif
-
-
-#ifndef CdeInstallationTop
-# define CdeInstallationTop /usr/dt
-#endif
-#ifndef CdeConfigurationTop
-# define CdeConfigurationTop /etc/dt
-#endif
-#ifndef CdeLogFilesTop
-# define CdeLogFilesTop /var/dt
-#endif
-#ifndef CdeUserTop
-# define CdeUserTop .dt
-#endif
-
-#ifndef CdeProjectDefines
-# define CdeProjectDefines \
- -DANSICPP -DMULTIBYTE -DNLS16 \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-#endif
-#ifdef ProjectDefines
-# undef ProjectDefines
-#endif
-#define ProjectDefines X11ProjectDefines MotifProjectDefines CdeProjectDefines
-
-#ifndef CdeCplusplusProjectDefines
-# define CdeCplusplusProjectDefines CdeProjectDefines
-#endif
-#ifdef CplusplusProjectDefines
-# undef CplusplusProjectDefines
-#endif
-#define CplusplusProjectDefines \
- X11CplusplusProjectDefines MotifCplusplusProjectDefines CdeCplusplusProjectDefines
-
-/*
- * Doc build rules
- */
-
-/*
- * MakeSdlVolume - generate rules to create an SDL volume, in the specified
- * directory, from an SGML source doc.
- * Note: the volume name must match the directory name.
- */
-#ifndef MakeSdlVolume
-#define MakeSdlVolume(vol,dir,env,opts,dep) @@\
-all:: dir/vol.sdl @@\
- @@\
-dir/vol.sdl: dep @@\
- MakeDir(dir) @@\
- env $(DTDOCBOOK) $(DTDOCBOOKOPTIONS) opts -o dir/vol.sdl vol/book.sgm @@\
- @@\
-clean:: @@\
- $(RM) dir/vol.sdl vol/book.log
-#endif
-
-/*
- * MakeTocFile - generate rules to create an SGML TOC file.
- * Note: the volume name must match the directory name.
- */
-#ifndef MakeTocFile
-#define MakeTocFile(vol,env,opts,ttle,ident,dep) @@\
-all:: vol/TOC.sgm @@\
- @@\
-vol/TOC.sgm: dep @@\
- MakeDir($(DTINFOGENTMPDIR)) @@\
- env $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -f vol/TOC.sgm -id ident -title ttle vol/book.sgm @@\
- @@\
-clean:: @@\
- $(RM) vol/TOC.sgm
-#endif
-
-#ifndef MakeTocFile3
-#define MakeTocFile3(vol,env,opts,ttle,ident,dep1,dep2,dep3) @@\
-all:: vol/TOC.sgm @@\
- @@\
-vol/TOC.sgm: dep1 @@\
-vol/TOC.sgm: dep2 @@\
-vol/TOC.sgm: dep3 @@\
- MakeDir($(DTINFOGENTMPDIR)) @@\
- env $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -f vol/TOC.sgm -id ident -title ttle vol/book.sgm @@\
- @@\
-clean:: @@\
- $(RM) vol/TOC.sgm
-#endif
-
-/*
- * TocFileDep - generate TOC file dependency rule
- */
-#ifndef TocFileDep
-#define TocFileDep(vol,dep) @@\
-vol/TOC.sgm: dep
-#endif
-
-/*
- * MakeInfolib - generate rules to create an infolib.
- */
-#ifndef MakeInfolib
-#define MakeInfolib(infolib,bkcase,env,opts,dep) @@\
-all:: infolib/bkcase/dtsearch/dtsearch.ocf @@\
- @@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep @@\
- MakeDir($(DTINFOGENTMPDIR)) @@\
- MakeDir(infolib) @@\
- env $(DTINFOGEN) build -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc
-#endif
-
-/*
- * InfolibDep - generate infolib dependency rule - Highly depending on MMDB!
- */
-#ifndef InfolibDep
-#define InfolibDep(infolib,bkcase,dep) @@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep
-#endif
-
-#ifndef InfolibDep3
-#define InfolibDep3(infolib,bkcase,dep1,dep2,dep3) @@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep1 @@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep2 @@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep3
-#endif
diff --git a/nx-X11/config/cf/cde.tmpl b/nx-X11/config/cf/cde.tmpl
deleted file mode 100644
index c30a449a8..000000000
--- a/nx-X11/config/cf/cde.tmpl
+++ /dev/null
@@ -1,439 +0,0 @@
-XCOMM $Xorg: cde.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-/* Include the Motif project template file. */
-#include <Motif.tmpl>
-
-#ifndef _CUse
-# if UseInstalledCDE
-# define _CUse(a,b) a
-# else
-# define _CUse(a,b) b
-# endif
-#endif
-
-#ifndef _CUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
-# if UseInstalledCDE
-# define _CUseCat(a,b,c) a##c
-# else
-# define _CUseCat(a,b,c) b##c
-# endif
-# else
-# if UseInstalledCDE
-# define _CUseCat(a,b,c) a/**/c
-# else
-# define _CUseCat(a,b,c) b/**/c
-# endif
-# endif
-#endif
-
-#ifndef CDETop
-# if ImportCDE
-# define CDETop $(TOP)/imports/cde
-# else
-# define CDETop $(TOP)
-# endif
-#endif
-
-#define CDESharedRev 2.1
-
-#ifndef SharedLibPam
-# define SharedLibPam HasSharedLibraries
-#endif
-#ifndef NormalLibPam
-# define NormalLibPam (!SharedLibPam | ForceNormalLib)
-#endif
-#ifndef DebugLibPam
-# define DebugLibPam NO
-#endif
-#ifndef ProfileLibPam
-# define ProfileLibPam NO
-#endif
-#ifndef SharedPamRev
-# define SharedPamRev CDESharedRev
-#endif
-
-#ifndef SharedLibTt
-# define SharedLibTt HasSharedLibraries
-#endif
-#ifndef NormalLibTt
-# define NormalLibTt (!SharedLibTt | ForceNormalLib)
-#endif
-#ifndef DebugLibTt
-# define DebugLibTt NO
-#endif
-#ifndef ProfileLibTt
-# define ProfileLibTt NO
-#endif
-#ifndef SharedTtRev
-# define SharedTtRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtSvc
-# define SharedLibDtSvc HasSharedLibraries
-#endif
-#ifndef NormalLibDtSvc
-# define NormalLibDtSvc (!SharedLibDtSvc | ForceNormalLib)
-#endif
-#ifndef DebugLibDtSvc
-# define DebugLibDtSvc NO
-#endif
-#ifndef ProfileLibDtSvc
-# define ProfileLibDtSvc NO
-#endif
-#ifndef SharedDtSvcRev
-# define SharedDtSvcRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtSearch
-# define SharedLibDtSearch HasSharedLibraries
-#endif
-#ifndef NormalLibDtSearch
-# define NormalLibDtSearch (!SharedLibDtSearch | ForceNormalLib)
-#endif
-#ifndef DebugLibDtSearch
-# define DebugLibDtSearch NO
-#endif
-#ifndef ProfileLibDtSearch
-# define ProfileLibDtSearch NO
-#endif
-#ifndef SharedDtSearchRev
-# define SharedDtSearchRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtWidget
-# define SharedLibDtWidget HasSharedLibraries
-#endif
-#ifndef NormalLibDtWidget
-# define NormalLibDtWidget (!SharedLibDtWidget | ForceNormalLib)
-#endif
-#ifndef DebugLibDtWidget
-# define DebugLibDtWidget NO
-#endif
-#ifndef ProfileLibDtWidget
-# define ProfileLibDtWidget NO
-#endif
-#ifndef SharedDtWidgetRev
-# define SharedDtWidgetRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtHelp
-# define SharedLibDtHelp HasSharedLibraries
-#endif
-#ifndef NormalLibDtHelp
-# define NormalLibDtHelp (!SharedLibDtHelp | ForceNormalLib)
-#endif
-#ifndef DebugLibDtHelp
-# define DebugLibDtHelp NO
-#endif
-#ifndef ProfileLibDtHelp
-# define ProfileLibDtHelp NO
-#endif
-#ifndef SharedDtHelpRev
-# define SharedDtHelpRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtPrint
-# define SharedLibDtPrint HasSharedLibraries
-#endif
-#ifndef NormalLibDtPrint
-# define NormalLibDtPrint (!SharedLibDtPrint | ForceNormalLib)
-#endif
-#ifndef DebugLibDtPrint
-# define DebugLibDtPrint NO
-#endif
-#ifndef ProfileLibDtPrint
-# define ProfileLibDtPrint NO
-#endif
-#ifndef SharedDtPrintRev
-# define SharedDtPrintRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtTerm
-# define SharedLibDtTerm HasSharedLibraries
-#endif
-#ifndef NormalLibDtTerm
-# define NormalLibDtTerm (!SharedLibDtTerm | ForceNormalLib)
-#endif
-#ifndef DebugLibDtTerm
-# define DebugLibDtTerm NO
-#endif
-#ifndef ProfileLibDtTerm
-# define ProfileLibDtTerm NO
-#endif
-#ifndef SharedDtTermRev
-# define SharedDtTermRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtMrm
-# define SharedLibDtMrm HasSharedLibraries
-#endif
-#ifndef NormalLibDtMrm
-# define NormalLibDtMrm (!SharedLibDtMrm | ForceNormalLib)
-#endif
-#ifndef DebugLibDtMrm
-# define DebugLibDtMrm NO
-#endif
-#ifndef ProfileLibDtMrm
-# define ProfileLibDtMrm NO
-#endif
-#ifndef SharedDtMrmRev
-# define SharedDtMrmRev CDESharedRev
-#endif
-
-#ifndef SharedLibDtMmdb
-# define SharedLibDtMmdb HasSharedLibraries
-#endif
-#ifndef NormalLibDtMmdb
-# define NormalLibDtMmdb (!SharedLibDtMmdb | ForceNormalLib)
-#endif
-#ifndef DebugLibDtMmdb
-# define DebugLibDtMmdb NO
-#endif
-#ifndef ProfileLibDtMmdb
-# define ProfileLibDtMmdb NO
-#endif
-#ifndef SharedDtMmdbRev
-# define SharedDtMmdbRev CDESharedRev
-#endif
-
-#ifndef SharedLibCsa
-# define SharedLibCsa HasSharedLibraries
-#endif
-#ifndef NormalLibCsa
-# define NormalLibCsa (!SharedLibCsa | ForceNormalLib)
-#endif
-#ifndef DebugLibCsa
-# define DebugLibCsa NO
-#endif
-#ifndef ProfileLibCsa
-# define ProfileLibCsa NO
-#endif
-#ifndef SharedCsaRev
-# define SharedCsaRev CDESharedRev
-#endif
-
-#ifndef DtLocalesToBuild
-#define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1 ja_JP.dt-eucJP
-#endif
-
-#ifndef DtCodeGen
-# if UseInstalledCDE
-# define DtCodeGen dtcodegen
-# else
-# define DtCodeGen $(CLIENTENVSETUP) $(CDESRC)/dtappbuilder/src/abmf/dtcodegen
-# endif
-#endif
-
-#ifndef BuildCDEDoc
-# define BuildCDEDoc YES
-#endif
-
-#ifndef UseNSGMLS
-# ifdef SunArchitecture
-# define UseNSGMLS NO
-# else
-# define UseNSGMLS YES
-# endif
-#endif
-#ifndef SGMLParser
-# if UseNSGMLS
-# define SGMLDir $(NSGMLSSRC)
-# define SGMLParser $(NSGMLSSRC)/nsgmls
-# else
-# define SGMLDir $(SGMLSSRC)
-# define SGMLParser $(SGMLSSRC)/sgmls
-# endif
-#endif
-
-#ifndef DtInfoGen
-# if UseInstalledCDE
-# define DtInfoGen dtinfogen
-# else
-# define DtInfoGen $(CLIENTENVSETUP) $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:SGMLDir:$(CDESRC)/dtsr $(DTINFOGENSRC)/infolib/etc/dtinfogen
-# endif
-#endif
-#ifndef DtInfoGenTmpDir
-# define DtInfoGenTmpDir $(TOP)/doc/tmp
-#endif
-
-#ifndef DtDocBook
-# if UseInstalledCDE
-# define DtDocBook dtdocbook
-# else
-# define DtDocBook $(CLIENTENVSETUP) $(DTLCXENVSETUP) $(CDESRC)/dtdocbook/doc2sdl/dtdocbook
-# endif
-#endif
-#ifndef DtDocBookOptions
-# if UseInstalledCDE
-# define DtDocBookOptions
-# else
-# define DtDocBookOptions -t $(CDESRC)/dtdocbook/doc2sdl -H $(HELPTAGPASS2DEF) -I $(CDESRC)/dtdocbook/instant/instant -L $(CDESRC)/dtdocbook/xlate_locale/xlate_locale -S SGMLParser
-# endif
-#endif
-
- CDETOP = CDETop
-#if ImportCDE || UseInstalledCDE
- CDEINCLUDESRC = $(CDETOP)/include
-#else
- CDEINCLUDESRC = $(CDETOP)/exports/include
-#endif
- TOP_CDE_INCLUDES = -I$(CDEINCLUDESRC)
- CDELIBSRC = $(CDETOP)/lib
- PAMSRC = $(CDELIBSRC)/pam/libpam
- TTSRC = $(CDELIBSRC)/tt
- DTSVCSRC = $(CDELIBSRC)/DtSvc
- DTSEARCHSRC = $(CDELIBSRC)/DtSearch
- DTWIDGETSRC = $(CDELIBSRC)/DtWidget
- DTHELPSRC = $(CDELIBSRC)/DtHelp
- DTPRINTSRC = $(CDELIBSRC)/DtPrint
- DTTERMSRC = $(CDELIBSRC)/DtTerm
- DTMRMSRC = $(CDELIBSRC)/DtMrm
- DTMMDBSRC = $(CDELIBSRC)/DtMmdb
- CSASRC = $(CDELIBSRC)/csa
- CDESRC = $(CDETOP)/programs
-#ifdef BuildLibPathVar
- DTENVLIBDIR = CDEBuildLibPath
-#endif
-#ifdef CDEProjectRoot
- CDEPROJECTROOT = CDEProjectRoot
-#endif
- CDE_INSTALLATION_TOP = CdeInstallationTop
-CDE_CONFIGURATION_TOP = CdeConfigurationTop
- CDE_LOGFILES_TOP = CdeLogFilesTop
- CDE_USER_TOP = CdeUserTop
-
- DTCODEGEN = DtCodeGen
- HELPPARSERSRC = $(CDESRC)/dthelp/parser
- HELPTAG = _CUseCat($(BINDIR),$(HELPPARSERSRC)/helptag,/dthelptag)
- HELPTAGPASS1DEF = _CUseCat($(BINDIR),$(HELPPARSERSRC)/pass1/helptag,/dthelp_htag1)
- HELPTAGPASS2DEF = _CUseCat($(BINDIR),$(HELPPARSERSRC)/pass2/htag2,/dthelp_htag2)
- DTDOCBOOK = DtDocBook
- DTDOCBOOKOPTIONS = DtDocBookOptions
-#if UseNSGMLS
- NSGMLSSRC = $(CDESRC)/nsgmls
-#else
- SGMLSSRC = $(CDESRC)/dtdocbook/sgmls
-#endif
- DTINFOGENSRC = $(CDESRC)/dtinfo/dtinfogen
- DTINFOGEN = DtInfoGen
- DTINFOGENTMPDIR = DtInfoGenTmpDir
-#ifdef DtInfoGenOptions
- DTINFOGENOPTIONS = DtInfoGenOptions
-#endif
-#ifdef ArchitectureDefines
- ARCHITECTURE_DEFINES = ArchitectureDefines
-#endif
-#if !UseInstalledCDE
-DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC)
-#endif
-
-#ifndef TtClientLibs
-# define TtClientLibs $(TTLIB) $(XLIB)
-#endif
-#ifndef TtClientDepLibs
-# define TtClientDepLibs $(DEPTTLIB) $(DEPXLIB)
-#endif
-
-/* These libraries use UseInstalledCDE instead of UseInstalled. */
-#undef _Use
-#undef _UseCat
-#define _Use _CUse
-#define _UseCat _CUseCat
-
-#ifndef CDEBuildLibDir
-# define CDEBuildLibDir BuildLibDir
-#endif
-
-#if SharedLibPam
-SharedLibReferences(PAM,pam,$(PAMSRC),SOPAMREV,SharedPamRev)
-#else
-ProjectUnsharedLibReferences(PAM,pam,$(PAMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibTt
-SharedLibReferences(TT,tt,$(TTSRC)/lib,SOTTREV,SharedTtRev)
-#else
-ProjectUnsharedLibReferences(TT,tt,$(TTSRC)/lib,CDEBuildLibDir)
-#endif
-
-#if SharedLibDtSvc
-SharedLibReferences(DTSVC,DtSvc,$(DTSVCSRC),SODTSVCREV,SharedDtSvcRev)
-#else
-ProjectUnsharedLibReferences(DTSVC,DtSvc,$(DTSVCSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtSearch
-SharedLibReferences(DTSEARCH,DtSearch,$(DTSEARCHSRC),SODTSEARCHREV,SharedDtSearchRev)
-#else
-ProjectUnsharedLibReferences(DTSEARCH,DtSearch,$(DTSEARCHSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtWidget
-SharedLibReferences(DTWIDGET,DtWidget,$(DTWIDGETSRC),SODTWIDGETREV,SharedDtWidgetRev)
-#else
-ProjectUnsharedLibReferences(DTWIDGET,DtWidget,$(DTWIDGETSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtHelp
-SharedLibReferences(DTHELP,DtHelp,$(DTHELPSRC),SODTHELPREV,SharedDtHelpRev)
-#else
-ProjectUnsharedLibReferences(DTHELP,DtHelp,$(DTHELPSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtPrint
-SharedLibReferences(DTPRINT,DtPrint,$(DTPRINTSRC),SODTPRINTREV,SharedDtPrintRev)
-#else
-ProjectUnsharedLibReferences(DTPRINT,DtPrint,$(DTPRINTSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtTerm
-SharedLibReferences(DTTERM,DtTerm,$(DTTERMSRC),SODTTERMREV,SharedDtTermRev)
-#else
-ProjectUnsharedLibReferences(DTTERM,DtTerm,$(DTTERMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtMrm
-SharedLibReferences(DTMRM,DtMrm,$(DTMRMSRC),SODTMRMREV,SharedDtMrmRev)
-#else
-ProjectUnsharedLibReferences(DTMRM,DtMrm,$(DTMRMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtMmdb
-SharedLibReferences(DTMMDB,DtMmdb,$(DTMMDBSRC),SODTMMDBREV,SharedDtMmdbRev)
-#else
-ProjectUnsharedLibReferences(DTMMDB,DtMmdb,$(DTMMDBSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtCm
-SharedLibReferences(DTCM,DtCm,$(DTCMSRC),SODTCMREV,SharedDtCmRev)
-#else
-ProjectUnsharedLibReferences(DTCM,DtCm,$(DTCMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibCsa
-SharedLibReferences(CSA,csa,$(CSASRC),SOCSAREV,SharedCsaRev)
-#else
-ProjectUnsharedLibReferences(CSA,csa,$(CSASRC),CDEBuildLibDir)
-#endif
-
-
-/* Revert to the normal library rules. */
-#undef _Use
-#undef _UseCat
-#define _Use _XUse
-#define _UseCat _XUseCat
-
-
-#ifndef DtClientLibs
-# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
-#endif
-#ifndef DepDtClientLibs
-# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-#ifndef DtClientSysLibs
-# define DtClientSysLibs $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lm
-#endif
-#ifndef DtClientExtraLibs
-# define DtClientExtraLibs /**/
-#endif
diff --git a/nx-X11/config/cf/convex.cf b/nx-X11/config/cf/convex.cf
deleted file mode 100644
index 3b522f7a7..000000000
--- a/nx-X11/config/cf/convex.cf
+++ /dev/null
@@ -1,102 +0,0 @@
-XCOMM platform: $Xorg: convex.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-#define OSName ConvexOS V9.0
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 9
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef VersionNumber
-#define VersionNumber 0.0.0.0
-#endif
-
-#define BootstrapCFlags -tm c1
-#define SetTtyGroup YES
-#define BuildServer NO
-#define ConnectionFlags -DTCPCONN -DUNIXCONN -DCOVUENETCONN
-#define InstallXdmConfig YES
-#define XdmDir $(LIBDIR)/xdm-sample
-#define XdmServersType fs /* one tab here */
-#define HasXmWidgets NO
-#define InstKmemFlags -g kmem -m 2711 -v $(VERSION)
-#define InstScriptFlags -m 0755 -g bin
-#define InstManFlags -m 0444 -g bin
-#define DefaultCCOptions -fn -tm c1
-#define LibraryCCOptions -fx -tm c1
-#define StripFlags -r -x
-#define HasSecureOS YES
-#define BuildExamples YES
-#define BuildMotif NO
-#define BuildConvexClients YES
-#define MotifBC YES
-#define UilCommand uil
-#define ExampleDir $(LIBDIR)/examples
-#define UnSupDir $(LIBDIR)/unsupported
-#define BuildTestExt YES
-#define DefaultScreenSaverTime 0
-
-#if BuildTestExt
-#define TestDefines -DXTESTEXT1
-#else
-#define TestDefines /**/
-#endif
-
-#define ExtensionOSDefines TestDefines
-
- VERSION = VersionNumber
- UIL = UilCommand
- UNSUPDIR = UnSupDir /* unsupported examples and code */
-
-/*
- * _Use - makes a choice based on UseInstalled.
- */
-#ifndef _Use
-#ifdef UseInstalled
-#define _Use(a,b) a
-#else
-#define _Use(a,b) b
-#endif
-#endif
-
-/*
- * _UseCat - combination of _Use and Concat.
- * exists to avoid problems with some preprocessors
- */
-#ifndef _UseCat
-#if (defined(__STDC__) || (defined(__convex__) && defined(__stdc__)))
-&& !defined(UnixCpp)
-#ifdef UseInstalled
-#define _UseCat(a,b,c) a##c
-#else
-#define _UseCat(a,b,c) b##c
-#endif
-#else
-#ifdef UseInstalled
-#define _UseCat(a,b,c) a/**/c
-#else
-#define _UseCat(a,b,c) b/**/c
-#endif
-#endif
-#endif
-
-#if HasXmWidgets
- MRESOURCESRC = $(LIBSRC)/Mrm
-DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$(MRESOURCESRC),/libMrm.a)
- MRESOURCELIB = LoaderLibPrefix _Use(-lMrm,$(DEPMRESOURCELIB))
-LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln)
-
- XMLIBSRC = $(LIBSRC)/Xm
- DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a)
- XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB))
- LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln)
-
- UILLIBSRC = $(LIBSRC)/uil
- DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a)
- UILLIB = LoaderLibPrefix _Use(-lUil,$(DEPUILLIB))
- LINTUILLIB = _UseCat($(LINTLIBDIR),$(UILLIBSRC),/llib-lUil.ln)
-
-#endif
diff --git a/nx-X11/config/cf/cray.cf b/nx-X11/config/cf/cray.cf
deleted file mode 100644
index 2cc570f56..000000000
--- a/nx-X11/config/cf/cray.cf
+++ /dev/null
@@ -1,49 +0,0 @@
-XCOMM platform: $Xorg: cray.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-#define OSName UNICOS 8.0
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 8
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-
-#define SystemV YES
-#define Malloc0ReturnsNull YES
-#define RemoveTargetProgramByMoving YES
-#define ArCmd bld cr
-#define StandardDefines -DSYSV -DUSG
-#define ExecableScripts NO
-#define HasPoll NO
-#define HasXServer NO
-#define ConnectionFlags -DTCPCONN
-#define HasShm NO
-#define NativeFPFormat CRAY_Float
-#ifdef UseInstalled
-#define InstallCmd install
-#else
-#define InstallCmd $(SHELL) $(CONFIGSRC)/util/install.sh
-#endif
-
-#ifdef _CRAY2
-#define DefaultCCOptions -hpagelm -hlimitlm
-#endif
-
-#if OSMajorVersion >= 6
-#define PreProcessCmd /lib/pcpp
-#define CppCmd /lib/pcpp
-#else
-# if OSMajorVersion == 5
-# define PreProcessCmd /lib/cpp
-# define CppCmd /lib/cpp
-# define ExtraLoadFlags -lnet
-# endif
-#endif
-
-/* XKB library code does not work here yet */
-#define BuildXKBlib NO
-
-#define MotifDefines -DNO_REGEX -DNO_REGCOMP
diff --git a/nx-X11/config/cf/cross.def.NX.original b/nx-X11/config/cf/cross.def.NX.original
deleted file mode 100644
index 9f71091f5..000000000
--- a/nx-X11/config/cf/cross.def.NX.original
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
-/*
- * This file contains redefinitions of some symbols to enable
- * cross compilation: e.g. paths for include files and paths to
- * compiler images. It will have to be edited to reflect these
- * given your local configuration.
- */
-#if 0
-#undef i386Architecture
-#define Arm32Architecture
-
-#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
-#define ServerCDebugFlags -O2
-#undef StandardDefines
-#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /opt/Embedix/tools/arm-linux/include
-#define PreIncDir
-#undef PostIncDir
-#define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc
-#undef CplusplusCmd
-#define HasCplusplus YES
-#define CplusplusCmd /opt/Embedix/tools/bin/arm-linux-g++
-#define DoRanlibCmd YES
-#define RanlibCmd /opt/Embedix/tools/bin/arm-linux-ranlib
-#undef ExtraLoadFlags
-#define ExtraLoadFlags
-#define FbNoPixelAddrCode
-#undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-
-#undef LdPostLib
-#define LdPostLib -L/opt/Embedix/tools/arm-linux/lib
-
-#undef ExtensionOSDefines
-#define ExtensionOSDefines
-
-#define ServerXdmcpDefines /**/
-
-#define HostCcCmd cc
-#endif
-#include <cross.rules>
diff --git a/nx-X11/config/cf/cross.def.X.original b/nx-X11/config/cf/cross.def.X.original
deleted file mode 100644
index 958c746ce..000000000
--- a/nx-X11/config/cf/cross.def.X.original
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
-/*
- * This file contains redefinitions of some symbols to enable
- * cross compilation: e.g. paths for include files and paths to
- * compiler images. It will have to be edited to reflect these
- * given your local configuration.
- */
-#if 0
-#undef i386Architecture
-#define Arm32Architecture
-
-#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
-#define ServerCDebugFlags -O2
-#undef StandardDefines
-#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /skiff/local/arm-linux/include
-#define PreIncDir
-#undef PostIncDir
-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /skiff/local/bin/arm-linux-gcc
-#undef CplusplusCmd
-#define HasCplusplus YES
-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
-#define DoRanlibCmd YES
-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
-#undef ExtraLoadFlags
-#define ExtraLoadFlags
-#define FbNoPixelAddrCode
-#undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-
-#undef LdPostLib
-#define LdPostLib -L/skiff/local/arm-linux/lib
-
-#undef ExtensionOSDefines
-#define ExtensionOSDefines
-
-#define ServerXdmcpDefines /**/
-
-#define HostCcCmd cc
-#endif
-#include <cross.rules>
diff --git a/nx-X11/config/cf/cygwin.cf b/nx-X11/config/cf/cygwin.cf
deleted file mode 100644
index 73ed8cec5..000000000
--- a/nx-X11/config/cf/cygwin.cf
+++ /dev/null
@@ -1,469 +0,0 @@
-/* Cygwin/X vendor strings and version */
-#include "xorgversion.def"
-
-#ifndef CygxVersionMajor
-# define CygxVersionMajor XORG_VERSION_MAJOR
-#endif
-#ifndef CygxVersionMinor
-# define CygxVersionMinor XORG_VERSION_MINOR
-#endif
-#ifndef CygxVersionPatch
-# define CygxVersionPatch XORG_VERSION_PATCH
-#endif
-#ifndef CygxVersionSnap
-# define CygxVersionSnap XORG_VERSION_SNAP
-#endif
-#ifndef CygxVersionServer
-# define CygxVersionServer 0
-#endif
-
-#ifndef CygxVersion
-# define CygxVersion (10000000 * CygxVersionMajor + 100000 * CygxVersionMinor + 1000 * CygxVersionPatch + CygxVersionSnap)
-#endif
-
-#ifndef CygxVersionString
-# define CygxVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap%CygxVersionServer| sed -e 's/ /./g' -e 's/%/-/g'`
-#endif
-
-#ifndef CygxManVersionString
-# define CygxManVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap| sed -e 's/ /./g' -e 's/^/Version\\\ /'`
-#endif
-
-#ifndef XVendorString
-# define XVendorString "The Cygwin/X Project"
-#endif
-#ifndef XVendorRelease
-# define XVendorRelease CygxVersion
-#endif
-#ifndef XVendorManVersionString
-# define XVendorManVersionString CygxManVersionString
-#endif
-#ifndef XVendorManNameString
-# define XVendorManNameString "Cygwin/X"
-#endif
-#ifndef XVendorContact
-# define XVendorContact "cygwin-xfree@cygwin.com"
-#endif
-
-/* Operating system strings and version */
-#ifndef OSName
-# define OSName Cygwin
-#endif
-#ifndef OSVendor
-# define OSVendor Red Hat Inc.
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-#ifndef ProjectRoot
-# define ProjectRoot /usr/X11R6
-#endif
-
-#if !CrossCompiling
-# define HasGcc2 YES
-#endif /* !CrossCompiling */
-#define HasGcc2ForCplusplus YES
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define UnixCpp /* Just a flag that affects Concat macros in Imake.rules */
-
-#define ExtraLoadFlags -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc
-
-#define HasShadowPasswd NO
-#define HasLibCrypt YES
-#define HasPutenv YES
-#define HasPoll NO
-#if (OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion >= 5)
-# define HasStrlcat YES
-#endif
-#define HasShm YES
-
-#define HasSnprintf YES
-#ifndef HasMakefileSafeInclude
-# define HasMakefileSafeInclude YES
-#endif
-
-/*
- * Cygwin has Tcl/Tk, but you need to keep the version numbers
- * of the libs in sync. These version numbers may change
- * occassionally.
- */
-#define Hastcl YES
-#define Hastk YES
-#define TclLibName tcl80
-#define TkLibName tk80
-
-#define HasSockets YES
-#define GzipFontCompression YES
-#define HasZlib YES
-#ifndef GzipLibrary
-# define GzipLibrary -lz.dll
-#endif
-
-/* We don't need -lm */
-#define MathLibrary /**/
-
-/*
- * /lib/libtermcap.a doesn't have tgetent, which is needed for
- * xc/programs/xterm/resize.exe
- */
-#define TermcapLibrary -lncurses.dll
-
-#define AvoidNullMakeCommand YES
-#define StripInstalledPrograms YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull NO
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-#define SetTtyGroup YES
-#define ExpandManNames YES
-#define HasDlopen NO
-#define HasGnuMake YES
-#define UseGccMakeDepend NO
-#define ThreadedX YES
-#define HasThreadSafeAPI YES
-#if !CrossCompiling
-#define CaseSensitiveFileSystem NO
-#endif
-#define HasWChar32 YES
-#define HasBasename NO /* basename() in libc */
-
-#define LnCmd ln -s
-#ifndef CcCmd
-# define CcCmd gcc
-#endif /* CcCmd */
-#ifndef CplusplusCmd
-# define CplusplusCmd g++
-#endif /* CplusplusCmd */
-#ifndef AsCmd
-# define AsCmd as
-#endif /* AsCmd */
-
-#define GccGasOption -DGCCUSESGAS
-#define AsmDefines -DUSE_GAS -DGCCUSESGAS
-
-#ifndef LdCmd
-# define LdCmd gcc -lautomode
-#endif /* LdCmd */
-
-#define MkdirHierCmd mkdir -p
-
-#ifndef CppCmd
-# define CppCmd cpp
-#endif /* CppCmd */
-#ifndef YaccCmd
-# define YaccCmd bison -y
-#endif /* YaccCmd */
-
-#define LexCmd flex -l
-#define LexLib -lfl
-#define HasFlex YES
-#ifndef CrossCompileDir
-# ifndef HasExpat
-# define HasExpat YES
-# endif
-# ifndef HasFreetype2
-# define HasFreetype2 YES
-# endif
-# ifndef HasFontconfig
-# define HasFontconfig YES
-# endif
-#endif
-
-/* Cygwin-specific Windows resource compiler command */
-#ifdef CrossCompileDir
-# ifndef WindresCmd
-# define WindresCmd Concat3(CrossCompileDir,/,windres)
-# endif
-#else
-# ifndef WindresCmd
-# define WindresCmd windres
-# endif
-#endif
-
-#define PreProcessCmd CcCmd -E
-
-#ifndef PostIncDir
-# ifdef CrossCompileDir
-# define PostIncDir `CrossCompileDir/CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'`
-# else
-# define PostIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'`
-# endif
-#endif
-#ifndef ExtraIncDir
-# ifdef CrossCompileDir
-# define ExtraIncDir CrossCompileDir/../include/w32api
-# else
-# define ExtraIncDir /usr/include/w32api
-# endif
-#endif
-
-#ifndef BourneShell
-/*
- * This will cause builds/installs to terminate on errors, as on other
- * platforms.
- */
-#define BourneShell /bin/sh -e
-#endif
-
-#define LdCombineFlags -r
-
-#ifndef DefaultCCOptions
-# define DefaultCCOptions -Wall -Wpointer-arith
-#endif
-
-/* Cygwin 1.5.x now includes alloca */
-#if OSMinorVersion >= 5
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#else
-# define AllocateLocalDefines -DNO_ALLOCA
-#endif
-
-#ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 -fno-strength-reduce
-#endif
-
-/*
- * -DFD_SETSIZE=256 is needed for xfs and the xserver. cygwin defines the
- * FD_SETSIZE as 64 but some code expects it to be larger.
- */
-#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE \
- -D_X86_ -D__CYGWIN__ -D_XOPEN_SOURCE \
- -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE \
- -D_SVID_SOURCE -D_GNU_SOURCE -DFD_SETSIZE=256 \
- -DXResExtension
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H \
- -DHAS_ISW_FUNCS -DNO_WIDEC_H
-#define StandardCppOptions -traditional
-
-/* Cygwin shared memory requires cygipc package or cygserver. */
-#if UseCygIPC
-# if ThreadedX
-# define StandardCppDefines -DHAS_THREADS -DHAS_SHM StandardDefines
-# else
-# define StandardCppDefines -DHAS_SHM StandardDefines
-# endif
-#else
-# if ThreadedX
-# define StandardCppDefines -DHAS_THREADS StandardDefines
-# else
-# define StandardCppDefines StandardDefines
-# endif
-#endif
-
-/* IPv6 not yet supported */
-#ifndef BuildIPv6
-# define BuildIPv6 NO
-#endif
-
-#if 0
-/* 2004/02/29 - Harold - This doesn't do anything yet. Stay tuned. */
-/* Support for accelerating OpenGL with Win32's OpenGL layer. */
-#ifndef BuildXWinDRI
-# define BuildXWinDRI NO
-#endif
-#if BuildXWinDRI
-# define GlxExtraDefines -DGLX_DIRECT_RENDERING GlxArchDefines
-#endif
-#endif
-
-/* XWin Server specific build flags */
-#ifndef GlxUseWindows
-# define GlxUseWindows YES
-#endif
-#ifndef BuildXWinClipboard
-# define BuildXWinClipboard YES
-#endif
-#ifndef BuildXWinEmulatePseudo
-# define BuildXWinEmulatePseudo NO
-#endif
-#ifndef BuildXWinMultiWindow
-# define BuildXWinMultiWindow YES
-#endif
-#ifndef BuildXWinMultiWindowExtWM
-# define BuildXWinMultiWindowExtWM YES
-#endif
-#ifndef BuildXWinNativeGDI
-# define BuildXWinNativeGDI NO
-#endif
-#ifndef BuildXWinPrimaryFB
-# define BuildXWinPrimaryFB NO
-#endif
-#ifndef BuildXWinUpdateStats
-# define BuildXWinUpdateStats NO
-#endif
-#ifndef BuildXWinXF86Config
-# define BuildXWinXF86Config NO
-#endif
-
-/* XWin specific build flags - 1st order dependency */
-#if BuildXWinMultiWindowExtWM && !defined(BuildWindowsWMLibrary)
-# define BuildWindowsWMLibrary YES
-#elif !defined(BuildWindowsWMLibrary)
-# define BuildWindowsWMLibrary NO
-#endif /* BuildXWinMultiWindowExtWM && BuildWindowsWMLibrary */
-
-/* XWin Server specific defines */
-#if BuildXWinClipboard
-# define XWinClipboardDefines -DXWIN_CLIPBOARD
-#else
-# define XWinClipboardDefines
-#endif /* BuildXWinClipboard */
-#if BuildXWinEmulatePseudo
-# define XWinEmulatePseudoDefines -DXWIN_EMULATEPSEUDO
-#else
-# define XWinEmulatePseudoDefines
-#endif /* BuildXWinEmulatePseudo */
-#if BuildXWinMultiWindow
-# define XWinMultiWindowDefines -DXWIN_MULTIWINDOW
-#else
-# define XWinMultiWindowDefines
-#endif /* BuildXWinMultiWindow */
-#if BuildXWinMultiWindowExtWM
-# define BuildRootless YES
-# define XWinMultiWindowExtWMDefines -DXWIN_MULTIWINDOWEXTWM
-#else /* BuildXWinMultiWindowExtWM */
-# define XWinMultiWindowExtWMDefines
-#endif /* BuildXWinMultiWindowExtWM */
-#if BuildXWinNativeGDI
-# define XWinNativeGDIDefines -DXWIN_NATIVEGDI
-#else
-# define XWinNativeGDIDefines
-#endif /* BuildXWinNativeGDI */
-#if BuildXWinPrimaryFB
-# define XWinPrimaryFBDefines -DXWIN_PRIMARYFB
-#else
-# define XWinPrimaryFBDefines
-#endif /* BuildXWinPrimaryFB */
-#if BuildXWinUpdateStats
-# define XWinUpdateStatsDefines -DXWIN_UPDATESTATS
-#else
-# define XWinUpdateStatsDefines
-#endif /* BuildXWinUpdateStats */
-#if BuildXWinXF86Config
-# define XWinXF86ConfigDefines -DXWIN_XF86CONFIG
-#else
-# define XWinXF86ConfigDefines
-#endif /* BuildXWinXF86Config */
-
-/*
- * XFree86Server is defined for the w32api headers, which protects some
- * colliding names with #ifdef XFree86Server.
- */
-#define XWinServerDefines -DPIXPRIV \
- -DXFree86Server \
- -DX_BYTE_ORDER=ByteOrder \
- XvExtensionDefines \
- XWinXF86ConfigDefines XWinNativeGDIDefines \
- XWinPrimaryFBDefines \
- XWinEmulatePseudoDefines \
- XWinUpdateStatsDefines \
- XWinClipboardDefines XWinMultiWindowDefines \
- XWinMultiWindowExtWMDefines \
- -DDDXBEFORERESET
-#define ServerOSDefines -DDDXTIME -DDDXOSINIT \
- -DDDXOSVERRORF -DDDXOSFATALERROR
-#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-#define ServerExtraDefines -DGCCUSESGAS XWinServerDefines \
- AllocateLocalDefines
-#define ConnectionFlags -DTCPCONN -DUNIXCONN
-#define ExtraLibraries
-#define InstUidFlags -m 4711
-#define UseRgbTxt YES
-#define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~
-
-/* Flags for which the default in X11.tmpl is not what we want. */
-#ifndef BuildXinerama
-# define BuildXinerama NO /* Not supported by XWin Server */
-#endif
-#ifndef BuildXIE
-# define BuildXIE NO /* Deprecated */
-#endif
-#ifndef BuildDPMS
-# define BuildDPMS NO /* Not supported by XWin Server */
-#endif
-#ifndef BuildXInputExt
-# define BuildXInputExt YES /* Not enabled by default */
-#endif
-#ifndef BuildRandR
-# define BuildRandR YES /* Not supported by XWin Server */
-#endif
-#ifndef BuildXF86BigfontExt
-# define BuildXF86BigfontExt YES /* Not enabled by default */
-#endif
-#ifndef BuildGlxExt
-# define BuildGlxExt YES /* Not enabled by default */
-#endif
-#ifndef BuildXprintLib
-# define BuildXprintLib YES /* Not enabled when Xprt disabled */
-#endif
-#ifndef BuildXterm
-# define BuildXterm NO /* Built separately on Cygwin */
-#endif
-#ifndef BuildXResExt
-# define BuildXResExt YES /* Not enabled by default */
-#endif
-#ifndef BuildFreeType
-# define BuildFreeType YES /* Not enabled by default */
-#endif
-#ifndef BuildXTrueType
-# define BuildXTrueType YES /* Not enabled by default */
-#endif
-
-/* Server build rules */
-#ifndef XnestServer
-# define XnestServer YES
-#endif
-#ifndef XprtServer
-# define XprtServer NO
-#endif
-#ifndef XVirtualFramebufferServer
-# define XVirtualFramebufferServer YES
-#endif
-#ifndef XWinServer
-# define XWinServer YES
-#endif
-
-/* We need libX11 and libXext for the XWin Server */
-#if XWinServer
-# define BuildX11Lib YES
-#endif
-
-/*
- * --unix option of Cygwin make fools the standard MakeFlagsToShellFlags macro
- */
-#define MakeFlagsToShellFlags(makeflags,shellcmd) \
- for flag in ${MAKEFLAGS} ''; do \ @@\
- case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
-#ifndef ManSuffix
-# define ManSuffix 1
-#endif
-
-#ifndef XtransFailSoft
-#define XtransFailSoft YES
-#endif
-
-#ifndef HasDevWindows
-# define HasDevWindows YES
-#endif
-
-#include <cygwin.rules>
-
-#if CrossCompiling
-#include <cross.def>
-#endif
diff --git a/nx-X11/config/cf/cygwin.rules b/nx-X11/config/cf/cygwin.rules
deleted file mode 100644
index d144755af..000000000
--- a/nx-X11/config/cf/cygwin.rules
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Cygwin shared library rules (DLL versions)
- */
-
-#define HasSharedLibraries YES
-#define NeedLibInsideFlag NO
-#define ForceNormalLib NO
-#ifndef SharedLibX11
-# define SharedLibX11 YES
-#endif
-#ifndef NormalLibX11
-# define NormalLibX11 NO
-#endif
-#define SharedLibXaw YES
-#define SharedLibXmu YES
-#define SharedLibXt YES
-#define SharedLibFont NO
-#define SharedLibXaw7 YES
-#define SharedLibXaw6 YES
-#define SharedLibSM YES
-#define SharedLibICE YES
-#define SharedLibXext YES
-#define SharedLibXi YES
-#define SharedLibXtst YES
-#define SharedOldX YES
-#define SharedLibXp YES
-#define SharedLibGlx YES
-#define SharedLibDps YES
-#define SharedLibDpsTk YES
-#define SharedLibGlu YES
-#define SharedLibWindowsWM NO
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <cygwin.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -dll /**/
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -D_DLL
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -D_DLL
-#endif
-#ifndef UseExportLists
-#define UseExportLists YES
-#endif
-
-#define SharedLibraryName(libname, rev) \
-Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll)
-
-#define ImportLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)
-
-#define ShortImportLibraryName(libname, rev) \
-Concat3(lib,libname,.dll.a)
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-
-#ifndef SharedDepLibraryTarget
-# ifdef UseInstalled
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib)
-# endif
-# else /* !UseInstalled */
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-# endif
-# endif /* UseInstalled */
-
-
-/*
- * SharedDepLibraryTarget
- */
-
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): deplist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
- @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
- */
-
-#ifndef SharedDepCplusplusLibraryTarget
-# ifdef UseInstalled
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib)
-# endif
-# else /* !UseInstalled */
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-# endif
-# endif /* UseInstalled */
-
-
-/*
- * SharedDepCplusplusLibraryTarget
- */
-
-#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): deplist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeCplusplusDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
- @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-#endif /* SharedDepCplusplusLibraryTarget */
-
-
-/*
- * SharedDepModuleTarget
- */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(CC) -o $@ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- @@\
-clean:: @@\
- RemoveFile(name)
-#endif /* SharedDepModuleTarget */
-
-
-/*
- * SharedLibraryDataTarget - generate rules to create shared data file
- */
-
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif
-
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * MakeDllProg
- */
-
-#define MakeDLLProg(libname,solist,prog,rev) @@\
- prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
-
-/*
- * MakeDll
- */
-
-#define MakeDLL(libname,solist,rev) @@\
- MakeDLLProg(libname,solist,$(CC),rev)
-
-/*
- * MakeCplusplusDll
- */
-
-#define MakeCplusplusDLL(libname,solist,rev) @@\
- MakeDLLProg(libname,solist,$(CXX),rev)
-
-
-
-/*
- * SharedLibraryTarget
- */
-
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): solist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-
-/*
- * InstallLink
- */
-
-#ifndef InstallLink
-#define InstallLink(step, file, link, dest) @@\
-step:: @@\
- MakeDir($(DESTDIR)dest) @@\
- $(LN) -sf file $(DESTDIR)dest/link
-#endif
-
-/*
- * InstallSharedLibrary
- */
-
-#define InstallSharedLibrary(libname,rev,dest) @@\
-InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
-InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) @@\
-InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))
-
-
-/*
- * ProgramTargetName - This can be simply 'target' or 'target.exe' when
- * building on Cygwin proper, as Cygwin automatically appends .exe to compiled
- * executables and make, rm, ln, etc. will automatically search for a file
- * with .exe appended if the raw file name cannot be found. However,
- * building with a cross compiler requires 'target.exe', as the cross
- * compiler doesn't know to append .exe, nor do the cross compiler tools
- * know to search for files with .exe appended if the raw file name cannot
- * be found.
- */
-
-#define ProgramTargetName(target) Concat(target,.exe)
-
-
-/*
- * HostProgramTargetName - Don't add .exe if cross-compiling.
- */
-
-#ifndef HostProgramTargetName
-# if CrossCompiling
-# define HostProgramTargetName(target) target
-# else
-# define HostProgramTargetName(target) ProgramTargetName(target)
-# endif
-#endif
-
-
-/*
- * LinkBuildDLL - Cygwin only rule, similar to LinkBuildModule.
- * Unfortunately, we have to create a copy of each DLL in xc/exports/bin;
- * linking doesn't work, the executables (e.g. xkbcomp) will report
- * that they cannot find DLLs (e.g. libX11.dll).
- */
-
-#ifdef UseInstalled
-#define LinkBuildDLL(lib) $(_NULLCMD_)
-#else
-#define LinkBuildDLL(lib) MakeDir($(BUILDBINDIR)) @@\
- RemoveFile($(BUILDBINDIR)/lib) @@\
- cd $(BUILDBINDIR) && $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/lib .
-#endif
-
-#ifndef LinkImportLibrary
-#ifdef UseInstalled
-#define LinkImportLibrary(lib, importlib) $(_NULLCMD_)
-#else
-#define LinkImportLibrary(lib, importlib) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/importlib) @@\
- cd $(BUILDLIBDIR) && $(LN) lib importlib
-#endif
-#endif /* LinkImportLibrary */
-
-
-/*
- * LinkBuildBinary - This rule normally creates a link in xc/exports/bin
- * to a binary, but we create an actual copy of the binary.
- * Creating a link causes the DLLs that the binary depend on, such as
- * libX11.dll, not to be found. Copying the binary causes the runtime
- * directory to be xc/exports/bin, which is the location of the DLLs, thus,
- * the DLLs can now be found by the binary. Phew...
- *
- * Note that sometimes the binary is not an executable. One example
- * is the rgb binary file.
- *
- * Passing -p preserves the attributes as the date and prevents useless
- * rebuilds.
- *
- * ProgramTargetName is passed to LinkBuildBinary if the binary
- * is actually an executable; thus, we do not wrap the binary name
- * with ProgramTargetName here.
- */
-
-#ifndef LinkBuildBinary
-#define LinkBuildBinary(binary) @@\
-all:: binary @@\
- MakeDir($(BUILDBINDIR)) @@\
- RemoveFile($(BUILDBINDIR)/binary) @@\
- cd $(BUILDBINDIR) && $(CP) -p $(BUILDBINTOP)/$(CURRENT_DIR)/binary .
-#endif /* LinkBuildBinary */
-
-/*
- * ProfiledRelocatableTarget - generate rules to produce a profiled
- * relocatable object file instead of a library. Differs from Imake.rules
- * by passing '--oformat pe-i386' to ld.
- */
-
-#ifndef ProfiledRelocatableTarget
-#define ProfiledRelocatableTarget(objname,objlist) @@\
-AllTarget(Concat(objname,_p.Osuf)) @@\
- @@\
-Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- $(LD) -X -r --oformat pe-i386 objlist -o $@
-
-#endif /* ProfiledRelocatableTarget */
-
-
-/*
- * DebuggedRelocatableTarget - generate rules to produce a debuggable
- * relocatable object file instead of a library. Differs from Imake.rules
- * by passing '--oformat pe-i386' to ld.
- */
-
-#ifndef DebuggedRelocatableTarget
-#define DebuggedRelocatableTarget(objname,objlist) @@\
-AllTarget(Concat(objname,_d.Osuf)) @@\
- @@\
-Concat(objname,_d.Osuf): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- $(LD) -X -r --oformat pe-i386 objlist -o $@
-
-#endif /* DebuggedRelocatableTarget */
-
-
-/*
- * DependDependencyStatement - Imake.rules wraps $(DEPEND) in
- * ProgramTargetName(), which causes cross compiling to think that
- * $(DEPEND) hasn't been built, as $(DEPEND) is a host tool, and should
- * not be wrapped with ProgramTargetName(). Perhaps there should be
- * a HostProgramTargetName()...
- */
-
-#ifndef DependDependencyStatement
-#if HasMakefileSafeInclude
-#define DependDependencyStatement() @@\
-DependFileName:: $(DEPEND)
-#else
-#define DependDependencyStatement() @@\
-depend:: $(DEPEND)
-#endif
-#endif
-
-
-/*
- * DependDependency - Imake.rules wraps $(DEPEND) in ProgramTargetName().
- * This doesn't work when cross compiling, see the locally defined
- * DependDependencyStatement comment (above) for more information.
- */
-
-#ifndef DependDependency
-#ifdef UseInstalled
-#define DependDependency() /**/
-#else
-#define DependDependency() @@\
-DependDependencyStatement() @@\
- @@\
-NoCmpScript($(DEPEND)) @@\
- @@\
-$(DEPEND): @@\
- @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\
- cd $(DEPENDSRC) && $(MAKE) makedependonly; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)"
-
-#endif /* UseInstalled */
-#endif /* DependDependency */
-
-
-/*
- * ImakeDependency - Imake.rules wraps $(IMAKE) in ProgramTargetName(),
- * which doesn't work when cross compiling, as imake is supposed to be a
- * host program. See the locally defined DependDependencyStatement
- * comment (above) for more information.
- */
-
-#ifndef ImakeDependency
-#ifdef UseInstalled
-#define ImakeDependency(target) /**/
-#else
-#define ImakeDependency(target) @@\
-target:: $(IMAKE) @@\
- @@\
-NoCmpScript($(IMAKE) $(IMAKE).Osuf) @@\
- @@\
-$(IMAKE) $(IMAKE).Osuf: @@\
- -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \ @@\
- echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \ @@\
- echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ @@\
- $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)")
-#endif /* UseInstalled */
-#endif /* ImakeDependency */
-
-
-/*
- * ResourceObjectRule - Build a Windows resouce file (.res) into
- * an object file (.o) that can be linked in with the executable
- * or library being built.
- */
-
-#ifndef ResourceObjectRule
-#define ResourceObjectRule(basename,depends,options) @@\
-AllTarget(basename.RESsuf) @@\
-basename.RESsuf: basename.RCsuf depends @@\
- RemoveFile($@) @@\
- ClearmakeOSName \ @@\
- WindresCmd basename.RCsuf options -O coff -o basename.RESsuf @@\
-clean:: @@\
- RemoveFiles(basename.RESsuf)
-
-#endif /* ResourceObjectRule */
-
-/* The arglist can get quite long. Make sure we can delete it though */
-#ifndef MakeFonts
-# define MakeFonts() @@\
-all:: $(OBJS) @@\
- @@\
-MakeFontsDir($(OBJS)) @@\
- @@\
-clean:: @@\
- find -name "*.pcf" -o -name "*.pcf.Z" -o -name "*.pcf.gz" | xargs -r rm
-#endif /* MakeFonts */
-
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@sinclude file
-#endif
diff --git a/nx-X11/config/cf/cygwin.tmpl b/nx-X11/config/cf/cygwin.tmpl
deleted file mode 100644
index 404b62845..000000000
--- a/nx-X11/config/cf/cygwin.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
-
-#define SharedX11Reqs
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
-#define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XONLYLIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-/*
- * We don't build Xss
- * #define SharedXssReqs $(LDPRELIB) $(XLIB)
- */
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXfixesReqs $(LDPRELIB) $(XLIB)
-#define SharedXdamageReqs $(LDPRELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXevieReqs $(LDPRELIB) $(XLIB)
-
-#ifndef FixupLibReferences
-# define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-
-/*
- * Suffix for Windows resource source files
- */
-
-#ifndef RCsuf
-# define RCsuf rc
-#endif
-
-
-/*
- * Suffix for Windows resource compiled files
- */
-
-#ifndef RESsuf
-# define RESsuf res
-#endif
diff --git a/nx-X11/config/cf/darwin.cf b/nx-X11/config/cf/darwin.cf
deleted file mode 100644
index d0b067c89..000000000
--- a/nx-X11/config/cf/darwin.cf
+++ /dev/null
@@ -1,330 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.8 2005/04/01 01:22:07 torrey Exp $
-XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
-
-/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
-
-/* imake determines the default values by parsing uname */
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSVendor
-#define OSVendor Apple Computer, Inc.
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * Define the operating system's capabilities
- */
-#define HasSnprintf YES
-#define HasPutenv YES
-#define HasBSD44Sockets YES
-#define Malloc0ReturnsNull NO
-#define HasShadowPasswd NO
-#define HasUsableFileMmap YES
-#define HasZlib YES
-#ifndef HasShm
-# define HasShm YES
-#endif
-#define HasNdbm YES
-#if OSMajorVersion >= 6
-# define HasNCurses YES
-# define HasArc4Random YES
-# define HasGetIfAddrs YES
-# define HasStrlcat YES
-#else
-# define HasBasename NO
-# define HasNCurses NO
-#endif
-#ifndef HasGroff
-# define HasGroff YES
-#endif
-#ifndef HasGcc3
-# define HasGcc3 NO
-#endif
-#ifndef HasFreetype2
-# define HasFreetype2 NO
-#endif
-#ifndef HasExpat
-# define HasExpat NO
-#endif
-#ifndef HasLibpng
-# define HasLibpng NO
-#endif
-
-/* Older versions don't really support IPv6, but #define AF_INET6. */
-#if OSMajorVersion < 6
-# define BuildIPv6 NO
-#endif
-
-/* Thread support */
-#define HasPosixThreads YES
-#define SystemMTDefines -D_REENTRANT
-#if OSMajorVersion >= 6
-# define HasThreadSafeAPI YES
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_UNISTDAPI
-#else
-# define HasThreadSafeAPI NO
-# define MTSafeAPIDefines -DXOS_USE_MTSAFE_NETDBAPI
-#endif
-
-/* Libtool on Darwin always uses minor numbers */
-#define LibtoolMinorVersions YES
-
-/* The most common file system, HFS+, is not case sensitive. */
-#ifndef CaseSensitiveFileSystem
-# define CaseSensitiveFileSystem NO
-#endif
-
-/*
- * This enables some settings for developers.
- */
-#ifndef XFree86Devel
-# define XFree86Devel NO
-#endif
-
-/*
- * This enables Quartz compatibility.
- * Turn off to build on raw Darwin systems.
- */
-#ifndef DarwinQuartzSupport
-# define DarwinQuartzSupport YES
-#endif
-
-#if DarwinQuartzSupport
-
-# if OSMajorVersion >= 7
- PROJ_BUILD = xcodebuild
-# else
- PROJ_BUILD = pbxbuild
-# endif
-
-# ifndef HasXplugin
-# if OSMajorVersion >= 7
-# define HasXplugin YES
-# else
-# define HasXplugin NO
-# endif
-# endif
-
-# if HasXplugin
-# ifndef XpLibDir
-# define XpLibDir /usr/lib
-# endif
-# ifndef XpIncDir
-# define XpIncDir $(SERVERSRC)/hw/darwin/quartz/xpr
-# endif
- XPLIBDIR = XpLibDir
- XPINCDIR = XpIncDir
-# define XpluginLibrary Concat(-L,$(XPLIBDIR)) -lXplugin
-# else
-# define XpluginLibrary /**/
-# endif
-
-# ifndef BuildAppleDRI
-# if HasXplugin
-# define BuildAppleDRI YES
-# else
-# define BuildAppleDRI NO
-# endif
-# endif
-
-# if BuildAppleDRI
-# define GlxExtraDefines -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL GlxArchDefines
-# endif
-
-# define BuildRootless YES
-# define BuildAppleWMLibrary YES
-
-#endif /* DarwinQuartzSupport */
-
-/* we don't need -lm */
-#define MathLibrary /**/
-
-#define TermcapLibrary -lcurses
-#define SetTtyGroup YES /* for xterm */
-
-/* we don't have a dbm library */
-#define DBMLibrary /**/
-
-#define MkdirHierCmd mkdir -p
-
-/* Use flex -l for compatibility with various versions of flex. */
-#ifndef LexCmd
-# define LexCmd flex -l
-#endif
-#define HasFlex YES
-
-/*
- * Our cpp isn't in /lib/cpp and early versions don't like -undef.
- * The gcc 3.3 cpp that Apple ships inserts spurious #pragmas,
- * so we use the 3.1-based version in this case.
- */
-#if (GccMajorVersion == 3) && (GccMinorVersion == 3)
-# define CppCmd /usr/bin/cpp3
-#else
-# define CppCmd /usr/bin/cpp
-#endif
-#if (GccMajorVersion == 3) && (GccMinorVersion == 3) || (GccMajorVersion > 3)
-# define StandardCppOptions -traditional -D__GNUC__
-#endif
-#if HasGcc3
-# define RawCppCmd CppCmd -undef
-#else
-# define RawCppCmd CppCmd
-#endif
-
-/* we have a gcc compatible compiler, but its not called gcc */
-#define CcCmd /usr/bin/cc
-#define CplusplusCmd /usr/bin/c++
-
-/* default flags to pass to cc */
-#ifndef DefaultCCOptions
-#if XFree86Devel
-# define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wredundant-decls -Wnested-externs \
- -no-cpp-precomp
-#else
-# define DefaultCCOptions -Wall -Wpointer-arith -no-cpp-precomp
-#endif
-#endif
-
-/* flags to pass to cc when building libraries */
-#ifndef LibraryCCOptions
-# define LibraryCCOptions DefaultCCOptions -fno-common
-#endif
-
-/* The cr implementation does not build with NEED_SCREEN_REGIONS,
- so play it safe. */
-#ifndef ServerCCOptions
-# define ServerCCOptions DefaultCCOptions -UNEED_SCREEN_REGIONS
-#endif
-
-#ifdef PpcDarwinArchitecture
-# define DarwinMachineDefines -D__powerpc__
-# if HasGcc3
-# define OptimizedCDebugFlags -Os
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-# define ByteOrder X_BIG_ENDIAN
-#endif /* PpcDarwinArchitecture */
-
-#ifdef i386DarwinArchitecture
-# define DarwinMachineDefines -D__i386__
-# if HasGcc3
-# define OptimizedCDebugFlags -Os
-# else
-# define OptimizedCDebugFlags -O2 -fno-strength-reduce
-# endif
-# define ByteOrder X_LITTLE_ENDIAN
-#endif /* i386DarwinArchitecture */
-
-#if OSMajorVersion < 7
-# define DarwinLocaleDefines -DX_LOCALE
-#else
-# define DarwinLocaleDefines /**/
-# define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-#endif
-
-/*
- * __DARWIN__ will be used for platform specific #ifdefs that can't
- * be handled by existing X defines.
- *
- * Darwin's alloca() seg faults (rather than returning NULL) on failed
- * allocations, so we can't use it.
- */
-#define StandardDefines DarwinMachineDefines -D__DARWIN__ \
- -DNO_ALLOCA -DCSRG_BASED DarwinLocaleDefines
-
-/*
- * Set this to NO to just build the client libs, which should work without
- * having to write any platform specific code.
- */
-#ifndef BuildServer
-# define BuildServer YES
-
-/* our custom X server */
-# define XDarwinServer YES
-#endif
-
-/* Thanks to the IOKit, the X server does not have to be SetUID. */
-#ifndef InstallXserverSetUID
-# define InstallXserverSetUID NO
-#endif
-
-/* Allow Xtrans to work with non-SetUID server. */
-#ifndef XtransFailSoft
-# define XtransFailSoft YES
-#endif
-
-/* disable XKB by default as it can cause problems */
-#define DfltDisableXKB YES
-
-/* no direct graphics extension */
-#define BuildXF86DGA NO
-
-/* Support for tablets and other non-standard input devices */
-#ifndef BuildXInputExt
-# define BuildXInputExt YES
-#endif
-#define BuildXInputLib YES
-
-/* no Display Power Management extension */
-#define BuildDPMS NO
-
-/* no XFree86-Misc extension */
-#define BuildXF86MiscExt NO
-
-/* no XFree86-VidMode extension */
-#define BuildXF86VidModeExt NO
-
-#ifndef BuildXterm
-# define BuildXterm BuildClients /* Not enabled by default */
-#endif
-
-#define BuildLibPathVar DYLD_LIBRARY_PATH
-
-/* include rules to build shared libraries */
-#include <darwinLib.rules>
-
-/*
- * BundleProgramTarget - Generate rules for compiling, linking and
- * installing a bundle executable.
- */
-#ifndef BundleProgramTarget
-#define BundleProgramTarget(program,loader,subdirs,objs,deplib,syslib,dstdir) @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: loader subdirs objs deplib @@\
- RemoveTargetProgram($@) @@\
- LinkRule($@,-bundle $(LDOPTIONS),objs,deplib $(LDLIBS) syslib -bundle_loader loader) @@\
- @@\
-InstallProgram(program,dstdir/program.bundle/Contents/MacOS) @@\
- @@\
-clean:: @@\
- RemoveFile(program)
-#endif /* BundleProgramTarget */
-
-/*
- * Darwin specific Imake Config files
- */
-#ifndef LocalConfigFiles
-#define LocalConfigFiles \
- darwinLib.rules \
- darwinLib.tmpl
-#endif
-
-/* include all the X.Org rules */
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/darwinLib.rules b/nx-X11/config/cf/darwinLib.rules
deleted file mode 100644
index 01f69d3e3..000000000
--- a/nx-X11/config/cf/darwinLib.rules
+++ /dev/null
@@ -1,167 +0,0 @@
-XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.8 2003/10/09 22:43:18 herrb Exp $
-/*
- * Darwin/Mac OS X shared library rules
- */
-
-#ifndef UseElfFormat
-#define UseElfFormat NO
-#endif
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <darwinLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -dynamiclib
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -dynamic
-#endif
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags /**/
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.rev.dylib) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) && \ @@\
- $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.dylib); \ @@\
- $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)); fi
-#endif /* InstallSharedLibrary */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.rev.dylib)) @@\
- @@\
-Concat(lib,libname.rev.dylib): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\
- set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\
- $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\
- LinkBuildSonameLibrary($$INSTALLNAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.dylib); \ @@\
- $(LN) $@ Concat(lib,libname.dylib)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\
- $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.rev.dylib)) @@\
- @@\
-Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\
- set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\
- $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\
- LinkBuildSonameLibrary($$INSTALLNAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.dylib); \ @@\
- $(LN) $@ Concat(lib,libname.dylib)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\
- $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepCplusplusLibraryTarget
-# define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.rev.dylib)) @@\
- @@\
-Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\
- set -x; (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\
- $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\
- LinkBuildSonameLibrary($$INSTALLNAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.dylib); \ @@\
- $(LN) $@ Concat(lib,libname.dylib)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\
- $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-
-#endif /* SharedDepCplusplusLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryDataTarget */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
diff --git a/nx-X11/config/cf/darwinLib.tmpl b/nx-X11/config/cf/darwinLib.tmpl
deleted file mode 100644
index 0d3c4368f..000000000
--- a/nx-X11/config/cf/darwinLib.tmpl
+++ /dev/null
@@ -1,61 +0,0 @@
-XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.19 2003/11/04 00:24:36 torrey Exp $
-/*
- * Darwin/Mac OS X shared library template
- */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-/* Allow for libpthread, as overridden by OS definitions */
-#if !defined(SharedX11Reqs)
-#define SharedX11Reqs
-#endif
-#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
-
-#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) -flat_namespace
-
-#define SharedAppleWMReqs $(LDPRELIB) $(XLIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXpReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -flat_namespace
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-#define SharedXssReqs $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXfixesReqs $(LDPRELIB) $(XLIB)
-#define SharedXdamageReqs $(LDPRELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXevieReqs $(LDPRELIB) $(XLIB)
diff --git a/nx-X11/config/cf/dmx.cf b/nx-X11/config/cf/dmx.cf
deleted file mode 100644
index f5e25f313..000000000
--- a/nx-X11/config/cf/dmx.cf
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $XFree86$ */
-
-/*
- * This file contains DMX server specific defines
- */
-
-#undef XVendorString
-#define XVendorString "DMX Project"
-
-/*
- * Note 1: This is a signed int that is printed as a decimal number.
- * Since we want to make it human-interpretable, the fields are
- * defined as:
- * 2147483648
- * AAbbyymmdd
- * AA: major version 01-20
- * bb: minor version 00-99
- * yy: year 00-99 [See Note 2]
- * mm: month 01-12
- * dd: day 01-31
- *
- * Note 2: The default epoch for the year is 2000.
- * To change the default epoch, change the DMX_VENDOR_RELEASE
- * macro below, bumb the minor version number, and change
- * xdpyinfo to key off the major/minor version to determine the
- * new epoch. Remember to do this on January 1, 2100 and every
- * 100 years thereafter.
- */
-#define DMX_VENDOR_RELEASE(major,minor,year,month,day) \
- ((major) * 100000000) + \
- ((minor) * 1000000) + \
- ((year-2000) * 10000) + \
- ((month) * 100) + \
- ((day) * 1)
-#undef XVendorRelease
-#define XVendorRelease DMX_VENDOR_RELEASE(1,2,2004,6,30)
-
-EXTENSIONS_NOT_SUPPORTED = \
- -UMULTIBUFFER \
- -UXV \
- -UDBE \
- -UXF86VIDMODE \
- -UXF86MISC \
- -UXFreeXDGA \
- -UXF86DRI \
- -UMITSHM \
- -UTOGCUP \
- -UDPSEXT \
- -UMITMISC \
- -USCREENSAVER \
- -URANDR \
- -UXFIXES \
- -UDAMAGE
-
-EXT_TEMP_NOT_SUPPORTED = \
- -UFONTCACHE
-
-DMX_DEFINES = \
- $(EXTENSIONS_NOT_SUPPORTED) \
- $(EXT_TEMP_NOT_SUPPORTED) \
- -UXFree86LOADER
-
-XCOMM MITSHM -- works but doesn't quite do what people think it should
-XCOMM DPMSExtension -- compiled in but is non-functional
-XCOMM MITMISC provides legacy support for X11R1,2 applications. Disable.
diff --git a/nx-X11/config/cf/fujitsu.cf b/nx-X11/config/cf/fujitsu.cf
deleted file mode 100644
index 3615d3074..000000000
--- a/nx-X11/config/cf/fujitsu.cf
+++ /dev/null
@@ -1,95 +0,0 @@
-XCOMM platform: $Xorg: fujitsu.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion)
-
-#define PatheticCpp YES
-
-#ifdef SparcArchitecture
-
-#define BootstrapCFlags -D__uxp__
-#define StandardDefines -D__uxp__ -DSVR4 -DANSICPP
-#define StandardCppDefines -D__uxp__ -DSVR4 -DANSICPP
-
-#define CppCmd /usr/ccs/lib/cpp
-
-#ifndef ArCmdBase
-# define ArCmdBase /usr/ccs/bin/ar
-#endif
-#ifndef AsCmd
-# define AsCmd /usr/ccs/bin/as
-#endif
-#ifndef CcCmd
-# define CcCmd /usr/ccs/bin/cc
-#endif
-#ifndef CplusplusCmd
-# define CplusplusCmd /opt/uxpcplus/bin/CC
-#endif
-#ifndef CplusplusFilt
-# define CplusplusFilt /opt/uxpcplus/bin/c++filt
-#endif
-#ifndef CplusplusDependIncludes
-# define CplusplusDependIncludes -I/opt/uxpcplus/include/CC
-#endif
-#ifndef LdCmd
-# define LdCmd /usr/ccs/bin/ld
-#endif
-#ifndef LexCmd
-# define LexCmd /usr/ccs/bin/lex
-#endif
-#ifndef YaccCmd
-# define YaccCmd /usr/ccs/bin/yacc
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define SystemV4 YES
-#define HasSockets YES
-#define DBMLibrary /* ndbm modules are in -lc */
-#define HasNdbm YES
-#ifndef HasLdRunPath
-#define HasLdRunPath YES
-#endif
-#define BuildServer NO
-
-#include <sv4Lib.rules>
-
-#endif
-
-#ifdef mc68000Architecture
-
-#define BootstrapCFlags -D__sxg__
-#define StandardDefines -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-#define StandardCppDefines -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-
-#define LnCmd ln
-
-#define DoRanlibCmd NO
-#define DefaultCCOptions +Z384
-#define ExtraLibraries -lXbsd -lsocket -lu
-#define TermcapLibrary -lcurses
-#define BuildServer NO
-#define HasSymLinks NO
-#define HasVFork NO
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-#endif
-
-#define GencatFlags -m
-
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS
-#define DtSearchDefines -DI18N_MSG DtSvcDefines -DNEED_STRCASECMP
-#define DtWidgetDefines DtSearchDefines
-
-#define ArchitectureDefines -DUXP_ARCHITECTURE
-
-#define CdeProjectDefines \
- -DMULTIBYTE -DNLS16 \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
diff --git a/nx-X11/config/cf/generic.cf b/nx-X11/config/cf/generic.cf
deleted file mode 100644
index dd1cd10a7..000000000
--- a/nx-X11/config/cf/generic.cf
+++ /dev/null
@@ -1,21 +0,0 @@
-XCOMM platform: $Xorg: generic.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-#define OSName Unknown Operating System
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 0
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-
-#ifdef SYSV
-#define SystemV YES
-#endif
-#ifdef SVR4
-#define SystemV4 YES
-#endif
-
-#define BuildServer NO
diff --git a/nx-X11/config/cf/gnu.cf b/nx-X11/config/cf/gnu.cf
deleted file mode 100644
index 632c3a7fa..000000000
--- a/nx-X11/config/cf/gnu.cf
+++ /dev/null
@@ -1,187 +0,0 @@
-XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $
-XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.3 2005/02/09 04:09:54 gisburn Exp $
-
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
- -D_POSIX_SOURCE -D_XOPEN_SOURCE \
- -D_BSD_SOURCE -D_SVID_SOURCE
-
-XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
-
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-
-#define HasPosixThreads YES
-#define ThreadedX YES
-#define HasThreadSafeAPI YES
-#define ThreadsLibraries -lpthread
-#define SystemMTDefines -D_REENTRANT
-
-#ifndef HasLibCrypt
-#define HasLibCrypt YES
-#endif
-
-#ifndef BuildXF86RushExt
-# define BuildXF86RushExt YES
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define HasDlopen YES
-#ifndef HasShadowPasswd
-# define HasShadowPasswd YES
-#endif
-#define HasPutenv YES
-
-XCOMM Not implemented and will always fail.
-#ifndef HasShm
-# define HasShm YES
-#endif
-
-#define HasBSD44Sockets YES
-#define HasSockets YES
-#define HasSnprintf YES
-#define HasMkstemp YES
-#define HasUsableFileMmap YES
-#ifndef HasNCurses
-#define HasNCurses YES
-#endif
-
-#define AvoidNullMakeCommand YES
-#ifndef DebuggableLibraries
-#define DebuggableLibraries NO
-#endif
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#ifndef NeedWidePrototypes
-#define NeedWidePrototypes NO
-#endif
-#define SetTtyGroup YES
-
-#ifndef UseStaticTermcapLib
-#define UseStaticTermcapLib NO
-#endif
-
-#define MkdirHierCmd mkdir -p
-#ifndef CcCmd
-#define CcCmd gcc
-#endif
-#ifndef AsCmd
-#define AsCmd as
-#endif
-#ifndef LdCmd
-#define LdCmd ld
-#endif
-
-#define AsmDefines -D__ELF__
-#define CplusplusCmd c++
-#ifndef TermcapLibrary
-#if UseStaticTermcapLib
-#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
-#else
-#define TermcapLibrary -lncurses
-#endif
-#endif
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#ifndef CppCmd
-#define CppCmd /lib/cpp
-#endif
-#define YaccCmd bison -y
-#define LexCmd flex -l
-#define HasFlex YES
-#define LexLib -lfl
-#define PreProcessCmd CcCmd -E
-#define PostIncDir DefaultGccIncludeDir
-#define LdCombineFlags -r
-#ifndef LdPostLib
-#define LdPostLib /* Never needed */
-#endif
-#define HasWChar32 YES
-#define StandardCppOptions -traditional
-#define StandardCppDefines StandardDefines
-
-#define HasVarRun YES
-#define VarDbDirectory $(VARDIR)/lib
-
-XCOMM i386Architecture
-#define OptimizedCDebugFlags DefaultGcc2i386Opt
-#define GNUMachineDefines -D__i386__
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-#define HasPlugin YES
-#define VendorHasX11R6_3libXext YES
-
-#ifndef StandardDefines
-#define StandardDefines GNUMachineDefines GNUSourceDefines
-#endif
-
-#define DlLibrary -rdynamic -ldl
-
-#define ServerExtraSysLibs /**/
-
-#define ConnectionFlags -DUNIXCONN -DTCPCONN
-
-/* Some of these man page defaults are overriden in the above OS sections */
-#ifndef ManSuffix
-# define ManSuffix 1x
-#endif
-#ifndef ManDir
-# define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix 3x
-#endif
-#ifndef LibmanDir
-# define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix 5x
-#endif
-#ifndef FileManDir
-# define FileManDir $(MANSOURCEPATH)5
-#endif
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-#endif
-
-#define HasGnuMake YES
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
-#define ArchitectureDefines -DGNU_ARCHITECTURE
-
-#define XserverNeedsSetUID YES
-
-#include <gnuLib.rules>
-
-XCOMM XXX Might need this if they are not careful with slashes.
-XCOMM #define DirFailPrefix -
-
-#include <xorg.cf>
-
diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules
deleted file mode 100644
index 10045500e..000000000
--- a/nx-X11/config/cf/gnuLib.rules
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * GNU/Hurd shared library rules
- *
- * $XFree86: xc/config/cf/gnuLib.rules,v 1.9 2003/10/11 09:40:13 herrb Exp $
- */
-
-/*
- * GNU/Hurd shared library rules
- * Cloned from Linux (ELF) shared library rules
- *
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib NO
-#endif
-
-XCOMM XXX To rpath or not to rpath...
-#ifndef UseRpath
-#define UseRpath NO
-#endif
-
-#ifndef SharedOldX
-#define SharedOldX NO
-#endif
-
-#undef SpecialMalloc
-#define SpecialMalloc NO
-
-#define BaseShLibReqs -lc
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <gnuLib.tmpl>
-#endif
-#ifndef RpathLoadFlags
-#if UseRpath
-#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
-#else
-#define RpathLoadFlags /**/
-#endif
-#endif
-#ifndef LibraryRpathLoadFlags
-#define LibraryRpathLoadFlags RpathLoadFlags
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#ifndef ExtraLoadFlags
-#ifdef UseInstalled
-XCOMM XXX Maybe superfluous.
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
-#else
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
-#endif
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\
- set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
- @if $(SOSYMLINK); then (set -x; \
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedDepLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
diff --git a/nx-X11/config/cf/gnuLib.tmpl b/nx-X11/config/cf/gnuLib.tmpl
deleted file mode 100644
index 012277c1d..000000000
--- a/nx-X11/config/cf/gnuLib.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-XCOMM
-XCOMM GNU Hurd shared library template
-XCOMM
-XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.5 2003/05/29 21:56:57 herrb Exp $
-XCOMM
-
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-#define SharedX11Reqs
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
diff --git a/nx-X11/config/cf/host.def.NX.original b/nx-X11/config/cf/host.def.NX.original
deleted file mode 100644
index e9f53c2a9..000000000
--- a/nx-X11/config/cf/host.def.NX.original
+++ /dev/null
@@ -1,1020 +0,0 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
-/******************************************************************************/
-/*
- * This file is to provide a quick method for most people to change the
- * behaviour of their Xorg installation without having to fully
- * understand the workings of site.def and all the various '.cf' files.
- *
- * In the vast majority of cases, it should not be necessary to use this
- * file at all or change it in any way.
- *
- * This file is divided into two sections. The first contains settings
- * that end-users might reasonably change. The second contains settings
- * that developers might want to change.
- *
- * IMPORTANT NOTE: In all cases changing the defaults may cause problems
- * and/or unexpected side-effects. If you don't understand what a setting
- * does, then it's best to not change it. If you make changes and have
- * problems, verify that those problems are also present when using an
- * empty host.def file and unchanged version of this file before reporting
- * them.
- *
- * A good way to use this file is to copy it to host.def, and make the
- * changes there. That way, future patches to this file won't fail.
- * The host.def file will never be patched.
- *
- * The distributed version of this file MUST contain no uncommented
- * definitions. Default definitions belong in xorg.cf, or <vendor>.cf
- * files.
- */
-/******************************************************************************/
-
-/**************************************************************************/
-/* */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-/* */
-/* NX-X11, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present */
-/* software is allowed according to terms specified in the file LICENSE */
-/* which comes in the source distribution. */
-/* */
-/* Check http://www.nomachine.com/licensing.html for applicability. */
-/* */
-/* NX and NoMachine are trademarks of Medialogic S.p.A. */
-/* */
-/* All rights reserved. */
-/* */
-/**************************************************************************/
-
-#if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture)
-
-#if defined(SunArchitecture)
-#define ProjectRoot /usr/openwin
-#endif
-
-/*
- * Enable use the Cygwin IPC libraries to get MIT-SHM support.
- */
-#if defined(cygwinArchitecture)
-#define UseCygIPC YES
-#endif
-
-/*
- * If you have build-specific modifications in your host.def file, but
- * want an empty host.def file installed when doing 'make install',
- * uncomment the following
- *
-#define InstallEmptyHostDef
- */
-
-/*
- * Which servers to build. There is only Xorg server.
- * It can be disabled by the following.
- *
-#define XorgServer NO
- */
-#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.
- *
-#define NXLibraries YES
- */
-#define NXLibraries YES
-
-/*
- * Building the NX agent nested server is disabled
- * by default. Enable this in your host.def.
- *
-#define NXAgentServer YES
- */
-#define NXAgentServer YES
-
-/*
- * Assume the new build tree.
- *
-#define NXUpgradeAgentServer NO
- */
-#define NXUpgradeAgentServer YES
-
-#ifdef NXAgentServer
-#define BuildRenderLibrary YES
-#define SharedLibFreetype2 YES
-#define NormalLibFreetype2 YES
-#define FontLibSharedFreeType NO
-#endif
-
-/*
- * Define this symbol to build the NX enhanced MS Windows
- * X server for Cygnus environment.
- *
-#define NXWinServer YES
- */
-#if defined(cygwinArchitecture)
-#define NXWinServer NO
-#define XWinServer NO
-#endif
-
-/*
- * Set the default server (ie the one that gets the sym-link to "X")
- *
-#define ServerToInstall Xorg
- */
-
-/*
- * Force build of X libraries if any nested server is to be built.
- *
-#define BuildLibraries YES
- *
- * If you just want libraries for NXAgentServer, this should be
- * enough (never tested, although).
- *
-#define BuildLibrariesForXServers YES
- */
-#if XnestServer || NXAgentServer
-#define BuildLibraries YES
-#endif
-
-#define BuildDamageLibrary YES
-
-#define BuildXfixesLibrary YES
-
-#define BuildCompositeLibrary YES
-
-#define BuildRandRLibrary YES
-
-#define BuildDocs NO
-
-#define BuildComposite YES
-
-/*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below. If you run
- * the servers by hand (with xinit or startx), then they do need to be
- * installed SetUID on most platforms.
- *
- * Consult your system administrator before making the X server setuid.
- *
-#define InstallXserverSetUID NO
- */
-
-
-/*
- * Server configuration parameters. The defaults are shown here:
- */
-
-/*
- * Which drivers to build. When building a static server, each of these
- * will be included in it. When building the loadable server each of these
- * modules will be built.
- *
-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
- neomagic i740 tdfx savage \
- cirrus vmware tseng trident chips apm \
- GlideDriver fbdev i128 \
- ati DevelDrivers ark cyrix \
- siliconmotion \
- vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
- */
-
-/*
- * To add third party drivers to the standard driver list, set the
- * following.
- *
-#define XF86ExtraCardDrivers extradriver1 extradriver2 ...
- */
-
-/*
- * Select the XInput devices you want by uncommenting this.
- *
-#define XInputDrivers mouse keyboard acecad calcomp citron \
- digitaledge dmc dynapro elographics \
- microtouch mutouch penmount spaceorb summa \
- wacom void magictouch aiptek
- */
-
-/* To enable building of development DRI drivers (insecure, or not
- * useful on the chosen architecture, uncomment this define.
-#define BuildDevelDRIDrivers YES
- */
-
-/*
- * To use the deprecated, old keyboard driver, uncomment this. But
- * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
- * work for your architechture. The old driver will be removed in the
- * next release.
- *
-#define UseDeprecatedKeyboardDriver YES
- */
-
-/*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- * HaveMatroxHal -- You have the HALlib.a binary library installed
- * in xfree86/drivers/mga/HALlib, and you want it to
- * be used.
- * Default: NO
- *
- * BuildMatroxHal -- You have the source for the HALlib library (installed
- * in xfree86/drivers/mga/hallib), and want to build and
- * use it.
- * Default: NO
- *
- * UseMatroxHal -- You want to build support for loading/using the HAL
- * library into the mga driver. For module server builds
- * you don't need to have the HALlib library to do this.
- * but you want to build support for loading it and using
- * it into the mga driver module.
- * Default: YES for loadable server build
- * (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-/*
- * To disable use of the Matrox HAL library, uncomment this:
- *
-#define UseMatroxHal NO
- */
-
-/*
- * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
- * uncomment this:
- *
-#define HaveMatroxHal YES
- */
-
-/*
- * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
- * uncomment this:
-#define BuildMatroxHal YES
- */
-
-/*
- * 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.
- *
-#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
- */
-#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.
- *
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
- */
-
-#if defined(LinuxArchitecture) || defined(SunArchitecture) || defined(FreeBSDArchitecture)
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/,$(FONTDIR)/TTF/
-#endif /* #if defined(LinuxArchitecture) || defined(SunArchitecture) */
-
-#if defined(cygwinArchitecture)
-#define DefaultFontPath /mnt/NX/fonts/base/,/mnt/NX/fonts/misc/,/mnt/NX/fonts/Speedo/,/mnt/NX/fonts/Type1/,/mnt/NX/fonts/75dpi/,/mnt/NX/fonts/100dpi/,/mnt/NX/fonts/TTF/
-#define DefaultRGBDatabase /mnt/NX/fonts/rgb
-#endif /* #if defined(cygwinArchitecture) */
-
-/*
- * To build only the servers with a cut-down source tree, uncomment
- * this.
- *
-#define BuildServersOnly YES
- */
-#define BuildServersOnly YES
-
-/*
- * By default, the sample config files for xinit, xdm and xfs are installed
- * only when there is no pre-existing version installed. Uncommenting the
- * following lines will force the sample versions to be installed even if
- * it means over-writing existing versions.
- *
-#define InstallXinitConfig YES
-#define InstallXdmConfig YES
-#define InstallFSConfig YES
- */
-
-/*
- * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent exising application
- * defaults files from being over-written.
- *
-#define InstallAppDefFiles NO
- */
-
-/*
- * Undefine the following if you don't want to have config files and
- * app-defaults installed in a separate directory (i.e. /etc/X11).
- *
-#define UseSeparateConfDir NO
- */
-
-/*
- * To enable building the glide driver, you need to define
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
-#define HasGlide2 YES
- */
-
-/*
- * Set the path to your Glide include files.
- *
-#define Glide2IncDir /usr/include/glide
- */
-
-/*
- * Have glide 3?
- *
-#define HasGlide3 YES
- */
-
-/*
- * Set the path to your Glide 3 include files.
- *
-#define Glide3IncDir /usr/include/glide3
- */
-
-
-
-/*
- * Unless you're a developer you shouldn't need to change anything
- * beyond this point.
- */
-
-/*
- * If you want to enable some developer settings, like more verbose
- * compiler warnings, uncomment this.
- *
-#define XFree86Devel YES
-*/
-
-/*
- * If using GCC 2.x on a system where it isn't the default, uncomment
- * the following
- *
- */
-#if defined(SunArchitecture)
-#define HasGcc2 YES
-#define HasGcc YES
-#endif
-
-/*
- * The default optimisation flags for GCC 2.x. -fno-strength-reduce is
- * here to work around a bug in -O2 for GCC 2.x on i386 platforms.
- * If you are using a version that doesn't have this bug, you can
- * uncomment the following line, and remove '-fno-strength-reduce'
- * If you are building binaries for a 486, it may be beneficial to add
- * -m486
- *
-#define DefaultGcc2i386Opt -O2 -fno-strength-reduce
- */
-
-#if defined (LinuxArchitecture)
-#define DefaultGcc2i386Opt -g -O3
-#endif
-
-/*
- * Enable all the optimizations on AMD64.
- */
-
-#define DefaultGcc2AMD64Opt -g -O3 GccAliasingArgs
-
-/*
- * This allows the GCC warning flags to be set. The default is shown here.
- *
-#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wredundant-decls -Wnested-externs
- */
-
-/*
- * Sun Compiler stuff..
- *
-#define HasSunC YES
-#define HasSunCplusplus YES
-#define CplusplusCompilerMajorVersion 5
-#define CplusplusCompilerMinorVersion 0
-#define CCompilerMajorVersion 5
-#define CCompilerMinorVersion 0
- */
-
-/*
- * Optimized Sun Compiler Build.
- *
-#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro
-#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro
- */
-
-/*
- * Debuggable Sun Compiler Build.
- * Note: This builds _EVERYTHING_ as debuggable
- *
-#define DefaultCDebugFlags -g -xs
-#define OptimizedCDebugFlags -g -xs
- */
-
-/*
- * For Linux, this should match the Binutils version you have. This example
- * is for 2.6.0.7. See linux.cf for the default setting.
- *
- * This should automatically get set correctly by imake.
- *
-#define LinuxBinUtilsMajorVersion 26
- */
-
-/*
- * For Linux, these should match the libc version you have. This example
- * is for libc.5.4.x. See linux.cf for the default setting.
- *
- * This should automatically get set correctly by imake.
- *
-#define LinuxCLibMajorVersion 5
-#define LinuxClibMinorVersion 4
- */
-
-/*
- * If you want to use the GNU malloc library, uncomment this
- *
-#define UseGnuMalloc YES
- */
-
-/*
- * Set this to whatever is required to access the GNU malloc library.
- * The default is '-lgmalloc' unless is specified in the OS's .cf file.
- *
-#define GnuMallocLibrary -L/usr/local/lib -lgmalloc
- */
-
-/*
- * To enable the internal Xserver malloc, uncomment this
- *
-#define UseInternalMalloc YES
- */
-
-/*
- * Some Linux releases don't have a libtermcap. In this case you may need
- * to uncomment the following
- *
-#define TermcapLibrary -lncurses
- */
-
-/*
- * Build a server that dynamically loads the modules by setting
- * this to YES. This defaults to YES on most platforms. A static server
- * can be built by setting this to NO.
- *
-#define DoLoadableServer NO
- */
-
-/*
- * This release defaults to building dlopen() style modules instead of the
- * previously standard loader modules.
- *
- * Uncomment the following to return to the XFree86 custom loader modules.
- *
-#define MakeDllModules NO
- */
-
-/*
- * Build XAA. This can be disabled with:
- *
-#define XF86XAA NO
- */
-
-/*
- * Build vgahw. This can be disabled with:
- *
-#define XF86VgaHw NO
- */
-
-/*
- * Build xf1bpp. This can be disabled with:
- *
-#define XF1Bpp NO
- */
-
-/*
- * Build xf4bpp. This can be disabled with:
- *
-#define XF4Bpp NO
- */
-
-
-/*
- * BSD Console driver support (for FreeBSD and NetBSD).
- *
- * By default, support is included for pccons and pcvt for NetBSD, and
- * pccons, syscons and pcvt for FreeBSD.
- *
- * To change the list of supported drivers, set the following parameter.
- * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT.
- * The following example includes support for syscons and pcvt only.
- *
-#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT
- */
-
-/*
- * 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
- */
-#if defined(SunArchitecture)
-#define BuildXInputExt YES
-#endif
-
-/*
- * Uncomment this for joystick support.
- *
- * Note: Joystick support is broken, so don't enable this.
- *
-#define JoystickSupport YES
- */
-
-/*
- * To disable the ScreenSaver Extension, uncomment this line.
- *
-#define BuildScreenSaverExt NO
- */
-#define BuildScreenSaverExt NO
-
-/*
- * If you don't want to build Xinerama support, uncomment this.
- *
-#define BuildXinerama NO
- */
-#define BuildXinerama NO
-
-/*
- * If you don't want to build support for the GLX extension, uncomment this.
- *
-#define BuildGlxExt NO
- */
-#define BuildGlxExt YES
-
-/*
- * Taken from xorg.cf.
- */
-
-#if defined(SparcArchitecture) \
- || defined (Sparc64Architecture) \
- || defined(ia64Architecture) \
- || defined(s390xArchitecture) \
- || defined(AMD64Architecture)
-#define GlxExtraDefines -D__GLX_ALIGN64
-#endif
-
-/*
- * If you want to build the xf86rush extension, uncomment this line.
- * This isn't recommended.
- *
-#define BuildXF86RushExt YES
- */
-#define BuildXF86RushExt NO
-
-/*
- * If you want to build the client library for the xf86rush extension,
- * uncomment this line. This isn't recommended.
- *
-#define BuildXF86RushLibrary NO
- */
-#define BuildXF86RushLibrary NO
-
-/*
- * We should never need LBX in a NX enabled environment...
- *
-#define BuildLBX NO
- */
-#define BuildLBX NO
-
-#define BuildXKB YES
-#define BuildXKBlib YES
-
-#define SharedLibXau NO
-
-/*
- * If you are running NetBSD 0.9C or later, and have the aperture driver
- * installed, uncomment this.
- *
-#define HasNetBSDApertureDriver YES
- */
-
-/*
- * If you are running SVR3 and have the mmap driver installed (for linear
- * framebuffer access) uncomment this.
- *
-#define HasSVR3mmapDrv YES
- */
-
-/*
- * If you are using an SVR3 (like ISC 4.x) which supports long file names,
- * you can uncomment this to have manual pages installed under their
- * full names
- *
-#define ExpandManNames YES
- */
-
-/*
- * For a POSIXized build on Interactive uncomment this
- * Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2.
- *
-#define UsePosix YES
- */
-
-/*
- * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
- * comment this out.
- *
- */
-#if defined(LinuxArchitecture)
-#define HasXdmAuth YES
-#endif /* #if defined(LinuxArchitecture) */
-
-/*
- * If you have Linux DECnet support, and want to build XFree86 with support
- * for connections over DECnet, uncomment this.
- *
-#define HasDECnet YES
- */
-
-/*
- * To build static and shared libraries with debugging information, uncomment
- * this. Assumes you have Gcc2.
- * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
- * to build debugging versions of the libraries separately.)
- *
-#define DebuggableLibraries YES
-*/
-#if defined(LinuxArchitecture)
-#define DebuggableLibraries YES
-#endif /* #if defined(LinuxArchitecture) */
-/*
- * To forceably build static libraries in addition to shared libraries,
- * uncomment this.
- *
-#define ForceNormalLib YES
- */
-
-/*
- * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
- * not the Linux ELF versions.
- *
-#define LinuxElfDefault NO
- */
-
-/*
- * To use ELF format shared libraries for supported OSs, uncomment this.
- *
- * For Linux the default setting of this is the same as the setting of
- * LinuxElfDefault.
- *
- * For FreeBSD this should automatically be set correctly by imake. Only
- * change it here if you need to override the automatic setting.
- *
-#define UseElfFormat YES
- */
-
-/*
- * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install
- * a.out compatibility libraries. To enable that, uncomment this.
- *
-#define BuildAoutLibraries YES
- */
-
-/*
- * If you have trouble with make bombing out in Xlib, try uncommenting this.
- * You will not get dependencies as a result, but better than nothing.
- *
-#define MakeHashTableBug YES
- */
-
-/*
- * If you do not want your man pages compress under SVR3 systems that
- * support it, uncomment this.
- *
-#define CompressManPages NO
- */
-
-/*
- * If you have sgmlfmt (the XFree86 doctools package) and want to build
- * formatted docs from the SGML source, uncomment this.
- *
-#define HasSgmlFmt YES
- */
-
-/*
- * To disable building some document formats, uncomment some of these.
- *
-#define BuildLinuxDocText NO
-#define BuildLinuxDocHtml NO
-#define BuildLinuxDocPS NO
- */
-
-/*
- * To install Japanese versions of the documentation uncomment this.
- * Note: The Japanese documentation consists of a subset of the
- * XFree86 3.1 docs.
- *
-#define InstallJapaneseDocs YES
- */
-
-/*
- * To build/install X specs docs, uncomment the following.
- * The SpecsDocDirs setting here is recommended because it covers
- * the docs that XFree86 has changed or added.
- *
-#define BuildSpecsDocs YES
-#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n
- */
-
-/*
- * To build all specs docs, not just those listed in SpecsDocDirs, uncomment
- * the following.
- *
-#define BuildAllSpecsDocs YES
- */
-
-/*
- * If your system doesn't support vm86() mode and you have
- * libx86emu set library path here
- *
-#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 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
- */
-#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.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasExpat NO
- */
-#define HasExpat NO
-
-/*
- * To use a Expat library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasExpat YES
-#define ExpatDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed PNG library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasLibpng NO
- */
-
-/*
- * To use a PNG library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasLibpng YES
-#define LibpngDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed xterm program.
- * To use the one included in this release instead, uncomment the following.
- *
-#define BuildXterm YES
- */
-
-#define SharedLibXau NO
-
-#define SharedLibXdmcp NO
-
-#define BuildXaw7 YES
-
-#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 NO
-#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) */
diff --git a/nx-X11/config/cf/host.def.X.original b/nx-X11/config/cf/host.def.X.original
deleted file mode 100644
index e69de29bb..000000000
--- a/nx-X11/config/cf/host.def.X.original
+++ /dev/null
diff --git a/nx-X11/config/cf/hp.cf b/nx-X11/config/cf/hp.cf
deleted file mode 100644
index 370476bd1..000000000
--- a/nx-X11/config/cf/hp.cf
+++ /dev/null
@@ -1,210 +0,0 @@
-XCOMM platform: $Xorg: hp.cf,v 1.5 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-
-/* The default yacc options are too small for Uil.y. */
-#define YaccFlags -Nm15000
-
-/*
- * C++ compiler setup. This file knows what options to use with
- * certain compilers, including HP C++ and CenterLine C++.
- *
- * For HP C++, define HasHPCplusplus to YES in site.def.
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def.
- * For other compilers, define HasCplusplus to YES in site.def, and
- * check to see if you need to provide values for CplusplusOptions
- * and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- */
-
-#if HasHPCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions -Aa
-# endif
-# ifndef CplusplusOptions
-# define CplusplusOptions -Aa
-# endif
-# ifndef CplusplusCmd
-# define CplusplusCmd /opt/CC/bin/CC
-# endif
-# ifndef CplusplusDependIncludes
-# define CplusplusDependIncludes -I/opt/CC/include/CC
-# endif
-#endif
-
-#ifndef CcCmd
-# define CcCmd /opt/ansic/bin/cc
-#endif
-#ifndef YaccCmd
-# define YaccCmd /opt/langtools/bin/yacc
-#endif
-#ifndef LexCmd
-# define LexCmd /opt/langtools/bin/lex
-#endif
-#ifndef LintCmd
-# define LintCmd /opt/ansic/bin/lint
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# endif
-# ifndef OptimizedCplusplusDebugFlags
-# define OptimizedCplusplusDebugFlags -O
-# endif
-# ifndef CplusplusDependIncludes
-# define CplusplusDependIncludes -I/usr/local/CenterLine/clc++/pa-hpux8/incl
-# endif
-#endif
-
-
-#define SystemV YES
-#define Malloc0ReturnsNull YES
-#if OSMajorVersion > 9
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#else
-# define AllocateLocalDefines -DNO_ALLOCA
-#endif
-
-#ifdef __hp9000s800
-# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags +O1
-# endif
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Ae +ESlit
-# endif
-# ifndef SharedLibraryCCOptions
-# define SharedLibraryCCOptions -Ae
-# endif
-# define StandardDefines -Dhpux -DSYSV
-# define ServerExtraDefines -DXOS -DBSTORE -DSOFTWARE_CURSOR -DSCREEN_PIXMAPS -DMERGE_SAVE_UNDERS -DHAS_IFREQ -DFORCE_SEPARATE_PRIVATE AllocateLocalDefines
-
-# if OSMajorVersion > 9
-# include <hpLib.rules>
-# endif
-
-#else /* __hp9000s800 */
-# define StandardDefines -Dhpux -DSYSV
-# if OSMajorVersion < 8
-# define DefaultCCOptions -Wc,-Nd4000,-Ns4100,-Ne700,-Np200,-Nw300
-# else
-# define OptimizedCDebugFlags +O1
-# endif
-# define LintOpts -ax -Nd4000 -Ns8000 -Ne700 -Np200 -Na25000
-#endif
-#define MvCmd mv -f
-#define LdCombineFlags -r
-#define ExecableScripts YES
-#define HasVFork YES
-#define HasPoll YES
-#define RemoveTargetProgramByMoving YES
-#define ExpandManNames YES
-#define HasPutenv YES
-#define HasNdbm YES
-#define DBMLibrary /usr/lib/libdbm.a
-#define PrimaryScreenResolution 91
-#define ExtensionOSDefines -DHPINPUT -DXTESTEXT1
-#define XhpServer YES
-#define ServerExtraSysLibs -ldld
-#ifndef BuildXInputExt
-# define BuildXInputExt YES
-#endif
-#define HPFastScrolling YES
-#ifndef BuildServer
-# define BuildServer __hp9000s700
-#endif
-#if OSMajorVersion < 10
-#define NeedBerklib (BuildServer|BuildFontServer)
-#endif
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-
-#if OSMajorVersion < 6 || (OSMajorVersion == 6 && OSMinorVersion < 2)
-# define ConnectionFlags -DTCPCONN /* no unix sockets */
-#endif
-
-#if OSMajorVersion > 8
-#define HasWChar32 YES
-#define HasPlugin YES
-#endif
-
-#ifdef __hp9000s300
-# ifndef CompatabilityDefines
-# define CompatabilityDefines -D__hp9000s300 -Dhp9000s300
-# endif
-#elif defined(__hp9000s700)
-# ifndef CompatabilityDefines
-# define CompatabilityDefines -D__hp9000s800 -Dhp9000s800 -D__hp9000s700
-# endif
-#else
-# ifndef CompatabilityDefines
-# define CompatabilityDefines -D__hp9000s800 -Dhp9000s800
-# endif
-#endif
-
-#ifndef OsDefines
-# if OSMajorVersion > 9
-# define OsDefines -DhpV4 -DHPUX
-# else
-# define OsDefines -DHPUX
-# endif
-#endif
-
-#if OSMajorVersion > 9
-# if ThreadedX
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-# endif
-# ifndef CppCmd
-# define CppCmd /usr/ccs/lbin/cpp
-# endif
-#endif
-
-/* CC does not recognize -Ae, and has a different meaning for +e. */
-/* +e also confuses cpp. */
-#define AnsiDefines -Ae -D_HPUX_SOURCE
-#define CplusplusAnsiDefines -Aa -D_HPUX_SOURCE
-
-#define BuildLibPathVar SHLIB_PATH
-
-#define CdeBaseProjectDefines \
- -DNLS16 -DMALLOC_0_RETURNS_NULL -DMERGE -D__hpux \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion \
- CompatabilityDefines OsDefines
-
-#define CdeProjectDefines CdeBaseProjectDefines AnsiDefines
-#define CdeCplusplusProjectDefines \
- CdeBaseProjectDefines CplusplusAnsiDefines
-
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-#if OSMajorVersion > 9
-#define DtMailDefines \
- -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
- -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-#else
-#define DtMailDefines \
- -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
- -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/usr/mail/%s\"
-#endif
-
-#define ArchitectureDefines -DHP_ARCHITECTURE
-
-#define ExportListGenSource elistgen.hp
diff --git a/nx-X11/config/cf/hpLib.rules b/nx-X11/config/cf/hpLib.rules
deleted file mode 100644
index 4d68f13eb..000000000
--- a/nx-X11/config/cf/hpLib.rules
+++ /dev/null
@@ -1,144 +0,0 @@
-XCOMM $Xorg: hpLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-/*
- * HP shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.3 1999/01/11 05:13:06 dawes Exp $
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <hpLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -b
-#endif
-#ifndef PositionIndependentCFlags
-# define PositionIndependentCFlags +z
-#endif
-#ifndef LargePositionIndependentCFlags
-# define LargePositionIndependentCFlags +Z
-#endif
-#ifndef InstLibFlags
-# define InstLibFlags -m 0555
-#endif
-#ifndef UseInstalled
-/* assert: LdPostLib pulls in -L$(USRLIBDIR), so it doesn't need to be here */
-# define ExtraLoadFlags -Wl,+s -Wl,+b$(USRLIBDIRPATH)
-#endif
-#ifndef UseExportLists
-# define UseExportLists YES
-#endif
-
-/* Pre-linking shared libraries is supported in HP/UX 10. */
-#if OSMajorVersion > 9
-# define HPRequiredLibs $(LDPRELIBS) $(REQUIREDLIBS) +s +b $(USRLIBDIRPATH)
-#else
-# define HPRequiredLibs $(REQUIREDLIBS)
-#endif
-
-#ifndef LinkWithExports
-# if UseExportLists
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs) @@\
- if [ -f Concat(lib,libname.elist) ]; then \ @@\
- RemoveFiles($@.exports $@.list); \ @@\
- $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\
- $(EXPORTLISTGEN) $@~ $@.list > $@.exports; \ @@\
- (cd down; $(LD) -c up/$@.exports -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs); \ @@\
- RemoveFiles($@.exports $@.list); \ @@\
- fi
-# else
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs)
-# endif
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-# define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.sl.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- RMoveToBakFile(Concat($(DESTDIR)dest/lib,libname.sl.rev)) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sl.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.sl) @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.sl.rev) Concat(lib,libname.sl) @@\
- -RemoveFile(Concat(lib,libname.sl.rev.bak))
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.sl.rev)) @@\
- @@\
-Concat(lib,libname.sl.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- LinkWithExports(libname,rev,solist,down,up) @@\
- -RemoveFiles($@ $@.bak) @@\
- MoveToBakFile($@) @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.sl) @@\
- $(LN) $@ Concat(lib,libname.sl) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.sl)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.sl.rev) Concat(lib,libname.sl)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.sl.rev)) @@\
- @@\
-Concat(lib,libname.sl.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- LinkWithExports(libname,rev,solist,down,up) @@\
- -RemoveFiles($@ $@.bak) @@\
- MoveToBakFile($@) @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.sl) @@\
- $(LN) $@ Concat(lib,libname.sl) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.sl)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.sl.rev) Concat(lib,libname.sl)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
diff --git a/nx-X11/config/cf/hpLib.tmpl b/nx-X11/config/cf/hpLib.tmpl
deleted file mode 100644
index c955aaaab..000000000
--- a/nx-X11/config/cf/hpLib.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $Xorg: hpLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM $XFree86$
-
-/*
- * HP shared library template
- */
-
-#define SharedThreadReqs /**/
-#define SharedOldXReqs $(XONLYLIB)
-#define SharedX11Reqs SharedThreadReqs
-#define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXmuReqs $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(XONLYLIB)
-#define SharedXiReqs $(XLIB)
-#define SharedXtstReqs $(XLIB)
-#define SharedSMReqs $(ICELIB)
-#define SharedXpReqs $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
-#define SharedXmReqs SharedXReqs
-#define SharedMrmReqs $(XMLIB) SharedXReqs
-#define SharedUilReqs $(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs $(CXXLIB)
-#define SharedDtSvcReqs $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtMmdbReqs $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtSearchReqs -lm
-#define SharedDtWidgetReqs $(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtHelpReqs $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtPrintReqs $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtTermReqs $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMrmReqs $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMailReqs $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedCsaReqs $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
diff --git a/nx-X11/config/cf/iPAQH3600.cf b/nx-X11/config/cf/iPAQH3600.cf
deleted file mode 100644
index 34e14c16d..000000000
--- a/nx-X11/config/cf/iPAQH3600.cf
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $XFree86: xc/config/cf/iPAQH3600.cf,v 1.2 2000/10/10 14:05:48 tsi Exp $ */
-/*
- * This configuration file contains additional configuration needed
- * to cross compile X for the Compaq iPAQ H3600 PocketPC.
- * To use this, add the following to host.def:
- #define KDriveXServer YES
- #define XiPAQH3500Server YES
- */
-
-#define CrossCompiling YES
-
-#undef i386Architecture
-#define Arm32Architecture
-
-#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
-#define ServerCDebugFlags -O2
-#undef StandardDefines
-#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /opt/Embedix/tools/arm-linux/include
-#define PreIncDir
-#undef PostIncDir
-#define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc
-#define DoRanlibCmd YES
-#define RanlibCmd /opt/Embedix/tools/bin/arm-linux-ranlib
-#undef ExtraLoadFlags
-#define ExtraLoadFlags
-#define FbNoPixelAddrCode
-#undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-
-#undef LdPostLib
-#define LdPostLib -L/opt/Embedix/tools/arm-linux/lib
-
-#undef XfbdevServer
-#define XfbdevServer YES
-#undef BuildXprint
-#define BuildLBX NO
-#define BuildFonts NO
-#define BuildAppgroup NO
-#define BuildRECORD NO
-#define BuildDBE NO
-#define BuildXCSecurity NO
-#define ItsyCompilerBug YES
-#define FontServerAccess NO
-#define ServerXdmcpDefines /**/
-
-#undef ExtensionOSDefines
-#define ExtensionOSDefines
-
-#define ProjectRoot /usr/X11R6
-
-#define GzipFontCompression YES
-
-#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1
-
-#define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src
-
-/* ComplexHostProgramTarget - Compile a program such that we can run
- * it on this host, i.e., don't use the default cross compiler.
- */
-#ifndef ComplexHostProgramTarget
-#define ComplexHostProgramTarget(program) @@\
- CC=cc @@\
- STD_INCLUDES= @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
-EXTRA_LOAD_FLAGS= @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* ComplexHostProgramTarget */
-
-#ifndef SimpleHostProgramTarget
-#define SimpleHostProgramTarget(program) @@\
- SRCS = program.c @@\
- @@\
- CC=cc @@\
- STD_INCLUDES= @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
-EXTRA_LOAD_FLAGS= @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: program.o $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* SimpleHostProgramTarget */
diff --git a/nx-X11/config/cf/iPAQH3600.cf.NX.original b/nx-X11/config/cf/iPAQH3600.cf.NX.original
deleted file mode 100644
index 34e14c16d..000000000
--- a/nx-X11/config/cf/iPAQH3600.cf.NX.original
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $XFree86: xc/config/cf/iPAQH3600.cf,v 1.2 2000/10/10 14:05:48 tsi Exp $ */
-/*
- * This configuration file contains additional configuration needed
- * to cross compile X for the Compaq iPAQ H3600 PocketPC.
- * To use this, add the following to host.def:
- #define KDriveXServer YES
- #define XiPAQH3500Server YES
- */
-
-#define CrossCompiling YES
-
-#undef i386Architecture
-#define Arm32Architecture
-
-#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
-#define ServerCDebugFlags -O2
-#undef StandardDefines
-#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /opt/Embedix/tools/arm-linux/include
-#define PreIncDir
-#undef PostIncDir
-#define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc
-#define DoRanlibCmd YES
-#define RanlibCmd /opt/Embedix/tools/bin/arm-linux-ranlib
-#undef ExtraLoadFlags
-#define ExtraLoadFlags
-#define FbNoPixelAddrCode
-#undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-
-#undef LdPostLib
-#define LdPostLib -L/opt/Embedix/tools/arm-linux/lib
-
-#undef XfbdevServer
-#define XfbdevServer YES
-#undef BuildXprint
-#define BuildLBX NO
-#define BuildFonts NO
-#define BuildAppgroup NO
-#define BuildRECORD NO
-#define BuildDBE NO
-#define BuildXCSecurity NO
-#define ItsyCompilerBug YES
-#define FontServerAccess NO
-#define ServerXdmcpDefines /**/
-
-#undef ExtensionOSDefines
-#define ExtensionOSDefines
-
-#define ProjectRoot /usr/X11R6
-
-#define GzipFontCompression YES
-
-#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1
-
-#define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src
-
-/* ComplexHostProgramTarget - Compile a program such that we can run
- * it on this host, i.e., don't use the default cross compiler.
- */
-#ifndef ComplexHostProgramTarget
-#define ComplexHostProgramTarget(program) @@\
- CC=cc @@\
- STD_INCLUDES= @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
-EXTRA_LOAD_FLAGS= @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* ComplexHostProgramTarget */
-
-#ifndef SimpleHostProgramTarget
-#define SimpleHostProgramTarget(program) @@\
- SRCS = program.c @@\
- @@\
- CC=cc @@\
- STD_INCLUDES= @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
-EXTRA_LOAD_FLAGS= @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: program.o $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-LintTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-#endif /* SimpleHostProgramTarget */
diff --git a/nx-X11/config/cf/iPAQH3600.cf.X.original b/nx-X11/config/cf/iPAQH3600.cf.X.original
deleted file mode 100644
index e69de29bb..000000000
--- a/nx-X11/config/cf/iPAQH3600.cf.X.original
+++ /dev/null
diff --git a/nx-X11/config/cf/ibm.cf b/nx-X11/config/cf/ibm.cf
deleted file mode 100644
index decbc2223..000000000
--- a/nx-X11/config/cf/ibm.cf
+++ /dev/null
@@ -1,198 +0,0 @@
-XCOMM platform: $XdotOrg: xc/config/cf/ibm.cf,v 1.3 2004/08/30 13:32:51 kem Exp $
-XCOMM platform: $Xorg: ibm.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# ifdef DefaultOSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-# elif (OSMajorVersion == 4) && (OSMinorVersion == 1)
-# define OSTeenyVersion 3
-# else
-# define OSTeenyVersion 0
-# endif
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-#define RemoveFiles(files) for f in files; do RemoveFile($$f); done
-
-#if (OSMajorVersion > 4)
-# define HasSnprintf YES
-# define HasStrcasecmp YES
-#endif
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2)
-#define HasBSD44Sockets YES
-#define HasPutenv YES
-#define HasPlugin YES
-/*
- * If you do not have threads support installed, put
- * #define HasPosixThreads NO
- * in the BeforeVendorCF section of your site.def.
- */
-#if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1))) || (OSMajorVersion >= 5))
-#define HasPosixThreads YES
-#endif
-#if HasPosixThreads
-#ifndef ThreadedX
-#define ThreadedX YES
-#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-#endif
-#endif
-#endif /* OS > 3.2 */
-
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-
-#ifndef XVirtualFramebufferServer
-#define XVirtualFramebufferServer YES
-#endif
-
-#if !defined(TermcapLibrary)
-#define TermcapLibrary -lcurses
-#endif
-
-#if !defined(HasPam) && ((OSMajorVersion == 5) && (OSMinorVersion >= 2) || OSMajorVersion > 5)
-#define HasPam YES
-#ifndef PamLibraries
-#define PamLibraries -lpam
-#endif
-#endif
-
-/*
- * For IBM platforms, we must define both the location of the compiler
- * and the location of its standard C++ library. The library location
- * is needed to resolve dependent library symbols if we build our own
- * C++ shared libraries.
- */
-
-#if !HasGcc2ForCplusplus
-# ifndef CplusplusCmd
-# if ThreadedX
-# define CplusplusCmd xlC_r
-# else
-# define CplusplusCmd xlC
-# endif
-# endif
-#endif
-
-#ifndef CplusplusFilt
-# define CplusplusFilt /usr/lpp/xlC/bin/c++filt
-#endif
-#ifndef CplusplusLibC
-# if ThreadedX
-# define CplusplusLibC /usr/lpp/xlC/lib/libC.a
-# else
-# define CplusplusLibC /usr/lpp/xlC/lib/libC_r.a
-# endif
-#endif
-#if !HasGcc2ForCplusplus
-# ifndef CplusplusDependIncludes
-# define CplusplusDependIncludes -I/usr/lpp/xlC/include
-# endif
-#endif
-
-/*
- * IBM's xlC refuses to compile files unless their names end in ".C".
- * As an alternative to this fix, one could edit /etc/xlC.cfg
- * to change the suffix accepted by the compiler, but we prefer not
- * requiring users to reconfigure their C++ compilers to make them work.
- * We also have to override the default SUFFIXES to defeat the use of
- * the builtin .C -> .o file, which doesn't use the right flags.
- */
-
-.SUFFIXES:
-.SUFFIXES: .o .c .y .l .s .sh .h .f .Y .L .cxx
-
-#define NormalLibObjCplusplusCompile(options) test -r $*.C || $(LN) $*.CCsuf $*.C @@\
- $(CXX) -c $(CXXFLAGS) options $*.C
-
-#define SpecialCplusplusObjectRule(baseobj,basedep,options) @@\
-baseobj.Osuf: basedep.CCsuf @@\
- test -r basedep.C || $(LN) basedep.CCsuf basedep.C @@\
- $(CXX) -c $(CXXFLAGS) options basedep.C
-
-
-#define BuildLibPathVar LIBPATH
-#define SystemV YES
-#define LdCombineFlags -r
-#define ExecableScripts YES
-#define Malloc0ReturnsNull YES
-#define CppCmd /usr/ccs/lib/cpp
-#define ExpandManNames YES
-#define ExtensionOSDefines -DXTESTEXT1
-
-/* IBM cpp has slightly non-standard line directives, but supports -P */
-#define CppNoLineInfoOption -P
-
-#if OSMajorVersion > 3
-#if OSMajorVersion > 4
-#define StandardDefines -DSYSV -DAIXV3 -DAIXV4 -DAIXV5 -D_ALL_SOURCE
-#else
-#define StandardDefines -DSYSV -DAIXV3 -DAIXV4 -D_ALL_SOURCE
-#endif
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define ServerExtraDefines -D_IBM_LFT
-#if ThreadedX
-#define CcCmd xlc_r
-#else
-#define CcCmd xlc
-#endif
-#define SystemMTDefines /* xlc_r defines -D_THREAD_SAFE */
-#define ThreadsLibraries -lpthreads /* xlc_r does -lc_r */
-#define ThreadsCplusplusLibraries -lpthreads
-#define AvoidNullMakeCommand YES
-#define NullMakeCommand @ echo
-/* AIX 4 appends all MAKEFLAGS (even dups), so cannot pass on command line. */
-#define ConstructMFLAGS NO
-#define LdPreLib _Use(-L$(USRLIBDIR),-L$(BUILDLIBDIR))
-#define ExtraFilesToClean *.inp
-#else /* OSMajorVersion < 4 */
-#define StandardDefines -DSYSV -DAIXV3 -D_ALL_SOURCE
-#define ServerExtraDefines -D_IBM_HFT
-#define CcCmd xlc
-#define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
-#define SystemMTDefines -D_THREAD_SAFE
-#define ThreadsLibraries -lpthreads -lc_r
-#endif /* OSMajorVersion */
-
-#define OPERATING_SYSTEM AIX /* directory name under server/ddx/ibm/ */
-#define InstallCmd /usr/ucb/install
-#include <ibmLib.rules>
-
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- /usr/lib/makewhatis $(DESTDIR)manpath
-#endif
-
-#define DtMailDefines \
- -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H \
- -DBIG_ENDIAN -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP -DSENDMAIL_LOCKS \
- -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-
-#define ArchitectureDefines -DIBM_ARCHITECTURE
-
-#define ExportListGenSource elistgen.ibm
-
-#define CdeProjectDefines \
- -D_AIX -D__AIX -D__aix -D_aix -Daix -DMULTIBYTE -DNLS16 -DMESSAGE_CAT \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion -DAIX
-
-/*
- * -D__STR31__ disables inlining of memcpy to work around optimization bug
- * in XLC v1.2.0.7. Bug report filed as PMR 8X196, branch 060.
- */
-#ifndef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O -D__STR31__ -DNDEBUG
-#endif
-
-#define CdeTicDefines -DHAS_KNL -DHAS_KTAB
diff --git a/nx-X11/config/cf/ibmLib.rules b/nx-X11/config/cf/ibmLib.rules
deleted file mode 100644
index eb6071330..000000000
--- a/nx-X11/config/cf/ibmLib.rules
+++ /dev/null
@@ -1,349 +0,0 @@
-XCOMM $Xorg: ibmLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/ibmLib.rules,v 1.2 2004/04/23 18:41:58 eich Exp $
-
-/*
- * AIX shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-# define ForceNormalLib NO
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef -DSHAREDCODE
-#endif
-#if OSMajorVersion < 5
-# ifndef SharedLibraryDef
-# define SharedLibraryDef -DAIXSHLIB
-# endif
-#else
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <ibmLib.tmpl>
-#endif
-#ifndef PositionIndependentCFlags
-# define PositionIndependentCFlags -bM\:SRE
-#endif
-#ifndef ExtraLoadFlags
-# define ExtraLoadFlags -bnodelcsect
-#endif
-#if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3
-# if ThreadedX
-# define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
-# else
-# define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
-# endif
-# define SharedLibPostRef $(LDPOSTLIBS)
-#endif
-#ifndef SharedLibPostRef
-# define SharedLibPostRef $(LDPOSTLIBS)
-#endif
-#if ThreadedX
-# define BaseShLibReqs -lc_r -lm
-#else
-# define BaseShLibReqs -lc -lm
-#endif
-#ifndef UseExportLists
-# define UseExportLists YES
-#endif
-
-/*
- * MakeExportList - generate an export list file for linking libraries.
- */
-#ifndef MakeExportList
-# if UseExportLists
-# define MakeExportList(libname,result) \
- @-RemoveFile(result) @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- echo "#! $@ ($${shr4obj:-shr.o})" > result @@\
- if [ -f Concat(lib,libname.elist) ]; then \ @@\
- $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic > $@.list; \ @@\
- $(EXPORTLISTGEN) $@~ $@.list >> result; \ @@\
- RemoveFile($@.list); \ @@\
- else \ @@\
- dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' >> result; \ @@\
- fi;
-# else
-# define MakeExportList(libname,result) \
- @-RemoveFile(result) @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- echo "#! $@ ($${shr4obj:-shr.o})" > result @@\
- dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' >> result;
-# endif
-#endif /* MakeExportList */
-
-
-#if !defined(UseInstalled) && !defined(UseInstalledX11) \
- && !defined(UseImports) && !defined(ImportX11)
- /* we want this to be defined only when building X */
-
-# if OSMajorVersion < 5
-# if OSMajorVersion < 4
-/*
- * SharedLibReferences - variables for shared libraries
- */
-
-# ifndef SharedLibReferences
-# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-Concat3(DEP,varname,LIB) = /**/ @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-# endif
-
-# else /* OSMajorVersion < 4 */
-
-# ifndef SharedLibReferences
-# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-Concat3(DEP,varname,LIB) = /**/ @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-# endif
-
-# endif
-# else /* OSMajorVersion < 5 */
-
-# ifndef SharedLibReferences
-# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-Concat3(DEP,varname,LIB) = /**/ @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname), Concat3($(BUILDLIBDIR),/lib,libname.so)) @@\
-LintLibReferences(varname,libname,libsource)
-# endif
-
-# endif
-
-# if OSMajorVersion < 5
-# if OSMajorVersion < 4
-/*
- * SharedFontLibReferences - shared font libraries
- */
-
-# ifndef SharedFontLibReferences
-# define SharedFontLibReferences() @@\
-DEPFONTLIB = /**/ @@\
-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
-# endif
-# else
-# ifndef SharedFontLibReferences
-# define SharedFontLibReferences() @@\
-DEPFONTLIB = /**/ @@\
-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
-# endif
-# endif
-# else /* OSMajorVersion < 5 */
-# ifndef SharedFontLibReferences
-# define SharedFontLibReferences() @@\
-DEPFONTLIB = /**/ @@\
-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
-# endif
-
-# endif
-
-/*
- * SharedDSLibReferences - variables for shared libraries
- */
-# ifndef SharedDSLibReferences
-# define SharedDSLibReferences(varname,libname,libsource,revname,rev) @@\
-SharedLibReferences(varname,libname,libsource,revname,rev)
-# endif
-
-# if OSMajorVersion == 4
-/*
- * UnsharedLibReferences - variables for unshared libraries
- */
-# ifndef UnsharedLibReferences
-# define UnsharedLibReferences(varname,libname,libsource) @@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/lib,$(BUILDLIBDIR)/lib,libname.a) @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR)/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-# endif
-# endif
-
-#endif /* !defined(UseInstalled) && !defined(UseInstalledX11) ... */
-
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-# if OSMajorVersion < 5
-# define InstallSharedLibrary(libname,rev,dest) @@\
-InstallLibrary(libname,dest)
-# else /* OSMajorVersion < 5 */
-# define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so) $(DESTDIR)dest
-# endif /* OSMajorVersion < 5 */
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that the we do not hose people by having
- * the library gone for long periods.
- *
- * IBM uses an unusual shared object file name (shr4.o) in some libraries.
- * Duplicate this behavior to preserve compatibility with IBM's libraries.
- */
-#if OSMajorVersion < 5
-# if OSMajorVersion < 4
-
-# ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.a)) @@\
- @@\
-Concat(lib,libname.a): solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ shr.o shr4.o @@\
- (cd down; $(AR) up/$@~ solist) @@\
- dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\
- $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef @@\
- $(LN) shr.o shr4.o @@\
- $(RM) $@~ @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- $(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS) @@\
- $(RM) $@.syms $@ shr.o shr4.o @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
-
-# else /* OSMajorVersion < 4 */
-
-# ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.a)) @@\
- @@\
-Concat(lib,libname.a): solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
- RemoveFiles($@~ shr.o shr4.o) @@\
- (cd down; $(AR) up/$@~ solist) @@\
- MakeExportList(libname,libname.imp) @@\
- $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.imp -bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS) @@\
- $(LN) shr.o shr4.o @@\
- RemoveFile($@~) @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- $(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS) @@\
- RemoveFile($@) @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(libname.imp) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
-# endif /* OSMajorVersion < 4 */
-#else /* OSMajorVersion < 5 */
-# ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so)) @@\
- @@\
-Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(AR) $*.a solist @@\
- dump -g $*.a | sed -n -e 's/^[ ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms @@\
- $(LD) -bnoipath -bnoentry -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc @@\
- $(RM) $@ $*.a $*.syms @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-# endif /* SharedLibraryTarget */
-#endif /* OSMajorVersion < 5 */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#if OSMajorVersion < 5
-# if OSMajorVersion < 4
-
-# ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.a)) @@\
- @@\
-Concat(lib,libname.a): deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ shr.o shr4.o @@\
- (cd down; $(AR) up/$@~ solist) @@\
- dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\
- $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef @@\
- $(LN) shr.o shr4.o @@\
- $(RM) $@~ @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- $(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS) @@\
- $(RM) $@.syms $@ shr.o shr4.o @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
-
-# else /* OSMajorVersion < 4 */
-
-# ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.a)) @@\
- @@\
-Concat(lib,libname.a): deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
- RemoveFiles($@~ shr.o shr4.o) @@\
- (cd down; $(AR) up/$@~ solist) @@\
- MakeExportList(libname,libname.imp) @@\
- $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.imp -bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS) @@\
- $(LN) shr.o shr4.o @@\
- RemoveFile($@~) @@\
- case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\
- $(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS) @@\
- RemoveFile($@) @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(libname.imp) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
-
-# endif /* OSMajorVersion < 4 */
-#else /* OSMajorVersion < 5 */
-# ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so)) @@\
- @@\
-Concat(lib,libname.so): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(AR) $*.a solist @@\
- dump -g $*.a | sed -n -e 's/^[ ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms @@\
- $(LD) -bnoipath -bnoentry -bsymbolic -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc @@\
- $(RM) $@ $*.a $*.syms @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so) Concat(lib,libname.so)
-
-# endif /* SharedDepLibraryTarget */
-#endif /* OSMajorVersion < 5 */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
diff --git a/nx-X11/config/cf/ibmLib.tmpl b/nx-X11/config/cf/ibmLib.tmpl
deleted file mode 100644
index ff196aa5d..000000000
--- a/nx-X11/config/cf/ibmLib.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/ibmLib.tmpl,v 1.6 2005/05/19 18:53:42 ajax Exp $
-
-/*
- * AIX shared library template
- */
-
-XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3tsi Exp $
-
-/*
- * IBM used an unusual shared object file name in some libraries.
- * Mimic this behavior to preserve compatibility with IBM's libraries.
- */
-#ifndef IBMShr4Compatibility
-#define IBMShr4Compatibility YES
-#endif
-
-/*
- * Imake thinks lines with colons are the result of a broken cpp
- * inserting extra leading whitespace, so use ',' as a separator.
- */
-#if IBMShr4Compatibility
- SHR4OBJLIBS = X11,Xt,oldX,Xm,Mrm,Uil
-#endif
-
-#if ThreadedX
-#define SharedThreadReqs -lpthreads
-#define SharedX11Reqs -lpthreads
-#else
-#define SharedThreadReqs /**/
-#endif
-
-#define SharedXextReqs $(XONLYLIB)
-#define SharedXmuReqs $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(XLIBONLY)
-#define SharedOldXReqs $(XLIBONLY)
-#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) $(XPMLIB)
-#define SharedXaw7Reqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB)
-#define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXiReqs $(XLIB)
-#define SharedXtstReqs $(XLIB)
-#define SharedXieReqs $(XONLYLIB)
-#define SharedSMReqs $(ICELIB)
-#define SharedXpReqs $(XLIB)
-#define SharedXpmReqs $(XLIB)
-#define SharedDPSReqs $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(DPSLIB) $(XTOOLLIB) $(XLIB)
-#define SharedXrenderReqs $(XLIB)
-#define SharedXrandrReqs $(XRENDERLIB) $(XLIB)
-#define SharedXcursorReqs $(XRENDERLIB) $(XLIB)
-#define SharedxkbfileReqs $(XLIBONLY)
-#define SharedxkbuiReqs $(XLIBONLY) $(XKBFILELIB)
-#define SharedFontencReqs $(BUILDLIBDIR)/libz.a
-#define SharedXfontcacheReqs $(XLIB)
-#define SharedXfontReqs stubs/libfntstubs.a $(FREETYPE2LIB)
-#define SharedXfixesReqs $(XONLYLIB)
-#define SharedXdamageReqs $(XONLYLIB)
-#define SharedXcompositeReqs $(XONLYLIB)
-#define SharedXevieReqs $(XONLYLIB) $(EXTENSIONLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
-#define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs $(CXXLIB)
-#define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs $(CXXLIB)
-#define SharedDtSearchReqs $(LDPRELIBS) -lisode
-#define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs
-#define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv
-#define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs
-#define SharedDtTermReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv -lm
-#define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-#define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs
-
-#if !defined(UseInstalled) && !defined(UseInstalledX11) \
- && !defined(UseImports) && !defined(ImportX11)
- /* we want this to be defined only when building X */
-# ifndef FixupLibReferences
-# define FixupLibReferences() @@\
-DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a)
-# endif
-#endif
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST
-
-ICONVSYSLIB = -liconv
-
-#if (OSMajorVersion > 4) || ((OSMajorVersion == 4) && (OSMinorVersion >= 2))
-DYNLIBSYSLIB = -ldl
-#endif
-
diff --git a/nx-X11/config/cf/isc.cf b/nx-X11/config/cf/isc.cf
deleted file mode 100644
index b4078e4d1..000000000
--- a/nx-X11/config/cf/isc.cf
+++ /dev/null
@@ -1,284 +0,0 @@
-XCOMM $Xorg: isc.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes Exp $
-
-#ifndef HasGcc2
-#define HasGcc2 YES
-#endif
-
-/* INTERACTIVE UNIX SYSTEM (IUS) Version 3.x 4.x */
-
-#if IscVersion > 300
-# define ISCVerDef -DISC40 -DISC30
-# define OSVendor (IUS Version 4.x)
-#else
-# if IscVersion == 300
-# define ISCVerDef -DISC30
-# define OSVendor (ISC Version 3.0)
-# else
-# if IscVersion == 202
-# define OSVendor (ISC Version 2.0.2)
-# define ISCVerDef -DISC202
-# else
-# define OSVendor (ISC Version 2.2.1)
-# define ISCVerDef -DISC22
-# endif
-# endif
-#endif
-
-/* Disable the use of /var/X11 */
-#ifndef HasVarDirectory
-#define HasVarDirectory NO
-#endif
-
-/* Use mmap Driver */
-#ifndef HasSVR3mmapDrv
-# define HasSVR3mmapDrv YES
-#endif
-
-#ifndef BuildXF86DRI
-# define BuildXF86DRI NO
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-/*
- * disable building DRI support into video drivers, which can be done
- * even on platforms that don't have functional DRI support.
- * maybe not on ISC ? (mr 28.06.1999)
- */
-#ifndef BuildXF86DRIDriverSupport
-#define BuildXF86DRIDriverSupport NO
-#endif
-
-/* to use inline Math from linux ;-) package inline-math-2.6.tar.gz */
-/* you should first install the package, available on your favorite linux ftp */
-/* and define UseInlineMath YES inside host.def */
-#ifndef UseInlineMath
-# define UseInlineMath NO
-#endif
-
-/* You could use cbrt from liboptm.a (Interactive icc Compiler) */
-/* define to YES inside host.def */
-#ifndef HasCbrt
-# define HasCbrt NO
-#endif
-
-/* Use GNUs MallocLibrary */
-#ifndef UseGnuMalloc
-# define UseGnuMalloc NO
-#endif
-
-/* Install Zlib Headers - used in lib/zlib/Imakefile */
-#ifndef OsNeedZlibHeaders
-# define OsNeedZlibHeaders YES
-#endif
-
-/* Expand Manual Pages (needs S5L) */
-#ifndef ExpandManNames
-# define ExpandManNames NO
-#endif
-
-/* if you haven't groff or the TextProcessingWorkbench - do preformat*/
-#ifndef FormattedManPages
-# define FormattedManPages YES
-#endif
-
-#ifndef HasPosixRegex /* Need extra/regex since 3.9Ns */
-#define HasPosixRegex NO
-#endif
-
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-
-#ifndef CpuOption
-#define CpuOption -m486
-#endif
-
-/* gcc 2.7.2/2.8.1 tested Optimization Flags */
-#ifndef DefaultGcc2i386Opt
-#define DefaultGcc2i386Opt -O2 CpuOption -fno-strength-reduce GccWarningOptions
-#endif
-
-/* For a POSIXized build on Interactive maybe needed to use gcc2.7.2 */
-#ifndef UsePosix
-# define UsePosix YES
-#endif
-
-/* ISC 4.1Mu
-#define IscCompileVersion 410
-*/
-
-#if !defined(IscCompileVersion) && IscVersion < 410
-/* ISC 4.0 compatible */
-#define IscCompileVersion 400
-#endif
-
-#if IscCompileVersion == 400
-
-/* binaries which should run on ISC 4.0 or for the build on a real 4.0 System */
-# define UseChmod YES
-
-/* for compatibility with ISC 4.0 - reported by Ami Fischmann */
-/* troubles when linking with libX11.a build on ISC4.1 and used with 4.0 */
-# define HasSnprintf NO
-# define UseXwctomb YES
-
-#endif
-
-#if defined(UseXwctomb)
-# define XwctombDefine -DUSE_XMBTOWC
-#else
-# define XwctombDefine
-#endif
-
-#if defined(UseChmod)
-# define IscCompatDefines XwctombDefine -DUSE_CHMOD
-#else
-# define IscCompatDefines XwctombDefine
-#endif
-
-#ifdef UsePosix
-# define PosixDefines -posix -D_SYSV3 -D_POSIX_SOURCE
-#else
-# define PosixDefines
-#endif
-
-#define OSDefines -DISC ISCVerDef IscCompatDefines
-
-/*
-#define OSName Unix System V/386 Release 3.2
-#define OSMajorVersion 3
-#define OSMinorVersion 2
-*/
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-#ifndef OSName
-#define OSName INTERACTIVE UNIX System V/386 Release 3.2
-#endif
-
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/* Note, cpp already does -Di386 */
-#define BootstrapCFlags OSDefines -DSYSV
-
-#if IscVersion > 202
-# define LocalLibraries -lpt
-# define PosixLibraries -lcposix
-#else
-# define LocalLibraries MallocLibrary -lpt
-# define PosixLibraries
-#endif
-
-#define SocketLibraries -linet
-
-#ifndef GnuMallocLibrary
-#ifndef UseIscLd
-# define GnuMallocLibrary -L/usr/local/lib -lgnumalloc
-#else
-# define GnuMallocLibrary /usr/local/lib/libgmalloc.a
-#endif
-#endif
-
-#ifndef MallocLibrary
-# if UseGnuMalloc
-# define MallocLibrary GnuMallocLibrary
-# else
-# define MallocLibrary -lmalloc
-# endif
-#endif
-
-#ifndef ExtraLibraries
-# if UseGnuMalloc
-# define ExtraLibraries SocketLibraries LocalLibraries MallocLibrary PosixLibraries
-# else
-# define ExtraLibraries SocketLibraries LocalLibraries PosixLibraries
-# endif
-#endif
-
-#if UseXwctomb
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#else
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if HasCbrt
-#define MathLibrary -loptm
-#endif
-
-#ifdef UseInlineMath
-#define InlineMathDefines -DUseInlineMath
-#if !HasCbrt
-#define ServerExtraSysLibs $(CBRT) MathLibrary
-#endif
-#else
-#define InlineMathDefines
-#endif
-
-#ifndef ServerExtraSysLibs
-#define ServerExtraSysLibs $(CBRT)
-#endif
-
-#define ServerExtraDefines SVR3mmapFlags XFree86ServerDefines
-
-#if IscVersion > 300
-# ifndef HasSymLinks
-# define HasSymLinks YES
-# endif
-#endif
-
-#define HasShm YES
-
-#ifndef HasSnprintf
-#define HasSnprintf YES
-#endif
-
-#ifndef HasLibCrypt
-#define HasLibCrypt YES
-#define SpecialLibCrypt -lcrypt
-#endif
-
-#ifndef DefaultCDebugFlags
-# if HasGcc2
-# define DefaultCDebugFlags DefaultGcc2i386Opt PosixDefines InlineMathDefines
-# else
-# define DefaultCDebugFlags -O PosixDefines InlineMathDefines
-# endif
-#endif
-
-#if HasGcc2
-# define CcCmd gcc
-#endif
-
-#ifndef DefaultCplusplusOptions
-#define DefaultCplusplusOptions -fno-implicit-templates
-#endif
-
-#ifndef ConnectionFlags
-#define ConnectionFlags -DLOCALCONN -DTCPCONN
-/* -DSTREAMSCONN -DUNIXCONN -- does not work on ISC SVR3 */
-#endif
-
-#define CompressManCmd $(COMPRESS) -v
-
-#define XmanSearchPath /usr/catman
-
-#ifndef RemoveDSDENroffMacros
-#define RemoveDSDENroffMacros YES
-#endif
-
-#include <svr3.cf>
-
diff --git a/nx-X11/config/cf/lnxdoc.rules b/nx-X11/config/cf/lnxdoc.rules
deleted file mode 100644
index a538920df..000000000
--- a/nx-X11/config/cf/lnxdoc.rules
+++ /dev/null
@@ -1,145 +0,0 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.27 2003/01/15 03:17:29 dawes Exp $
-XCOMM
-XCOMM Rules for formatting Linuxdoc-SGML documentation
-XCOMM
-
-#include <lnxdoc.tmpl>
-
-#ifdef DontInstallLinuxDoc
-#define LinuxDocInstall(file,dest) /* do nothing */
-#define LinuxDocInstallMultiple(files,dest) /* do nothing */
-#define LinuxDocInstallIfExists(file,dest) /* do nothing */
-#else
-#define LinuxDocInstall(file,dest) InstallNonExecFile(file,dest)
-#define LinuxDocInstallMultiple(files,dest) @@\
-InstallMultipleDest(install,files,dest)
-
-#define LinuxDocInstallIfExists(file,dir) @@\
-install:: @@\
- MakeDir($(DESTDIR)dir) @@\
- @if [ -f file ]; then set -x; \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) \ @@\
- file $(DESTDIR)dir; \ @@\
- fi
-#endif
-
-/* Version for sgmlfmt */
-
-#if BuildLinuxDocPS
-#define LinuxDocSgmlToPs(sgmlfile,base) @@\
-all:: base.ps PdfTarget(base) @@\
- @@\
-base.ps: sgmlfile $(SGMLDEPENDS) @@\
- RemoveFile(_$@ $@) @@\
- @(BASE=`basename sgmlfile .sgml`;\ @@\
- set -x;\ @@\
- RemoveFile($$BASE.ps);\ @@\
- $(SGMLFMTCMD) -f ps sgmlfile && \ @@\
- $(MV) $$BASE.ps _$@ && $(MV) _$@ $@) @@\
- @@\
-LinuxDocInstall(base.ps,$(XFREE86PSDOCDIR)) @@\
- @@\
-ConvertPsToPdf(base) @@\
- @@\
-LinuxDocInstallIfExists(base.pdf,$(XFREE86PDFDOCDIR)) @@\
- @@\
-clean:: @@\
- RemoveFile(Concat(_,base.ps) base.ps)
-#else
-#define LinuxDocSgmlToPs(sgmlfile,base) /**/
-#endif
-
-#if BuildLinuxDocText
-#define LinuxDocSgmlToText(sgmlfile,textfile) @@\
-AllTarget(textfile) @@\
- @@\
-textfile: sgmlfile $(SGMLDEPENDS) @@\
- RemoveFiles(_$@ $@) @@\
- @(BASE=`basename sgmlfile .sgml`;\ @@\
- set -x;\ @@\
- RemoveFile($$BASE.latin1);\ @@\
- $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \ @@\
- $(CVSIDENTFIX) < $$BASE.latin1 | $(XORGIDENTFIX) | $(XFREE86IDENTFIX) > _$@ && $(MV) _$@ $@ && \ @@\
- RemoveFile($$BASE.latin1)) @@\
- @@\
-LinuxDocInstall(textfile,$(XFREE86DOCDIR)) @@\
- @@\
-clean:: @@\
- @(file=textfile; set -x; RemoveFiles(_$$file $$file))
-#else
-#define LinuxDocSgmlToText(sgmlfile,textfile) /**/
-#endif
-
-#if BuildLinuxDocHtml
-#define LinuxDocSgmlToHtml(sgmlfile,base) @@\
-AllTarget(base.html) @@\
- @@\
-base.html: sgmlfile $(SGMLDEPENDS) @@\
- @if [ sgmlfile != base.sgml ]; then $(LN) sgmlfile base.sgml; fi @@\
- RemoveFiles(base*.html) @@\
- $(SGMLFMTCMD) -f html base.sgml || RemoveFile($@) @@\
- @if [ sgmlfile != base.sgml ]; then RemoveFile(base.sgml); fi @@\
- @@\
-LinuxDocInstallMultiple(base*.html,$(XFREE86HTMLDOCDIR)) @@\
- @@\
-clean:: @@\
- RemoveFiles(base*.html)
-#else
-#define LinuxDocSgmlToHtml(sgmlfile,base) /**/
-#endif
-
-/*
- * Rule for maintainers to use to updated formatted copies of docs in the
- * source tree. Use with care.
- */
-
-#ifndef UpdateFormattedDocLong
-#define UpdateFormattedDocLong(textfile,dstdir,dstfile) @@\
-update.docs:: textfile @@\
- -@if [ -f dstdir/dstfile ]; then \ @@\
- if [ "$(FORCEUPDATE)" = yes ]; then set -x; \ @@\
- if [ "$(FOLLOWLINK)" = no ]; then \ @@\
- $(RM) dstdir/dstfile; \ @@\
- fi; \ @@\
- cp textfile dstdir/dstfile; \ @@\
- echo "" >> dstdir/dstfile; \ @@\
- echo "\$$XdotOrg\$$" >> dstdir/dstfile; \ @@\
- else \ @@\
- $(RM) __tmp1__ __tmp2__; \ @@\
- fgrep -v "\$$XdotOrg:" textfile > __tmp1__; \ @@\
- fgrep -v "\$$XdotOrg:" dstdir/dstfile > __tmp2__; \ @@\
- if diff -B __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \ @@\
- else set -x; \ @@\
- if [ "$(FOLLOWLINK)" = no ]; then \ @@\
- $(RM) dstdir/dstfile; \ @@\
- fi; \ @@\
- cp textfile dstdir/dstfile ; \ @@\
- echo "" >> dstdir/dstfile; \ @@\
- echo "\$$XdotOrg"": \$$" >> dstdir/dstfile; \ @@\
- fi; \ @@\
- fi; \ @@\
- fi @@\
- @$(RM) __tmp1__ __tmp2__
-#endif
-
-#ifndef UpdateFormattedDoc
-#define UpdateFormattedDoc(textfile,dstdir) @@\
-UpdateFormattedDocLong(textfile,dstdir,textfile)
-#endif
-
-/*
- * Avoid using LinuxDocTargetLong with base != sgmlfile because HTML
- * index generation assumes that base == sgmlfile.
- */
-#define LinuxDocTargetLong(sgmlfile,textfile,base) @@\
-LinuxDocSgmlToText(sgmlfile,textfile) @@\
-LinuxDocSgmlToHtml(sgmlfile,base) @@\
-LinuxDocSgmlToPs(sgmlfile,base) @@\
-UpdateFormattedDoc(textfile,$(FORMATTEDDIR))
-
-#define LinuxDocReadmeTarget(base) @@\
-LinuxDocTargetLong(base.sgml,ReadmeFile(base),base)
-
-#define LinuxDocTarget(base) @@\
-LinuxDocTargetLong(base.sgml,base,base)
-
diff --git a/nx-X11/config/cf/lnxdoc.tmpl b/nx-X11/config/cf/lnxdoc.tmpl
deleted file mode 100644
index af5faf385..000000000
--- a/nx-X11/config/cf/lnxdoc.tmpl
+++ /dev/null
@@ -1,85 +0,0 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.11tsi Exp $
-XCOMM
-
-#ifndef HasSgmlFmt
-#define HasSgmlFmt NO
-#endif
-
-#ifndef HasLinuxDoc
-#define HasLinuxDoc NO
-#endif
-
-#ifndef DoSgmlDocs
-#define DoSgmlDocs (HasLinuxDoc || HasSgmlFmt)
-#endif
-
-#ifndef XFree86IdentFix
-#define XFree86IdentFix sed -e '/\$$\XFree86:/s/....\/..\/.. ..:..:.. *//' \
- -e '/\$$\XFree86:/s/\$$/Generated from /'
-#endif
-
-#ifndef XorgIdentFix
-#define XorgIdentFix sed -e '/\$$\XdotOrg:/s/....\/..\/.. ..:..:.. *//' \
- -e '/\$$\XdotOrg:/s/\$$/Generated from /'
-#endif
-
-#ifndef CVSIdentFix
-#define CVSIdentFix sed -e '/\$$\Id:/s/....\/..\/.. ..:..:.. *//' \
- -e '/\$$\Id:/s/\$$/Generated from /'
-#endif
-
-#ifndef HasLatex
-#define HasLatex NO
-#endif
-
-#ifndef SgmlFmtCmd
-#define SgmlFmtCmd sgmlfmt
-#endif
-
-#ifndef HasDvips
-#define HasDvips NO
-#endif
-
-#ifndef DvipsOptions
-#define DvipsOptions /**/
-#endif
-
-#ifndef DvipsCmd
-#define DvipsCmd dvips
-#endif
-
-#ifndef BuildLinuxDocText
-#define BuildLinuxDocText DoSgmlDocs
-#endif
-
-#ifndef BuildLinuxDocHtml
-#define BuildLinuxDocHtml DoSgmlDocs
-#endif
-
-#ifndef BuildLinuxDocPS
-#define BuildLinuxDocPS DoSgmlDocs
-#endif
-
-#ifndef BuildSgmlDocs
-#define BuildSgmlDocs DoSgmlDocs
-#endif
-
-#ifndef ReadmeFile
-#define ReadmeFile(base) README.base
-#endif
-
-
- XFREE86IDENTFIX = XFree86IdentFix
- XORGIDENTFIX = XorgIdentFix
- CVSIDENTFIX = CVSIdentFix
- DVIPS = DvipsCmd
- DVIPSOPTIONS = DvipsOptions
- SGMLFMTCMD = SgmlFmtCmd
-
-XCOMM Some extra things to clean
-
-#ifdef ExtraFilesToClean
-#undef ExtraFilesToClean
-#endif
-#define ExtraFilesToClean *.aux *.dvi *.log *.tex *.toc *.html *.ps *.latin1
-
diff --git a/nx-X11/config/cf/luna.cf b/nx-X11/config/cf/luna.cf
deleted file mode 100644
index 8ca01b2b7..000000000
--- a/nx-X11/config/cf/luna.cf
+++ /dev/null
@@ -1,115 +0,0 @@
-XCOMM platform: $Xorg: luna.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-/*
- * Please set the values for OSMajorVerion and OSMinorVersion
- * before making makefiles.
- *
- * The Luna version of the make program doesn't define the standard
- * macro MAKE, so you must run it as "make MAKE=make" at top level,
- * e.g., "make MAKE=make World"
- */
-
-#ifdef Mc68000Architecture
-# ifdef luna2
-#ifndef OSName
-#define OSName Mach 2.5 Vers 1.40
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 1
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 40
-#endif
-# else
-#ifndef OSName
-#define OSName UNIOS-B 4.3BSD UNIX: 2.00
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 2
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#define DirFailPrefix -
-# endif
-#else /* Mc88000Architecture */
-#ifndef OSName
-#define OSName Mach 2.5 Vers 2.00.1
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 2
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 1
-#endif
-#endif
-XCOMM operating system: OSName
-
-#define HasBsearch NO
-#define HasVoidSignalReturn NO
-#define HasGcc YES
-#define HasCThreads YES
-#define HasThreadSafeAPI NO
-#define Malloc0ReturnsNull HasCThreads /* -lthreads fails, -lc works */
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define BootstrapCFlags -DUSE_CC_E -DNFS_STDOUT_BUG
-
-#define ThreadsLibraries -lthreads -lmach
-#define ThreadsCplusplusLibraries -lthreads -lmach
-
-#define PrimaryScreenResolution 100
-#define BuildXKB YES
-
-#ifdef Mc68000Architecture
-#ifdef luna2
-#if ((OSMajorVersion <= 1) && (OSMinorVersion < 40))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL
-#endif
-#else /* luna1 */
-#if ((OSMajorVersion <= 1) && (OSMinorVersion <= 60))
-#define StandardDefines -Dluna -Duniosb
-#endif
-#if ((OSMajorVersion < 2) || ((OSMajorVersion == 2) && (OSMinorVersion < 1)))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL
-#endif
-#endif /* luna2 */
-#if HasGcc
-#define OptimizedCDebugFlags -O -traditional
-#define ServerCDebugFlags -Dmc68020 -O -traditional
-#else /* cc */
-#define OptimizedCDebugFlags -O -Z18
-#define ServerCDebugFlags -Dmc68020 -O -Z18
-#endif /* HasGcc */
-#endif /* Mc68000Architecture */
-
-
-#ifdef Mc88000Architecture
-#if ((OSMajorVersion <= 1) && (OSMinorVersion <= 12))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL
-#endif
-#define HasNdbm YES
-#define ExtraLibraries -li18n
-#if HasGcc
-#define CcCmd gcc -fstrength-reduce
-#define PreIncDir /usr/local/lib/gcc/gcc-include
-#define OptimizedCDebugFlags -O2 /* -traditional */
-#else
-#define PreIncDir /usr/lib/ccom/include
-#endif
-#define PostIncDir /usr/mach/include
-#endif
-
-#ifdef Mc68000Architecture
-#define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */
-#define XlunaServer YES
-#endif
-
-#ifdef Mc88000Architecture
-#define XlunaServer YES
-#endif
-
-#if ((OSMajorVersion >= 2) && (OSMinorVersion >= 0) && (OSTeenyVersion >= 1))
-#define HasWChar32 YES
-#endif
diff --git a/nx-X11/config/cf/lynx.cf b/nx-X11/config/cf/lynx.cf
deleted file mode 100644
index 2668a362e..000000000
--- a/nx-X11/config/cf/lynx.cf
+++ /dev/null
@@ -1,421 +0,0 @@
-XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.47 2003/04/24 22:14:53 herrb Exp $
-
-
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSVendor
-#define OSVendor (LynuxWorks Inc.)
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#ifndef HasSetenv
-#define HasSetenv NO
-#endif
-
-#if OSMajorVersion > 2
-#define HasGcc2 YES
-#endif
-
-#ifndef HasGcc2
-#define HasGcc2 NO
-#endif
-
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2)
-# ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus YES
-# endif
-#endif
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus YES
-#endif
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define HasShadowPasswd NO
-#ifndef HasLibCrypt
-# define HasLibCrypt NO
-#endif
-#define HasPutenv YES
-#define HasSutenv NO
-#define HasSnprintf NO
-#define HasShm YES
-#define HasSockets YES
-#define HasVFork NO
-#define HasVarDirectory NO
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 4)
-# define HasBSD44Sockets YES
-#endif
-#define HasStickyDirBit NO
-#ifndef HasPosixRegex
-# define HasPosixRegex NO
-#endif
-#ifndef HasPerl
-# define HasPerl NO
-#endif
-#ifndef HasFreetype2
-# define HasFreetype2 NO
-#endif
-
-#if OSMajorVersion <= 2
-# define USE_MACHINE_ABSOLUTE
-#endif
-
-/* At least on x86 we're seeing spurious server crashes when
- * using signals (SmartScheduler, SilkenMouse) starting with
- * LynxOS 3.1.0.
- */
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion == 1)
-# ifndef UseSmartScheduler
-# define UseSmartScheduler NO
-# endif
-#endif
-
-#ifdef UseSmartScheduler
-/* pull in real sigio in os-support instead of sigiostubs */
-# define AllowSIGIO YES
-#endif
-
-#define HasPosixThreads YES
-#define ThreadedX YES
-#define HasThreadSafeAPI YES
-#if HasGcc2
-# if OSMajorVersion == 2 && OSMinorVersion == 3
-# define ThreadsCompileFlags -mposix -mthreads
-# define ThreadsCplusplusCompileFlags -mposix -mthreads
-# else
-# define ThreadsCompileFlags -mthreads
-# define ThreadsCplusplusCompileFlags -mthreads
-# endif
-#else
-# define ThreadsCompileFlags -m
-# define ThreadsCplusplusCompileFlags -m
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion < 3
-# define ThreadsLibraries /lib/thread/libc.a /lib/thread/libc_p.a
-#endif
-#if (OSMajorVersion == 3 && OSMinorVersion == 0) || (OSMajorVersion == 2 && OSMinorVersion <= 5)
-# define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
-#endif
-#define AvoidNullMakeCommand YES
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2)
-#define StripInstalledPrograms YES
-#else
-/* under LynxOS AT V2.x /bin/strip will leave file.unstripped around
- * and fail if installing across different file systems
- */
-#define StripInstalledPrograms NO
-#endif
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull NO
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-#define MkdirHierCmd mkdir -p
-#define DirFailPrefix -
-
-#if HasGcc2
-# if OSMajorVersion == 2 && OSMinorVersion == 3
-# define CplusplusCmd g++ -mposix
-# define CcCmd gcc -mposix
-# else
-# define CplusplusCmd g++
-# define CcCmd gcc
-# endif
-# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion == 5)
-# if defined(UseInstalled)
-# define DefaultCCOptions -fcommon -D__NO_INCLUDE_WARN__
-# else
-# define DefaultCCOptions -ansi -pedantic -fcommon -D__NO_INCLUDE_WARN__ GccWarningOptions
-# endif
-# endif
-#else
-# define CplusplusCmd g++
-# define CcCmd gcc
-# define DefaultCCOptions -ansi GccWarningOptions
-# define GccGasOption -DGCCUSESGAS /* For SuperProbe */
-#endif
-#define AsCmd as
-#define LdCmd ld
-#define AsmDefines -DUSE_GAS
-#if OSMajorVersion < 4
-# define CppCmd /lib/cpp
-#else
-# define CppCmd /bin/cpp
-#endif
-#define RawCppCmd CppCmd
-#if !CrossCompiling
-#define YaccCmd bison -y
-/* make sure we take the right flex on 2.3.0 and 2.4.0 */
-#define LexCmd /bin/flex
-#endif
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 5)
-# define LexLib -lfl
-#else
-# define LexLib /**/
-#endif
-#define HasFlex YES
-/* On LynxOS AT 2.3.0 /lib/libm.a is a symbolic link to /lib/libc.a, so we
- * screw up some POSIX functionality when -lm comes before -lc_p in our
- * ld argument list. For LynxOS-AT we don't need -lm but for others we
- * do (e.g. SPARC)
- */
-#if OSMajorVersion == 2 && OSMinorVersion == 3
-# define MathLibrary -lc_p -lm
-# define TermcapLibrary -lc_p -ltermcap
-#else
-# define MathLibrary -lm
-# define TermcapLibrary -ltermcap
-#endif
-#define PreProcessCmd CcCmd -E
-#if HasGcc2
-# define PostIncDir DefaultGccIncludeDir
-#endif
-#define LdCombineFlags -r
-#if HasGcc2
-# ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-#else
-# define OptimizedCDebugFlags -O
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion <= 2
-# define StandardDefines -DLynx -DLynx_22 -DX_NOT_POSIX
-#else
-# if defined(i386Architecture)
-/* need __i386__ for 2.5.0 AT and higher */
-# if OSMajorVersion <= 3
-# define StandardDefines -DLynx -DX_LOCALE -D__i386__ -DNO_MMAP
-# else
-# define StandardDefines -DLynx -DX_LOCALE -D__i386__
-# endif
-# else
-# if OSMajorVersion <= 3
-# define StandardDefines -DLynx -DX_LOCALE -DNO_MMAP
-# else
-# define StandardDefines -DLynx -DX_LOCALE
-# endif
-# endif
-#endif
-
-#define StandardCppOptions -traditional
-#define StandardCppDefines StandardDefines
-#if defined(i386Architecture) || defined(PpcArchitecture)
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-# if OSMajorVersion == 2 && OSMinorVersion < 5
-# define XkbServerDefines -DNEED_POPEN_WORKAROUND
-# endif
-#else
-# if defined(SparcArchitecture)
-# define SparcConsoleDefines /* -DPATCHED_CONSOLE */
-# define ServerOSDefines -DDDXOSINIT
-# define ServerExtraDefines -DGCCUSESGAS SparcConsoleDefines
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-# else
-# define ServerOSDefines /**/
-# define ServerExtraDefines -DGCCUSESGAS
-# endif
-#endif
-#define ServerExtraSysLibs $(CBRT) MathLibrary
-#define ConnectionFlags -DUNIXCONN -DTCPCONN
-#if OSMajorVersion <= 2 && OSMinorVersion < 5
-# define ExtraLibraries -lbsd
-#else
-# define ExtraLibraries -lbsd -llynx
-#endif
-#if !HasGcc2
-# define ExtraLoadFlags -k
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion <= 2
-# define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-/* If you have the mtrr driver installed you might want to enable this */
-#ifndef HasMTRRSupport
-#define HasMTRRSupport NO
-#endif
-
-#if (defined(i386Architecture) || defined(PpcArchitecture)) && (OSMajorVersion > 2 || OSMinorVersion > 2)
-# ifndef DoLoadableServer
-# define DoLoadableServer YES
-# endif
-#endif
-
-
-/* define HasMotif to YES for LynxOS with Motif
- * installed according to the notes in README.LynxOS.
- */
-#ifndef HasMotif
-# define HasMotif NO
-#endif
-#ifndef MetroLink
-/* We handle the Motif stuff elsewhere */
-#if HasMotif
-# ifndef UseInstalledMotif
-# define UseInstalledMotif YES
-# endif
-# ifndef SaberProgramTarget
-# define SaberProgramTarget(program,srclist,objlist,locallibs,syslibs) /**/
-# endif
-# define LocalTmplFile <Motif.tmpl>
-# define LocalRulesFile <Motif.rules>
-#endif
-#endif
-
-#define ManSourcePath $(MANPATH)/cat
-
-#ifndef ManSuffix
-# define ManSuffix 1
-#endif
-#ifndef ManDir
-# define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix 3
-#endif
-#ifndef LibmanDir
-# define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix 5
-#endif
-#ifndef FileManDir
-# define FileManDir $(MANSOURCEPATH)5
-#endif
-
-#define HasGroff YES
-
-/* groff 1.09 compiles right out of the box with LynxOS 2.3,
- * so if you want to have manual pages you should install groff 1.09
- * before you run 'make install.man'
- */
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest) @@\
-BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-install.man:: file.$(MANNEWSUFFIX) @@\
- MakeDir($(DESTDIR)destdir) @@\
- $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\
- groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
- echo dest dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX) @@\
- gawk ' \ @@\
- /^\.SH[ ]*NAME/ { \ @@\
- getline; sub("\\\\", "(" p ") "); print; exit \ @@\
- }' p=$(MANSUFFIX) file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\
- $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
- @@\
-install.man:: @@\
- @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\
- for i in aliases; do (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.*; \ @@\
- (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
- $$i.$${SUFFIX})); \ @@\
- echo $$i dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX); \ @@\
- done)
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
-BuildInstallHtmlManPage(file,dest,suffix) @@\
- @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-install.man:: file.$(MANNEWSUFFIX) @@\
- MakeDir($(DESTDIR)destdir) @@\
- $(RM) $(DESTDIR)destdir/dest.suffix* @@\
- groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\
- echo dest dest suffix >> $(DESTDIR)destdir/Concat(LIST,suffix) @@\
- gawk ' \ @@\
- /^\.SH[ ]*NAME/ { \ @@\
- getline; sub("\\\\", "(" p ") "); print; exit \ @@\
- }' p=suffix file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\
- $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest) @@\
-install.man:: list @@\
- MakeDir($(DESTDIR)dest) @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (MNAME=`echo $$i | cut -f1 -d.`; \ @@\
- set -x; \ @@\
- $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\
- groff -e -t -man -Tascii $$i >/tmp/$$i; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
- echo $${MNAME} $${MNAME} $(MANSUFFIX) >> $(DESTDIR)dest/LIST$(MANSUFFIX)\ @@\
- gawk ' \ @@\
- /^\.SH[ ]*NAME/ { \ @@\
- getline; sub("\\\\", "(" p ") "); print; exit \ @@\
- }' p=$(MANSUFFIX) $$i >> $(DESTDIR)dest/../whatis \ @@\
- $(RM) /tmp/$$i); \ @@\
- done
-#endif
-
-/*
- * Definitions for the SUN server on LynxOS SPARC
- */
-#ifdef SparcArchitecture
-# define XsunLynxServer YES
-# define XsunLynxMonoServer NO
-# ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary YES
-# endif
-# if BuildXInputExt
-# undef BuildXInputExt
-# endif
-# define BuildXInputExt NO
-# define BuildXF86MiscExt NO
-# define BuildXF86VidModeExt NO
-/*
- * XFree86 uses its own (more portable) database routines to speed up
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in
- * site.def
- */
-# ifndef UseRgbTxt
-# define UseRgbTxt YES
-# endif
-#endif
-
-#if !defined(i386Architecture) && !defined(PpcArchitecture)
-# define BuildXF86DGA NO
-#endif
-
-#if 0
-#include <lynxLib.rules>
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/macII.cf b/nx-X11/config/cf/macII.cf
deleted file mode 100644
index 8b0ce689b..000000000
--- a/nx-X11/config/cf/macII.cf
+++ /dev/null
@@ -1,51 +0,0 @@
-XCOMM platform: $Xorg: macII.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifndef OSName
-#define OSName A/UX 3.0.1
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 1
-#endif
-XCOMM operating system: OSName
-
-#if HasGcc
-#define BootstrapCFlags -DmacII
-#endif
-#define SystemV YES
-#define HasPoll NO
-#define NeedBerklib YES
-#define ExtraLibraries $(XBSDLIB) -lposix -lm -lmr
-#define Malloc0ReturnsNull YES
-#define StandardDefines -DmacII -DSYSV
-#define ExecableScripts NO
-#define RemoveTargetProgramByMoving YES
-#define ExpandManNames YES
-#define XmacIIServer YES
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#if MacHasc89
-#define CcCmd c89 -D_POSIX_SOURCE
-#else
-#define HasVoidSignalReturn NO
-#endif
-#if OSMajorVersion <= 2
-#define ServerExtraDefines -DSUPPORT_2_0
-#endif
-#define InstKmemFlags -g sys -m 2711
-#define ExtensionOSDefines -DXTESTEXT1
-
-#if !HasGcc
-#define DefaultCCOptions -A 3
-#endif
-
-/*
- * If you wish to override the man page directories, do so here using just
- * one tab between the parameter name (e.g. ManDirectoryRoot) and the
- * value so that cpp doesn't get confused.
- */
-#define ManDirectoryRoot /usr/catman/u_man
diff --git a/nx-X11/config/cf/mach.cf b/nx-X11/config/cf/mach.cf
deleted file mode 100644
index 1347e7da9..000000000
--- a/nx-X11/config/cf/mach.cf
+++ /dev/null
@@ -1,76 +0,0 @@
-XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.12 2001/01/17 16:22:32 dawes Exp $
-
-#define OSName Mach 2.5/3.0
-#define OSVendor /**/
-XCOMM operating system: OSName
-#define OSMajorVersion 1
-#define OSMinorVersion 1
-
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define UseGccMakeDepend YES
-
-#define CcCmd gcc
-#define CppCmd /usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
-#define PreProcessCmd /usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
-#define DefaultCCOptions /**/
-#define GccGasOption -DGCCUSESGAS
-
-#define AsmDefines -DUSE_GAS
-#define BootstrapCFlags -DNOSTDHDRS
-#define ExtensionOSDefines /* -DXTESTEXT1 */
-#define ServerExtraSysLibs /usr/lib/libmach.a
-#ifdef i386Architecture
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#else
-#define ServerExtraDefines GccGasOption
-#endif
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#define StandardDefines -DNOSTDHDRS -DMACH386
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-
-#define AvoidNullMakeCommand YES
-#define CompressAllFonts YES
-#define DirFailPrefix -
-#define HasNdbm YES
-#define HasPutenv YES
-#define Malloc0ReturnsNull YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-#define StripInstalledPrograms YES
-
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary /* -lgnumalloc */
-#endif
-
-#ifdef InstallCmd
-#undef InstallCmd
-#endif
-#define InstallCmd /usr/bin/install
-
-#ifndef PreIncDir
-# define PreIncDir /usr/include
-#endif
-
-#define HasGroff YES
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#ifdef i386Architecture
-# include <xorg.cf>
-#endif
diff --git a/nx-X11/config/cf/mingw.cf b/nx-X11/config/cf/mingw.cf
deleted file mode 100644
index a9cdedc53..000000000
--- a/nx-X11/config/cf/mingw.cf
+++ /dev/null
@@ -1,551 +0,0 @@
-/* MingGW vendor strings and version */
-#include "xorgversion.def"
-
-#ifndef CygxVersionMajor
-# define CygxVersionMajor XORG_VERSION_MAJOR
-#endif
-#ifndef CygxVersionMinor
-# define CygxVersionMinor XORG_VERSION_MINOR
-#endif
-#ifndef CygxVersionPatch
-# define CygxVersionPatch XORG_VERSION_PATCH
-#endif
-#ifndef CygxVersionSnap
-# define CygxVersionSnap XORG_VERSION_SNAP
-#endif
-#ifndef CygxVersionServer
-# define CygxVersionServer 0
-#endif
-
-#ifndef CygxVersion
-# define CygxVersion (10000000 * CygxVersionMajor + 100000 * CygxVersionMinor + 1000 * CygxVersionPatch + CygxVersionSnap)
-#endif
-
-#ifndef CygxVersionString
-# define CygxVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap%CygxVersionServer| sed -e 's/ /./g' -e 's/%/-/g'`
-#endif
-
-#ifndef CygxManVersionString
-# define CygxManVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap| sed -e 's/ /./g' -e 's/^/Version\\\ /'`
-#endif
-
-#ifndef XVendorString
-# define XVendorString "The Cygwin/X Project"
-#endif
-#ifndef XVendorRelease
-# define XVendorRelease CygxVersion
-#endif
-#ifndef XVendorManVersionString
-# define XVendorManVersionString CygxManVersionString
-#endif
-#ifndef XVendorManNameString
-# define XVendorManNameString "Xming"
-#endif
-#ifndef XVendorContact
-# define XVendorContact "win32-x11@sources.redhat.com"
-#endif
-
-/* Operating system strings and version */
-#ifndef OSName
-# define OSName Windows
-#endif
-#ifndef OSVendor
-# define OSVendor Microsoft
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-
-#ifndef ProjectRoot
-# define ProjectRoot /usr/X11R6
-#endif
-
-/*
- * GNU Compiler stuff
- */
-#ifndef HasGcc3
-# define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-# define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-# define HasGcc HasGcc2
-#endif
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus HasGcc2
-#endif
-
-#if HasGcc
-# ifndef Gcc28Warnings
-# if (GccMajorVersion > 2) || \
- ((GccMajorVersion == 2) && (GccMinorVersion >= 8))
-# define Gcc28Warnings -Wundef
-# else
-# define Gcc28Warnings /* */
-# endif
-# ifndef HasGcc33
-# if (((GccMajorVersion == 3) && (GccMinorVersion >= 3)) || \
- (GccMajorVersion > 3))
-# define HasGcc33 YES
-# else
-# define HasGcc33 NO
-# endif
-# endif
-# ifndef HasGcc34
-# if (((GccMajorVersion == 3) && (GccMinorVersion >= 4)) || \
- (GccMajorVersion > 3))
-# define HasGcc34 YES
-# else
-# define HasGcc34 NO
-# endif
-# endif
-# endif
-# ifndef GccWarningOptions
-# if XFree86Devel
-# define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wredundant-decls -Wnested-externs Gcc28Warnings
-# else
-# define GccWarningOptions -Wall -Wpointer-arith Gcc28Warnings
-# endif
-# endif
-# ifndef DefaultCCOptions
-# if defined(UseInstalled)
-# define DefaultCCOptions
-# else
-# define DefaultCCOptions GccWarningOptions
-# endif
-# endif
-# if defined(UseInstalled)
-# ifndef UseGccMakeDepend
-# define UseGccMakeDepend YES
-# endif
-# endif
-#endif
-
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define UnixCpp /* Just a flag that affects Concat macros in Imake.rules */
-#define HasShadowPasswd NO
-#define HasLibCrypt YES
-#define HasPutenv YES
-#define HasFchown NO
-#define HasPoll NO
-#if (OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion >= 5)
-# define HasStrlcat YES
-#endif
-#define HasShm NO
-
-/* snprintf from windows runtime does return -1 if the buffer is to small */
-#define HasSnprintf NO
-
-#define HasFfs NO
-
-#ifndef HasMakefileSafeInclude
-# define HasMakefileSafeInclude YES
-#endif
-
-#define Hastcl NO
-#define Hastk NO
-
-#define HasSockets NO
-#define GzipFontCompression YES
-#define HasZlib NO
-#define HasFreetype2 NO
-
-/* We don't need -lm */
-#define MathLibrary /**/
-
-/*
- * /lib/libtermcap.a doesn't have tgetent, which is needed for
- * xc/programs/xterm/resize.exe
- */
-#define TermcapLibrary -lncurses.dll
-
-#define AvoidNullMakeCommand YES
-#define StripInstalledPrograms YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull NO
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-#define SetTtyGroup YES
-#define ExpandManNames YES
-#define HasDlopen NO
-#define HasGnuMake YES
-#define UseGccMakeDepend NO
-#define ThreadedX YES
-#define HasThreadSafeAPI YES
-#if !CrossCompiling
-#define CaseSensitiveFileSystem NO
-#endif
-#define HasWChar32 YES
-#define HasBasename NO /* basename() in libc */
-
-#define LnCmd ln -s
-#ifndef CcCmd
-# define CcCmd gcc
-#endif /* CcCmd */
-#ifndef CplusplusCmd
-# define CplusplusCmd g++
-#endif /* CplusplusCmd */
-#ifndef AsCmd
-# define AsCmd as
-#endif /* AsCmd */
-
-#define GccGasOption -DGCCUSESGAS
-#define AsmDefines -DUSE_GAS -DGCCUSESGAS
-
-#ifndef LdCmd
-# define LdCmd gcc -lautomode
-#endif /* LdCmd */
-
-#define MkdirHierCmd mkdir -p
-
-#ifndef CppCmd
-# define CppCmd cpp
-#endif /* CppCmd */
-#ifndef YaccCmd
-# define YaccCmd bison -y
-#endif /* YaccCmd */
-
-#define LexCmd flex -l
-#define LexLib -lfl
-#define HasFlex YES
-#ifndef CrossCompileDir
-# ifndef HasExpat
-# define HasExpat YES
-# endif
-# ifndef HasFreetype2
-# define HasFreetype2 YES
-# endif
-# ifndef HasFontconfig
-# define HasFontconfig YES
-# endif
-#endif
-
-/* Cygwin-specific Windows resource compiler command */
-#ifdef CrossCompileDir
-# ifndef WindresCmd
-# define WindresCmd Concat3(CrossCompileDir,/,windres)
-# endif
-#else
-# ifndef WindresCmd
-# define WindresCmd windres
-# endif
-#endif
-
-#define PreProcessCmd CcCmd -E
-
-#ifndef PostIncDir
-# ifdef CrossCompileDir
-# define PostIncDir `CrossCompileDir/CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'`
-# else
-# define PostIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'`
-# endif
-#endif
-#ifndef ExtraIncDir
-# ifdef CrossCompileDir
-# define ExtraIncDir CrossCompileDir/../include/w32api
-# else
-# define ExtraIncDir /usr/include/w32api
-# endif
-#endif
-
-#ifndef BourneShell
-/*
- * This will cause builds/installs to terminate on errors, as on other
- * platforms.
- */
-#define BourneShell /bin/sh -e
-#endif
-
-#define LdCombineFlags -r
-
-#ifndef DefaultCCOptions
-# define DefaultCCOptions -Wall -Wpointer-arith
-#endif
-
-/* Cygwin 1.5.x now includes alloca */
-#if OSMinorVersion >= 5
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#else
-# define AllocateLocalDefines -DNO_ALLOCA
-#endif
-
-#ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 -fno-strength-reduce
-#endif
-
-/*
- * -DFD_SETSIZE=256 is needed for xfs and the xserver. cygwin defines the
- * FD_SETSIZE as 64 but some code expects it to be larger.
- */
-#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE \
- -D_X86_ -DWIN32 -D_XOPEN_SOURCE \
- -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE \
- -D_SVID_SOURCE -D_GNU_SOURCE -DFD_SETSIZE=1024 \
- -DXResExtension
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H \
- -DHAS_ISW_FUNCS -DNO_WIDEC_H
-#define StandardCppOptions -traditional
-
-/* Cygwin shared memory requires cygipc package or cygserver. */
-#if UseCygIPC
-# if ThreadedX
-# define StandardCppDefines -DHAS_THREADS -DHAS_SHM StandardDefines
-# else
-# define StandardCppDefines -DHAS_SHM StandardDefines
-# endif
-#else
-# if ThreadedX
-# define StandardCppDefines -DHAS_THREADS StandardDefines
-# else
-# define StandardCppDefines StandardDefines
-# endif
-#endif
-
-#define BuildIPv6 NO
-#define BuildLBX NO
-
-/*
- * This requires the pthreads-win32 library
- * It is available from http://www.sourceware.org/pthreads-win32
- */
-#ifndef HasPThreads
-# define HasPThreads YES
-#endif
-
-/* Most libraries do not compile with mingw. Build only the servers. */
-#ifndef BuildServersOnly
-# define BuildServersOnly YES
-#endif
-
-/* Enable those parts that do work and are required for running Xming */
-#ifndef BuildXextLib
-# define BuildXextLib YES
-#endif
-#ifndef BuildXkbcomp
-# define BuildXkbcomp YES
-#endif
-
-/* XWin Server specific build flags */
-#ifndef GlxUseWindows
-# define GlxUseWindows YES
-#endif
-#if !GlxUseWindows
-# define GlxExtraDefines -DAPIENTRY=GLAPIENTRY
-#endif
-
-#ifndef BuildXWinClipboard
-# define BuildXWinClipboard HasPThreads
-#endif
-#ifndef BuildXWinEmulatePseudo
-# define BuildXWinEmulatePseudo NO
-#endif
-#ifndef BuildXWinMultiWindow
-# define BuildXWinMultiWindow HasPThreads
-#endif
-#ifndef BuildXWinMultiWindowExtWM
-# define BuildXWinMultiWindowExtWM HasPThreads
-#endif
-#ifndef BuildXWinNativeGDI
-# define BuildXWinNativeGDI NO
-#endif
-#ifndef BuildXWinPrimaryFB
-# define BuildXWinPrimaryFB NO
-#endif
-#ifndef BuildXWinUpdateStats
-# define BuildXWinUpdateStats NO
-#endif
-#ifndef BuildXWinXF86Config
-# define BuildXWinXF86Config NO
-#endif
-
-/* XWin specific build flags - 1st order dependency */
-#if BuildXWinMultiWindowExtWM && !defined(BuildWindowsWMLibrary)
-# define BuildWindowsWMLibrary YES
-#elif !defined(BuildWindowsWMLibrary)
-# define BuildWindowsWMLibrary NO
-#endif /* BuildXWinMultiWindowExtWM && BuildWindowsWMLibrary */
-
-#if (BuildXWinClipboard || BuildXWinMultiWindow || BuildXWinMultiWindowExtWM) && !defined(BuildX11Lib)
-# define BuildX11Lib YES
-#endif
-
-/* XWin Server specific defines */
-#if BuildXWinClipboard
-# define XWinClipboardDefines -DXWIN_CLIPBOARD
-#else
-# define XWinClipboardDefines
-#endif /* BuildXWinClipboard */
-#if BuildXWinEmulatePseudo
-# define XWinEmulatePseudoDefines -DXWIN_EMULATEPSEUDO
-#else
-# define XWinEmulatePseudoDefines
-#endif /* BuildXWinEmulatePseudo */
-#if BuildXWinMultiWindow
-# define XWinMultiWindowDefines -DXWIN_MULTIWINDOW
-#else
-# define XWinMultiWindowDefines
-#endif /* BuildXWinMultiWindow */
-#if BuildXWinMultiWindowExtWM
-# define BuildRootless YES
-# define XWinMultiWindowExtWMDefines -DXWIN_MULTIWINDOWEXTWM
-#else /* BuildXWinMultiWindowExtWM */
-# define XWinMultiWindowExtWMDefines
-#endif /* BuildXWinMultiWindowExtWM */
-#if BuildXWinNativeGDI
-# define XWinNativeGDIDefines -DXWIN_NATIVEGDI
-#else
-# define XWinNativeGDIDefines
-#endif /* BuildXWinNativeGDI */
-#if BuildXWinPrimaryFB
-# define XWinPrimaryFBDefines -DXWIN_PRIMARYFB
-#else
-# define XWinPrimaryFBDefines
-#endif /* BuildXWinPrimaryFB */
-#if BuildXWinUpdateStats
-# define XWinUpdateStatsDefines -DXWIN_UPDATESTATS
-#else
-# define XWinUpdateStatsDefines
-#endif /* BuildXWinUpdateStats */
-#if BuildXWinXF86Config
-# define XWinXF86ConfigDefines -DXWIN_XF86CONFIG
-#else
-# define XWinXF86ConfigDefines
-#endif /* BuildXWinXF86Config */
-
-#if HasPThreads
-# define XWinPThreadsDefines -DPTW32_DLLPORT=
-#else
-# define XWinPThreadsDefines
-#endif /* HasPThreads */
-
-/*
- * XFree86Server is defined for the w32api headers, which protects some
- * colliding names with #ifdef XFree86Server.
- */
-#define XWinServerDefines -DPIXPRIV \
- -DXFree86Server \
- -DX_BYTE_ORDER=ByteOrder \
- XvExtensionDefines \
- XWinXF86ConfigDefines XWinNativeGDIDefines \
- XWinPrimaryFBDefines \
- XWinEmulatePseudoDefines \
- XWinUpdateStatsDefines \
- XWinClipboardDefines XWinMultiWindowDefines \
- XWinMultiWindowExtWMDefines \
- XWinPThreadsDefines \
- -DDDXBEFORERESET
-#define ServerOSDefines -DDDXTIME -DDDXOSINIT \
- -DDDXOSVERRORF -DDDXOSFATALERROR
-#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-#define ServerExtraDefines -DGCCUSESGAS XWinServerDefines \
- AllocateLocalDefines
-#define ConnectionFlags -DTCPCONN
-#define ExtraLibraries
-#define InstUidFlags -m 4711
-#define UseRgbTxt YES
-#define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~
-
-/* Flags for which the default in X11.tmpl is not what we want. */
-#ifndef BuildXinerama
-# define BuildXinerama NO /* Not supported by XWin Server */
-#endif
-#ifndef BuildXIE
-# define BuildXIE NO /* Deprecated */
-#endif
-#ifndef BuildDPMS
-# define BuildDPMS NO /* Not supported by XWin Server */
-#endif
-#ifndef BuildXInputExt
-# define BuildXInputExt YES /* Not enabled by default */
-#endif
-#ifndef BuildRandR
-# define BuildRandR YES /* Not supported by XWin Server */
-#endif
-#ifndef BuildXF86BigfontExt
-# define BuildXF86BigfontExt NO
-#endif
-#ifndef BuildGlxExt
-# define BuildGlxExt YES
-#endif
-#ifndef BuildXprintLib
-# define BuildXprintLib NO
-#endif
-#ifndef BuildXprint
-# define BuildXprint NO
-#endif
-#ifndef BuildXterm
-# define BuildXterm NO /* Built separately on Cygwin */
-#endif
-#ifndef BuildXResExt
-# define BuildXResExt YES /* Not enabled by default */
-#endif
-#ifndef BuildFreeType
-# define BuildFreeType YES /* Not enabled by default */
-#endif
-#ifndef BuildXTrueType
-# define BuildXTrueType YES /* Not enabled by default */
-#endif
-
-/* Server build rules */
-#ifndef XnestServer
-# define XnestServer NO
-#endif
-#ifndef XprtServer
-# define XprtServer NO
-#endif
-#ifndef XVirtualFramebufferServer
-# define XVirtualFramebufferServer NO
-#endif
-#ifndef XWinServer
-# define XWinServer YES
-#endif
-
-/*
- * --unix option of Cygwin make fools the standard MakeFlagsToShellFlags macro
- */
-#define MakeFlagsToShellFlags(makeflags,shellcmd) \
- for flag in ${MAKEFLAGS} ''; do \ @@\
- case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
-#ifndef ManSuffix
-# define ManSuffix 1
-#endif
-
-#ifndef XtransFailSoft
-#define XtransFailSoft YES
-#endif
-
-#ifndef HasDevWindows
-# define HasDevWindows NO
-#endif
-
-#ifndef RelocateProjectRoot
-# define RelocateProjectRoot YES
-#endif
-
-#ifndef UseInstalledOnCrossCompile
-# define UseInstalledOnCrossCompile YES
-#endif
-
-#include <mingw.rules>
-
-#if CrossCompiling
-#include <cross.def>
-#endif
diff --git a/nx-X11/config/cf/mingw.rules b/nx-X11/config/cf/mingw.rules
deleted file mode 100644
index 505b0685c..000000000
--- a/nx-X11/config/cf/mingw.rules
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Cygwin shared library rules (DLL versions)
- */
-
-#define HasSharedLibraries YES
-#define NeedLibInsideFlag NO
-#define ForceNormalLib NO
-#define NormalLibX11 NO
-# define SharedLibFont NO
-# define SharedLibFontEnc NO
-# define SharedLibWindowsWM NO
-# define SharedLibxkbfile YES
-
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <mingw.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -dll /**/
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -D_DLL
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -D_DLL
-#endif
-#ifndef UseExportLists
-#define UseExportLists YES
-#endif
-
-#define SharedLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll)
-
-#define ImportLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)
-
-#define ShortImportLibraryName(libname, rev) \
-Concat3(lib,libname,.dll.a)
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-
-#ifndef SharedDepLibraryTarget
-# ifdef UseInstalled
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib)
-# endif
-# else /* !UseInstalled */
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-# endif
-# endif /* UseInstalled */
-
-
-/*
- * SharedDepLibraryTarget
- */
-
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): deplist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
- @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
- */
-
-#ifndef SharedDepCplusplusLibraryTarget
-# ifdef UseInstalled
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib)
-# endif
-# else /* !UseInstalled */
-# ifndef LinkBuildSonameLibrary
-# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-# endif
-# endif /* UseInstalled */
-
-
-/*
- * SharedDepCplusplusLibraryTarget
- */
-
-#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): deplist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeCplusplusDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
- @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-#endif /* SharedDepCplusplusLibraryTarget */
-
-
-/*
- * SharedDepModuleTarget
- */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(CC) -o $@ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- @@\
-clean:: @@\
- RemoveFile(name)
-#endif /* SharedDepModuleTarget */
-
-
-/*
- * SharedLibraryDataTarget - generate rules to create shared data file
- */
-
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif
-
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * MakeDllProg
- */
-
-#define MakeDLLProg(libname,solist,prog,rev) @@\
- prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS) -lws2_32
-
-/*
- * MakeDll
- */
-
-#define MakeDLL(libname,solist,rev) @@\
- MakeDLLProg(libname,solist,$(CC),rev)
-
-/*
- * MakeCplusplusDll
- */
-
-#define MakeCplusplusDLL(libname,solist,rev) @@\
- MakeDLLProg(libname,solist,$(CXX),rev)
-
-
-
-/*
- * SharedLibraryTarget
- */
-
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(SharedLibraryName(libname,rev)) @@\
- @@\
-SharedLibraryName(libname,rev): solist @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
- MakeDLL(libname,solist,rev) @@\
- LinkBuildLibrary(ImportLibraryName(libname,rev)) @@\
- LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname)) @@\
- LinkBuildDLL(SharedLibraryName(libname,rev)) @@\
-clean:: @@\
- RemoveFile(ImportLibraryName(libname,rev)) @@\
- RemoveFile(SharedLibraryName(libname,rev)) @@\
-
-
-/*
- * InstallLink
- */
-
-#ifndef InstallLink
-#define InstallLink(step, file, link, dest) @@\
-step:: @@\
- MakeDir($(DESTDIR)dest) @@\
- $(LN) -sf file $(DESTDIR)dest/link
-#endif
-
-/*
- * InstallSharedLibrary
- */
-
-#define InstallSharedLibrary(libname,rev,dest) @@\
-InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
-InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) @@\
-InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))
-
-
-/*
- * ProgramTargetName - This can be simply 'target' or 'target.exe' when
- * building on Cygwin proper, as Cygwin automatically appends .exe to compiled
- * executables and make, rm, ln, etc. will automatically search for a file
- * with .exe appended if the raw file name cannot be found. However,
- * building with a cross compiler requires 'target.exe', as the cross
- * compiler doesn't know to append .exe, nor do the cross compiler tools
- * know to search for files with .exe appended if the raw file name cannot
- * be found.
- */
-
-#define ProgramTargetName(target) Concat(target,.exe)
-
-
-/*
- * HostProgramTargetName - Don't add .exe if cross-compiling.
- */
-
-#ifndef HostProgramTargetName
-# if CrossCompiling
-# define HostProgramTargetName(target) target
-# else
-# define HostProgramTargetName(target) ProgramTargetName(target)
-# endif
-#endif
-
-
-/*
- * LinkBuildDLL - Cygwin only rule, similar to LinkBuildModule.
- * Unfortunately, we have to create a copy of each DLL in xc/exports/bin;
- * linking doesn't work, the executables (e.g. xkbcomp) will report
- * that they cannot find DLLs (e.g. libX11.dll).
- */
-
-#ifdef UseInstalled
-#define LinkBuildDLL(lib) $(_NULLCMD_)
-#else
-#define LinkBuildDLL(lib) MakeDir($(BUILDBINDIR)) @@\
- RemoveFile($(BUILDBINDIR)/lib) @@\
- cd $(BUILDBINDIR) && $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/lib .
-#endif
-
-#ifndef LinkImportLibrary
-#ifdef UseInstalled
-#define LinkImportLibrary(lib, importlib) $(_NULLCMD_)
-#else
-#define LinkImportLibrary(lib, importlib) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/importlib) @@\
- cd $(BUILDLIBDIR) && $(LN) lib importlib
-#endif
-#endif /* LinkImportLibrary */
-
-
-/*
- * LinkBuildBinary - This rule normally creates a link in xc/exports/bin
- * to a binary, but we create an actual copy of the binary.
- * Creating a link causes the DLLs that the binary depend on, such as
- * libX11.dll, not to be found. Copying the binary causes the runtime
- * directory to be xc/exports/bin, which is the location of the DLLs, thus,
- * the DLLs can now be found by the binary. Phew...
- *
- * Note that sometimes the binary is not an executable. One example
- * is the rgb binary file.
- *
- * Passing -p preserves the attributes as the date and prevents useless
- * rebuilds.
- *
- * ProgramTargetName is passed to LinkBuildBinary if the binary
- * is actually an executable; thus, we do not wrap the binary name
- * with ProgramTargetName here.
- */
-
-#ifndef LinkBuildBinary
-#define LinkBuildBinary(binary) @@\
-all:: binary @@\
- MakeDir($(BUILDBINDIR)) @@\
- RemoveFile($(BUILDBINDIR)/binary) @@\
- cd $(BUILDBINDIR) && $(CP) -p $(BUILDBINTOP)/$(CURRENT_DIR)/binary .
-#endif /* LinkBuildBinary */
-
-/*
- * ProfiledRelocatableTarget - generate rules to produce a profiled
- * relocatable object file instead of a library. Differs from Imake.rules
- * by passing '--oformat pe-i386' to ld.
- */
-
-#ifndef ProfiledRelocatableTarget
-#define ProfiledRelocatableTarget(objname,objlist) @@\
-AllTarget(Concat(objname,_p.Osuf)) @@\
- @@\
-Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- $(LD) -X -r --oformat pe-i386 objlist -o $@
-
-#endif /* ProfiledRelocatableTarget */
-
-
-/*
- * DebuggedRelocatableTarget - generate rules to produce a debuggable
- * relocatable object file instead of a library. Differs from Imake.rules
- * by passing '--oformat pe-i386' to ld.
- */
-
-#ifndef DebuggedRelocatableTarget
-#define DebuggedRelocatableTarget(objname,objlist) @@\
-AllTarget(Concat(objname,_d.Osuf)) @@\
- @@\
-Concat(objname,_d.Osuf): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- $(LD) -X -r --oformat pe-i386 objlist -o $@
-
-#endif /* DebuggedRelocatableTarget */
-
-
-/*
- * DependDependencyStatement - Imake.rules wraps $(DEPEND) in
- * ProgramTargetName(), which causes cross compiling to think that
- * $(DEPEND) hasn't been built, as $(DEPEND) is a host tool, and should
- * not be wrapped with ProgramTargetName(). Perhaps there should be
- * a HostProgramTargetName()...
- */
-
-#ifndef DependDependencyStatement
-#if HasMakefileSafeInclude
-#define DependDependencyStatement() @@\
-DependFileName:: $(DEPEND)
-#else
-#define DependDependencyStatement() @@\
-depend:: $(DEPEND)
-#endif
-#endif
-
-
-/*
- * DependDependency - Imake.rules wraps $(DEPEND) in ProgramTargetName().
- * This doesn't work when cross compiling, see the locally defined
- * DependDependencyStatement comment (above) for more information.
- */
-
-#ifndef DependDependency
-#ifdef UseInstalled
-#define DependDependency() /**/
-#else
-#define DependDependency() @@\
-DependDependencyStatement() @@\
- @@\
-NoCmpScript($(DEPEND)) @@\
- @@\
-$(DEPEND): @@\
- @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\
- cd $(DEPENDSRC) && $(MAKE) makedependonly; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)"
-
-#endif /* UseInstalled */
-#endif /* DependDependency */
-
-
-/*
- * ImakeDependency - Imake.rules wraps $(IMAKE) in ProgramTargetName(),
- * which doesn't work when cross compiling, as imake is supposed to be a
- * host program. See the locally defined DependDependencyStatement
- * comment (above) for more information.
- */
-
-#ifndef ImakeDependency
-#ifdef UseInstalled
-#define ImakeDependency(target) /**/
-#else
-#define ImakeDependency(target) @@\
-target:: $(IMAKE) @@\
- @@\
-NoCmpScript($(IMAKE) $(IMAKE).Osuf) @@\
- @@\
-$(IMAKE) $(IMAKE).Osuf: @@\
- -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \ @@\
- echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \ @@\
- echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ @@\
- $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)")
-#endif /* UseInstalled */
-#endif /* ImakeDependency */
-
-
-/*
- * ResourceObjectRule - Build a Windows resouce file (.res) into
- * an object file (.o) that can be linked in with the executable
- * or library being built.
- */
-
-#ifndef ResourceObjectRule
-#define ResourceObjectRule(basename,depends,options) @@\
-AllTarget(basename.RESsuf) @@\
-basename.RESsuf: basename.RCsuf depends @@\
- RemoveFile($@) @@\
- ClearmakeOSName \ @@\
- WindresCmd basename.RCsuf options -O coff -o basename.RESsuf @@\
-clean:: @@\
- RemoveFiles(basename.RESsuf)
-
-#endif /* ResourceObjectRule */
-
-/* The arglist can get quite long. Make sure we can delete it though */
-#ifndef MakeFonts
-# define MakeFonts() @@\
-all:: $(OBJS) @@\
- @@\
-MakeFontsDir($(OBJS)) @@\
- @@\
-clean:: @@\
- find -name "*.pcf" -o -name "*.pcf.Z" -o -name "*.pcf.gz" | xargs -r rm
-#endif /* MakeFonts */
-
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@sinclude file
-#endif
-
-
-#ifndef ProjectUnsharedLibReferences
-#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) $(Concat(varname,EXTLIB)) @@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-XONLYEXTLIB = -lwsock32
diff --git a/nx-X11/config/cf/mingw.tmpl b/nx-X11/config/cf/mingw.tmpl
deleted file mode 100644
index 6be56d117..000000000
--- a/nx-X11/config/cf/mingw.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
-
-#define SharedX11Reqs -lwsock32
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
-#define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XONLYLIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-/*
- * We don't build Xss
- * #define SharedXssReqs $(LDPRELIB) $(XLIB)
- */
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXfixesReqs $(LDPRELIB) $(XLIB)
-#define SharedXdamageReqs $(LDPRELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
-#define SharedXevieReqs $(LDPRELIB) $(XLIB)
-
-#ifndef FixupLibReferences
-# define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-
-/*
- * Suffix for Windows resource source files
- */
-
-#ifndef RCsuf
-# define RCsuf rc
-#endif
-
-
-/*
- * Suffix for Windows resource compiled files
- */
-
-#ifndef RESsuf
-# define RESsuf res
-#endif
diff --git a/nx-X11/config/cf/minix.cf b/nx-X11/config/cf/minix.cf
deleted file mode 100644
index ba101dc48..000000000
--- a/nx-X11/config/cf/minix.cf
+++ /dev/null
@@ -1,64 +0,0 @@
-XCOMM $Xorg: minix.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes Exp $
-
-
-/*
- * If you want to change any of these, do it in the BeforeVendorCF part
- * of site.def
- */
-#define OSName Minix-386vm
-#define OSVendor /* philip@cs.vu.nl */
-#define OSMajorVersion 1
-#define OSMinorVersion 6
-#define OSTeenyVersion 25.1.0
-
-#define AcdGcc
-
-#ifdef AcdGcc
-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-#define AsmDefines -DUSE_GAS
-#define GccGasOption -DGCCUSESGAS /* For SuperProbe */
-#endif
-
-/* Defaults for Minix */
-
-#define ConnectionFlags -DMNX_TCPCONN
-#define StandardDefines -D_MINIX -DMINIX -D_POSIX_SOURCE
-#define StandardIncludes
-
-#define DoRanlibCmd NO
-#define AvoidNullMakeCommand YES
-#define HasSockets NO
-#define HasStreams NO
-#define HasVFork NO
-#define HasNdbm YES
-#define ExtraLibraries -lnbio
-#define NeedConstPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedNestedPrototypes YES
-/* #define UseCCMakeDepend YES */
-#define DefaultCCOptions -wo -fsoft
-#define ArCmd CcCmd -c.a -o
-#define ArAddCmd ArCmd
-#define CcCmd acd -descr gcc -name cc
-#define AsCmd CcCmd -c
-#define CppCmd /usr/lib/cpp
-#define LdCmd CcCmd
-#define LdCombineFlags -r
-#define LexLib /* */
-
-#define SetTtyGroup YES /* for xterm */
-#define HasPutenv YES /* for xsm */
-
-#ifndef AssembleObject
-#define AssembleObject(basename,flags) $(RM) $@ @@\
- $(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags basename.S | \ @@\
- grep -v '^\#' > basename.i.s @@\
- $(AS) -o $*.o basename.i.s @@\
- $(RM) basename.i.s
-#endif
-
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/moto.cf b/nx-X11/config/cf/moto.cf
deleted file mode 100644
index b43295932..000000000
--- a/nx-X11/config/cf/moto.cf
+++ /dev/null
@@ -1,58 +0,0 @@
-XCOMM platform: $Xorg: moto.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#if defined(MotoR3Architecture)
-
-#ifndef OSName
-#define OSName Motorola R32V2/R3V6.2
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 2
-#endif
-
-#define SystemV YES
-#define BootstrapCFlags -DSYSV -DMOTOROLA
-#define StandardDefines -DSYSV -DUSG -DMOTOROLA
-#define Malloc0ReturnsNull YES
-#define BuildServer NO
-#define UseCCMakeDepend YES
-#define OptimizedCDebugFlags /* -O */
-
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR)
-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR)
-
-#endif /* MotoR3Architecture */
-
-
-#if defined(MotoR4Architecture)
-
-#ifndef OSName
-#define OSName Motorola R40V4
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 4
-#endif
-
-#define SystemV4 YES
-#define BootstrapCFlags -DSVR4 -DMOTOROLA
-#define StandardDefines -DSVR4 -DMOTOROLA
-#define BuildServer NO
-
-#define CppCmd /usr/ccs/lib/cpp
-#define LdCmd /usr/ccs/bin/ld
-#define LexCmd /usr/ccs/bin/lex
-#define MakeCmd /usr/ccs/bin/make
-#define YaccCmd /usr/ccs/bin/yacc
-#define CcCmd /bin/cc /* a front-end to gcc/CI5 */
-#define DefaultCCOptions /* -Xc no longer needed */
-
-#include <sv4Lib.rules>
-
-#endif /* MotoR4Architecture */
-
-XCOMM operating system: OSName
diff --git a/nx-X11/config/cf/ncr.cf b/nx-X11/config/cf/ncr.cf
deleted file mode 100644
index 64dfdb038..000000000
--- a/nx-X11/config/cf/ncr.cf
+++ /dev/null
@@ -1,131 +0,0 @@
-XCOMM platform: $Xorg: ncr.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.20 2001/01/17 16:22:32 dawes Exp $
-
-#ifndef OSName
-#define OSName Unix System V Release 4/MP-RAS
-#endif
-#ifndef OSVendor
-#define OSVendor NCR
-#endif
-XCOMM operating system: OSName
-
-#define BootstrapCFlags -DNCR
-#define HasStreams YES
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-
-/* Build Flags */
-
-XCOMM
-XCOMM These flags build correctly on SVR4/MP-RAS 3.0. If building on
-XCOMM SVR4/MP-RAS 2.X, you must add -DWINTCP to StandardDefines
-XCOMM
-#define StandardDefines -DSVR4 -DNCR -Di386
-#ifndef DefaultCCOptions
-#define DefaultCCOptions -Xa -Hnocopyr -W0,-asm
-#endif
-#define DefaultCDebugFlags -O3
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#define ServerExtraDefines -DNO_SECONDARY AllocateLocalDefines XFree86ServerDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#define ToolkitStringsABIOptions -intelabi
-
-XCOMM This has not been tested, don't turn it on yet.
-XCOMM #define ExtensionOSDefines -DXTESTEXT1
-
-#define ExtraLoadFlags -lc -L/usr/ucblib -lucb -lm -lgen -lcmd
-
-/* Setup proper ownership of installed files */
-
-#define StripInstalledPrograms YES
-#define InstPgmFlags -s -m 0711 -o bin -g bin
-#define InstBinFlags -m 0755 -o bin -g bin
-#define InstUidFlags -m 4711 -o root -g bin
-#define InstLibFlags -m 0644 -o bin -g bin
-#define InstIncFlags -m 0444 -o bin -g bin
-#define InstManFlags -m 0444 -o bin -g bin
-#define InstDatFlags -m 0444 -o bin -g bin
-
-/* Various Configuration settings */
-
-#define DefaultUserPath /bin:/sbin:/usr/bin:/usr/sbin:$(BINDIR):/usr/ucb
-#define DefaultSystemPath /etc:/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/ucb
-#define ExtraFilesToClean *.z
-
-/* Create man pages properly */
-
-#define BookFormatManPages YES
-#define ManDirectoryRoot /usr/catman/X115
-#define ManSuffix 1X
-#define LibManSuffix 3X
-#define FileManSuffix 4X
-#define ManSourcePath $(MANPATH)/g
-#define XmanSearchPath /usr/catman
-
-#define TblCmd /usr/ucb/tbl
-#define EqnCmd /usr/ucb/eqn
-#define ColCmd /usr/bin/col
-#define NeqnCmd /usr/ucb/neqn
-#define NroffCmd /usr/ucb/nroff -Tlp
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define InstallManPageLong(file,destdir,dest) @@\
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
- @@\
-all:: file.z @@\
- @@\
-file.z:: file.$(MANNEWSUFFIX) @@\
- @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
- then \ @@\
- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\
- $(RM) /tmp/$$$$.man.z; \ @@\
- pack -f /tmp/$$$$.man; \ @@\
- cp /tmp/$$$$.man.z file.z; \ @@\
- $(RM) /tmp/$$$$.man.z; \ @@\
- fi @@\
- @@\
-install.man:: @@\
- MakeDir($(DESTDIR)destdir) @@\
- -@if [ -f file.z ]; \ @@\
- then \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.z $(DESTDIR)destdir/dest.z; \@@\
- fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
- InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- MakeFlagsToShellFlags(i,set +e); \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \ @@\
- pack -f /tmp/$$$$.suff; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff.z $(DESTDIR)dest/$$i.z; \ @@\
- $(RM) /tmp/$$$$.suff.z); \ @@\
- done
-
-#define InstallMultipleMan(list,dest) @@\
- InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases) @@\
-install.man:: @@\
- @MakeFlagsToShellFlags(i,set +e); \ @@\
- for i in aliases; do \ @@\
- (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.z;\ @@\
- (cd $(DESTDIR)destdir; $(LN) file.z $$i.z);\ @@\
- ); \ @@\
- done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
- InstallManPageAliases(file,destdir,aliases)
-
-#include <svr4.cf>
diff --git a/nx-X11/config/cf/nec.cf b/nx-X11/config/cf/nec.cf
deleted file mode 100644
index 8fb072ff7..000000000
--- a/nx-X11/config/cf/nec.cf
+++ /dev/null
@@ -1,131 +0,0 @@
-XCOMM platform: $Xorg: nec.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-#ifdef nec_ews_svr2
-# define NecCISCArchitecture
-#else /* !defined(nec_ews_svr2) */
-# if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)
-# define NecRISCArchitecture
-# else /* !(defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)) */
-# ifdef SX
-# define NecSX3Architecture
-# else /* !defined(SX) */
-# ifdef _nec_ft
-# define NecFaultTolerantArchitecture
-# else /* !defined(_nec_ft) */
-# ifdef PC_UX
-# define NecPCArchitecture
-# endif /* PC_UX */
-# endif /* !defined(_nec_ft) */
-# endif /* !defined(SX) */
-# endif /* !(defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)) */
-#endif /* !defined(nec_ews_svr2) */
-
-#ifdef NecCISCArchitecture
-#ifndef OSName
-#define OSName EWS-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 10
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-#define HasSharedLibraries NO
-#define HasVoidSignalReturn NO
-#define HasSockets YES
-#define SystemV YES
-#define StandardDefines -Dnec_ews -Dnec_ews_svr2 -DUSG -DSYSV
-#define StandardCppDefines -Dnec_ews -Dnec_ews_svr2 -DUSG -DSYSV
-#define LnCmd ln -s
- LEXOPTION = -j
-#endif
-
-#ifdef NecRISCArchitecture
-# ifdef _nec_up
-#ifndef OSName
-#define OSName UP-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-# else
-#ifndef OSName
-#define OSName EWS-UX/V\(Rel4.2\)
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 9
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-# endif
-#define HasSharedLibraries YES
-#define HasVoidSignalReturn YES
-#define SystemV4 YES
-#define HasSockets YES
-#endif
-
-#ifdef NecSX3Architecture
-#ifndef OSName
-#define OSName SUPER-UX
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-#define SystemV YES
-#define HasSharedLibraries NO
-#define HasVoidSignalReturn YES
-#endif
-
-#ifdef NecFaultTolerantArchitecture
-#ifndef OSName
-#define OSName FT-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-#define HasSharedLibraries YES
-#define HasVoidSignalReturn YES
-#define SystemV4 YES
-#define HasSockets YES
-#endif
-
-#ifdef NecPCArchitecture
-#ifndef OSName
-#define OSName PC-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-#define HasSharedLibraries NO
-#define HasVoidSignalReturn NO
-#define SystemV YES
-#endif
-
-#define HasSaberC NO /* for machines that have it */
-#define HasGcc NO
-#define HasBsearch YES
-
-#define DefaultCCOptions -Wf,-XNp9000,-XNd6000
-#define ExtraLibraries -lsocket -lnsl -lw
-
-#define BuildServer NO
-/* #define InstallCmd $(INS) */
-#define RemoveTargetProgramByMoving YES
-
-#include <necLib.rules>
-
-#define LibraryCCOptions DefaultCCOptions
-#define LibraryDefines StandardDefines
diff --git a/nx-X11/config/cf/necLib.rules b/nx-X11/config/cf/necLib.rules
deleted file mode 100644
index 713ebdd80..000000000
--- a/nx-X11/config/cf/necLib.rules
+++ /dev/null
@@ -1,131 +0,0 @@
-XCOMM $Xorg: necLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * NECOS shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.2 1999/01/11 05:13:07 dawes Exp $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <necLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags
-#endif
-
-
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile NO
-#endif
-
-#define SharedLibObjCompile(options) $(_NULLCMD_)
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- cd $(DESTDIR)/dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@\
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest) @@\
-install:: Concat(lib,libname.sa.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
- RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
-
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(CC) -G -o $@~ $(SHLIBLDFLAGS) solist @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-AllTarget(Concat(lib,libname.so)) @@\
- @@\
-Concat(lib,libname.so): Concat(lib,libname.so.rev) @@\
- $(RM) $@ @@\
- $(LN) $? $@ @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(CC) -G -o $@~ $(SHLIBLDFLAGS) solist @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-AllTarget(Concat(lib,libname.so)) @@\
- @@\
-Concat(lib,libname.so): Concat(lib,libname.so.rev) @@\
- $(RM) $@ @@\
- $(LN) $? $@ @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist) @@\
-AllTarget(Concat(lib,libname.sa.rev)) @@\
- @@\
-Concat(lib,libname.sa.rev): salist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@ @@\
- $(AR) $@ salist @@\
- RanLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.sa.rev)
-
-#endif /* SharedLibraryDataTarget */
diff --git a/nx-X11/config/cf/necLib.tmpl b/nx-X11/config/cf/necLib.tmpl
deleted file mode 100644
index e586af01b..000000000
--- a/nx-X11/config/cf/necLib.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-XCOMM $Xorg: necLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * NEC shared library template
- */
-
-#ifndef SharedXlibRev
-#define SharedXlibRev 4.10
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.10
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.10
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 5.0
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.10
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.10
-#endif
-#ifndef SharedXinputRev
-#define SharedXinputRev 4.10
-#endif
-
-#include <sv4Lib.tmpl>
diff --git a/nx-X11/config/cf/nto.cf b/nx-X11/config/cf/nto.cf
deleted file mode 100644
index e3b94fec1..000000000
--- a/nx-X11/config/cf/nto.cf
+++ /dev/null
@@ -1,152 +0,0 @@
-/* $XFree86: xc/config/cf/nto.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $ */
-/* Get X to build using the gcc toolchain, self hosted RTP x86 */
-/* Let us try to separate the x86 stuff out of here as well... */
-
-/* don't want to conflict with QSSL's Xphoton in /usr/X11R6 */
-#define ProjectRoot /opt/X11R6
-
-
-#ifndef OSName
-#define OSName QNX6/Neutrino
-#endif
-
-#ifndef OSVendor
-#define OSVendor QNX Corp.
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 6
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 1
-#endif
-
-#if defined(i386Architecture)
-#define BuildServer YES
-#else
-#define BuildServer NO
-#endif
-
-#define DoLoadableServer YES
-
-#define BourneShell /bin/sh
-#define OSDefines -DNO_REGEX -DSTRINGS_ALIGNED
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#define StripInstalledPrograms NO
-#define BuildLBX YES
-#define ForceNormalLib YES
-
-#define SourceDefines -D_POSIX_SOURCE -D_QNX_SOURCE
-#define CrossCompiling NO
-#define DoRanlibCmd YES
-#define GccUsesGas YES
-#define MkdirHierCmd mkdir -p
-
-#ifdef UseInstalled
-#define InstallCmd install
-#else
-#define InstallCmd $(SHELL) $(CONFIGSRC)/util/install.sh
-#endif
-#define DefaultCCOptions
-#define LibraryCCOptions
-#define ServerCCOptions
-#define LocalLibraries
-#define CLibrary
-#define PosixLibraries
-#define ConnectionFlags -DTCPCONN
-
-#define StandardCppDefines -traditional StandardDefines
-#define PreProcessCmd CppCmd
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#define HasShm NO /* For now as well */
-#define HasSockets YES
-#define HasPutenv YES
-#define HasCbrt NO
-#define HasShadowPasswd YES
-#define HasSnprintf YES
-#define HasBSD44Sockets YES
-
-#define BuildHtmlManPages NO /* We don't want HTML manpages */
-
-#define AvoidNullMakeCommand YES
-#define CompressAllFonts YES
-#define Malloc0ReturnsNull YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define OptimizedCDebugFlags -O2
-#define DefaultCDebugFlags -O2
-
-#ifndef NeedWidePrototypes
-#define NeedWidePrototypes NO
-#endif
-
-#define YaccCmd bison -y
-#define LexCmd flex -l
-#define LexLib -lfl
-#define TermcapLibrary -lncurses
-#ifndef UseStaticTermcapLib
-#define UseStaticTermcapLib NO
-#endif
-
-/* Here, we put in the #defines which are CPU-specific */
-/* Note that the full paths to the tools will go away when self-hosted */
-
-#ifdef i386Architecture
-#define BootstrapCFlags -D__QNXNTO__ -Di386
-#define OSDefines -DNO_REGEX -DSTRINGS_ALIGNED
-#define NTODefines -D__i386__ -D__ELF__ -D__QNXNTO__ -D_i386
-#define CcCmd gcc
-#define CplusplusCmd g++ -fhonor-std -fno-builtin
-#define ArCmd ar cq
-#define LdCmd ld
-#define AsCmd as
-#define RanlibCmd ranlib
-#define CppCmd /usr/bin/cpp
-/* do this until NTO's cpp can support -undef in the future */
-#define RawCppCmd CppCmd -Uunix -Ui386
-#define AsmDefines -DUSE_GAS -D__ELF__ -D__QNXNTO__
-#define ExtraLibraries -lsocket
-#endif
-
-/* MIPS architecture */
-#ifdef mipsArchitecture
-#define BootstrapCFlags -D__QNXNTO__ -DMIPS
-#define OSDefines -DNO_REGEX -DSTRINGS_ALIGNED
-#define NTODefines -D__MIPS__ -D__ELF__ -D__QNXNTO__
-#define CcCmd /usr/gcc/ntomips/bin/gcc -bntomips -EL
-#define ArCmd /usr/gcc/bin/ar cq
-#define LdCmd /usr/gcc/bin/ld
-#define AsCmd /usr/gcc/ntomips/bin/as
-#define RanlibCmd /usr/gcc/bin/ranlib
-#define AsmDefines -DUSE_GAS -D__ELF__ -D__QNXNTO__
-#define ExtraLibraries -lsocket
-#endif
-
-/* Power PC support */
-#ifdef PPCArchitecture
-#define BootstrapCFlags -D__QNXNTO__ -DPPC
-#define OSDefines -DNO_REGEX -DSTRINGS_ALIGNED
-#define NTODefines -D__PPC__ -D__ELF__ -D__QNXNTO__
-#define CcCmd /usr/gcc/ntoppc/bin/gcc -bntoppc
-#define ArCmd /usr/gcc/bin/ar cq
-#define LdCmd /usr/gcc/bin/ld
-#define AsCmd /usr/gcc/ntoppc/bin/as
-#define RanlibCmd /usr/gcc/bin/ranlib
-#define AsmDefines -DUSE_GAS -D__ELF__ -D__QNXNTO__
-#define ExtraLibraries -lsocket
-#endif
-
-
-#define StandardDefines OSDefines SourceDefines NTODefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#define ServerExtraDefines XFree86ServerDefines
-#define ExtraFilesToClean *.err *.map
-
-#include <nto.rules>
-#include <xorg.cf>
-
diff --git a/nx-X11/config/cf/nto.rules b/nx-X11/config/cf/nto.rules
deleted file mode 100644
index e5023e26f..000000000
--- a/nx-X11/config/cf/nto.rules
+++ /dev/null
@@ -1,240 +0,0 @@
-XCOMM $XFree86: xc/config/cf/nto.rules,v 1.7 2003/10/09 22:43:18 herrb Exp $
-XCOMM Rules for QNX/Neutrino
-XCOMM Note that some of these will disappear when we stop cross-compiling
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-
-#define LinkFile(tofile, fromfile) @@\
-tofile:: fromfile @@\
- $(CP) fromfile tofile @@\
- @@\
-includes:: tofile @@\
- @@\
-depend:: tofile @@\
- @@\
-clean:: @@\
- RemoveFile(tofile)
-
-#define ObjectFromSpecialSource(dst, src, flags) @@\
-NoConfigRec(dst.c) @@\
- @@\
-dst.c: src.c @@\
- RemoveFile($@) @@\
- $(CP) $? $@ @@\
- @@\
-SpecialCObjectRule(dst,NullParameter,flags) @@\
- @@\
-includes:: dst.c @@\
- @@\
-depend:: dst.c @@\
- @@\
-clean:: @@\
- RemoveFile(dst.c)
-
-
-#define ObjectFromSpecialAsmSource(dst, src, flags) @@\
-dst.S: src.S @@\
- RemoveFile($@) @@\
- $(CP) $? $@ @@\
- @@\
-dst.o: dst.S @@\
- AssembleObject(dst,flags) @@\
- @@\
-dst.i: dst.S @@\
- CPPOnlyAsm(dst,flags) @@\
- @@\
-depend:: dst.S @@\
- @@\
-clean:: @@\
- RemoveFile(dst.S)
-
-XCOMM Special rule ComplexHostProgramTarget needed to compile
-XCOMM our utilities locally because we are cross-compiling...
-XCOMM
-
-#define ComplexHostProgramTarget(program) @@\
- CC=cc @@\
- STD_INCLUDES = @@\
- CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
- CCOPTIONS = @@\
- EXTRA_LOAD_FLAGS = @@\
- PROGRAM = program @@\
- @@\
-AllTarget(program) @@\
- @@\
-program: $(OBJS) $(DEPLIBS) @@\
- RemoveTargetProgram($@) @@\
- HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
- @@\
-DependTarget() @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(program))
-
-XCOMM And this rule is again for a host simple host program when cross-compiling.
-XCOMM
-
-#define SimpleHostProgramTarget(program) @@\
- OBJS = program.o @@\
- SRCS = program.c @@\
- @@\
-ComplexHostProgramTarget(program)
-
-
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\
- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
- set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
- @if $(SOSYMLINK); then (set -x; \
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
-#endif /* InstallSharedLibrary */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#define BaseShLibReqs
-
-
-
-/*
- * ServerTargetWithFlags - generate rules to compile, link, and relink a server
- */
-#ifndef ServerTargetWithFlags
-#define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
-AllTarget(ProgramTargetName(server)) @@\
-ProgramTargetName(server): subdirs objects libs @@\
- MoveToBakFile($@) @@\
- LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
- @@\
-Concat(load,server): @@\
- MoveToBakFile(ProgramTargetName(server)) @@\
- LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
- @@\
-loadX:: Concat(load,server) @@\
- @@\
-SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
- @@\
-InstallProgramWithFlags(server,$(BINDIR),flags) @@\
- @@\
-clean:: @@\
- RemoveFile(ProgramTargetName(server))
-#endif /* ServerTargetWithFlags */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
- (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
- LinkBuildSonameLibrary($$SONAME) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\
- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedDepLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
-
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
diff --git a/nx-X11/config/cf/oldlib.rules b/nx-X11/config/cf/oldlib.rules
deleted file mode 100644
index 3ee19eb79..000000000
--- a/nx-X11/config/cf/oldlib.rules
+++ /dev/null
@@ -1,109 +0,0 @@
-/* You should not use these any more, use new Library.tmpl insead */
-
-XCOMM $Xorg: oldlib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * ProfiledLibraryObjectRule - generate make rules to build both profiled
- * and "normal" objects.
- */
-#ifndef ProfiledLibraryObjectRule
-#define ProfiledLibraryObjectRule() @@\
-all:: @@\
- LibMkdir(profiled) @@\
- @@\
-.c.o: @@\
- ProfiledLibObjCompile(NullParameter) @@\
- NormalLibObjCompile(NullParameter) @@\
- @@\
-clean:: @@\
- LibCleanDir(profiled) @@\
-
-#endif /* ProfiledLibraryObjectRule */
-
-
-/*
- * DebuggedLibraryObjectRule - generate make rules to build both debuggable
- * and "normal" objects.
- */
-#ifndef DebuggedLibraryObjectRule
-#define DebuggedLibraryObjectRule() @@\
-all:: @@\
- LibMkdir(debugger) @@\
- @@\
-.c.o: @@\
- DebuggedLibObjCompile(NullParameter) @@\
- NormalLibObjCompile(NullParameter) @@\
- @@\
-clean:: @@\
- LibCleanDir(debugger) @@\
-
-#endif /* DebuggedLibraryObjectRule */
-
-
-/*
- * DebuggedAndProfiledLibraryOjbectRule - generate make rules to build
- * debuggable, profiled, and "normal" objects.
- */
-#ifndef DebuggedAndProfiledLibraryObjectRule
-#define DebuggedAndProfiledLibraryObjectRule() @@\
-all:: @@\
- LibMkdir(profiled) @@\
- LibMkdir(debugger) @@\
- @@\
-.c.o: @@\
- ProfiledLibObjCompile(NullParameter) @@\
- DebuggedLibObjCompile(NullParameter) @@\
- NormalLibObjCompile(NullParameter) @@\
- @@\
-clean:: @@\
- LibCleanDir(profiled) @@\
- LibCleanDir(debugger) @@\
-
-#endif /* DebuggedAndProfiledLibraryObjectRule */
-
-
-/*
- * SpecialProfiledObjectRule - generate rules to compile a file with special
- * flags and to make a profiled version.
- */
-#ifndef SpecialProfiledObjectRule
-#define SpecialProfiledObjectRule(objs,depends,options) @@\
-all:: @@\
- LibMkdir(profiled) @@\
- @@\
-objs: depends @@\
- ProfiledLibObjCompile(options) @@\
- NormalLibObjCompile(options)
-#endif /* SpecialProfiledObjectRule */
-
-
-/*
- * SpecialDebuggedObjectRule - generate rules to compile a file with special
- * flags and to make a debuggable version.
- */
-#ifndef SpecialDebuggedObjectRule
-#define SpecialDebuggedObjectRule(objs,depends,options) @@\
-all:: @@\
- LibMkdir(debugger) @@\
- @@\
-objs: depends @@\
- DebuggedLibObjCompile(options) @@\
- NormalLibObjCompile(options)
-#endif /* SpecialDebuggedObjectRule */
-
-
-/*
- * SpecialDebuggedAndProfiledObjectRule - generate rules to compile a file
- * with special flags and to make debuggable and profiled versions.
- */
-#ifndef SpecialDebuggedAndProfiledObjectRule
-#define SpecialDebuggedAndProfiledObjectRule(objs,depends,options) @@\
-all:: @@\
- LibMkdir(profiled) @@\
- LibMkdir(debugger) @@\
- @@\
-objs: depends @@\
- ProfiledLibObjCompile(options) @@\
- DebuggedLibObjCompile(options) @@\
- NormalLibObjCompile(options)
-#endif /* SpecialDebuggedAndProfiledObjectRule */
diff --git a/nx-X11/config/cf/os2.cf b/nx-X11/config/cf/os2.cf
deleted file mode 100644
index 5e5905ce5..000000000
--- a/nx-X11/config/cf/os2.cf
+++ /dev/null
@@ -1,212 +0,0 @@
-XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.40 2003/06/10 17:03:50 dawes Exp $
-
-XCOMM hv: This file will now require a compiler that defines
-XCOMM hv: the symbol __UNIXOS2__ (currently a modified EMX gcc,
-XCOMM hv: but in future a separate system)
-
-#define OSName OS/2
-#define OSVendor IBM
-#define OSMajorVersion 4
-#define OSMinorVersion 5
-#define OSTeenyVersion 1
-
-#define BootstrapCFlags -DBSD43
-
-#define StandardDefines -DX_LOCALE -DX_WCHAR
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-/* for the man pages */
-#define BookFormatManPages YES
-#define ManSuffix 1
-#define FileManSuffix 4
-#define DontUseLibPathVar YES
-
-/* you must have installed groff! */
-#define TblCmd tbl
-#define ColCmd cat
-#define NeqnCmd eqn
-#define NroffCmd groff -Tascii
-#define EqnCmd eqn -Tascii
-#define HasGroff YES
- NEQN = NeqnCmd
- NROFF = NroffCmd
-
-/* A set of standard defines: */
-#define OSDefines -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE
-
-#ifndef BuildXKB
-#define BuildXKB YES
-#endif
-#ifndef BuildLBX
-#define BuildLBX YES
-#endif
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#undef MakeDLLModules
-#define MakeDLLModules NO
-#ifndef BuildModuleInSubdir
-#define BuildModuleInSubdir YES
-#endif
-
-
-/* some more properties of the OS/2 implementation */
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasSockets YES
-#define HasSnprintf YES
-#define HasWChar32 NO
-#define HasUsableFileMap NO
-#define HasNCurses YES
-#define HasVarRun NO
-#define HasLibPthread NO
-#define HasPosixThreads NO
-#define HasVarDb NO
-#define HasDlopen NO
-#define HasBsearch NO
-#define HasFchown NO
-#define HasLargeTmp NO
-#define HasPoll NO
-#define HasBSD44Sockets NO
-#define HasSecureRPC NO
-#define HasSymLinks NO
-#define HasVFork NO
-#define HasVarDirectory NO
-#define HasStrcasecmp YES
-#define StrcasecmpDefines -DNEED_STRCASECMP -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp
-#define Malloc0ReturnsNull YES
-#define SetTtyGroup NO
-#ifndef HasLibCrypt
-# define HasLibCrypt NO
-#endif
-#ifndef HasShm
-# define HasShm YES
-#endif
-#define ConnectionFlags -DTCPCONN -DOS2PIPECONN
-#define StdIncDir /usr/include
-#define HasStickyDirBit NO
-#define HasMkstemp NO
-#define HasBasename NO /* C-function, not shell utility!! */
-
-
-/*
- * Compiler Features
- */
-#define DefaultGcc2i386Opt -O2 -fstrength-reduce -fpcc-struct-return
-#define UseGccMakeDepend YES
-#define HasCplusplus YES
-#define HasGnuMake YES
-#define GccUsesGas YES
-#define UseGas YES
-#define GnuCpp YES
-#define DoRanlibCmd YES
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define NeedWidePrototypes NO
-
-#define HasPlugin NO
-#define VendorHasX11R6_3libExt YES
-
-#define CppCmd cpp
-#define YaccCmd bison -y
-#define StandardCppOptions -traditional
-#define StandardCppDefines /**/
-#define PreProcessCmd CppCmd
-
-#define CcCmd gcc -D__UNIXOS2__
-#define DefaultCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals
-#define LibraryCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals
-#define ServerCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals
-
-#define ModuleCcCmd gcc_elf
-#define ModuleCppCmd cpp_elf
-#define ModuleCFlags -D__UNIXOS2__ $(CDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES)
-#define ModuleAsCmd as_elf
-#define ModuleLdCmd ld_elf
-#define ModuleLdCombineFlags -X -r
-#define ModuleArCmd ar_elf cq
-#define NeedModuleRanlib YES
-#define ModuleRanlibCmd ranlib_elf
-#define HasPerl5 YES
-
-#define CplusplusCmd g++
-#define CplusplusOptions -Zmtd -Zsysv-signals -D__UNIXOS2__
-
-#define AsCmd as
-#define GccGasOption -DGCCUSESGAS
-#define AsmDefines -DUSE_GAS
-
-#define InstallCmd install
-
-#define LdCmd ld
-#define ExtraLoadFlags -Zbin-files
-#define ExtraLibraries -lshm -lemxfix -lsocket -lbsd -lgcc
-#define ServerExtraSysLibs -lregex -lshm -lemxfix -lsocket
-
-/* quite a number of programs you need, most of them the same as
- * with Unix, but listed here for completeness
- */
-#define ArCmd ar cq
-#define RanlibCmd ar s
-#define BourneShell /bin/sh
-#define LexCmd flex -l
-#define HasFlex YES
-#define LexLib -lfl
-#define LintCmd /**/
-#define MvCmd mv
-#define CompressCmd compress
-#define GzipCmd gzip
-#define LnCmd cp
-#define CpCmd cp
-#define RmCmd rm -f
-
-/* "shell scripts" in OS/2 have this extension */
-#define SHsuf sh
-
-#define InstPgmFlags /**/
-#define InstBinFlags /**/
-#define InstUidFlags /**/
-#define InstLibFlags /**/
-#define InstIncFlags /**/
-#define InstManFlags /**/
-#define InstDatFlags /**/
-#define InstallFlags /**/
-
-#define OptimizedCDebugFlags DefaultGcc2i386Opt
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-
-/*
- * Make & install Features
- */
-
-#define AvoidNullMakeCommand YES
-_NULLCMD_ =
-#define NullMakeCommand
-#define StripInstalledPrograms NO
-#define CompressAllFonts YES
-#define CompressManPages YES
-#define GzipFontCompression YES
-#define DefaultUserPath $(BINDIR)
-#define DefaultSystemPath $(BINDIR)
-#define CaseSensitiveFileSystem NO
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.~* *.exe *.dll *.obj *.lib *.map *raw_os2.def MISSING_ORDINALS
-#endif
-
-#define ProgramTargetName(target) Concat(target,.exe)
-#define HostProgramTargetName(target) ProgramTargetName(target)
-
-#include <os2.rules>
-#include <os2Lib.rules>
-
-# include <xorg.cf>
-
-
diff --git a/nx-X11/config/cf/os2.rules b/nx-X11/config/cf/os2.rules
deleted file mode 100644
index a5f26aca0..000000000
--- a/nx-X11/config/cf/os2.rules
+++ /dev/null
@@ -1,112 +0,0 @@
-XCOMM $Xorg: os2.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.23tsi Exp $
-
-.SUFFIXES: .Osuf .c .CCsuf
-
-.c.Osuf:
- $(CC) $(CFLAGS) -c $*.c
-
-#if HasCplusplus
-.CCsuf.Osuf:
- $(CXX) $(CFLAGS) -c $*.CCsuf
-#endif
-
-#ifndef UseInstalled
-#define XkbComp /xkbcomp
-#else
-#define XkbComp xkbcomp
-#endif
-
-/*
- * same problem as with cygwin...
- * DependDependencyStatement - Imake.rules wraps $(DEPEND) in
- * ProgramTargetName(), which causes cross compiling to think that
- * $(DEPEND) hasn't been built, as $(DEPEND) is a host tool, and should
- * not be wrapped with ProgramTargetName(). Perhaps there should be
- * a HostProgramTargetName()...
- */
-#ifndef DependDependencyStatement
-#define DependDependencyStatement() @@\
-depend:: $(DEPEND)
-#endif
- DEPEND2 = $(SHELL) $(DEPEND)
-
-/*
- * DependDependency - Imake.rules wraps $(DEPEND) in ProgramTargetName().
- * This doesn't work when cross compiling, see the locally defined
- * DependDependencyStatement comment (above) for more information.
- */
-
-#ifndef DependDependency
-#ifdef UseInstalled
-#define DependDependency() /**/
-#else
-#define DependDependency() @@\
-DependDependencyStatement() @@\
- @@\
-NoCmpScript($(DEPEND)) @@\
- @@\
-$(DEPEND): @@\
- @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\
- cd $(DEPENDSRC) && $(MAKE) makedependonly; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)"
-
-#endif /* UseInstalled */
-#endif /* DependDependency */
-
-/*
- * HostLinkRule - link a utility to be used on the build host
- * (differs from LinkRule if cross compiling)
- */
-#ifndef HostLinkRule
-#define HostLinkRule(program,options,objects,libraries) \
-$(CCLINK) -Zmtd -o program options objects libraries $(EXTRA_LOAD_FLAGS)
-#endif
-
-#ifndef DependTarget
-#define DependTarget() @@\
-DependDependency() @@\
- @@\
-depend:: @@\
- $(SHELL) $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-#endif /* DependTarget */
-
-/*
- * DependTarget3 - generate rules to compute dependencies for all files given.
- */
-#ifndef DependTarget3
-#define DependTarget3(srcs1,srcs2,srcs3) @@\
-DependDependency() @@\
- @@\
-depend:: @@\
- $(SHELL) $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1 @@\
- $(SHELL) $(DEPEND) -a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2 @@\
- $(SHELL) $(DEPEND) -a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3
-#endif /* DependTarget3 */
-
-#ifdef UseInstalled
-#define RmanDependency() /**/
-#else
-#define RmanDependency() @@\
-NoCmpScript(ProgramTargetName($(RMAN))) @@\
- @@\
-ProgramTargetName($(RMAN)): @@\
- @echo "checking $@ over in $(TOP)/config/util first..."; \ @@\
- echo "okay, continuing in $(CURRENT_DIR)"
-
-#endif /* UseInstalled */
-
-#define MakeXkbDir(basedir,subdir) @@\
-all:: Concat(subdir,.dir) @@\
- @@\
-Concat(subdir,.dir): @@\
- RemoveFile(Concat(subdir,.dir)) @@\
- XkbComp -lfhlpR -o Concat(subdir,.dir) * @@\
- @@\
-InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir) @@\
- @@\
-clean:: @@\
- RemoveFile(Concat(subdir,.dir))
diff --git a/nx-X11/config/cf/os2Lib.rules b/nx-X11/config/cf/os2Lib.rules
deleted file mode 100644
index decbd72ed..000000000
--- a/nx-X11/config/cf/os2Lib.rules
+++ /dev/null
@@ -1,210 +0,0 @@
-XCOMM $Xorg: os2Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.19 2003/10/11 09:40:15 herrb Exp $
-
-/*
- * OS2/EMX shared library rules (DLL version)
- *
-#ifndef __UNIXOS2__
-#error You must edit os2Lib.rules for your OS/2 dev system
-#endif */
-
-#define HasSharedLibraries YES
-#define ForceNormalLib NO
-#define SharedOldX NO
-#define SharedDataSeparation NO
-#define SharedCodeDef /**/
-#define SharedLibraryDef /**/
-#define ShLibIncludeFile <os2Lib.tmpl>
-#define SharedLibraryLoadFlags /**/
-#define PositionIndependentCFlags -Zmtd
-
-#define NormalSharedLibObjCompile(options) RemoveFile($@) @@\
- $(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c
-
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: libname.dll LibraryTargetName(libname) libname.lib @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) $(DLLNAME) $(DESTDIR)dest @@\
- $(INSTALL) -c $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
- $(INSTALL) -c $(INSTLIBFLAGS) libname.a $(DESTDIR)dest @@\
- $(INSTALL) -c $(INSTLIBFLAGS) libname.lib $(DESTDIR)dest
-
-#define LinkBuildLibrary2(slib,ext) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/slib.ext) @@\
- (cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/slib.ext .)
-
-#define LinkBuildLibrary3(slib,rev,ext) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/Concat3(slib,rev,ext)) @@\
- (cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/Concat3(slib,rev,ext) .)
-
-#define LinkBuildLibrary4(pre,slib,rev,ext) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/Concat4(pre,slib,rev,ext)) @@\
- (cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/Concat4(pre,slib,rev,ext) .)
-
-#define LinkBuildLibrary5(slib,rev,ext) MakeDir($(BUILDLIBDIR)) @@\
- RemoveFile($(BUILDLIBDIR)/$(DLLNAME)) @@\
- (cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$(INSTDLLNAME) .)
-
- EMXIMP = emximp
- EMXOMF = emxomf -p 32
- SHLD = gcc -Zdll -Zmtd -Zmap -Zbin-files
- SHXXLD = g++ -Zdll -Zmtd -Zmap -Zbin-files
- SHADDLIBS = ExtraLibraries -lc_import
- DLLNAME = `cat $(TOP)/$(CURRENT_DIR)/dll.name`
- INSTDLLNAME = `cat $(BUILDINCTOP)/$(CURRENT_DIR)/dll.name`
-
-#define BuildDllSupportLibs3(slib,rev) @@\
- $(EMXIMP) -o Concat3(slib,rev,.imp) Concat3(slib,os2,.def) @@\
- $(EMXIMP) -o Concat4(lib,slib,rev,.a) Concat3(slib,rev,.imp) @@\
- $(EMXIMP) -o Concat3(slib,rev,_o.imp) Concat3(slib,o_os2,.def) @@\
- $(EMXIMP) -o Concat3(slib,rev,.a) Concat3(slib,rev,_o.imp) @@\
- $(EMXOMF) -s -l -o Concat3(slib,rev,.lib) Concat3(slib,rev,.a) @@\
- LinkBuildLibrary4(lib,slib,rev,.a) @@\
-
-#define BuildLibSupportLibs(slib) @@\
- $(EMXOMF) -s -l -o Concat(slib,.lib) Concat(slib,.a) @@\
- LinkBuildLibrary3(lib,slib,.a) @@\
-
-#define BuildLibSupportLibs2(slib) @@\
- $(EMXOMF) -s -l -o Concat(slib,.lib) Concat3(lib,slib,.a) @@\
- LinkBuildLibrary3(lib,slib,.a) @@\
-
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat3(libname,rev,.dll)) @@\
-.SUFFIXES: .def @@\
- @@\
-Concat(libname,os2.def): Concat(libname,-def.cpp) @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) $(CONFIGSRC)/cf/os2def.db libname @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) -O1 $(CONFIGSRC)/cf/os2def.db libname @@\
- @@\
-Concat3(libname,rev,.dll): solist Concat(libname,os2.def) @@\
- RemoveFile($@) @@\
- $(SHLD) -o $(DLLNAME) solist $(REQUIREDLIBS) $(SHADDLIBS) Concat(libname,o_os2.def) @@\
- touch $@ @@\
- BuildDllSupportLibs3(libname,rev) @@\
- LinkBuildLibrary5(libname,rev,.dll) @@\
- @@\
-clean:: @@\
- RemoveFiles(Concat3(libname,rev,.imp) Concat3(libname,rev,_o.imp)) @@\
- RemoveFiles(Concat(libname,os2.def) Concat(libname,o_os2.def)) @@\
- RemoveFile(dll.name)
-
-#define NormalLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetName(libname)) @@\
- @@\
-LibraryTargetName(libname): objlist @@\
- RemoveFile($@) @@\
- MakeLibrary($@,objlist) @@\
- BuildLibSupportLibs2(libname)
-
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat3(libname,rev,.dll)) @@\
- @@\
-Concat(libname,os2.def): deplist $(EXTRALIBRARYDEPS) Concat(libname,-def.cpp) @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) $(CONFIGSRC)/cf/os2def.db libname @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) -O1 $(CONFIGSRC)/cf/os2def.db libname @@\
- @@\
-Concat3(libname,rev,.dll): Concat(libname,os2.def) @@\
- RemoveFile($@) @@\
- (cd down; $(SHLD) -o up/$(DLLNAME) solist $(REQUIREDLIBS) $(SHADDLIBS) Concat(libname,o_os2.def)) @@\
- touch $@ @@\
- BuildDllSupportLibs3(libname,rev) @@\
- LinkBuildLibrary5(libname,rev,.dll) @@\
- @@\
-clean:: @@\
- RemoveFiles(Concat3(libname,rev,.imp) Concat3(libname,rev,_o.imp)) @@\
- RemoveFiles(Concat(libname,os2.def) Concat(libname,o_os2.def)) @@\
- RemoveFile(dll.name)
-
-#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat3(libname,rev,.dll)) @@\
- @@\
-Concat(libname,os2.def): deplist $(EXTRALIBRARYDEPS) Concat(libname,-def.cpp) @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) $(CONFIGSRC)/cf/os2def.db libname @@\
- cmd /c $(subst /,\\,$(CONFIGSRC)/util/makedef.cmd) -O1 $(CONFIGSRC)/cf/os2def.db libname @@\
- @@\
-Concat3(libname,rev,.dll): Concat(libname,os2.def) @@\
- RemoveFile($@) @@\
- (cd down; $(SHXXLD) -o up/$(DLLNAME) solist $(REQUIREDLIBS) $(SHADDLIBS) Concat(libname,o_os2.def)) @@\
- touch $@ @@\
- BuildDllSupportLibs3(libname,rev) @@\
- LinkBuildLibrary5(libname,rev,.dll) @@\
- @@\
-clean:: @@\
- RemoveFiles(Concat3(libname,rev,.imp) Concat3(libname,rev,_o.imp)) @@\
- RemoveFiles(Concat(libname,os2.def) Concat(libname,o_os2.def)) @@\
- RemoveFile(dll.name)
-
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(CC) -o $@ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
- @@\
-clean:: @@\
- RemoveFile(name)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-#define InstallSharedLibraryData(libname,rev,dest)
-
-#define InstallLibrary(libname,dest) @@\
-install:: LibraryTargetName(libname) Concat(libname,.lib) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(libname,.lib) $(DESTDIR)dest @@\
- RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname))
-
-#define MakeStaticLibrary(libname) $(AR) libname *.o
-
-#define UnsharedLibraryTarget(libname,objlist,down,up) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_s)) @@\
- @@\
-LibraryTargetNameSuffix(libname,_s): objlist @@\
- RemoveFile($@) @@\
- (cd down; MakeStaticLibrary(up/$@)) @@\
- RanLibrary($@) @@\
- _LinkBuildLibrary($@) @@\
- @@\
-install:: LibraryTargetNameSuffix(libname,_s) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetNameSuffix(libname,_s) $(DESTDIR)$(SHLIBDIR)
-
-#define UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_s)) @@\
- @@\
-LibraryTargetNameSuffix(libname,_s): objlist1 objlist2 objlist3 @@\
- RemoveFile($@) @@\
- (cd down; MakeStaticLibrary(up/$@)) @@\
- RanLibrary($@) @@\
- _LinkBuildLibrary($@) @@\
- @@\
-install:: LibraryTargetNameSuffix(libname,_s) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetNameSuffix(libname,_s) $(DESTDIR)$(SHLIBDIR)
-
-#define DebuggedLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_d)) @@\
- @@\
-LibraryTargetNameSuffix(libname,_d): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- (cd debugger; MakeStaticLibrary(../$@)) @@\
- RanLibrary($@) @@\
- _LinkBuildLibrary($@)
-
-#define ProfiledLibraryTarget(libname,objlist) @@\
-AllTarget(LibraryTargetNameSuffix(libname,_p)) @@\
- @@\
-LibraryTargetNameSuffix(libname,_p): objlist $(EXTRALIBRARYDEPS) @@\
- RemoveFile($@) @@\
- (cd profiled; MakeStaticLibrary(../$@)) @@\
- RanLibrary($@) @@\
- _LinkBuildLibrary($@)
-
-#define LibraryModuleTarget(module,objlist) @@\
-AllTarget(LibraryTargetName(module)) @@\
- @@\
-LibraryTargetName(module): objlist @@\
- RemoveFile($@) @@\
- MakeLibrary($@,objlist)
diff --git a/nx-X11/config/cf/os2Lib.tmpl b/nx-X11/config/cf/os2Lib.tmpl
deleted file mode 100644
index 522993031..000000000
--- a/nx-X11/config/cf/os2Lib.tmpl
+++ /dev/null
@@ -1,208 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/os2Lib.tmpl,v 1.5 2004/09/02 01:10:28 kem Exp $
-XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
-
-/*
- * OS2/EMX shared library template
- *
-#ifndef __UNIXOS2__
-#error You must edit os2Lib.tmpl for your (non-EMX) OS/2 dev system
-#endif */
-
-#define SharedLibFont NO
-
-#define SharedX11Reqs $(LDPRELIB) -lshm
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedXpReqs $(LDPRELIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXssReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-
-/* library revisions, these are typically empty! */
-#define SharedX11Rev /**/
-#define SharedXextRev /**/
-#define SharedXssRev /**/
-#define SharedXxf86miscRev /**/
-#define SharedXxf86vmRev /**/
-#define SharedXxf86dgaRev /**/
-#define SharedXxf86rushRev /**/
-#define SharedXvRev /**/
-#define SharedXineramaRev /**/
-#define SharedDpsRev /**/
-#define SharedDpsTkRev /**/
-#define SharedPSResRev /**/
-#define SharedGlxRev /**/
-#define SharedXfontcacheRev /**/
-#define SharedXauRev /**/
-#define SharedXdmcpRev /**/
-#define SharedXmuRev /**/
-#define SharedXmuuRev /**/
-#define SharedOldXRev /**/
-#define SharedXpRev /**/
-#define SharedXtRev /**/
-#define SharedXaRev /**/
-#define SharedXawRev /**/
-#define SharedXaw7Rev 7
-#define SharedXaw6Rev 6
-#define SharedXiRev /**/
-#define SharedXtstRev /**/
-#define SharedICERev /**/
-#define SharedSMRev /**/
-#define SharedXkeyRev /**/
-#define SharedFSRev /**/
-#define SharedFontRev /**/
-#define SharedXpmRev /**/
-#define SharedGluRev /**/
-#define SharedXrenderRev /**/
-#define SharedXrandrRev /**/
-#define SharedXftRev /**/
-#define SharedXft1Rev 1
-#define SharedFreetype2Rev /**/
-#define SharedXTrapRev /**/
-#define SharedExpatRev /**/
-#define SharedFontconfigRev /**/
-#define SharedXcursorRev /**/
-#define SharedxkbfileRev /**/
-#define SharedXvMCRev /**/
-#define SharedXResRev /**/
-#define SharedFontEncRev /**/
-
-/*
- * By setting this in your Imakefile, you can force using static libraries
- * to be linked with you app, rather than DLLs
- */
-#ifndef LinkStatically
-#define LinkStatically NO
-#endif
-
-#if LinkStatically
-#define SDlibX11 -lX11_s
-#define SDlibXExt -lXExt_s
-#define SDlibXmu -lXmu_s
-#define SDlibXt -lXt_s
-#define SDlibXaw -lXaw_s
-#define SDlibXaw7 -lXaw_s
-#define SDlibXaw6 -lXaw_s
-#define SDlibXi -lXi_s
-#define SDlibXtst -lXtst_s
-#define SDlibXp -lXp_s
-#define SDlibXv -lXv_s
-#define SDlibGL -lGL_s
-#define SDlibDPS -lDPS_s
-#define SDlibDPSTK -lDPSTK_s
-#else
-#define SDlibX11 -lX11
-#define SDlibXExt -lXExt
-#define SDlibXmu -lXmu
-#define SDlibXt -lXt
-#define SDlibXaw -lXaw
-#define SDlibXaw7 -lXaw
-#define SDlibXaw6 -lXaw
-#define SDlibXi -lXi
-#define SDlibXtst -lXtst
-#define SDlibXp -lXp
-#define SDlibXv -lXv
-#define SDlibGL -lGL
-#define SDlibDPS -lDPS
-#define SDlibDPSTK -lDPSTK
-#endif
-
-/*
- * and now a little bit of magic for using imake without source tree; if we
- * are using shared libraries, we really do not need to depend on anything
- */
-#if SharedLibXext
- DEPEXTENSIONLIB =
- EXTENSIONLIB = _Use(SDlibXExt,-L$(EXTENSIONSRC)/lib SDlibXExt)
-#endif
-#if SharedLibX11
- DEPXLIB =
- XLIB = $(EXTENSIONLIB) _Use(SDlibX11,-L$(XLIBSRC) SDlibX11)
-#endif
-#if SharedLibXmu
- DEPXMULIB =
- XMULIB = _Use(SDlibXmu,-L$(XMUSRC) SDlibXmu) $(XLIB)
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-#endif
-#if SharedOldX
- DEPOLDXLIB =
- OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX)
-#endif
-#if SharedLibXt
- DEPXTOOLLIB =
- XTOOLLIB = _Use(SDlibXt,-L$(TOOLKITSRC) SDlibXt)
-#endif
-#if SharedLibXaw
- DEPXAWLIB =
- XAWLIB = _Use(SDlibXaw,-L$(AWIDGETSRC) SDlibXaw)
-#endif
-#if SharedLibXaw7
- DEPXAW7LIB =
- XAW7LIB = _Use(SDlibXaw7,-L$(AWIDGETSRC) SDlibXaw7)
-#endif
-#if SharedLibXaw6
- DEPXAW6LIB =
- XAW6LIB = _Use(SDlibXaw6,-L$(AWIDGETSRC) SDlibXaw6)
-#endif
-#if SharedLibXi
- DEPXILIB =
- XILIB = _Use(SDlibXi,-L$(XILIBSRC) SDlibXi)
-#endif
-#if SharedLibXTest
- DEPXTESTLIB =
- XTESTLIB = _Use(SDlibXtst,-L$(EXTENSIONSRC)/lib/xtest SDlibXtst)
-#endif
-#if SharedLibXp
- DEPXPLIB =
- XPLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp)
-#endif
-#if SharedLibXv
- DEPXVLIB =
- XVLIB = _Use(SDlibXv,-L$(EXTENSIONSRC)/lib SDlibXv)
-#endif
-#if SharedLibGL
- DEPGLLIB =
- GLLIB = _Use(SDlibGL,-L$(EXTENSIONSRC)/lib SDlibGL)
-#endif
-#if SharedLibDPS
- DEPDPSLIB =
- DPSLIB = _Use(SDlibDPS,-L$(EXTENSIONSRC)/lib SDlibDPS)
-#endif
-#if SharedLibDPSTK
- DEPDPSTKLIB =
- DPSTKLIB = _Use(SDlibDPSTK,-L$(EXTENSIONSRC)/lib SDlibDPSTK)
-#endif
-
diff --git a/nx-X11/config/cf/os2def.db b/nx-X11/config/cf/os2def.db
deleted file mode 100644
index 095b3e548..000000000
--- a/nx-X11/config/cf/os2def.db
+++ /dev/null
@@ -1,5095 +0,0 @@
-; This table is the central conversion table for symbols exported
-; by OS/2 DLLs. It replaces the old *os2.def files. It requires a
-; WinNT *-def.cpp file, though, and the script xc/config/util/makedef.cmd.
-; If you want to add a new symbol use a new ordinal number,
-; don't replace existing ones, because this would introduce incompatibilities
-; with existing code.
-;
-; ATTENTION! When adding new items, the field delimiter is expected to
-; be TAB, not a nice looking number of spaces! Don't try to beautify this
-; file!!!!
-;
-; $XFree86: xc/config/cf/os2def.db,v 1.7 2003/11/12 00:10:23 dawes Exp $
-;
-LIBRARY X11 X11
-X11 XSaveContext 1
-X11 XFindContext 2
-X11 XDeleteContext 3
-X11 XListDepths 4
-X11 XrmParseCommand 5
-X11 Xpermalloc 6
-X11 _XrmInternalStringToQuark 7
-X11 XrmStringToQuark 8
-X11 XrmPermStringToQuark 9
-X11 XrmUniqueQuark 10
-X11 XrmQuarkToString 11
-X11 XAllocColorCells 12
-X11 XAllocColorPlanes 13
-X11 XAllowEvents 14
-X11 XAutoRepeatOn 15
-X11 XAutoRepeatOff 16
-X11 XSetWindowBackground 17
-X11 XSetWindowBorderWidth 18
-X11 XBell 19
-X11 XSetWindowBorder 20
-X11 XEnableAccessControl 21
-X11 XDisableAccessControl 22
-X11 XSetAccessControl 23
-X11 XSetCloseDownMode 24
-X11 XChangeActivePointerGrab 25
-X11 XSetWindowColormap 26
-X11 XChangeGC 27
-X11 XChangeKeyboardControl 28
-X11 XChangePointerControl 29
-X11 XChangeProperty 30
-X11 XChangeSaveSet 31
-X11 XAddToSaveSet 32
-X11 XRemoveFromSaveSet 33
-X11 XChangeWindowAttributes 34
-X11 XResizeWindow 35
-X11 XCheckIfEvent 36
-X11 XCheckMaskEvent 37
-X11 XCheckWindowEvent 38
-X11 XCheckTypedEvent 39
-X11 XCheckTypedWindowEvent 40
-X11 XCirculateSubwindows 41
-X11 XCirculateSubwindowsDown 42
-X11 XCirculateSubwindowsUp 43
-X11 XCloseDisplay 44
-X11 XClearWindow 45
-X11 XClearArea 46
-X11 XMoveResizeWindow 47
-X11 _XConnectDisplay 48
-X11 _XDisconnectDisplay 49
-X11 _XSendClientPrefix 50
-X11 XSetAuthorization 51
-X11 XConvertSelection 52
-X11 XCopyArea 53
-X11 XCopyColormapAndFree 54
-X11 XCopyGC 55
-X11 XCopyPlane 56
-X11 XCreateBitmapFromData 57
-X11 XCreateColormap 58
-X11 XCreatePixmapCursor 59
-X11 XCreateGC 60
-X11 _XUpdateGCCache 61
-X11 _XFlushGCCache 62
-X11 XFlushGC 63
-X11 XGContextFromGC 64
-X11 XCreateGlyphCursor 65
-X11 XCreatePixmapFromBitmapData 66
-X11 XCreatePixmap 67
-X11 XCreateSimpleWindow 68
-X11 XCreateFontCursor 69
-X11 XDefineCursor 70
-X11 XDeleteProperty 71
-X11 XDestroySubwindows 72
-X11 XDestroyWindow 73
-X11 XDisplayName 74
-X11 XDrawArc 75
-X11 XDrawArcs 76
-X11 XDrawLine 77
-X11 XDrawLines 78
-X11 XDrawPoint 79
-X11 XDrawPoints 80
-X11 XDrawRectangle 81
-X11 XDrawRectangles 82
-X11 XDrawSegments 83
-X11 XGetErrorText 84
-X11 XGetErrorDatabaseText 85
-X11 XSetErrorHandler 86
-X11 XSetIOErrorHandler 87
-X11 _XEventToWire 88
-X11 XFetchName 89
-X11 XGetIconName 90
-X11 XFillArc 91
-X11 XFillArcs 92
-X11 XFillPolygon 93
-X11 XFillRectangle 94
-X11 XFillRectangles 95
-X11 XFlush 96
-X11 XLoadQueryFont 97
-X11 XFreeFont 98
-X11 XQueryFont 99
-X11 XListFonts 100
-X11 XFreeFontNames 101
-X11 XListFontsWithInfo 102
-X11 XFreeFontInfo 103
-X11 XFreeColormap 104
-X11 XFreeColors 105
-X11 XFreeCursor 106
-X11 _XFreeExtData 107
-X11 XFreeGC 108
-X11 XFreePixmap 109
-X11 XActivateScreenSaver 110
-X11 XResetScreenSaver 111
-X11 XForceScreenSaver 112
-X11 XSetArcMode 113
-X11 XSetFillRule 114
-X11 XSetFillStyle 115
-X11 XSetGraphicsExposures 116
-X11 XSetSubwindowMode 117
-X11 XGeometry 118
-X11 XGetAtomName 119
-X11 XAllocNamedColor 120
-X11 XGetDefault 121
-X11 XGetFontPath 122
-X11 XFreeFontPath 123
-X11 XGetFontProperty 124
-X11 XGetGeometry 125
-X11 XAllocColor 126
-X11 XGetSizeHints 127
-X11 XGetWMHints 128
-X11 XGetZoomHints 129
-X11 XGetNormalHints 130
-X11 XGetIconSizes 131
-X11 XGetCommand 132
-X11 XGetTransientForHint 133
-X11 XGetClassHint 134
-X11 XGetInputFocus 135
-X11 XGetImage 136
-X11 XGetSubImage 137
-X11 XGetKeyboardControl 138
-X11 XGetMotionEvents 139
-X11 XGetPointerControl 140
-X11 XGetPointerMapping 141
-X11 XGetKeyboardMapping 142
-X11 XGetWindowProperty 143
-X11 XGetSelectionOwner 144
-X11 XGetScreenSaver 145
-X11 XGetStandardColormap 146
-X11 XGetWindowAttributes 147
-X11 XGrabButton 148
-X11 XGrabKey 149
-X11 XGrabKeyboard 150
-X11 XGrabPointer 151
-X11 XGrabServer 152
-X11 XAddHost 153
-X11 XRemoveHost 154
-X11 XAddHosts 155
-X11 XRemoveHosts 156
-X11 XIfEvent 157
-X11 _XGetScanlinePad 158
-X11 _XGetBitsPerPixel 159
-X11 XCreateImage 160
-X11 _XSetImage 161
-X11 _XInitImageFuncPtrs 162
-X11 XDrawImageString 163
-X11 XDrawImageString16 164
-X11 XInitExtension 165
-X11 XAddExtension 166
-X11 XEHeadOfExtensionList 167
-X11 XAddToExtensionList 168
-X11 XFindOnExtensionList 169
-X11 XESetCreateGC 170
-X11 XESetCopyGC 171
-X11 XESetFlushGC 172
-X11 XESetFreeGC 173
-X11 XESetCreateFont 174
-X11 XESetFreeFont 175
-X11 XESetCloseDisplay 176
-X11 XESetWireToEvent 177
-X11 XESetEventToWire 178
-X11 XESetWireToError 179
-X11 XESetError 180
-X11 XESetErrorString 181
-X11 XESetPrintErrorValues 182
-X11 XInstallColormap 183
-X11 XInternAtom 184
-X11 XKeycodeToKeysym 185
-X11 XKeysymToKeycode 186
-X11 XLookupKeysym 187
-X11 XRefreshKeyboardMapping 188
-X11 XLookupString 189
-X11 XRebindKeysym 190
-X11 XKeysymToString 191
-X11 XKillClient 192
-X11 XListHosts 193
-X11 XListInstalledColormaps 194
-X11 XListProperties 195
-X11 XListExtensions 196
-X11 XFreeExtensionList 197
-X11 XLoadFont 198
-X11 XLookupColor 199
-X11 XLowerWindow 200
-X11 XConnectionNumber 942
-X11 XRootWindow 943
-X11 XDefaultScreen 201
-X11 XDefaultRootWindow 202
-X11 XDefaultVisual 203
-X11 XDefaultGC 204
-X11 XBlackPixel 205
-X11 XWhitePixel 206
-X11 XAllPlanes 207
-X11 XQLength 208
-X11 XDisplayWidth 209
-X11 XDisplayHeight 210
-X11 XDisplayWidthMM 211
-X11 XDisplayHeightMM 212
-X11 XDisplayPlanes 213
-X11 XDisplayCells 214
-X11 XScreenCount 215
-X11 XServerVendor 216
-X11 XProtocolVersion 217
-X11 XProtocolRevision 218
-X11 XVendorRelease 219
-X11 XDisplayString 220
-X11 XDefaultDepth 221
-X11 XDefaultColormap 222
-X11 XBitmapUnit 223
-X11 XBitmapBitOrder 224
-X11 XBitmapPad 225
-X11 XImageByteOrder 226
-X11 XNextRequest 227
-X11 XLastKnownRequestProcessed 228
-X11 XScreenOfDisplay 229
-X11 XDefaultScreenOfDisplay 230
-X11 XDisplayOfScreen 231
-X11 XRootWindowOfScreen 232
-X11 XBlackPixelOfScreen 233
-X11 XWhitePixelOfScreen 234
-X11 XDefaultColormapOfScreen 235
-X11 XDefaultDepthOfScreen 236
-X11 XDefaultGCOfScreen 237
-X11 XDefaultVisualOfScreen 238
-X11 XWidthOfScreen 239
-X11 XHeightOfScreen 240
-X11 XWidthMMOfScreen 241
-X11 XHeightMMOfScreen 242
-X11 XPlanesOfScreen 243
-X11 XCellsOfScreen 244
-X11 XMinCmapsOfScreen 245
-X11 XMaxCmapsOfScreen 246
-X11 XDoesSaveUnders 247
-X11 XDoesBackingStore 248
-X11 XEventMaskOfScreen 249
-X11 XScreenNumberOfScreen 250
-X11 XDestroyImage 251
-X11 XGetPixel 252
-X11 XPutPixel 253
-X11 XSubImage 254
-X11 XAddPixel 255
-X11 XNoOp 256
-X11 XMapRaised 257
-X11 XMapSubwindows 258
-X11 XMapWindow 259
-X11 XMaskEvent 260
-X11 XMaxRequestSize 261
-X11 XResourceManagerString 262
-X11 XDisplayMotionBufferSize 263
-X11 XDisplayKeycodes 264
-X11 XVisualIDFromVisual 265
-X11 XGetModifierMapping 266
-X11 XSetModifierMapping 267
-X11 XNewModifiermap 268
-X11 XFreeModifiermap 269
-X11 XInsertModifiermapEntry 270
-X11 XDeleteModifiermapEntry 271
-X11 XMoveWindow 272
-X11 XNextEvent 273
-X11 XOpenDisplay 274
-X11 _XFreeDisplayStructure 275
-X11 XParseColor 276
-X11 XParseGeometry 277
-X11 XPeekEvent 278
-X11 XPeekIfEvent 279
-X11 XEventsQueued 280
-X11 XPending 281
-X11 XSetWindowBackgroundPixmap 282
-X11 XSetWindowBorderPixmap 283
-X11 XPolygonRegion 284
-X11 XDrawText 285
-X11 XDrawText16 286
-X11 XPutBackEvent 287
-X11 _XReverse_Bytes 288
-X11 XPutImage 289
-X11 XQueryBestSize 290
-X11 XQueryColor 291
-X11 XQueryColors 292
-X11 XQueryBestCursor 293
-X11 XQueryExtension 294
-X11 XQueryKeymap 295
-X11 XQueryPointer 296
-X11 XQueryBestStipple 297
-X11 XQueryTextExtents16 298
-X11 XQueryTextExtents 299
-X11 XQueryBestTile 300
-X11 XQueryTree 301
-X11 XRaiseWindow 302
-X11 XReadBitmapFile 303
-X11 XRecolorCursor 304
-X11 XConfigureWindow 305
-X11 XCreateRegion 306
-X11 XClipBox 307
-X11 XUnionRectWithRegion 308
-X11 XSetRegion 309
-X11 XDestroyRegion 310
-X11 XOffsetRegion 311
-X11 XShrinkRegion 312
-X11 XIntersectRegion 313
-X11 XUnionRegion 314
-X11 XSubtractRegion 315
-X11 XXorRegion 316
-X11 XEmptyRegion 317
-X11 XEqualRegion 318
-X11 XPointInRegion 319
-X11 XRectInRegion 320
-X11 XReparentWindow 321
-X11 XRestackWindows 322
-X11 XRotateWindowProperties 323
-X11 XScreenResourceString 324
-X11 XSelectInput 325
-X11 XSendEvent 326
-X11 XSetBackground 327
-X11 XSetClipRectangles 328
-X11 _XSetClipRectangles 329
-X11 XSetClipMask 330
-X11 XSetClipOrigin 331
-X11 XSetDashes 332
-X11 XSetFontPath 333
-X11 XSetFont 334
-X11 XSetForeground 335
-X11 XSetFunction 336
-X11 XSetSizeHints 337
-X11 XSetWMHints 338
-X11 XSetZoomHints 339
-X11 XSetNormalHints 340
-X11 XSetIconSizes 341
-X11 XSetCommand 342
-X11 XSetStandardProperties 343
-X11 XSetTransientForHint 344
-X11 XSetClassHint 345
-X11 XSetInputFocus 346
-X11 XSetLineAttributes 347
-X11 XSetPlaneMask 348
-X11 XSetPointerMapping 349
-X11 XChangeKeyboardMapping 350
-X11 XSetSelectionOwner 351
-X11 XSetScreenSaver 352
-X11 XSetState 353
-X11 XSetStipple 354
-X11 XSetStandardColormap 355
-X11 XSetTile 356
-X11 XSetTSOrigin 357
-X11 XRotateBuffers 358
-X11 XFetchBuffer 359
-X11 XFetchBytes 360
-X11 XStoreBuffer 361
-X11 XStoreBytes 362
-X11 XStoreColor 363
-X11 XStoreColors 364
-X11 XStoreNamedColor 365
-X11 XStoreName 366
-X11 XSetIconName 367
-X11 _XInitKeysymDB 368
-X11 XStringToKeysym 369
-X11 XSync 370
-X11 _XSyncFunction 371
-X11 XSynchronize 372
-X11 XSetAfterFunction 373
-X11 XDrawString 374
-X11 XDrawString16 375
-X11 XTextExtents 376
-X11 XTextWidth 377
-X11 XTextExtents16 378
-X11 XTextWidth16 379
-X11 XTranslateCoordinates 380
-X11 XUndefineCursor 381
-X11 XUngrabButton 382
-X11 XUngrabKeyboard 383
-X11 XUngrabKey 384
-X11 XUngrabPointer 385
-X11 XUngrabServer 386
-X11 XUninstallColormap 387
-X11 XUnloadFont 388
-X11 XUnmapSubwindows 389
-X11 XUnmapWindow 390
-X11 XGetVisualInfo 391
-X11 XMatchVisualInfo 392
-X11 XWarpPointer 393
-X11 XWindowEvent 394
-X11 XCreateWindow 395
-X11 _XProcessWindowAttributes 396
-X11 XWriteBitmapFile 397
-X11 _XFlush 398
-X11 _XEventsQueued 399
-X11 _XReadEvents 400
-X11 _XRead 401
-X11 _XReadPad 402
-X11 _XSend 403
-X11 _XAllocID 404
-X11 _XSetLastRequestRead 405
-X11 _XReply 406
-X11 _XEatData 407
-X11 _XEnq 408
-X11 _XUnknownWireEvent 409
-X11 _XUnknownNativeEvent 410
-X11 _XWireToEvent 411
-X11 _XDefaultIOError 412
-X11 _XDefaultError 413
-X11 _XDefaultWireError 414
-X11 _XError 415
-X11 _XIOError 416
-X11 _XAllocScratch 417
-X11 _XVIDtoVisual 418
-X11 XFree 419
-X11 _XGetHostname 420
-X11 _XScreenOfWindow 421
-X11 _XAllocIDs 423
-X11 _XAllocTemp 424
-X11 _XFreeTemp 425
-X11 XrmInitialize 426
-X11 XrmGetDatabase 427
-X11 XrmSetDatabase 428
-X11 XrmStringToQuarkList 429
-X11 XrmStringToBindingQuarkList 430
-X11 XrmCombineDatabase 431
-X11 XrmMergeDatabases 432
-X11 XrmQPutResource 433
-X11 XrmPutResource 434
-X11 XrmQPutStringResource 435
-X11 XrmPutStringResource 436
-X11 XrmPutLineResource 437
-X11 XrmGetStringDatabase 438
-X11 XrmGetFileDatabase 439
-X11 XrmCombineFileDatabase 440
-X11 XrmEnumerateDatabase 441
-X11 XrmPutFileDatabase 442
-X11 XrmQGetSearchList 443
-X11 XrmQGetSearchResource 444
-X11 XrmQGetResource 445
-X11 XrmGetResource 446
-X11 XrmLocaleOfDatabase 447
-X11 XrmDestroyDatabase 448
-X11 XGetGCValues 449
-X11 XGetWMSizeHints 450
-X11 XGetWMNormalHints 451
-X11 XGetRGBColormaps 452
-X11 XGetTextProperty 453
-X11 XGetWMName 454
-X11 XGetWMIconName 455
-X11 XGetWMClientMachine 456
-X11 XGetWMColormapWindows 457
-X11 XGetWMProtocols 458
-X11 XIconifyWindow 459
-X11 XListPixmapFormats 460
-X11 XAllocSizeHints 461
-X11 XAllocStandardColormap 462
-X11 XAllocWMHints 463
-X11 XAllocClassHint 464
-X11 XAllocIconSize 465
-X11 XReconfigureWMWindow 466
-X11 XSetWMSizeHints 467
-X11 XSetWMNormalHints 468
-X11 XSetRGBColormaps 469
-X11 XSetTextProperty 470
-X11 XSetWMName 471
-X11 XSetWMIconName 472
-X11 XSetWMClientMachine 473
-X11 XSetWMColormapWindows 474
-X11 XSetWMProperties 475
-X11 XSetWMProtocols 476
-X11 XStringListToTextProperty 477
-X11 XTextPropertyToStringList 478
-X11 XFreeStringList 479
-X11 XWMGeometry 480
-X11 XWithdrawWindow 481
-X11 XauDisposeAuth 482
-X11 XauGetBestAuthByAddr 483
-X11 XauFileName 484
-X11 XauReadAuth 485
-X11 XcmsCIELabToCIEXYZ 486
-X11 XcmsCIEXYZToCIELab 487
-X11 XcmsCIELabClipab 488
-X11 XcmsCIELabClipL 489
-X11 XcmsCIELabClipLab 490
-X11 XcmsCIELabQueryMinL 491
-X11 XcmsCIELabQueryMaxC 492
-X11 XcmsCIELabQueryMaxL 493
-X11 _XcmsCIELabQueryMaxLCRGB 494
-X11 XcmsCIELabQueryMaxLC 495
-X11 XcmsCIELabWhiteShiftColors 496
-X11 XcmsCIELuvToCIEuvY 497
-X11 XcmsCIEuvYToCIELuv 498
-X11 XcmsCIELuvClipuv 499
-X11 XcmsCIELuvClipL 500
-X11 XcmsCIELuvClipLuv 501
-X11 XcmsCIELuvQueryMinL 502
-X11 XcmsCIELuvQueryMaxC 503
-X11 XcmsCIELuvQueryMaxL 504
-X11 _XcmsCIELuvQueryMaxLCRGB 505
-X11 XcmsCIELuvQueryMaxLC 506
-X11 XcmsCIELuvWhiteShiftColors 507
-X11 XcmsCIEuvYToCIEXYZ 508
-X11 XcmsCIEXYZToCIEuvY 509
-X11 XcmsCIExyYToCIEXYZ 510
-X11 XcmsCIEXYZToCIExyY 511
-X11 XcmsTekHVCToCIEuvY 512
-X11 XcmsCIEuvYToTekHVC 513
-X11 _XcmsTekHVC_CheckModify 514
-X11 XcmsTekHVCClipC 515
-X11 XcmsTekHVCClipV 516
-X11 XcmsTekHVCClipVC 517
-X11 XcmsTekHVCQueryMinV 518
-X11 XcmsTekHVCQueryMaxC 519
-X11 XcmsTekHVCQueryMaxV 520
-X11 _XcmsTekHVCQueryMaxVCRGB 521
-X11 XcmsTekHVCQueryMaxVC 522
-X11 XcmsTekHVCQueryMaxVSamples 523
-X11 XcmsTekHVCWhiteShiftColors 524
-X11 XcmsAddColorSpace 525
-X11 XcmsAddFunctionSet 526
-X11 XcmsAllocNamedColor 527
-X11 XcmsAllocColor 528
-X11 XcmsCreateCCC 529
-X11 XcmsDefaultCCC 530
-X11 XcmsFreeCCC 531
-X11 _XcmsAddCmapRec 532
-X11 _XcmsCopyCmapRecAndFree 533
-X11 _XcmsDeleteCmapRec 534
-X11 XcmsCCCOfColormap 535
-X11 _XcmsCopyISOLatin1Lowered 536
-X11 _XcmsResolveColorString 537
-X11 _XcmsConvertColorsWithWhitePt 538
-X11 _XcmsEqualWhitePts 539
-X11 _XcmsDIConvertColors 540
-X11 _XcmsDDConvertColors 541
-X11 XcmsConvertColors 542
-X11 _XcmsRegFormatOfPrefix 543
-X11 XcmsFormatOfPrefix 544
-X11 _XcmsCopyPointerArray 545
-X11 _XcmsFreePointerArray 546
-X11 _XcmsPushPointerArray 547
-X11 _XcmsInitDefaultCCCs 548
-X11 _XcmsInitScrnInfo 549
-X11 _XcmsFreeIntensityMaps 550
-X11 _XcmsGetIntensityMap 551
-X11 _XcmsGetTableType0 552
-X11 _XcmsGetTableType1 553
-X11 _XcmsValueCmp 554
-X11 _XcmsIntensityCmp 555
-X11 _XcmsValueInterpolation 556
-X11 _XcmsIntensityInterpolation 557
-X11 _XcmsTableSearch 558
-X11 _XcmsMatVec 559
-X11 XcmsCIEXYZToRGBi 560
-X11 XcmsRGBiToCIEXYZ 561
-X11 XcmsRGBiToRGB 562
-X11 XcmsRGBToRGBi 563
-X11 _XcmsLRGB_InitScrnDefault 564
-X11 XcmsLookupColor 565
-X11 _XcmsCubeRoot 566
-X11 _XcmsSquareRoot 567
-X11 XcmsDisplayOfCCC 568
-X11 XcmsVisualOfCCC 569
-X11 XcmsScreenNumberOfCCC 570
-X11 XcmsScreenWhitePointOfCCC 571
-X11 XcmsClientWhitePointOfCCC 572
-X11 XcmsPrefixOfFormat 573
-X11 _XcmsGetElement 574
-X11 _XcmsGetProperty 575
-X11 XcmsQueryBlack 576
-X11 XcmsQueryBlue 577
-X11 XcmsQueryGreen 578
-X11 XcmsQueryRed 579
-X11 XcmsQueryWhite 580
-X11 XcmsQueryColor 581
-X11 XcmsQueryColors 582
-X11 XcmsSetWhitePoint 583
-X11 XcmsSetCompressionProc 584
-X11 XcmsSetWhiteAdjustProc 585
-X11 _XcmsSetGetColors 586
-X11 XcmsStoreColor 587
-X11 XcmsStoreColors 588
-X11 _XcmsCosine 589
-X11 _XcmsSine 590
-X11 _XcmsArcTangent 591
-X11 _XcmsRGB_to_XColor 592
-X11 _XColor_to_XcmsRGB 593
-X11 _XcmsResolveColor 594
-X11 _XcmsUnresolveColor 595
-X11 _XUnresolveColor 596
-X11 _XParseBaseFontNameList 597
-X11 XCreateFontSet 598
-X11 XFontsOfFontSet 599
-X11 XBaseFontNameListOfFontSet 941
-X11 XLocaleOfFontSet 600
-X11 XContextDependentDrawing 601
-X11 XExtentsOfFontSet 602
-X11 XFreeFontSet 603
-X11 XVaCreateNestedList 604
-X11 XGetIMValues 605
-X11 XCreateIC 606
-X11 XDestroyIC 607
-X11 XGetICValues 608
-X11 XSetICValues 609
-X11 XSetICFocus 610
-X11 XUnsetICFocus 611
-X11 XIMOfIC 612
-X11 XmbResetIC 613
-X11 XwcResetIC 614
-X11 XmbLookupString 615
-X11 XwcLookupString 616
-X11 _XIMCompileResourceList 617
-X11 _XCopyToArg 618
-X11 XOpenIM 619
-X11 XCloseIM 620
-X11 XDisplayOfIM 621
-X11 XLocaleOfIM 622
-X11 XSetLocaleModifiers 623
-X11 XSupportsLocale 624
-X11 _XlcValidModSyntax 625
-X11 _XlcDefaultMapModifiers 626
-X11 _XlcAddLoader 627
-X11 _XlcCurrentLC 628
-X11 XmbSetWMProperties 629
-X11 XmbDrawText 630
-X11 XmbDrawString 631
-X11 XmbDrawImageString 632
-X11 XmbTextEscapement 633
-X11 XmbTextExtents 634
-X11 XmbTextPerCharExtents 635
-X11 XwcDrawText 636
-X11 XwcDrawString 637
-X11 XwcDrawImageString 638
-X11 XwcTextEscapement 639
-X11 XwcTextExtents 640
-X11 XwcTextPerCharExtents 641
-X11 XFilterEvent 642
-X11 _XRegisterFilterByMask 643
-X11 _XRegisterFilterByType 644
-X11 _XUnregisterFilter 645
-X11 _Xsetlocale 646
-X11 XDefaultString 647
-X11 _XlcDefaultLoader 648
-X11 _XrmInitParseInfo 649
-X11 XmbTextPropertyToTextList 650
-X11 XmbTextListToTextProperty 651
-X11 XwcTextPropertyToTextList 652
-X11 XwcFreeStringList 653
-X11 XwcTextListToTextProperty 654
-X11 _X11TransConnectDisplay 655
-X11 XGetAtomNames 656
-X11 XInitImage 657
-X11 XESetBeforeFlush 658
-X11 _XFreeAtomTable 659
-X11 _XUpdateAtomCache 660
-X11 XInternAtoms 661
-X11 _XKeyInitialize 662
-X11 XConvertCase 663
-X11 _XTranslateKey 664
-X11 _XTranslateKeySym 665
-X11 _XKeysymToModifiers 666
-X11 XExtendedMaxRequestSize 667
-X11 XReadBitmapFileData 668
-X11 _XAsyncErrorHandler 669
-X11 _XDeqAsyncHandler 670
-X11 _XGetAsyncReply 671
-X11 _XGetAsyncData 672
-X11 _XPollfdCacheInit 673
-X11 _XPollfdCacheAdd 674
-X11 _XPollfdCacheDel 675
-X11 _XRegisterInternalConnection 676
-X11 _XUnregisterInternalConnection 677
-X11 XInternalConnectionNumbers 678
-X11 XProcessInternalConnection 679
-X11 XAddConnectionWatch 680
-X11 XRemoveConnectionWatch 681
-X11 _XDeq 682
-X11 _XcmsCIEXYZ_ValidSpec 683
-X11 _XcmsCIEuvY_ValidSpec 684
-X11 XcmsSetCCCOfColormap 685
-X11 XDirectionalDependentDrawing 686
-X11 XContextualDrawing 687
-X11 XSetIMValues 688
-X11 XRegisterIMInstantiateCallback 689
-X11 XUnregisterIMInstantiateCallback 690
-X11 XCreateOC 691
-X11 XDestroyOC 692
-X11 XOMOfOC 693
-X11 XSetOCValues 694
-X11 XGetOCValues 695
-X11 XOpenOM 696
-X11 XCloseOM 697
-X11 XSetOMValues 698
-X11 XGetOMValues 699
-X11 XDisplayOfOM 700
-X11 XLocaleOfOM 701
-X11 _XlcRemoveLoader 702
-X11 _XOpenLC 703
-X11 _XCloseLC 704
-X11 _XlcCopyFromArg 705
-X11 _XlcCopyToArg 706
-X11 _XlcCountVaList 707
-X11 _XlcVaToArgList 708
-X11 _XlcCompileResourceList 709
-X11 _XlcGetValues 710
-X11 _XlcSetValues 711
-X11 XInitThreads 712
-X11 XLockDisplay 713
-X11 XUnlockDisplay 714
-X11 _X11TransFreeConnInfo 715
-X11 _X11TransOpenCOTSClient 716
-X11 _X11TransOpenCLTSClient 717
-X11 _X11TransSetOption 718
-X11 _X11TransConnect 719
-X11 _X11TransBytesReadable 720
-X11 _X11TransRead 721
-X11 _X11TransWrite 722
-X11 _X11TransReadv 723
-X11 _X11TransWritev 724
-X11 _X11TransDisconnect 725
-X11 _X11TransClose 726
-X11 _X11TransCloseForCloning 727
-X11 _X11TransIsLocal 728
-X11 _X11TransGetMyAddr 729
-X11 _X11TransGetPeerAddr 730
-X11 _X11TransGetConnectionNumber 731
-X11 _X11TransGetHostname 732
-X11 _X11TransConvertAddress 733
-X11 _XimCbDispatch 734
-X11 _XimLookupMBText 735
-X11 _XimLookupWCText 736
-X11 _XimRegisterFilter 737
-X11 _XimUnregisterFilter 738
-X11 _XimReregisterFilter 739
-X11 _XimRegisterServerFilter 740
-X11 _XimUnregisterServerFilter 741
-X11 _XimProtoCreateIC 742
-X11 _XimCheckDataSize 743
-X11 _XimSetHeader 744
-X11 _XimProtoIMFree 745
-X11 _XimProtoOpenIM 746
-X11 _XimICOfXICID 747
-X11 _XimSetEventMaskCallback 748
-X11 _XimSync 749
-X11 _XimProcSyncReply 750
-X11 _XimRespSyncReply 751
-X11 _XimSyncCallback 752
-X11 _XimForwardEvent 753
-X11 _XimForwardEventCallback 754
-X11 _XimRegisterTriggerKeysCallback 755
-X11 _XimGetWindowEventmask 756
-X11 _XimTriggerNotify 757
-X11 _XimFreeCommitInfo 758
-X11 _XimCommitCallback 759
-X11 _XimProcError 760
-X11 _XimErrorCallback 761
-X11 _XimError 762
-X11 _Ximctstombs 763
-X11 _Ximctstowcs 764
-X11 _XimProtoMbLookupString 765
-X11 _XimProtoWcLookupString 766
-X11 _XimRegProtoIntrCallback 767
-X11 _XimFreeProtoIntrCallback 768
-X11 _XimDispatchInit 769
-X11 _XimProtoEventToWire 770
-X11 _XimProtoWireToEvent 771
-X11 _XimExtension 772
-X11 _XimRegisterIMInstantiateCallback 773
-X11 _XimUnRegisterIMInstantiateCallback 774
-X11 _XimResetIMInstantiateCallback 775
-X11 _XimDestroyIMStructureList 776
-X11 _XimServerDestroy 777
-X11 _XInitIM 779
-X11 _XimLocalFilter 780
-X11 _XimLocalGetICValues 781
-X11 _XimLocalCreateIC 782
-X11 _XimCheckIfLocalProcessing 783
-X11 _XimLocalIMFree 784
-X11 _XimLocalGetIMValues 785
-X11 _XimLocalSetIMValues 786
-X11 _XimLocalOpenIM 787
-X11 _XimLocalMbLookupString 788
-X11 _XimLocalWcLookupString 789
-X11 _XimParseStringFile 790
-X11 _XimSetICValueData 791
-X11 _XimLocalSetICValues 792
-X11 _XimSetIMResourceList 793
-X11 _XimSetICResourceList 794
-X11 _XimSetInnerIMResourceList 795
-X11 _XimSetInnerICResourceList 796
-X11 _XimCheckCreateICValues 797
-X11 _XimGetResourceListRec 798
-X11 _XimSetIMMode 799
-X11 _XimCheckIMMode 800
-X11 _XimSetICMode 801
-X11 _XimCheckICMode 802
-X11 _XimSetLocalIMDefaults 944
-X11 _XimSetICDefaults 803
-X11 _XimDecodeLocalIMAttr 804
-X11 _XimDecodeLocalICAttr 805
-X11 _XimCheckLocalInputStyle 806
-X11 _XimEncodeLocalIMAttr 807
-X11 _XimEncodeLocalICAttr 808
-X11 _XimGetCurrentIMValues 809
-X11 _XimSetCurrentIMValues 810
-X11 _XimGetCurrentICValues 811
-X11 _XimSetCurrentICValues 812
-X11 _XimInitialResourceInfo 813
-X11 _XimDecodeIMATTRIBUTE 814
-X11 _XimDecodeICATTRIBUTE 815
-X11 _XimEncodeIMATTRIBUTE 816
-X11 _XimEncodeICATTRIBUTE 817
-X11 _XimGetAttributeID 818
-X11 _XimThaiFilter 819
-X11 _XimThaiCreateIC 820
-X11 _XimCheckIfThaiProcessing 821
-X11 _XimThaiOpenIM 822
-X11 _XimThaiIMFree 823
-X11 _XimThaiCloseIM 824
-X11 _XimXConf 825
-X11 _XimConnect 826
-X11 _XimShutdown 827
-X11 _XimFlush 828
-X11 _XimFilterWaitEvent 829
-X11 _XimFreeTransIntrCallback 830
-X11 _XimTransFilterWaitEvent 831
-X11 _XimTransInternalConnection 832
-X11 _XimTransFlush 833
-X11 _XimTransConf 834
-X11 _XlcParseCharSet 835
-X11 _XlcInitCTInfo 836
-X11 _XlcGetCSValues 837
-X11 _XlcGetCharSet 838
-X11 _XlcAddCharSet 839
-X11 _XlcCreateDefaultCharSet 840
-X11 _XlcSetConverter 841
-X11 _XlcOpenConverter 842
-X11 _XlcCloseConverter 843
-X11 _XlcConvert 844
-X11 _XlcResetConverter 845
-X11 _XlcGetResource 846
-X11 _XlcGetLocaleDataBase 847
-X11 _XlcDestroyLocaleDataBase 848
-X11 _XlcCreateLocaleDataBase 849
-X11 _XlcEucLoader 850
-X11 _XlcFileName 851
-X11 _XlcResolveLocaleName 852
-X11 _XlcResolveDBName 853
-X11 _XlcResolveI18NPath 854
-X11 _XlcGenericLoader 855
-X11 _XlcInitLoader 856
-X11 _XmbTextPropertyToTextList 857
-X11 _XwcTextPropertyToTextList 858
-X11 _XwcFreeStringList 859
-X11 _XGetLCValues 860
-X11 _XlcDestroyLC 861
-X11 _XlcCreateLC 862
-X11 _XrmDefaultInitParseInfo 863
-X11 _XlcSjisLoader 864
-X11 _Xlcmbtowc 865
-X11 _Xlcwctomb 866
-X11 _Xlcmbstowcs 867
-X11 _Xlcwcstombs 868
-X11 _Xmbtowc 869
-X11 _Xwctomb 870
-X11 _Xmbstowcs 871
-X11 _Xwcstombs 872
-X11 _Xwcscpy 873
-X11 _Xwcsncpy 874
-X11 _Xwcslen 875
-X11 _Xwcscmp 876
-X11 _Xwcsncmp 877
-X11 _XmbTextListToTextProperty 878
-X11 _XwcTextListToTextProperty 879
-X11 _XlcUtfLoader 880
-X11 _XlcCompareISOLatin1 881
-X11 _XlcNCompareISOLatin1 882
-X11 _XmbDefaultTextEscapement 883
-X11 _XwcDefaultTextEscapement 884
-X11 _XmbDefaultTextExtents 885
-X11 _XwcDefaultTextExtents 886
-X11 _XmbDefaultTextPerCharExtents 887
-X11 _XwcDefaultTextPerCharExtents 888
-X11 _XmbDefaultDrawString 889
-X11 _XwcDefaultDrawString 890
-X11 _XmbDefaultDrawImageString 891
-X11 _XwcDefaultDrawImageString 892
-X11 _XomGenericOpenOM 893
-X11 _XInitOM 894
-X11 _XmbGenericDrawImageString 895
-X11 _XwcGenericDrawImageString 896
-X11 _XomGenericDrawString 897
-X11 _XmbGenericDrawString 898
-X11 _XwcGenericDrawString 899
-X11 _XmbGenericTextEscapement 900
-X11 _XwcGenericTextEscapement 901
-X11 _XomGenericTextExtents 902
-X11 _XmbGenericTextExtents 903
-X11 _XwcGenericTextExtents 904
-X11 _XmbGenericTextPerCharExtents 905
-X11 _XwcGenericTextPerCharExtents 906
-X11 _XomConvert 907
-X11 _XomInitConverter 908
-X11 _Xmblen 909
-X11 _XimGetResourceName 910
-X11 _XimGetResourceListRecByQuark 911
-X11 _XimSetIMValueData 912
-X11 _XimGetIMValueData 913
-X11 _XimGetICValueData 914
-X11 _XimMakeIMAttrIDList 915
-X11 _XimMakeICAttrIDList 916
-X11 _XimWrite 917
-X11 _XimRead 918
-X11 _XimRegisterDispatcher 919
-X11 _XimTransRegisterDispatcher 920
-X11 _XimTransCallDispatcher 921
-X11 _XimTransWrite 922
-X11 _XimTransRead 923
-X11 _XimXTransFreeConnInfo 924
-X11 _XimXTransOpenCOTSClient 925
-X11 _XimXTransOpenCLTSClient 926
-X11 _XimXTransSetOption 927
-X11 _XimXTransConnect 928
-X11 _XimXTransBytesReadable 929
-X11 _XimXTransRead 930
-X11 _XimXTransWrite 931
-X11 _XimXTransReadv 932
-X11 _XimXTransWritev 933
-X11 _XimXTransDisconnect 934
-X11 _XimXTransClose 935
-X11 _XimXTransCloseForCloning 936
-X11 _XimXTransIsLocal 937
-X11 _XimXTransGetMyAddr 938
-X11 _XimXTransGetPeerAddr 939
-X11 _XimXTransGetConnectionNumber 940
-X11 _XimXTransGetHostname 945
-X11 _Xdebug 946
-X11 __XOS2RedirRoot 950
-X11 __XOS2RedirRoot1 951
-X11 XkbIgnoreExtension 1000
-X11 XkbOpenDisplay 1001
-X11 XkbQueryExtension 1002
-X11 XkbUseExtension 1003
-X11 XkbLibraryVersion 1004
-X11 XkbSetXlibControls 1005
-X11 XkbGetXlibControls 1006
-X11 XkbSetAtomFuncs 1007
-X11 XkbKeycodeToKeysym 1008
-X11 XkbKeysymToModifiers 1009
-X11 XkbLookupKeySym 1010
-X11 XkbLookupKeyBinding 1011
-X11 XkbTranslateKeyCode 1012
-X11 XkbTranslateKeySym 1013
-X11 XkbSetAutoRepeatRate 1014
-X11 XkbGetAutoRepeatRate 1015
-X11 XkbChangeEnabledControls 1016
-X11 XkbDeviceBell 1017
-X11 XkbForceDeviceBell 1018
-X11 XkbDeviceBellEvent 1019
-X11 XkbBell 1020
-X11 XkbForceBell 1021
-X11 XkbBellEvent 1022
-X11 XkbSelectEvents 1023
-X11 XkbSelectEventDetails 1024
-X11 XkbNoteMapChanges 1025
-X11 XkbNoteNameChanges 1026
-X11 XkbGetIndicatorState 1027
-X11 XkbGetIndicatorMap 1029
-X11 XkbSetIndicatorMap 1030
-X11 XkbGetNamedIndicator 1031
-X11 XkbGetNamedDeviceIndicator 1032
-X11 XkbSetNamedIndicator 1033
-X11 XkbSetNamedDeviceIndicator 1034
-X11 XkbLockModifiers 1035
-X11 XkbLatchModifiers 1036
-X11 XkbLockGroup 1037
-X11 XkbLatchGroup 1038
-X11 XkbSetServerInternalMods 1039
-X11 XkbSetIgnoreLockMods 1040
-X11 XkbVirtualModsToReal 1041
-X11 XkbComputeEffectiveMap 1042
-X11 XkbInitCanonicalKeyTypes 1043
-X11 XkbAllocKeyboard 1044
-X11 XkbFreeKeyboard 1045
-X11 XkbAllocClientMap 1046
-X11 XkbAllocServerMap 1047
-X11 XkbFreeClientMap 1048
-X11 XkbFreeServerMap 1049
-X11 XkbAddKeyType 1050
-X11 XkbAllocIndicatorMaps 1051
-X11 XkbFreeIndicatorMaps 1052
-X11 XkbGetMap 1053
-X11 XkbGetUpdatedMap 1054
-X11 XkbGetMapChanges 1055
-X11 XkbRefreshKeyboardMapping 1056
-X11 XkbGetKeyTypes 1057
-X11 XkbGetKeySyms 1058
-X11 XkbGetKeyActions 1059
-X11 XkbGetKeyBehaviors 1060
-X11 XkbGetVirtualMods 1061
-X11 XkbGetKeyExplicitComponents 1062
-X11 XkbGetKeyModifierMap 1063
-X11 XkbAllocControls 1064
-X11 XkbFreeControls 1065
-X11 XkbGetControls 1066
-X11 XkbSetControls 1067
-X11 XkbAllocCompatMap 1069
-X11 XkbFreeCompatMap 1070
-X11 XkbGetCompatMap 1071
-X11 XkbSetCompatMap 1072
-X11 XkbAllocNames 1073
-X11 XkbGetNames 1074
-X11 XkbSetNames 1075
-X11 XkbChangeNames 1076
-X11 XkbFreeNames 1077
-X11 XkbGetState 1078
-X11 XkbSetMap 1079
-X11 XkbChangeMap 1080
-X11 XkbSetDetectableAutoRepeat 1081
-X11 XkbGetDetectableAutoRepeat 1082
-X11 XkbSetAutoResetControls 1083
-X11 XkbGetAutoResetControls 1084
-X11 XkbCopyKeyType 1085
-X11 XkbCopyKeyTypes 1086
-X11 XkbResizeKeyType 1087
-X11 XkbResizeKeySyms 1088
-X11 XkbResizeKeyActions 1089
-X11 XkbChangeTypesOfKey 1090
-X11 XkbListComponents 1091
-X11 XkbFreeComponentList 1092
-X11 XkbGetKeyboard 1093
-X11 XkbGetKeyboardByName 1094
-X11 XkbAddDeviceLedInfo 1098
-X11 XkbResizeDeviceButtonActions 1099
-X11 XkbAllocDeviceInfo 1100
-X11 XkbFreeDeviceInfo 1101
-X11 XkbNoteDeviceChanges 1102
-X11 XkbGetDeviceInfo 1103
-X11 XkbGetDeviceInfoChanges 1104
-X11 XkbGetDeviceButtonActions 1105
-X11 XkbGetDeviceLedInfo 1106
-X11 XkbSetDeviceInfo 1107
-X11 XkbChangeDeviceInfo 1108
-X11 XkbSetDeviceLedInfo 1109
-X11 XkbSetDeviceButtonActions 1110
-X11 XkbToControl 1111
-X11 XkbSetDebuggingFlags 1112
-X11 _XkbInternAtomFunc 1113
-X11 _XkbGetAtomNameFunc 1114
-X11 _XkbReloadDpy 1115
-X11 _XKeycodeToKeysym 1116
-X11 _XKeysymToKeycode 1117
-X11 _XLookupKeysym 1118
-X11 _XRefreshKeyboardMapping 1119
-X11 _XLookupString 1120
-X11 _XkbNoteCoreMapChanges 1121
-X11 _XkbInitReadBuffer 1122
-X11 _XkbSkipReadBufferData 1123
-X11 _XkbCopyFromReadBuffer 1124
-X11 _XkbReadCopyKeySyms 1125
-X11 _XkbWriteCopyKeySyms 1126
-X11 _XkbReadBufferCopyKeySyms 1127
-X11 _XkbPeekAtReadBuffer 1128
-X11 _XkbGetReadBufferPtr 1129
-X11 _XkbFreeReadBuffer 1130
-X11 _XkbGetReadBufferCountedString 1131
-X11 _XkbGetCharset 1132
-X11 _XkbGetConverters 1133
-X11 XkbGetGeometry 1134
-X11 XkbAddGeomShape 1135
-X11 XkbAddGeomOutline 1136
-X11 XkbComputeShapeBounds 1137
-X11 XkbAddGeomDoodad 1138
-X11 XkbAddGeomColor 1139
-X11 XkbAddGeomOverlayRow 1140
-X11 XkbAddGeomSection 1141
-X11 XkbAddGeomRow 1142
-X11 XkbAddGeomKey 1143
-X11 XkbComputeSectionBounds 1144
-X11 XkbAllocGeometry 1145
-X11 XkbAddGeomProperty 1146
-X11 XkbAddGeomOverlay 1147
-X11 XkbComputeShapeTop 1148
-X11 XkbFindOverlayForKey 1149
-X11 XkbAllocGeomKeyAliases 1150
-X11 XkbSetGeometry 1151
-X11 XkbXlibControlsImplemented 1152
-X11 XkbTranslateKey 1153
-X11 XkbAddGeomOverlayKey 1154
-X11 XkbNoteControlsChanges 1155
-X11 XkbGetKeyVirtualModMap 1156
-X11 XkbComputeRowBounds 1157
-X11 XkbGetNamedGeometry 1158
-X11 XkbKeyTypesForCoreSymbols 1159
-X11 XkbApplyCompatMapToKey 1160
-X11 XkbUpdateMapFromCore 1161
-X11 XkbUpdateActionVirtualMods 1162
-X11 XkbUpdateKeyTypeVirtualMods 1163
-X11 XkbApplyVirtualModChanges 1164
-X11 XkbFreeGeomProperties 1165
-X11 XkbFreeGeomKeyAliases 1166
-X11 XkbFreeGeomColors 1167
-X11 XkbFreeGeomPoints 1168
-X11 XkbFreeGeomOutlines 1169
-X11 XkbFreeGeomShapes 1170
-X11 XkbFreeGeomOverlayKeys 1171
-X11 XkbFreeGeomOverlayRows 1172
-X11 XkbFreeGeomOverlays 1173
-X11 XkbFreeGeomKeys 1174
-X11 XkbFreeGeomRows 1175
-X11 XkbFreeGeomSections 1176
-X11 XkbFreeGeomDoodads 1177
-X11 XkbFreeGeometry 1178
-X11 XkbAllocGeomProps 1179
-X11 XkbAllocGeomColors 1180
-X11 XkbAllocGeomShapes 1181
-X11 XkbAllocGeomSections 1182
-X11 XkbAllocGeomOverlays 1183
-X11 XkbAllocGeomOverlayRows 1184
-X11 XkbAllocGeomOverlayKeys 1185
-X11 XkbAllocGeomDoodads 1186
-X11 XkbAllocGeomSectionDoodads 1187
-X11 XkbAllocGeomOutlines 1188
-X11 XkbAllocGeomRows 1189
-X11 XkbAllocGeomPoints 1190
-X11 XkbAllocGeomKeys 1191
-X11 XkbAddGeomKeyAlias 1192
-X11 _XkeyTable 1200
-X11 _Xevent_to_mask 1201
-X11 _qfree 1202
-X11 _XIOErrorFunction 1203
-X11 _XErrorFunction 1204
-X11 _XHeadOfDisplayList 1205
-X11 XcmsCIELabColorSpace 1206
-X11 XcmsCIELuvColorSpace 1207
-X11 XcmsCIEXYZColorSpace 1208
-X11 XcmsCIEuvYColorSpace 1209
-X11 XcmsCIExyYColorSpace 1210
-X11 XcmsTekHVCColorSpace 1211
-X11 XcmsUNDEFINEDColorSpace 1212
-X11 _XcmsDIColorSpacesInit 1213
-X11 _XcmsDIColorSpaces 1214
-X11 _XcmsDDColorSpacesInit 1215
-X11 _XcmsDDColorSpaces 1216
-X11 _XcmsSCCFuncSetsInit 1217
-X11 _XcmsSCCFuncSets 1218
-X11 _XcmsCIEXYZ_prefix 1219
-X11 _XcmsCIEuvY_prefix 1220
-X11 _XcmsCIExyY_prefix 1221
-X11 _XcmsCIELab_prefix 1222
-X11 _XcmsCIELuv_prefix 1223
-X11 _XcmsTekHVC_prefix 1224
-X11 _XcmsRGBi_prefix 1225
-X11 _XcmsRGB_prefix 1226
-X11 _XcmsRegColorSpaces 1227
-X11 XcmsRGBiColorSpace 1228
-X11 XcmsRGBColorSpace 1229
-X11 XcmsLinearRGBFunctionSet 1230
-X11 _X11TransSocketINETFuncs 1231
-X11 _X11TransSocketTCPFuncs 1232
-X11 _XimXTransSocketINETFuncs 1233
-X11 _XimXTransSocketTCPFuncs 1234
-X11 _XimImSportRec 1235
-X11 _XimTransportRec 1236
-X11 _XlcGenericMethods 1237
-X11 _XlcPublicMethods 1238
-; 4.x exports starting from 1300
-X11 _XFlushIt 1300
-X11 _Xthread_init 1301
-X11 _Xthread_waiter 1302
-X11 XkbGetPerClientControls 1303
-X11 XkbSetPerClientControls 1304
-X11 Xutf8TextPropertyToTextList 1305
-X11 Xutf8TextListToTextProperty 1306
-X11 _XCreateMutex_fn 1307
-X11 _XFreeMutex_fn 1308
-X11 _XLockMutex_fn 1309
-X11 _XUnlockMutex_fn 1310
-X11 _Xglobal_lock 1311
-X11 Xutf8LookupString 1312
-X11 Xutf8DrawString 1313
-X11 Xutf8TextExtents 1314
-LIBRARY Xaw Xaw INITINSTANCE TERMINSTANCE
-Xaw XawAsciiSourceFreeString 1
-Xaw XawAsciiSave 2
-Xaw XawAsciiSaveAsFile 3
-Xaw XawAsciiSourceChanged 4
-Xaw XawDialogAddButton 5
-Xaw XawDialogGetValueString 6
-Xaw XawFormDoLayout 7
-Xaw XawListChange 8
-Xaw XawListUnhighlight 9
-Xaw XawListHighlight 10
-Xaw XawListShowCurrent 11
-Xaw XawPanedSetMinMax 13
-Xaw XawPanedGetMinMax 14
-Xaw XawPanedSetRefigureMode 15
-Xaw XawPanedGetNumSub 16
-Xaw XawScrollbarSetThumb 18
-Xaw XawSimpleMenuAddGlobalActions 19
-Xaw XawSimpleMenuGetActiveEntry 20
-Xaw XawSimpleMenuClearActiveEntry 21
-Xaw XawTextDisplay 22
-Xaw XawTextEnableRedisplay 23
-Xaw XawTextDisableRedisplay 24
-Xaw XawTextSetSelectionArray 25
-Xaw XawTextGetSelectionPos 26
-Xaw XawTextSetSource 27
-Xaw XawTextReplace 28
-Xaw XawTextTopPosition 29
-Xaw XawTextSetInsertionPoint 30
-Xaw XawTextGetInsertionPoint 31
-Xaw XawTextUnsetSelection 32
-Xaw XawTextSetSelection 33
-Xaw XawTextInvalidate 34
-Xaw XawTextGetSource 35
-Xaw XawTextSearch 36
-Xaw XawTextDisplayCaret 37
-Xaw XawTextSinkDisplayText 38
-Xaw XawTextSinkInsertCursor 39
-Xaw XawTextSinkClearToBackground 40
-Xaw XawTextSinkFindPosition 41
-Xaw XawTextSinkFindDistance 42
-Xaw XawTextSinkResolve 43
-Xaw XawTextSinkMaxLines 44
-Xaw XawTextSinkMaxHeight 45
-Xaw XawTextSinkSetTabs 46
-Xaw XawTextSinkGetCursorBounds 47
-Xaw XawTextSourceRead 48
-Xaw XawTextSourceReplace 49
-Xaw XawTextSourceScan 50
-Xaw XawTextSourceSearch 51
-Xaw XawTextSourceConvertSelection 52
-Xaw XawTextSourceSetSelection 53
-Xaw XawToggleChangeRadioGroup 54
-Xaw XawToggleGetCurrent 55
-Xaw XawToggleSetCurrent 56
-Xaw XawToggleUnsetCurrent 57
-Xaw XawTreeForceLayout 58
-Xaw XawViewportSetLocation 59
-Xaw XawViewportSetCoordinates 60
-Xaw _XawMultiSinkPosToXY 61
-Xaw _XawMultiSave 62
-Xaw _XawMultiSaveAsFile 63
-Xaw _XawMultiSourceFreeString 64
-Xaw _XawTextFormat 65
-Xaw _XawTextBuildLineTable 66
-Xaw _XawTextGetSTRING 67
-Xaw _XawTextSaltAwaySelection 68
-Xaw _XawTextPosToXY 69
-Xaw _XawTextWCToMB 70
-Xaw _XawTextMBToWC 71
-Xaw _Xaw_atowc 72
-Xaw _XawImResizeVendorShell 73
-Xaw _XawImGetShellHeight 74
-Xaw _XawImRealize 75
-Xaw _XawImInitialize 76
-Xaw _XawImReconnect 77
-Xaw _XawImRegister 78
-Xaw _XawImUnregister 79
-Xaw _XawImSetValues 80
-Xaw _XawImSetFocusValues 82
-Xaw _XawImUnsetFocus 84
-Xaw _XawImWcLookupString 85
-Xaw _XawImGetImAreaHeight 86
-Xaw _XawImCallVendorShellExtResize 87
-Xaw _XawImDestroy 88
-Xaw _XawTextZapSelection 89
-Xaw _XawTextInsertFileAction 90
-Xaw _XawTextInsertFile 91
-Xaw _XawTextDoSearchAction 92
-Xaw _XawTextPopdownSearchAction 93
-Xaw _XawTextSearch 94
-Xaw _XawTextDoReplaceAction 95
-Xaw _XawTextSetField 96
-Xaw asciiSrcObjectClass 100
-Xaw asciiSrcClassRec 101
-Xaw dialogWidgetClass 102
-Xaw dialogClassRec 103
-Xaw formWidgetClass 104
-Xaw formClassRec 105
-Xaw listWidgetClass 106
-Xaw listClassRec 107
-Xaw multiSinkObjectClass 108
-Xaw multiSinkClassRec 109
-Xaw multiSrcObjectClass 110
-Xaw multiSrcClassRec 111
-Xaw panedWidgetClass 112
-Xaw panedClassRec 113
-Xaw scrollbarWidgetClass 114
-Xaw scrollbarClassRec 115
-Xaw simpleMenuWidgetClass 116
-Xaw simpleMenuClassRec 117
-Xaw FMT8BIT 118
-Xaw XawFmt8Bit 119
-Xaw XawFmtWide 120
-Xaw _XawTextActionsTable 121
-Xaw _XawTextActionsTableCount 122
-Xaw textWidgetClass 123
-Xaw textClassRec 124
-Xaw textSinkObjectClass 125
-Xaw textSinkClassRec 126
-Xaw toggleWidgetClass 127
-Xaw toggleClassRec 128
-Xaw treeWidgetClass 129
-Xaw treeClassRec 130
-Xaw viewportWidgetClass 131
-Xaw viewportClassRec 132
-Xaw menuButtonClassRec 133
-Xaw menuButtonWidgetClass 134
-Xaw smeBSBClassRec 135
-Xaw smeBSBObjectClass 136
-Xaw smeLineClassRec 137
-Xaw smeLineObjectClass 138
-Xaw labelClassRec 139
-Xaw labelWidgetClass 140
-Xaw commandClassRec 141
-Xaw commandWidgetClass 142
-Xaw boxClassRec 143
-Xaw boxWidgetClass 144
-Xaw simpleClassRec 145
-Xaw simpleWidgetClass 146
-Xaw XawInitializeWidgetSet 147
-Xaw asciiTextClassRec 148
-Xaw asciiTextWidgetClass 149
-Xaw portholeClassRec 150
-Xaw portholeWidgetClass 151
-Xaw pannerClassRec 152
-Xaw pannerWidgetClass 153
-Xaw textSrcClassRec 154
-Xaw textSrcObjectClass 155
-Xaw gripWidgetClass 156
-Xaw XawWidgetArray 157
-Xaw XawWidgetCount 158
-Xaw XawPanedAllowResize 159
-Xaw _XawTextNeedsUpdating 160
-Xaw _XawTextGetText 161
-Xaw _XawTextSetScrollBars 162
-Xaw _XawTextVScroll 163
-Xaw _XawTextReplace 164
-Xaw _XawTextClearAndCenterDisplay 165
-Xaw _XawTextCheckResize 166
-Xaw _XawTextSelectionList 167
-Xaw _XawTextSetSelection 168
-Xaw _XawTextAlterSelection 169
-Xaw _XawTextPrepareToUpdate 170
-Xaw _XawTextShowPosition 171
-Xaw _XawTextExecuteUpdate 172
-Xaw XawVendorShellExtResize 173
-Xaw asciiSinkClassRec 174
-Xaw asciiSinkObjectClass 175
-Xaw gripClassRec 176
-Xaw vPanedWidgetClass 177
-Xaw repeaterClassRec 178
-Xaw repeaterWidgetClass 179
-Xaw smeClassRec 180
-Xaw smeObjectClass 181
-Xaw stripChartClassRec 182
-Xaw stripChartWidgetClass 183
-Xaw _XawDefaultTextTranslations1 184
-Xaw _XawDefaultTextTranslations2 185
-Xaw _XawDefaultTextTranslations3 186
-Xaw vendorShellClassRec 187
-Xaw _XawVendorShellClassRec 187
-Xaw vendorShellWidgetClass 188
-Xaw _XawDefaultTextTranslations4 189
-Xaw _XawDefaultTextTranslations 190
-Xaw _XawTextSrcUndo 191
-Xaw tipClassRec 192
-Xaw tipWidgetClass 193
-Xaw XawTipEnable 194
-Xaw XawTipDisable 195
-Xaw XawTextSinkConvertPropertyList 196
-Xaw XawTextGetSink 197
-Xaw XawTextSourceClearEntities 198
-Xaw XawTextSourceFindAnchor 199
-Xaw XawTextSourcePrevAnchor 200
-Xaw XawTextSourceNextAnchor 201
-Xaw XawTextSourceAnchorAndEntity 202
-Xaw XawTextSourceAddEntity 203
-;4.x export starting from 250
-Xaw xawvendorShellExtClassRec 250
-Xaw xawvendorShellExtWidgetClass 251
-Xaw XawTextSinkCopyProperty 252
-Xaw XawTextSinkGetProperty 253
-Xaw XawTextSinkCombineProperty 254
-Xaw XawTextSinkAddProperty 255
-Xaw XawTextLastPosition 256
-LIBRARY Xext Xext
-Xext XMITMiscGetBugMode 1
-Xext XMITMiscQueryExtension 2
-Xext XMITMiscSetBugMode 3
-Xext XMissingExtension 4
-Xext XSetExtensionErrorHandler 5
-Xext XShapeCombineMask 6
-Xext XShapeCombineRectangles 7
-Xext XShapeCombineRegion 8
-Xext XShapeCombineShape 9
-Xext XShapeGetRectangles 10
-Xext XShapeInputSelected 11
-Xext XShapeOffsetShape 12
-Xext XShapeQueryExtension 13
-Xext XShapeQueryExtents 14
-Xext XShapeQueryVersion 15
-Xext XShapeSelectInput 16
-Xext XSyncAwait 17
-Xext XSyncChangeAlarm 18
-Xext XSyncChangeCounter 19
-Xext XSyncCreateAlarm 20
-Xext XSyncCreateCounter 21
-Xext XSyncDestroyAlarm 22
-Xext XSyncDestroyCounter 23
-Xext XSyncFreeSystemCounterList 24
-Xext XSyncGetPriority 25
-Xext XSyncInitialize 26
-Xext XSyncIntToValue 27
-Xext XSyncIntsToValue 28
-Xext XSyncListSystemCounters 29
-Xext XSyncMaxValue 30
-Xext XSyncMinValue 31
-Xext XSyncQueryAlarm 32
-Xext XSyncQueryCounter 33
-Xext XSyncQueryExtension 34
-Xext XSyncSetCounter 35
-Xext XSyncSetPriority 36
-Xext XSyncValueAdd 37
-Xext XSyncValueEqual 38
-Xext XSyncValueGreaterOrEqual 39
-Xext XSyncValueGreaterThan 40
-Xext XSyncValueHigh32 41
-Xext XSyncValueIsNegative 42
-Xext XSyncValueIsPositive 43
-Xext XSyncValueIsZero 44
-Xext XSyncValueLessOrEqual 45
-Xext XSyncValueLessThan 46
-Xext XSyncValueLow32 47
-Xext XSyncValueSubtract 48
-Xext XTestFakeInput 49
-Xext XTestFlush 50
-Xext XTestGetInput 51
-Xext XTestMovePointer 52
-Xext XTestPressButton 53
-Xext XTestPressKey 54
-Xext XTestQueryInputSize 55
-Xext XTestReset 56
-Xext XTestStopInput 57
-Xext XextAddDisplay 58
-Xext XextCreateExtension 59
-Xext XextDestroyExtension 60
-Xext XextFindDisplay 61
-Xext XextRemoveDisplay 62
-Xext XmbufChangeBufferAttributes 63
-Xext XmbufChangeWindowAttributes 64
-Xext XmbufClearBufferArea 65
-Xext XmbufCreateBuffers 66
-Xext XmbufCreateStereoWindow 67
-Xext XmbufDestroyBuffers 68
-Xext XmbufDisplayBuffers 69
-Xext XmbufGetBufferAttributes 70
-Xext XmbufGetScreenInfo 71
-Xext XmbufGetVersion 72
-Xext XmbufGetWindowAttributes 73
-Xext XmbufQueryExtension 74
-Xext XdbeQueryExtension 75
-Xext XdbeAllocateBackBufferName 76
-Xext XdbeDeallocateBackBufferName 77
-Xext XdbeSwapBuffers 78
-Xext XdbeBeginIdiom 79
-Xext XdbeEndIdiom 80
-Xext XdbeGetVisualInfo 81
-Xext XdbeFreeVisualInfo 82
-Xext XdbeGetBackBufferAttributes 83
-Xext XSecurityQueryExtension 84
-Xext XSecurityAllocXauth 85
-Xext XSecurityFreeXauth 86
-Xext XSecurityGenerateAuthorization 87
-Xext XSecurityRevokeAuthorization 88
-Xext XagQueryVersion 89
-Xext XagCreateEmbeddedApplicationGroup 90
-Xext XagCreateNonembeddedApplicationGroup 91
-Xext XagDestroyApplicationGroup 92
-Xext XagGetApplicationGroupAttributes 93
-Xext XagQueryApplicationGroup 94
-Xext XagCreateAssociation 95
-Xext XagDestroyAssociation 96
-Xext XLbxQueryExtension 97
-Xext XLbxGetEventBase 98
-Xext XLbxQueryVersion 99
-Xext XShmQueryExtension 100
-Xext XShmGetEventBase 101
-Xext XShmQueryVersion 102
-Xext XShmPixmapFormat 103
-Xext XShmAttach 104
-Xext XShmDetach 105
-Xext XShmCreateImage 106
-Xext XShmPutImage 107
-Xext XShmGetImage 108
-Xext XShmCreatePixmap 109
-Xext XcupGetReservedColormapEntries 110
-Xext XcupQueryVersion 111
-Xext XcupStoreColors 112
-Xext XPanoramiXQueryVersion 113
-Xext XPanoramiXAllocInfo 114
-Xext XPanoramiXGetScreenCount 115
-Xext XPanoramiXGetScreenSize 116
-Xext XPanoramiXGetState 117
-Xext XPanoramiXQueryExtension 118
-Xext DPMSQueryExtension 119
-Xext DPMSGetVersion 120
-Xext DPMSCapable 121
-Xext DPMSSetTimeouts 122
-Xext DPMSGetTimeouts 123
-Xext DPMSEnable 124
-Xext DPMSDisable 125
-Xext DPMSForceLevel 126
-Xext DPMSInfo 127
-Xext XeviQueryExtension 128
-Xext XeviQueryVersion 129
-Xext XeviGetVisualInfo 130
-LIBRARY Xi Xi
-Xi XAllowDeviceEvents 1
-Xi XChangeDeviceControl 2
-Xi XChangeDeviceDontPropagateList 3
-Xi XChangeDeviceKeyMapping 4
-Xi XChangeFeedbackControl 5
-Xi XChangeKeyboardDevice 6
-Xi XChangePointerDevice 7
-Xi XCloseDevice 8
-Xi XDeviceBell 9
-Xi XFreeDeviceControl 10
-Xi XFreeDeviceList 11
-Xi XFreeDeviceMotionEvents 12
-Xi XFreeDeviceState 13
-Xi XFreeFeedbackList 14
-Xi XGetDeviceButtonMapping 15
-Xi XGetDeviceControl 16
-Xi XGetDeviceDontPropagateList 17
-Xi XGetDeviceFocus 18
-Xi XGetDeviceKeyMapping 19
-Xi XGetDeviceModifierMapping 20
-Xi XGetDeviceMotionEvents 21
-Xi XGetExtensionVersion 22
-Xi XGetFeedbackControl 23
-Xi XGetSelectedExtensionEvents 24
-Xi XGrabDevice 25
-Xi XGrabDeviceButton 26
-Xi XGrabDeviceKey 27
-Xi XListInputDevices 28
-Xi XOpenDevice 29
-Xi XQueryDeviceState 30
-Xi XSelectExtensionEvent 31
-Xi XSendExtensionEvent 32
-Xi XSetDeviceButtonMapping 33
-Xi XSetDeviceFocus 34
-Xi XSetDeviceMode 35
-Xi XSetDeviceModifierMapping 36
-Xi XSetDeviceValuators 37
-Xi XUngrabDevice 38
-Xi XUngrabDeviceButton 39
-Xi XUngrabDeviceKey 40
-Xi _xibadclass 41
-Xi _xibaddevice 42
-Xi _xibadevent 43
-Xi _xibadmode 44
-Xi _xidevicebusy 45
-LIBRARY Xmu Xmu
-Xmu XmuGetAtomName 1
-Xmu XmuInternAtom 2
-Xmu XmuInternStrings 3
-Xmu XmuMakeAtom 4
-Xmu XmuNameOfAtom 5
-Xmu XmuCopyISOLatin1Lowered 6
-Xmu XmuCopyISOLatin1Uppered 7
-Xmu XmuCompareISOLatin1 8
-Xmu XmuAddCloseDisplayHook 9
-Xmu XmuLookupCloseDisplayHook 10
-Xmu XmuRemoveCloseDisplayHook 11
-Xmu XmuCvtFunctionToCallback 12
-Xmu XmuCvtStringToBackingStore 13
-Xmu XmuCvtStringToCursor 14
-Xmu XmuCvtStringToColorCursor 15
-Xmu XmuCvtStringToGravity 16
-Xmu XmuCvtStringToJustify 17
-Xmu XmuCvtStringToLong 18
-Xmu XmuCvtStringToOrientation 19
-Xmu XmuCvtStringToBitmap 20
-Xmu XmuCvtStringToShapeStyle 21
-Xmu XmuReshapeWidget 22
-Xmu XmuCvtStringToWidget 23
-Xmu XmuNewCvtStringToWidget 24
-Xmu XmuCursorNameToIndex 25
-Xmu XmuDQCreate 26
-Xmu XmuDQDestroy 27
-Xmu XmuDQLookupDisplay 28
-Xmu XmuDQAddDisplay 29
-Xmu XmuDQRemoveDisplay 30
-Xmu XmuDrawRoundedRectangle 31
-Xmu XmuFillRoundedRectangle 32
-Xmu XmuDrawLogo 33
-Xmu XmuCreatePixmapFromBitmap 34
-Xmu XmuCreateStippledPixmap 35
-Xmu XmuReleaseStippledPixmap 36
-Xmu XmuLocateBitmapFile 37
-Xmu XmuLocatePixmapFile 38
-Xmu XmuReadBitmapData 39
-Xmu XmuReadBitmapDataFromFile 40
-Xmu XmuPrintDefaultErrorMessage 41
-Xmu XmuSimpleErrorHandler 42
-Xmu XmuRegisterExternalAgent 43
-Xmu XmuCallInitializers 44
-Xmu XmuAddInitializer 45
-Xmu XmuAllStandardColormaps 46
-Xmu XmuCreateColormap 47
-Xmu XmuDeleteStandardColormap 48
-Xmu XmuGetColormapAllocation 49
-Xmu XmuLookupStandardColormap 50
-Xmu XmuStandardColormap 51
-Xmu XmuVisualStandardColormaps 52
-Xmu XmuConvertStandardSelection 53
-Xmu XmuGetHostname 54
-Xmu XmuWnInitializeNodes 55
-Xmu XmuWnFetchResources 56
-Xmu XmuWnCountOwnedResources 57
-Xmu XmuWnNameToNode 58
-Xmu XmuClientWindow 59
-Xmu XmuUpdateMapHints 60
-Xmu XmuScreenOfWindow 61
-Xmu XctCreate 62
-Xmu XctNextItem 63
-Xmu XctFree 64
-Xmu XctReset 65
-Xmu _XmuCCLookupDisplay 66
-Xmu _XEditResCheckMessages 67
-Xmu _XEditResPutString8 68
-Xmu _XEditResPut8 69
-Xmu _XEditResPut16 70
-Xmu _XEditResPut32 71
-Xmu _XEditResPutWidgetInfo 72
-Xmu _XEditResResetStream 74
-Xmu _XEditResGet8 75
-Xmu _XEditResGet16 76
-Xmu _XEditResGetSigned16 77
-Xmu _XEditResGet32 78
-Xmu _XEditResGetString8 79
-Xmu _XEditResGetWidgetInfo 80
-Xmu _XA_ATOM_PAIR 81
-Xmu _XA_CHARACTER_POSITION 82
-Xmu _XA_CLASS 83
-Xmu _XA_CLIENT_WINDOW 84
-Xmu _XA_CLIPBOARD 85
-Xmu _XA_COMPOUND_TEXT 86
-Xmu _XA_DECNET_ADDRESS 87
-Xmu _XA_DELETE 88
-Xmu _XA_FILENAME 89
-Xmu _XA_HOSTNAME 90
-Xmu _XA_IP_ADDRESS 91
-Xmu _XA_LENGTH 92
-Xmu _XA_LIST_LENGTH 93
-Xmu _XA_NAME 94
-Xmu _XA_NET_ADDRESS 95
-Xmu _XA_NULL 96
-Xmu _XA_OWNER_OS 97
-Xmu _XA_SPAN 98
-Xmu _XA_TARGETS 99
-Xmu _XA_TEXT 100
-Xmu _XA_TIMESTAMP 101
-Xmu _XA_USER 102
-Xmu XmuDistinguishableColors 103
-Xmu XmuDistinguishablePixels 104
-Xmu XmuCvtWidgetToString 105
-Xmu XmuCvtGravityToString 106
-Xmu XmuDestroySegmentList 107
-Xmu XmuCvtJustifyToString 108
-Xmu XmuSnprintf 109
-Xmu XmuAreaOrXor 110
-Xmu XmuDestroyScanlineList 111
-Xmu XmuScanlineXor 112
-Xmu XmuNewScanline 113
-Xmu XmuNCopyISOLatin1Lowered 114
-Xmu XmuNCopyISOLatin1Uppered 115
-Xmu XmuCvtShapeStyleToString 116
-Xmu XmuCvtOrientationToString 117
-Xmu XmuCvtBackingStoreToString 118
-Xmu XmuNewArea 119
-Xmu XmuScanlineOrSegment 120
-Xmu XmuOptimizeScanline 121
-; 4.x export starting from 150
-Xmu _XmuStringToBitmapFreeCache 150
-Xmu _XmuStringToBitmapInitCache 151
-Xmu XmuLookupAPL 152
-Xmu XmuLookupArabic 153
-Xmu XmuLookupCyrillic 154
-Xmu XmuLookupGreek 155
-Xmu XmuLookupHebrew 156
-Xmu XmuLookupJISX0201 157
-Xmu XmuLookupKana 158
-Xmu XmuLookupLatin1 159
-Xmu XmuLookupLatin2 160
-Xmu XmuLookupLatin3 161
-Xmu XmuLookupLatin4 162
-Xmu XmuLookupString 163
-Xmu _XA_UTF8_STRING 164
-Xmu XmuScanlineNot 165
-Xmu XmuScanlineAnd 166
-Xmu XmuScanlineOr 167
-LIBRARY Xp Xp
-Xp XpCancelDoc 1
-Xp XpCancelJob 2
-Xp XpCancelPage 3
-Xp XpCreateContext 4
-Xp XpDestroyContext 5
-Xp XpEndDoc 6
-Xp XpEndJob 7
-Xp XpEndPage 8
-Xp XpFreePrinterList 9
-Xp XpGetAttributes 10
-Xp XpGetAuthParams 11
-Xp XpGetContext 12
-Xp XpGetDocumentData 13
-Xp XpGetLocaleHinter 14
-Xp XpGetLocaleNetString 15
-Xp XpGetOneAttribute 16
-Xp XpGetPageDimensions 17
-Xp XpGetPdmStartParams 18
-Xp XpGetPrinterList 19
-Xp XpGetScreenOfContext 20
-Xp XpInputSelected 21
-Xp XpNotifyPdm 22
-Xp XpPutDocumentData 23
-Xp XpQueryExtension 24
-Xp XpQueryScreens 25
-Xp XpQueryVersion 26
-Xp XpRehashPrinterList 27
-Xp XpSelectInput 28
-Xp XpSendAuth 29
-Xp XpSendOneTicket 30
-Xp XpSetAttributes 31
-Xp XpSetContext 32
-Xp XpSetLocaleHinter 33
-Xp XpStartDoc 34
-Xp XpStartJob 35
-Xp XpStartPage 36
-; 4.x exports starting from 40
-Xp XpSetImageResolution 40
-LIBRARY Xpm Xpm
-Xpm XpmCreatePixmapFromData 1
-Xpm XpmCreateDataFromPixmap 2
-Xpm XpmReadFileToPixmap 3
-Xpm XpmWriteFileFromPixmap 4
-Xpm XpmCreateImageFromData 5
-Xpm XpmCreateDataFromImage 6
-Xpm XpmReadFileToImage 7
-Xpm XpmWriteFileFromImage 8
-Xpm XpmCreateImageFromBuffer 9
-Xpm XpmCreatePixmapFromBuffer 10
-Xpm XpmCreateBufferFromImage 11
-Xpm XpmCreateBufferFromPixmap 12
-Xpm XpmReadFileToBuffer 13
-Xpm XpmWriteFileFromBuffer 14
-Xpm XpmReadFileToData 15
-Xpm XpmWriteFileFromData 16
-Xpm XpmAttributesSize 17
-Xpm XpmFreeAttributes 18
-Xpm XpmFreeExtensions 19
-Xpm XpmFreeXpmImage 20
-Xpm XpmFreeXpmInfo 21
-Xpm XpmGetErrorString 22
-Xpm XpmLibraryVersion 23
-Xpm XpmReadFileToXpmImage 24
-Xpm XpmWriteFileFromXpmImage 25
-Xpm XpmCreatePixmapFromXpmImage 26
-Xpm XpmCreateImageFromXpmImage 27
-Xpm XpmCreateXpmImageFromImage 28
-Xpm XpmCreateXpmImageFromPixmap 29
-Xpm XpmCreateDataFromXpmImage 30
-Xpm XpmCreateXpmImageFromData 31
-Xpm XpmCreateXpmImageFromBuffer 32
-Xpm XpmCreateBufferFromXpmImage 33
-; 4.x exports starting from 40
-Xpm XpmFree 40
-LIBRARY Xss Xss
-Xss XScreenSaverQueryExtension 1
-Xss XScreenSaverQueryVersion 2
-Xss XScreenSaverAllocInfo 3
-Xss XScreenSaverQueryInfo 4
-Xss XScreenSaverSelectInput 5
-Xss XScreenSaverSetAttributes 6
-Xss XScreenSaverUnsetAttributes 7
-Xss XScreenSaverRegister 8
-Xss XScreenSaverUnregister 9
-Xss XScreenSaverGetRegistered 10
-LIBRARY Xt Xt INITINSTANCE TERMINSTANCE
-Xt XtAppAddActionHook 1
-Xt XtRemoveActionHook 2
-Xt XtMalloc 3
-Xt XtRealloc 4
-Xt XtCalloc 5
-Xt XtFree 6
-Xt XtMergeArgLists 7
-Xt XtAddCallback 8
-Xt XtAddCallbacks 9
-Xt XtRemoveCallback 10
-Xt XtRemoveCallbacks 11
-Xt XtRemoveAllCallbacks 12
-Xt XtCallCallbacks 13
-Xt XtHasCallbacks 14
-Xt XtCallCallbackList 15
-Xt XtSetMultiClickTime 16
-Xt XtGetMultiClickTime 17
-Xt XtSetTypeConverter 18
-Xt XtAppSetTypeConverter 19
-Xt XtAddConverter 20
-Xt XtAppAddConverter 21
-Xt XtCallConverter 22
-Xt XtConvert 23
-Xt XtConvertAndStore 24
-Xt XtAppReleaseCacheRefs 25
-Xt XtCallbackReleaseCacheRefList 26
-Xt XtCallbackReleaseCacheRef 27
-Xt XtDisplayStringConversionWarning 28
-Xt XtStringConversionWarning 29
-Xt XtCvtIntToBoolean 30
-Xt XtCvtIntToShort 31
-Xt XtCvtStringToBoolean 32
-Xt XtCvtIntToBool 33
-Xt XtCvtStringToBool 34
-Xt XtCvtIntToColor 35
-Xt XtCvtStringToPixel 36
-Xt XtCvtStringToCursor 37
-Xt XtCvtStringToDisplay 38
-Xt XtCvtStringToFile 39
-Xt XtCvtIntToFloat 40
-Xt XtCvtStringToFloat 41
-Xt XtCvtStringToFont 42
-Xt XtCvtIntToFont 43
-Xt XtCvtStringToFontSet 44
-Xt XtCvtStringToFontStruct 45
-Xt XtCvtStringToInt 46
-Xt XtCvtStringToShort 47
-Xt XtCvtStringToDimension 48
-Xt XtCvtIntToUnsignedChar 49
-Xt XtCvtStringToUnsignedChar 50
-Xt XtCvtColorToPixel 51
-Xt XtCvtIntToPixel 52
-Xt XtCvtIntToPixmap 53
-Xt XtCvtStringToInitialState 54
-Xt XtCvtStringToVisual 55
-Xt XtCvtStringToAtom 56
-Xt XtCvtStringToDirectoryString 57
-Xt XtCvtStringToCommandArgArray 58
-Xt XtInitializeWidgetClass 59
-Xt XtCreateWidget 60
-Xt XtCreateManagedWidget 61
-Xt XtCreatePopupShell 62
-Xt XtAppCreateShell 63
-Xt XtCreateApplicationShell 64
-Xt XtDestroyWidget 65
-Xt XtOpenDisplay 66
-Xt XtDisplayInitialize 67
-Xt XtCreateApplicationContext 68
-Xt XtDestroyApplicationContext 69
-Xt XtDatabase 70
-Xt XtDisplayToApplicationContext 71
-Xt XtCloseDisplay 72
-Xt XtWidgetToApplicationContext 73
-Xt XtGetApplicationNameAndClass 74
-Xt XtGetErrorDatabase 75
-Xt XtAppGetErrorDatabase 76
-Xt XtGetErrorDatabaseText 77
-Xt XtAppGetErrorDatabaseText 78
-Xt XtErrorMsg 79
-Xt XtAppErrorMsg 80
-Xt XtWarningMsg 81
-Xt XtAppWarningMsg 82
-Xt XtSetErrorMsgHandler 83
-Xt XtAppSetErrorMsgHandler 84
-Xt XtSetWarningMsgHandler 85
-Xt XtAppSetWarningMsgHandler 86
-Xt XtError 87
-Xt XtAppError 88
-Xt XtWarning 89
-Xt XtAppWarning 90
-Xt XtSetErrorHandler 91
-Xt XtAppSetErrorHandler 92
-Xt XtSetWarningHandler 93
-Xt XtAppSetWarningHandler 94
-Xt XtBuildEventMask 95
-Xt XtRemoveEventHandler 96
-Xt XtAddEventHandler 97
-Xt XtInsertEventHandler 98
-Xt XtRemoveRawEventHandler 99
-Xt XtInsertRawEventHandler 100
-Xt XtAddRawEventHandler 101
-Xt XtWindowToWidget 102
-Xt XtDispatchEvent 103
-Xt XtAddGrab 104
-Xt XtRemoveGrab 105
-Xt XtMainLoop 106
-Xt XtAppMainLoop 107
-Xt XtAddExposureToRegion 108
-Xt XtLastTimestampProcessed 109
-Xt XtIsRectObj 110
-Xt XtIsWidget 111
-Xt XtIsComposite 112
-Xt XtIsConstraint 113
-Xt XtIsShell 114
-Xt XtIsOverrideShell 115
-Xt XtIsWMShell 116
-Xt XtIsVendorShell 117
-Xt XtIsTransientShell 118
-Xt XtIsTopLevelShell 119
-Xt XtIsApplicationShell 120
-Xt XtMapWidget 121
-Xt XtUnmapWidget 122
-Xt XtNewString 123
-Xt XtIsSessionShell 124
-Xt XtAllocateGC 125
-Xt XtGetGC 126
-Xt XtReleaseGC 127
-Xt XtDestroyGC 128
-Xt XtMakeGeometryRequest 129
-Xt XtMakeResizeRequest 130
-Xt XtResizeWindow 131
-Xt XtResizeWidget 132
-Xt XtConfigureWidget 133
-Xt XtMoveWidget 134
-Xt XtTranslateCoords 135
-Xt XtQueryGeometry 136
-Xt XtGetActionKeysym 137
-Xt XtGetResourceList 138
-Xt XtGetConstraintResourceList 139
-Xt XtGetValues 140
-Xt XtGetSubvalues 141
-Xt XtToolkitInitialize 142
-Xt XtSetLanguageProc 143
-Xt XtScreenDatabase 144
-Xt XtAppSetFallbackResources 145
-Xt XtAppInitialize 146
-Xt XtInitialize 147
-Xt XtOpenApplication 148
-Xt XtIsSubclass 149
-Xt XtRealizeWidget 150
-Xt XtUnrealizeWidget 151
-Xt XtCreateWindow 152
-Xt XtNameToWidget 153
-Xt XtDisplayOfObject 154
-Xt XtDisplay 155
-Xt XtScreenOfObject 156
-Xt XtScreen 157
-Xt XtWindowOfObject 158
-Xt XtWindow 159
-Xt XtSuperclass 160
-Xt XtClass 161
-Xt XtIsManaged 162
-Xt XtIsRealized 163
-Xt XtIsSensitive 164
-Xt XtParent 165
-Xt XtName 166
-Xt XtIsObject 167
-Xt XtFindFile 168
-Xt XtResolvePathname 169
-Xt XtCallAcceptFocus 170
-Xt XtSetKeyboardFocus 171
-Xt XtUnmanageChildren 172
-Xt XtUnmanageChild 173
-Xt XtManageChildren 174
-Xt XtManageChild 175
-Xt XtSetMappedWhenManaged 176
-Xt XtAddTimeOut 177
-Xt XtAppAddTimeOut 178
-Xt XtRemoveTimeOut 179
-Xt XtAddWorkProc 180
-Xt XtAppAddWorkProc 181
-Xt XtRemoveWorkProc 182
-Xt XtAddInput 183
-Xt XtAppAddInput 184
-Xt XtRemoveInput 185
-Xt XtNextEvent 186
-Xt XtAppNextEvent 187
-Xt XtProcessEvent 188
-Xt XtAppProcessEvent 189
-Xt XtPending 190
-Xt XtAppPending 191
-Xt XtPeekEvent 192
-Xt XtAppPeekEvent 193
-Xt XtGrabKey 194
-Xt XtGrabButton 195
-Xt XtUngrabKey 196
-Xt XtUngrabButton 197
-Xt XtGrabKeyboard 198
-Xt XtUngrabKeyboard 199
-Xt XtGrabPointer 200
-Xt XtUngrabPointer 201
-Xt XtPopup 202
-Xt XtPopupSpringLoaded 203
-Xt XtPopdown 204
-Xt XtCallbackPopdown 205
-Xt XtCallbackNone 206
-Xt XtCallbackNonexclusive 207
-Xt XtCallbackExclusive 208
-Xt XtGetSubresources 209
-Xt XtGetApplicationResources 210
-Xt XtSetSelectionTimeout 211
-Xt XtAppSetSelectionTimeout 212
-Xt XtGetSelectionTimeout 213
-Xt XtAppGetSelectionTimeout 214
-Xt XtOwnSelection 215
-Xt XtOwnSelectionIncremental 216
-Xt XtDisownSelection 217
-Xt XtGetSelectionValue 218
-Xt XtGetSelectionValueIncremental 219
-Xt XtGetSelectionValues 220
-Xt XtGetSelectionValuesIncremental 221
-Xt XtGetSelectionRequest 222
-Xt XtSetSensitive 223
-Xt XtSetSubvalues 224
-Xt XtSetValues 225
-Xt XtSetWMColormapWindows 226
-Xt XtAddActions 227
-Xt XtAppAddActions 228
-Xt XtGetActionList 229
-Xt XtMenuPopupAction 230
-Xt XtCallActionProc 231
-Xt XtRegisterGrabAction 232
-Xt XtConvertCase 233
-Xt XtTranslateKeycode 234
-Xt XtTranslateKey 235
-Xt XtSetKeyTranslator 236
-Xt XtRegisterCaseConverter 237
-Xt XtGetKeysymTable 238
-Xt XtKeysymToKeycodeList 239
-Xt XtCvtStringToAcceleratorTable 240
-Xt XtCvtStringToTranslationTable 241
-Xt XtParseAcceleratorTable 242
-Xt XtParseTranslationTable 243
-Xt XtUninstallTranslations 244
-Xt XtInstallAccelerators 245
-Xt XtInstallAllAccelerators 246
-Xt XtAugmentTranslations 247
-Xt XtOverrideTranslations 248
-Xt XtVaCreateWidget 249
-Xt XtVaCreateManagedWidget 250
-Xt XtVaAppCreateShell 251
-Xt XtVaCreatePopupShell 252
-Xt XtVaSetValues 253
-Xt XtVaSetSubvalues 254
-Xt XtVaAppInitialize 255
-Xt XtVaOpenApplication 256
-Xt XtVaGetSubresources 257
-Xt XtVaGetApplicationResources 258
-Xt XtVaGetValues 259
-Xt XtVaGetSubvalues 260
-Xt XtVaCreateArgsList 261
-Xt XtCvtStringToRestartStyle 262
-Xt XtCvtStringToGravity 263
-Xt XtAppSetExitFlag 264
-Xt XtAppGetExitFlag 265
-Xt XtGetDisplays 266
-Xt XtRemoveEventTypeHandler 267
-Xt XtInsertEventTypeHandler 268
-Xt XtRegisterDrawable 269
-Xt XtUnregisterDrawable 270
-Xt XtDispatchEventToWidget 271
-Xt XtLastEventProcessed 272
-Xt XtSetEventDispatcher 273
-Xt XtRegisterExtensionSelector 274
-Xt XtAppAddBlockHook 275
-Xt XtRemoveBlockHook 276
-Xt XtHooksOfDisplay 277
-Xt XtGetClassExtension 278
-Xt XtGetKeyboardFocusWidget 279
-Xt XtChangeManagedSet 280
-Xt XtAddSignal 281
-Xt XtAppAddSignal 282
-Xt XtRemoveSignal 283
-Xt XtNoticeSignal 284
-Xt XtReservePropertyAtom 285
-Xt XtReleasePropertyAtom 286
-Xt XtCreateSelectionRequest 287
-Xt XtSendSelectionRequest 288
-Xt XtCancelSelectionRequest 289
-Xt XtSetSelectionParameters 290
-Xt XtGetSelectionParameters 291
-Xt XtSessionGetToken 292
-Xt XtSessionReturnToken 293
-Xt XtAppLock 294
-Xt XtAppUnlock 295
-Xt XtProcessLock 296
-Xt XtProcessUnlock 297
-Xt XtToolkitThreadInitialize 298
-Xt _XtDoFreeBindings 299
-Xt _XtAllocError 300
-Xt _XtHeapInit 301
-Xt _XtHeapAlloc 302
-Xt _XtHeapFree 303
-Xt _XtAddCallback 304
-Xt _XtAddCallbackOnce 305
-Xt _XtRemoveCallback 306
-Xt _XtRemoveAllCallbacks 307
-Xt _XtCompileCallbackList 308
-Xt _XtGetCallbackList 309
-Xt _XtCallConditionalCallbackList 310
-Xt _XtSetDefaultConverterTable 311
-Xt _XtFreeConverterTable 312
-Xt _XtTableAddConverter 313
-Xt _XtCacheFlushTag 314
-Xt _XtConvert 315
-Xt _XtConvertInitialize 316
-Xt _XtAddDefaultConverters 317
-Xt _XtCreateWidget 318
-Xt _XtCreatePopupShell 319
-Xt _XtAppCreateShell 320
-Xt _XtDoPhase2Destroy 321
-Xt _XtGetProcessContext 322
-Xt _XtDefaultAppContext 323
-Xt _XtAppInit 324
-Xt _XtDestroyAppContexts 325
-Xt _XtSortPerDisplayList 326
-Xt _XtCloseDisplays 327
-Xt _XtDefaultErrorMsg 328
-Xt _XtDefaultWarningMsg 329
-Xt _XtDefaultError 330
-Xt _XtDefaultWarning 331
-Xt _XtSetDefaultErrorHandlers 332
-Xt _XtAllocWWTable 333
-Xt _XtFreeWWTable 334
-Xt _XtConvertTypeToMask 335
-Xt _XtOnGrabList 336
-Xt _XtEventInitialize 337
-Xt _XtFreeEventTable 338
-Xt _XtSendFocusEvent 339
-Xt _XtFreePerWidgetInput 340
-Xt _XtGetPerWidgetInput 341
-Xt _XtFillAncestorList 342
-Xt _XtFindRemapWidget 343
-Xt _XtUngrabBadGrabs 344
-Xt _XtGClistFree 345
-Xt _XtMakeGeometryRequest 346
-Xt _XtInherit 347
-Xt _XtPreparseCommandLine 348
-Xt _XtDisplayInitialize 349
-Xt _XtCheckSubclassFlag 350
-Xt _XtIsSubclassOf 351
-Xt _XtWindowedAncestor 352
-Xt _XtProcessKeyboardEvent 353
-Xt _XtHandleFocus 354
-Xt _XtRemoveAllInputs 355
-Xt _XtRefreshMapping 356
-Xt _XtDestroyServerGrabs 357
-Xt _XtCheckServerGrabsOnWidget 358
-Xt _XtProcessPointerEvent 359
-Xt _XtPopup 360
-Xt _XtCopyFromParent 361
-Xt _XtCopyFromArg 362
-Xt _XtCopyToArg 363
-Xt _XtCompileResourceList 364
-Xt _XtDependencies 365
-Xt _XtResourceDependencies 366
-Xt _XtConstraintResDependencies 367
-Xt _XtCreateIndirectionTable 368
-Xt _XtGetResources 369
-Xt _XtResourceListInitialize 370
-Xt _XtSetDefaultSelectionTimeout 371
-Xt _XtShellGetCoordinates 372
-Xt _XtInitializeActionData 373
-Xt _XtBindActions 374
-Xt _XtUnbindActions 375
-Xt _XtFreeActions 376
-Xt _XtRegisterGrabs 377
-Xt _XtGrabInitialize 378
-Xt _XtComputeLateBindings 379
-Xt _XtAllocTMContext 380
-Xt _XtMatchUsingDontCareMods 381
-Xt _XtMatchUsingStandardMods 382
-Xt _XtBuildKeysymTables 383
-Xt _XtTranslateInitialize 384
-Xt _XtAddTMConverters 385
-Xt _XtPrintXlations 386
-Xt _XtDisplayTranslations 387
-Xt _XtDisplayAccelerators 388
-Xt _XtDisplayInstalledAccelerators 389
-Xt _XtPrintActions 390
-Xt _XtPrintState 391
-Xt _XtPrintEventSeq 392
-Xt _XtGetQuarkIndex 393
-Xt _XtGetTypeIndex 394
-Xt _XtGetModifierIndex 395
-Xt _XtRegularMatch 396
-Xt _XtMatchAtom 397
-Xt _XtTranslateEvent 398
-Xt _XtTraverseStateTree 399
-Xt _XtInstallTranslations 400
-Xt _XtRemoveTranslations 401
-Xt _XtDestroyTMData 402
-Xt _XtCreateXlations 403
-Xt _XtParseTreeToStateTree 404
-Xt _XtAddEventSeqToStateTree 405
-Xt _XtCvtMergeTranslations 406
-Xt _XtGetTranslationValue 407
-Xt _XtRemoveStateTreeByIndex 408
-Xt _XtFreeTranslations 409
-Xt _XtMergeTranslations 410
-Xt _XtUnmergeTranslations 411
-Xt _XtPopupInitialize 412
-Xt _XtVaAppInitialize 413
-Xt _XtVaOpenApplication 414
-Xt _XtCountVaList 415
-Xt _XtVaCreateTypedArgList 416
-Xt _XtVaToArgList 417
-Xt _XtVaToTypedArgList 418
-Xt _XtPeekCallback 419
-Xt _XtCreateHookObj 420
-Xt _XtGetPerDisplay 421
-Xt _XtGetPerDisplayInput 422
-Xt _XtExtensionSelect 423
-Xt _XtAddShellToHookObj 424
-Xt _XtIsHookObject 425
-Xt _XtGetUserName 426
-Xt _XtWaitForSomething 427
-Xt XtDirectConvert 433
-Xt colorConvertArgs 435
-Xt screenConvertArg 436
-Xt XtCXtToolkitError 437
-Xt _XtQString 438
-Xt _XtAppDestroyCount 439
-Xt _XtperDisplayList 440
-Xt _XtGlobalTM 444
-Xt XtStrings 445
-Xt overrideShellClassRec 446
-Xt overrideShellWidgetClass 447
-Xt constraintClassRec 448
-Xt constraintWidgetClass 449
-Xt objectClassRec 450
-Xt objectClass 451
-Xt widgetClassRec 452
-Xt widgetClass 453
-Xt rectObjClassRec 454
-Xt rectObjClass 455
-Xt coreWidgetClass 457
-Xt wmShellClassRec 458
-Xt wmShellWidgetClass 459
-Xt XtShellStrings 460
-Xt topLevelShellClassRec 461
-Xt topLevelShellWidgetClass 462
-Xt transientShellClassRec 463
-Xt transientShellWidgetClass 464
-Xt shellClassRec 465
-Xt shellWidgetClass 466
-Xt compositeClassRec 467
-Xt compositeWidgetClass 468
-Xt applicationShellClassRec 469
-Xt applicationShellWidgetClass 470
-Xt _XtInheritTranslations 471
-Xt sessionShellClassRec 472
-Xt sessionShellWidgetClass 473
-Xt vendorShellClassRec 474
-Xt vendorShellWidgetClass 475
-Xt hookObjClassRec 476
-Xt hookObjectClass 477
-LIBRARY Xtst Xtst
-Xtst XTestCompareCurrentCursorWithWindow 1
-Xtst XTestCompareCursorWithWindow 2
-Xtst XTestDiscard 3
-Xtst XTestFakeButtonEvent 4
-Xtst XTestFakeDeviceButtonEvent 5
-Xtst XTestFakeDeviceKeyEvent 6
-Xtst XTestFakeDeviceMotionEvent 7
-Xtst XTestFakeKeyEvent 8
-Xtst XTestFakeMotionEvent 9
-Xtst XTestFakeProximityEvent 10
-Xtst XTestFakeRelativeMotionEvent 11
-Xtst XTestGrabControl 12
-Xtst XTestQueryExtension 13
-Xtst XTestSetGContextOfGC 14
-Xtst XTestSetVisualIDOfVisual 15
-Xtst XRecordIdBaseMask 16
-Xtst XRecordQueryVersion 17
-Xtst XRecordCreateContext 18
-Xtst XRecordAllocRange 19
-Xtst XRecordRegisterClients 20
-Xtst XRecordUnregisterClients 21
-Xtst XRecordGetContext 22
-Xtst XRecordFreeState 23
-Xtst XRecordFreeData 24
-Xtst XRecordEnableContext 25
-Xtst XRecordEnableContextAsync 26
-Xtst XRecordProcessReplies 27
-Xtst XRecordDisableContext 28
-Xtst XRecordFreeContext 29
-LIBRARY Xxf86dga Xxf86dga
-Xxf86dga XF86DGAQueryExtension 1
-Xxf86dga XF86DGAQueryVersion 2
-Xxf86dga XF86DGAGetVideoLL 3
-Xxf86dga XF86DGADirectVideoLL 4
-Xxf86dga XF86DGAGetViewPort 5
-Xxf86dga XF86DGASetViewPort 6
-Xxf86dga XF86DGAGetVidPage 7
-Xxf86dga XF86DGASetVidPage 8
-Xxf86dga XF86DGADirectVideo 9
-Xxf86dga XF86DGAGetVideo 10
-; 4.x exports starting from 20
-Xxf86dga XF86DGAQueryDirectVideo 20
-Xxf86dga XF86DGAInstallColormap 21
-LIBRARY Xxf86misc X86misc
-Xxf86misc XF86MiscQueryExtension 1
-Xxf86misc XF86MiscQueryVersion 2
-Xxf86misc XF86MiscSetSaver 3
-Xxf86misc XF86MiscGetSaver 4
-Xxf86misc XF86MiscSetKbdSettings 5
-Xxf86misc XF86MiscGetKbdSettings 6
-Xxf86misc XF86MiscSetMouseSettings 7
-Xxf86misc XF86MiscGetMouseSettings 8
-Xxf86misc XF86MiscGetFilePaths 9
-LIBRARY Xxf86vm Xxf86vm
-Xxf86vm XF86VidModeQueryExtension 1
-Xxf86vm XF86VidModeQueryVersion 2
-Xxf86vm XF86VidModeGetModeLine 3
-Xxf86vm XF86VidModeModModeLine 4
-Xxf86vm XF86VidModeSwitchMode 5
-Xxf86vm XF86VidModeLockModeSwitch 6
-Xxf86vm XF86VidModeGetMonitor 7
-Xxf86vm XF86VidModeGetAllModeLines 8
-Xxf86vm XF86VidModeGetGamma 9
-Xxf86vm XF86VidModeSetGamma 10
-Xxf86vm XF86VidModeSwitchToMode 11
-Xxf86vm XF86VidModeAddModeLine 12
-LIBRARY dps dps
-dps CSDPSInit 1
-dps CSDPSHeadOfDpyExt 2
-dps DPSCAPChangeGC 3
-dps DPSCAPCreate 4
-dps DPSCAPDestroy 5
-dps DPSCAPOpenAgent 6
-dps DPSCAPStartUp 8
-dps DPSCAPWrite 9
-dps DPSCAPCloseDisplayProc 10
-dps DPSCAPCloseAgent 13
-dps DPSclientsync 14
-dps DPScurrentXgcdrawable 15
-dps DPScurrentXgcdrawablecolor 16
-dps DPScurrentXoffset 17
-dps DPSsetXgcdrawable 18
-dps DPSsetXgcdrawablecolor 19
-dps DPSsetXoffset 20
-dps DPSsetXrgbactual 21
-dps DPSclientXready 22
-dps DPSsetXdrawingfunction 23
-dps DPScurrentXdrawingfunction 24
-dps DPSWarnProc 25
-dps DPSFatalProc 26
-dps DPSCantHappen 27
-dps DPScolorimage 28
-dps DPScurrentblackgeneration 29
-dps DPScurrentcmykcolor 30
-dps DPScurrentcolorscreen 31
-dps DPScurrentcolortransfer 32
-dps DPScurrentundercolorremoval 33
-dps DPSsetblackgeneration 34
-dps DPSsetcmykcolor 35
-dps DPSsetcolorscreen 36
-dps DPSsetcolortransfer 37
-dps DPSsetundercolorremoval 38
-dps DPSeq 39
-dps DPSexit 40
-dps DPSfalse 41
-dps DPSfor 42
-dps DPSforall 43
-dps DPSge 44
-dps DPSgt 45
-dps DPSif 46
-dps DPSifelse 47
-dps DPSle 48
-dps DPSloop 49
-dps DPSlt 50
-dps DPSne 51
-dps DPSnot 52
-dps DPSor 53
-dps DPSrepeat 54
-dps DPSstop 55
-dps DPSstopped 56
-dps DPStrue 57
-dps DPSUserObjects 58
-dps DPScondition 59
-dps DPScurrentcontext 60
-dps DPScurrentobjectformat 61
-dps DPSdefineusername 62
-dps DPSdefineuserobject 63
-dps DPSdetach 64
-dps DPSexecuserobject 65
-dps DPSfork 66
-dps DPSjoin 67
-dps DPSlock 68
-dps DPSmonitor 69
-dps DPSnotify 70
-dps DPSsetobjectformat 71
-dps DPSsetvmthreshold 72
-dps DPSundefineuserobject 73
-dps DPSwait 74
-dps DPSyield 75
-dps DPSaload 76
-dps DPSanchorsearch 77
-dps DPSarray 78
-dps DPSastore 79
-dps DPSbegin 80
-dps DPSclear 81
-dps DPScleartomark 82
-dps DPScopy 83
-dps DPScount 84
-dps DPScounttomark 85
-dps DPScvi 86
-dps DPScvlit 87
-dps DPScvn 88
-dps DPScvr 89
-dps DPScvrs 90
-dps DPScvs 91
-dps DPScvx 92
-dps DPSdef 93
-dps DPSdict 94
-dps DPSdictstack 95
-dps DPSdup 96
-dps DPSend 97
-dps DPSexch 98
-dps DPSexecstack 99
-dps DPSexecuteonly 100
-dps DPSget 101
-dps DPSgetinterval 102
-dps DPSindex 103
-dps DPSknown 104
-dps DPSlength 105
-dps DPSload 106
-dps DPSmark 107
-dps DPSmatrix 108
-dps DPSmaxlength 109
-dps DPSnoaccess 110
-dps DPSnull 111
-dps DPSpackedarray 112
-dps DPSpop 113
-dps DPSput 114
-dps DPSputinterval 115
-dps DPSrcheck 116
-dps DPSreadonly 117
-dps DPSroll 118
-dps DPSscheck 119
-dps DPSsearch 120
-dps DPSshareddict 121
-dps DPSstatusdict 122
-dps DPSstore 123
-dps DPSstring 124
-dps DPSstringwidth 125
-dps DPSsystemdict 126
-dps DPSuserdict 127
-dps DPSwcheck 128
-dps DPSwhere 129
-dps DPSxcheck 130
-dps DPSCreatePSWDict 131
-dps DPSDestroyPSWDict 132
-dps DPSWDictLookup 133
-dps DPSWDictEnter 134
-dps DPSWDictRemove 135
-dps DPSMakeAtom 136
-dps DPSFontDirectory 137
-dps DPSISOLatin1Encoding 138
-dps DPSSharedFontDirectory 139
-dps DPSStandardEncoding 140
-dps DPScachestatus 141
-dps DPScurrentcacheparams 142
-dps DPScurrentfont 143
-dps DPSdefinefont 144
-dps DPSfindfont 145
-dps DPSmakefont 146
-dps DPSscalefont 147
-dps DPSselectfont 148
-dps DPSsetcachedevice 149
-dps DPSsetcachelimit 150
-dps DPSsetcacheparams 151
-dps DPSsetcharwidth 152
-dps DPSsetfont 153
-dps DPSundefinefont 154
-dps DPSconcat 155
-dps DPScurrentdash 156
-dps DPScurrentflat 157
-dps DPScurrentgray 158
-dps DPScurrentgstate 159
-dps DPScurrenthalftone 160
-dps DPScurrenthalftonephase 161
-dps DPScurrenthsbcolor 162
-dps DPScurrentlinecap 163
-dps DPScurrentlinejoin 164
-dps DPScurrentlinewidth 165
-dps DPScurrentmatrix 166
-dps DPScurrentmiterlimit 167
-dps DPScurrentpoint 168
-dps DPScurrentrgbcolor 169
-dps DPScurrentscreen 170
-dps DPScurrentstrokeadjust 171
-dps DPScurrenttransfer 172
-dps DPSdefaultmatrix 173
-dps DPSgrestore 174
-dps DPSgrestoreall 175
-dps DPSgsave 176
-dps DPSgstate 177
-dps DPSinitgraphics 178
-dps DPSinitmatrix 179
-dps DPSrotate 180
-dps DPSscale 181
-dps DPSsetdash 182
-dps DPSsetflat 183
-dps DPSsetgray 184
-dps DPSsetgstate 185
-dps DPSsethalftone 186
-dps DPSsethalftonephase 187
-dps DPSsethsbcolor 188
-dps DPSsetlinecap 189
-dps DPSsetlinejoin 190
-dps DPSsetlinewidth 191
-dps DPSsetmatrix 192
-dps DPSsetmiterlimit 193
-dps DPSsetrgbcolor 194
-dps DPSsetscreen 195
-dps DPSsetstrokeadjust 196
-dps DPSsettransfer 197
-dps DPStranslate 198
-dps DPSclientPrintProc 199
-dps DPSinnerProcWriteData 200
-dps DPSSafeSetLastNameIndex 201
-dps DPSCheckInitClientGlobals 202
-dps DPSPrivateCheckWait 203
-dps DPSPrivateDestroyContext 204
-dps DPSPrivateDestroySpace 205
-dps DPSCheckShared 206
-dps DPSDefaultPrivateHandler 207
-dps DPSCreateContext 208
-dps DPSInitCommonTextContextProcs 209
-dps DPSInitCommonContextProcs 210
-dps DPSInitPrivateContextProcs 211
-dps DPSInitPrivateContextFields 212
-dps DPSInitPrivateTextContextFields 213
-dps DPSInitCommonSpaceProcs 214
-dps DPSInitPrivateSpaceFields 215
-dps DPSequals 216
-dps DPSequalsequals 217
-dps DPSbytesavailable 218
-dps DPSclosefile 219
-dps DPScurrentfile 220
-dps DPSdeletefile 221
-dps DPSecho 222
-dps DPSfile 223
-dps DPSfilenameforall 224
-dps DPSfileposition 225
-dps DPSflush 226
-dps DPSflushfile 227
-dps DPSprint 228
-dps DPSprintobject 229
-dps DPSpstack 230
-dps DPSread 231
-dps DPSreadhexstring 232
-dps DPSreadline 233
-dps DPSreadstring 234
-dps DPSrenamefile 235
-dps DPSresetfile 236
-dps DPSsetfileposition 237
-dps DPSstack 238
-dps DPSstatus 239
-dps DPStoken 240
-dps DPSwrite 241
-dps DPSwritehexstring 242
-dps DPSwriteobject 243
-dps DPSwritestring 244
-dps DPSleftbracket 245
-dps DPSrightbracket 246
-dps DPSleftleft 247
-dps DPSrightright 248
-dps DPScshow 249
-dps DPScurrentcolor 250
-dps DPScurrentcolorrendering 251
-dps DPScurrentcolorspace 252
-dps DPScurrentdevparams 253
-dps DPScurrentglobal 254
-dps DPScurrentoverprint 255
-dps DPScurrentpagedevice 256
-dps DPScurrentsystemparams 257
-dps DPScurrentuserparams 258
-dps DPSdefineresource 259
-dps DPSexecform 260
-dps DPSfilter 261
-dps DPSfindencoding 262
-dps DPSfindresource 263
-dps DPSgcheck 264
-dps DPSglobaldict 265
-dps DPSGlobalFontDirectory 266
-dps DPSglyphshow 267
-dps DPSlanguagelevel 268
-dps DPSmakepattern 269
-dps DPSproduct 270
-dps DPSresourceforall 271
-dps DPSresourcestatus 272
-dps DPSrevision 273
-dps DPSrootfont 274
-dps DPSserialnumber 275
-dps DPSsetcolor 276
-dps DPSsetcolorrendering 277
-dps DPSsetcolorspace 278
-dps DPSsetdevparams 279
-dps DPSsetglobal 280
-dps DPSsetoverprint 281
-dps DPSsetpagedevice 282
-dps DPSsetpattern 283
-dps DPSsetsystemparams 284
-dps DPSsetuserparams 285
-dps DPSstartjob 286
-dps DPSundefineresource 287
-dps DPSabs 288
-dps DPSadd 289
-dps DPSand 290
-dps DPSatan 291
-dps DPSbitshift 292
-dps DPSceiling 293
-dps DPScos 294
-dps DPSdiv 295
-dps DPSexp 296
-dps DPSfloor 297
-dps DPSidiv 298
-dps DPSln 299
-dps DPSlog 300
-dps DPSmod 301
-dps DPSmul 302
-dps DPSneg 303
-dps DPSround 304
-dps DPSsin 305
-dps DPSsqrt 306
-dps DPSsub 307
-dps DPStruncate 308
-dps DPSxor 309
-dps DPSbanddevice 310
-dps DPSframedevice 311
-dps DPSnulldevice 312
-dps DPSrenderbands 313
-dps DPSconcatmatrix 314
-dps DPSdtransform 315
-dps DPSidentmatrix 316
-dps DPSidtransform 317
-dps DPSinvertmatrix 318
-dps DPSitransform 319
-dps DPStransform 320
-dps DPSgetboolean 321
-dps DPSgetchararray 322
-dps DPSgetfloat 323
-dps DPSgetfloatarray 324
-dps DPSgetint 325
-dps DPSgetintarray 326
-dps DPSgetstring 327
-dps DPSsendboolean 328
-dps DPSsendchararray 329
-dps DPSsendfloat 330
-dps DPSsendfloatarray 331
-dps DPSsendint 332
-dps DPSsendintarray 333
-dps DPSsendstring 334
-dps DPSarc 335
-dps DPSarcn 336
-dps DPSarct 337
-dps DPSarcto 338
-dps DPScharpath 339
-dps DPSclip 340
-dps DPSclippath 341
-dps DPSclosepath 342
-dps DPScurveto 343
-dps DPSeoclip 344
-dps DPSeoviewclip 345
-dps DPSflattenpath 346
-dps DPSinitclip 347
-dps DPSinitviewclip 348
-dps DPSlineto 349
-dps DPSmoveto 350
-dps DPSnewpath 351
-dps DPSpathbbox 352
-dps DPSpathforall 353
-dps DPSrcurveto 354
-dps DPSrectclip 355
-dps DPSrectviewclip 356
-dps DPSreversepath 357
-dps DPSrlineto 358
-dps DPSrmoveto 359
-dps DPSsetbbox 360
-dps DPSsetucacheparams 361
-dps DPSuappend 362
-dps DPSucache 363
-dps DPSucachestatus 364
-dps DPSupath 365
-dps DPSviewclip 366
-dps DPSviewclippath 367
-dps DPSashow 368
-dps DPSawidthshow 369
-dps DPScopypage 370
-dps DPSeofill 371
-dps DPSerasepage 372
-dps DPSfill 373
-dps DPSimage 374
-dps DPSimagemask 375
-dps DPSkshow 376
-dps DPSrectfill 377
-dps DPSrectstroke 378
-dps DPSshow 379
-dps DPSshowpage 380
-dps DPSstroke 381
-dps DPSstrokepath 382
-dps DPSueofill 383
-dps DPSufill 384
-dps DPSustroke 385
-dps DPSustrokepath 386
-dps DPSwidthshow 387
-dps DPSxshow 388
-dps DPSxyshow 389
-dps DPSyshow 390
-dps DPSInitClient 391
-dps DPSIncludePrivContext 392
-dps DPSSendPostScript 393
-dps DPSSendInterrupt 394
-dps DPSSendEOF 395
-dps DPSSendTerminate 396
-dps DPSSendDestroySpace 397
-dps DPSCheckRaiseError 399
-dps DPSInitSysNames 400
-dps DPSSetWh 401
-dps DPSOutOfMemory 402
-dps DPSbind 403
-dps DPScleardictstack 404
-dps DPScountdictstack 405
-dps DPScountexecstack 406
-dps DPScurrentdict 407
-dps DPScurrentpacking 408
-dps DPScurrentshared 409
-dps DPSdeviceinfo 410
-dps DPSerrordict 411
-dps DPSexec 412
-dps DPSprompt 413
-dps DPSquit 414
-dps DPSrand 415
-dps DPSrealtime 416
-dps DPSrestore 417
-dps DPSrrand 418
-dps DPSrun 419
-dps DPSsave 420
-dps DPSsetpacking 421
-dps DPSsetshared 422
-dps DPSsrand 423
-dps DPSstart 424
-dps DPStype 425
-dps DPSundef 426
-dps DPSusertime 427
-dps DPSversion 428
-dps DPSvmreclaim 429
-dps DPSvmstatus 430
-dps DPSineofill 431
-dps DPSinfill 432
-dps DPSinstroke 433
-dps DPSinueofill 434
-dps DPSinufill 435
-dps DPSinustroke 436
-dps DPSwtranslation 437
-dps PSclientsync 438
-dps PScurrentXgcdrawable 439
-dps PScurrentXgcdrawablecolor 440
-dps PScurrentXoffset 441
-dps PSsetXgcdrawable 442
-dps PSsetXgcdrawablecolor 443
-dps PSsetXoffset 444
-dps PSsetXrgbactual 445
-dps PSclientXready 446
-dps PSsetXdrawingfunction 447
-dps PScurrentXdrawingfunction 448
-dps PScolorimage 449
-dps PScurrentblackgeneration 450
-dps PScurrentcmykcolor 451
-dps PScurrentcolorscreen 452
-dps PScurrentcolortransfer 453
-dps PScurrentundercolorremoval 454
-dps PSsetblackgeneration 455
-dps PSsetcmykcolor 456
-dps PSsetcolorscreen 457
-dps PSsetcolortransfer 458
-dps PSsetundercolorremoval 459
-dps PSeq 460
-dps PSexit 461
-dps PSfalse 462
-dps PSfor 463
-dps PSforall 464
-dps PSge 465
-dps PSgt 466
-dps PSif 467
-dps PSifelse 468
-dps PSle 469
-dps PSloop 470
-dps PSlt 471
-dps PSne 472
-dps PSnot 473
-dps PSor 474
-dps PSrepeat 475
-dps PSstop 476
-dps PSstopped 477
-dps PStrue 478
-dps PSUserObjects 479
-dps PScondition 480
-dps PScurrentcontext 481
-dps PScurrentobjectformat 482
-dps PSdefineusername 483
-dps PSdefineuserobject 484
-dps PSdetach 485
-dps PSexecuserobject 486
-dps PSfork 487
-dps PSjoin 488
-dps PSlock 489
-dps PSmonitor 490
-dps PSnotify 491
-dps PSsetobjectformat 492
-dps PSsetvmthreshold 493
-dps PSundefineuserobject 494
-dps PSwait 495
-dps PSyield 496
-dps PSaload 497
-dps PSanchorsearch 498
-dps PSarray 499
-dps PSastore 500
-dps PSbegin 501
-dps PSclear 502
-dps PScleartomark 503
-dps PScopy 504
-dps PScount 505
-dps PScounttomark 506
-dps PScvi 507
-dps PScvlit 508
-dps PScvn 509
-dps PScvr 510
-dps PScvrs 511
-dps PScvs 512
-dps PScvx 513
-dps PSdef 514
-dps PSdict 515
-dps PSdictstack 516
-dps PSdup 517
-dps PSend 518
-dps PSexch 519
-dps PSexecstack 520
-dps PSexecuteonly 521
-dps PSget 522
-dps PSgetinterval 523
-dps PSindex 524
-dps PSknown 525
-dps PSlength 526
-dps PSload 527
-dps PSmark 528
-dps PSmatrix 529
-dps PSmaxlength 530
-dps PSnoaccess 531
-dps PSnull 532
-dps PSpackedarray 533
-dps PSpop 534
-dps PSput 535
-dps PSputinterval 536
-dps PSrcheck 537
-dps PSreadonly 538
-dps PSroll 539
-dps PSscheck 540
-dps PSsearch 541
-dps PSshareddict 542
-dps PSstatusdict 543
-dps PSstore 544
-dps PSstring 545
-dps PSstringwidth 546
-dps PSsystemdict 547
-dps PSuserdict 548
-dps PSwcheck 549
-dps PSwhere 550
-dps PSxcheck 551
-dps PSFontDirectory 552
-dps PSISOLatin1Encoding 553
-dps PSSharedFontDirectory 554
-dps PSStandardEncoding 555
-dps PScachestatus 556
-dps PScurrentcacheparams 557
-dps PScurrentfont 558
-dps PSdefinefont 559
-dps PSfindfont 560
-dps PSmakefont 561
-dps PSscalefont 562
-dps PSselectfont 563
-dps PSsetcachedevice 564
-dps PSsetcachelimit 565
-dps PSsetcacheparams 566
-dps PSsetcharwidth 567
-dps PSsetfont 568
-dps PSundefinefont 569
-dps PSconcat 570
-dps PScurrentdash 571
-dps PScurrentflat 572
-dps PScurrentgray 573
-dps PScurrentgstate 574
-dps PScurrenthalftone 575
-dps PScurrenthalftonephase 576
-dps PScurrenthsbcolor 577
-dps PScurrentlinecap 578
-dps PScurrentlinejoin 579
-dps PScurrentlinewidth 580
-dps PScurrentmatrix 581
-dps PScurrentmiterlimit 582
-dps PScurrentpoint 583
-dps PScurrentrgbcolor 584
-dps PScurrentscreen 585
-dps PScurrentstrokeadjust 586
-dps PScurrenttransfer 587
-dps PSdefaultmatrix 588
-dps PSgrestore 589
-dps PSgrestoreall 590
-dps PSgsave 591
-dps PSgstate 592
-dps PSinitgraphics 593
-dps PSinitmatrix 594
-dps PSrotate 595
-dps PSscale 596
-dps PSsetdash 597
-dps PSsetflat 598
-dps PSsetgray 599
-dps PSsetgstate 600
-dps PSsethalftone 601
-dps PSsethalftonephase 602
-dps PSsethsbcolor 603
-dps PSsetlinecap 604
-dps PSsetlinejoin 605
-dps PSsetlinewidth 606
-dps PSsetmatrix 607
-dps PSsetmiterlimit 608
-dps PSsetrgbcolor 609
-dps PSsetscreen 610
-dps PSsetstrokeadjust 611
-dps PSsettransfer 612
-dps PStranslate 613
-dps PSequals 614
-dps PSequalsequals 615
-dps PSbytesavailable 616
-dps PSclosefile 617
-dps PScurrentfile 618
-dps PSdeletefile 619
-dps PSecho 620
-dps PSfile 621
-dps PSfilenameforall 622
-dps PSfileposition 623
-dps PSflush 624
-dps PSflushfile 625
-dps PSprint 626
-dps PSprintobject 627
-dps PSpstack 628
-dps PSread 629
-dps PSreadhexstring 630
-dps PSreadline 631
-dps PSreadstring 632
-dps PSrenamefile 633
-dps PSresetfile 634
-dps PSsetfileposition 635
-dps PSstack 636
-dps PSstatus 637
-dps PStoken 638
-dps PSwrite 639
-dps PSwritehexstring 640
-dps PSwriteobject 641
-dps PSwritestring 642
-dps PSleftbracket 643
-dps PSrightbracket 644
-dps PSleftleft 645
-dps PSrightright 646
-dps PScshow 647
-dps PScurrentcolor 648
-dps PScurrentcolorrendering 649
-dps PScurrentcolorspace 650
-dps PScurrentdevparams 651
-dps PScurrentglobal 652
-dps PScurrentoverprint 653
-dps PScurrentpagedevice 654
-dps PScurrentsystemparams 655
-dps PScurrentuserparams 656
-dps PSdefineresource 657
-dps PSexecform 658
-dps PSfilter 659
-dps PSfindencoding 660
-dps PSfindresource 661
-dps PSgcheck 662
-dps PSglobaldict 663
-dps PSGlobalFontDirectory 664
-dps PSglyphshow 665
-dps PSlanguagelevel 666
-dps PSmakepattern 667
-dps PSproduct 668
-dps PSresourceforall 669
-dps PSresourcestatus 670
-dps PSrevision 671
-dps PSrootfont 672
-dps PSserialnumber 673
-dps PSsetcolor 674
-dps PSsetcolorrendering 675
-dps PSsetcolorspace 676
-dps PSsetdevparams 677
-dps PSsetglobal 678
-dps PSsetoverprint 679
-dps PSsetpagedevice 680
-dps PSsetpattern 681
-dps PSsetsystemparams 682
-dps PSsetuserparams 683
-dps PSstartjob 684
-dps PSundefineresource 685
-dps PSabs 686
-dps PSadd 687
-dps PSand 688
-dps PSatan 689
-dps PSbitshift 690
-dps PSceiling 691
-dps PScos 692
-dps PSdiv 693
-dps PSexp 694
-dps PSfloor 695
-dps PSidiv 696
-dps PSln 697
-dps PSlog 698
-dps PSmod 699
-dps PSmul 700
-dps PSneg 701
-dps PSround 702
-dps PSsin 703
-dps PSsqrt 704
-dps PSsub 705
-dps PStruncate 706
-dps PSxor 707
-dps PSbanddevice 708
-dps PSframedevice 709
-dps PSnulldevice 710
-dps PSrenderbands 711
-dps PSconcatmatrix 712
-dps PSdtransform 713
-dps PSidentmatrix 714
-dps PSidtransform 715
-dps PSinvertmatrix 716
-dps PSitransform 717
-dps PStransform 718
-dps PSgetboolean 719
-dps PSgetchararray 720
-dps PSgetfloat 721
-dps PSgetfloatarray 722
-dps PSgetint 723
-dps PSgetintarray 724
-dps PSgetstring 725
-dps PSsendboolean 726
-dps PSsendchararray 727
-dps PSsendfloat 728
-dps PSsendfloatarray 729
-dps PSsendint 730
-dps PSsendintarray 731
-dps PSsendstring 732
-dps PSarc 733
-dps PSarcn 734
-dps PSarct 735
-dps PSarcto 736
-dps PScharpath 737
-dps PSclip 738
-dps PSclippath 739
-dps PSclosepath 740
-dps PScurveto 741
-dps PSeoclip 742
-dps PSeoviewclip 743
-dps PSflattenpath 744
-dps PSinitclip 745
-dps PSinitviewclip 746
-dps PSlineto 747
-dps PSmoveto 748
-dps PSnewpath 749
-dps PSpathbbox 750
-dps PSpathforall 751
-dps PSrcurveto 752
-dps PSrectclip 753
-dps PSrectviewclip 754
-dps PSreversepath 755
-dps PSrlineto 756
-dps PSrmoveto 757
-dps PSsetbbox 758
-dps PSsetucacheparams 759
-dps PSuappend 760
-dps PSucache 761
-dps PSucachestatus 762
-dps PSupath 763
-dps PSviewclip 764
-dps PSviewclippath 765
-dps PSashow 766
-dps PSawidthshow 767
-dps PScopypage 768
-dps PSeofill 769
-dps PSerasepage 770
-dps PSfill 771
-dps PSimage 772
-dps PSimagemask 773
-dps PSkshow 774
-dps PSrectfill 775
-dps PSrectstroke 776
-dps PSshow 777
-dps PSshowpage 778
-dps PSstroke 779
-dps PSstrokepath 780
-dps PSueofill 781
-dps PSufill 782
-dps PSustroke 783
-dps PSustrokepath 784
-dps PSwidthshow 785
-dps PSxshow 786
-dps PSxyshow 787
-dps PSyshow 788
-dps PSbind 789
-dps PScleardictstack 790
-dps PScountdictstack 791
-dps PScountexecstack 792
-dps PScurrentdict 793
-dps PScurrentpacking 794
-dps PScurrentshared 795
-dps PSdeviceinfo 796
-dps PSerrordict 797
-dps PSexec 798
-dps PSprompt 799
-dps PSquit 800
-dps PSrand 801
-dps PSrealtime 802
-dps PSrestore 803
-dps PSrrand 804
-dps PSrun 805
-dps PSsave 806
-dps PSsetpacking 807
-dps PSsetshared 808
-dps PSsrand 809
-dps PSstart 810
-dps PStype 811
-dps PSundef 812
-dps PSusertime 813
-dps PSversion 814
-dps PSvmreclaim 815
-dps PSvmstatus 816
-dps PSineofill 817
-dps PSinfill 818
-dps PSinstroke 819
-dps PSinueofill 820
-dps PSinufill 821
-dps PSinustroke 822
-dps PSwtranslation 823
-dps XDPSLInit 824
-dps DPSWriteStringChars 825
-dps XDPSUnfreezeContext 826
-dps DPSGetCurrentContext 827
-dps DPSAwaitReturnValues 828
-dps DPSNewUserObjectIndex 829
-dps XDPSGetContextStatus 830
-dps XDPSRegisterStatusProc 831
-dps DPSDefaultTextBackstop 832
-dps DPSMapNames 833
-dps XDPSGetDefaultColorMaps 834
-dps XDPSCreateSimpleContext 835
-dps DPSGenerateExtensionRecID 836
-dps DPSWaitContext 837
-dps DPSAddContextExtensionRec 838
-dps DPSGetContextExtensionRec 839
-dps DPSChainContext 840
-dps DPSDestroySpace 841
-dps DPSUnchainContext 842
-dps DPSBinObjSeqWrite 843
-dps DPSSetResultTable 844
-dps XDPSSetStatusMask 845
-dps XDPSXIDFromContext 846
-dps DPSWritePostScript 847
-dps DPSRemoveContextExtensionRec 848
-dps DPSDefaultErrorProc 849
-dps DPSCreateTextContext 850
-;4.x exports from 900
-dps DPSDestroyContext 900
-dps DPSFlushContext 901
-dps DPSGetContextType 902
-dps DPSGetCurrentErrorBackstop 903
-dps DPSGetCurrentTextBackstop 904
-dps DPSInitialize 905
-dps DPSInterruptContext 906
-dps DPSKnownContext 907
-dps DPSKnownSpace 908
-dps DPSNameFromIndex 909
-dps DPSPrivCurrentContext 910
-dps DPSResetContext 911
-dps DPSSetAbbrevMode 912
-dps DPSSetContext 913
-dps DPSSetErrorBackstop 914
-dps DPSSetNumStringConversion 915
-dps DPSSetTextBackstop 916
-dps DPSSetWrapSynchronization 917
-dps DPSSuppressBinaryConversion 918
-dps DPSUpdateNameMap 919
-dps DPSWriteData 920
-dps DPSWriteNumString 921
-dps DPSWriteTypedObjectArray 922
-dps DPScalloc 923
-dps DPSPrintf 924
-dps DPSRaise 925
-dps DPSFetchAbbrevList 926
-dps DPSGetOperatorAbbrev 927
-dps DPSGetSysnameAbbrev 928
-dps DPSChangeEncoding 929
-dps DPSContextFromContextID 930
-dps DPSHandleBogusError 931
-dps DPSServicePostScript 932
-dps XDPSContextFromSharedID 933
-dps XDPSContextFromXID 934
-dps XDPSCreateContext 935
-dps XDPSCreateSecureContext 936
-dps XDPSDispatchEvent 937
-dps XDPSFindContext 938
-dps XDPSGetProtocolVersion 939
-dps XDPSIsDPSEvent 940
-dps XDPSIsOutputEvent 941
-dps XDPSIsReadyEvent 942
-dps XDPSIsStatusEvent 943
-dps XDPSNotifyWhenReady 944
-dps XDPSReadyEventHandler 945
-dps XDPSRegisterReadyProc 946
-dps XDPSSetEventDelivery 947
-dps XDPSSetProcs 948
-dps XDPSSpaceFromSharedID 949
-dps XDPSSpaceFromXID 950
-dps XDPSStatusEventHandler 951
-dps XDPSXIDFromSpace 952
-dps DPSCreatePrivContext 953
-dps XDPSCreatePrivContextRec 954
-dps XDPSForceEvents 955
-dps XDPSNumFormat 956
-dps XDPSPrivZapDpy 957
-dps XDPSSendUnfreeze 958
-dps XDPSSetContextEncoding 959
-dps XDPSLCAPNotify 960
-dps XDPSLCallOutputEventHandler 961
-dps XDPSLCallReadyEventHandler 962
-dps XDPSLCallStatusEventHandler 963
-dps XDPSLCleanAll 964
-dps XDPSLCleanContext 965
-dps XDPSLContextFromXID 966
-dps XDPSLCreateContext 967
-dps XDPSLCreateContextAndSpace 968
-dps XDPSLCreateContextFromID 969
-dps XDPSLCreateSpace 970
-dps XDPSLDestroySpace 971
-dps XDPSLDispatchCSDPSFakeEvent 972
-dps XDPSLFlush 973
-dps XDPSLFlushGC 974
-dps XDPSLGetCSDPSFakeEventType 975
-dps XDPSLGetCSDPSReady 976
-dps XDPSLGetCSDPSStatus 977
-dps XDPSLGetCodes 978
-dps XDPSLGetGCFlushMode 979
-dps XDPSLGetPassEventsFlag 980
-dps XDPSLGetShunt 981
-dps XDPSLGetStatus 982
-dps XDPSLGetSyncMask 983
-dps XDPSLGetVersion 984
-dps XDPSLGetWrapWaitingFlag 985
-dps XDPSLGiveInput 986
-dps XDPSLIDFromContext 987
-dps XDPSLInitDisplayFlags 988
-dps XDPSLNotifyContext 989
-dps XDPSLNotifyWhenReady 990
-dps XDPSLReconcileRequests 991
-dps XDPSLReset 992
-dps XDPSLSetAfterProc 993
-dps XDPSLSetAgentArg 994
-dps XDPSLSetAgentName 995
-dps XDPSLSetClientMessageHandler 996
-dps XDPSLSetCodes 997
-dps XDPSLSetGCFlushMode 998
-dps XDPSLSetPassEventsFlag 999
-dps XDPSLSetReadyEventHandler 1000
-dps XDPSLSetShunt 1001
-dps XDPSLSetStatusEventHandler 1002
-dps XDPSLSetStatusMask 1003
-dps XDPSLSetSyncMask 1004
-dps XDPSLSetTextEventHandler 1005
-dps XDPSLSetVersion 1006
-dps XDPSLSetWrapWaitingFlag 1007
-dps XDPSLSync 1008
-dps XDPSLSyncGCClip 1009
-dps XDPSLTestErrorCode 1010
-dps XDPSLUpdateAgentArgs 1011
-dps XDPSSetXtEventDispatching 1012
-dps DPSCAPCopyGCProc 1013
-dps DPSCAPFlushGCProc 1014
-dps DPSCAPFreeGCProc 1015
-dps XDPSFlushGC 1016
-dps XDPSNXSetAgentArg 1017
-dps XDPSReconcileRequests 1018
-dps XDPSSyncGCClip 1019
-dps DPSCAPConnect 1020
-dps N_XDisconnectDisplay 1021
-dps N_XWaitForReadable 1022
-dps N_XWaitForWritable 1023
-dps StartXDPSNX 1024
-dps XDPSNXRecommendPort 1025
-dps XDPSGetNXArg 1026
-dps XDPSNXFindNX 1027
-dps XDPSNXSetClientArg 1028
-dps NXProcData 1029
-dps N_XANYSET 1030
-dps N_XFlush 1031
-dps N_XGetHostname 1032
-dps N_XRead 1033
-dps N_XReadPad 1034
-dps N_XReply 1035
-dps N_XSend 1036
-dps N_XUnknownNativeEvent 1037
-dps N_XUnknownWireEvent 1038
-LIBRARY dpstk dpstk
-dpstk XDPSSetFileFunctions 1
-dpstk XDPSFileRewindFunc 2
-dpstk XDPSFileGetsFunc 3
-dpstk XDPSEmbeddedEPSFRewindFunc 4
-dpstk XDPSEmbeddedGetsFunc 5
-dpstk XDPSCreatePixmapForEPSF 6
-dpstk XDPSPixelsPerPoint 7
-dpstk XDPSSetImagingTimeout 8
-dpstk XDPSCheckImagingResults 9
-dpstk XDPSImageFileIntoDrawable 10
-dpstk _DPSPSetMatrix 11
-dpstk _DPSPClearArea 12
-dpstk _DPSPSetMaskTransfer 13
-dpstk _DPSPDefineExecFunction 14
-dpstk _DPSPSaveBeforeExec 15
-dpstk _DPSPCheckForError 16
-dpstk _XDPSSetComponentInitialized 17
-dpstk _XDPSTestComponentInitialized 18
-dpstk XDPSSetContextDepth 19
-dpstk XDPSSetContextDrawable 20
-dpstk XDPSSetContextRGBMap 21
-dpstk XDPSSetContextGrayMap 22
-dpstk XDPSSetContextParameters 23
-dpstk XDPSPushContextParameters 24
-dpstk XDPSPopContextParameters 25
-dpstk XDPSCaptureContextGState 26
-dpstk XDPSUpdateContextGState 27
-dpstk XDPSFreeContextGState 28
-dpstk XDPSSetContextGState 29
-dpstk XDPSPushContextGState 30
-dpstk XDPSPopContextGState 31
-dpstk XDPSRegisterContext 32
-dpstk XDPSGetSharedContext 33
-dpstk XDPSDestroySharedContext 34
-dpstk XDPSUnregisterContext 35
-dpstk XDPSFreeDisplayInfo 36
-dpstk XDPSChainTextContext 37
-dpstk XDPSExtensionPresent 38
-dpstk PSDefineAsUserObj 39
-dpstk PSRedefineUserObj 40
-dpstk PSUndefineUserObj 41
-dpstk DPSDefineAsUserObj 42
-dpstk DPSRedefineUserObj 43
-dpstk DPSUndefineUserObj 44
-dpstk PSReserveUserObjIndices 45
-dpstk DPSReserveUserObjIndices 46
-dpstk PSReturnUserObjIndices 47
-dpstk DPSReturnUserObjIndices 48
-dpstk _DPSSSetContextParameters 49
-dpstk _DPSSSetContextDrawable 50
-dpstk _DPSSInstallDPSlibDict 51
-dpstk _DPSSCaptureGState 52
-dpstk _DPSSUpdateGState 53
-dpstk _DPSSRestoreGState 54
-dpstk _DPSSDefineUserObject 55
-dpstk _DPSSUndefineUserObject 56
-dpstk PSDoUserPath 57
-dpstk DPSDoUserPath 58
-dpstk PSHitUserPath 59
-dpstk DPSHitUserPath 60
-LIBRARY psres psres
-psres CheckPSResourceTime 1
-psres EnumeratePSResourceFiles 2
-psres FreePSResourceStorage 3
-psres InSavedList 4
-psres ListPSResourceFiles 5
-psres ListPSResourceTypes 6
-psres PSResEncoding 7
-psres PSResFileWarningHandler 8
-psres PSResFontAFM 9
-psres PSResFontBDF 10
-psres PSResFontBDFSizes 11
-psres PSResFontFamily 12
-psres PSResFontOutline 13
-psres PSResFontPrebuilt 14
-psres PSResForm 15
-psres PSResFree 16
-psres PSResMalloc 17
-psres PSResPattern 18
-psres PSResProcSet 19
-psres PSResRealloc 20
-psres SetPSResourcePolicy 21
-LIBRARY Xrender Xrender
-Xrender XRenderComposite 1
-Xrender XRenderFillRectangle 2
-Xrender XRenderFillRectangles 3
-Xrender XRenderAddGlyphs 4
-Xrender XRenderCompositeString16 5
-Xrender XRenderCompositeString32 6
-Xrender XRenderCompositeString8 7
-Xrender XRenderCreateGlyphSet 8
-Xrender XRenderFreeGlyphSet 9
-Xrender XRenderFreeGlyphs 10
-Xrender XRenderReferenceGlyphSet 11
-Xrender XRenderChangePicture 12
-Xrender XRenderCreatePicture 13
-Xrender XRenderFreePicture 14
-Xrender XRenderFindDisplay 15
-Xrender XRenderFindFormat 16
-Xrender XRenderFindVisualFormat 17
-Xrender XRenderQueryExtension 18
-Xrender XRenderQueryFormats 19
-Xrender XRenderQueryVersion 20
-Xrender XRenderSetPictureClipRegion 21
-Xrender XRenderCompositeText8 22
-Xrender XRenderCompositeText16 23
-Xrender XRenderCompositeText32 24
-Xrender XRenderCompositeTrapezoids 25
-Xrender XRenderParseColor 26
-Xrender XRenderCompositeDoublePoly 27
-Xrender XRenderFindStandardFormat 28
-Xrender XRenderCreateCursor 29
-Xrender XRenderSetPictureClipRectangles 30
-Xrender XRenderQueryFilters 31
-Xrender XRenderSetPictureFilter 32
-Xrender XRenderSetPictureTransform 33
-Xrender XRenderCompositeTriFan 34
-Xrender XRenderCompositeTriStrip 35
-Xrender XRenderCompositeTriangles 36
-Xrender XRenderQuerySubpixelOrder 37
-Xrender XRenderSetSubpixelOrder 38
-Xrender XRenderCreateAnimCursor 39
-LIBRARY GL GL
-GL glClearIndex 1
-GL glClearColor 2
-GL glClear 3
-GL glIndexMask 4
-GL glColorMask 5
-GL glAlphaFunc 6
-GL glBlendFunc 7
-GL glLogicOp 8
-GL glCullFace 9
-GL glFrontFace 10
-GL glPointSize 11
-GL glLineWidth 12
-GL glLineStipple 13
-GL glPolygonMode 14
-GL glPolygonStipple 15
-GL glGetPolygonStipple 16
-GL glEdgeFlag 17
-GL glEdgeFlagv 18
-GL glScissor 19
-GL glClipPlane 20
-GL glGetClipPlane 21
-GL glDrawBuffer 22
-GL glReadBuffer 23
-GL glEnable 24
-GL glDisable 25
-GL glIsEnabled 26
-GL glGetBooleanv 27
-GL glGetDoublev 28
-GL glGetFloatv 29
-GL glGetIntegerv 30
-GL glPushAttrib 31
-GL glPopAttrib 32
-GL glRenderMode 33
-GL glGetError 34
-GL glGetString 35
-GL glFinish 36
-GL glFlush 37
-GL glHint 38
-GL glClearDepth 39
-GL glDepthFunc 40
-GL glDepthMask 41
-GL glDepthRange 42
-GL glClearAccum 43
-GL glAccum 44
-GL glMatrixMode 45
-GL glOrtho 46
-GL glFrustum 47
-GL glViewport 48
-GL glPushMatrix 49
-GL glPopMatrix 50
-GL glLoadIdentity 51
-GL glLoadMatrixd 52
-GL glLoadMatrixf 53
-GL glMultMatrixd 54
-GL glMultMatrixf 55
-GL glRotated 56
-GL glRotatef 57
-GL glScaled 58
-GL glScalef 59
-GL glTranslated 60
-GL glTranslatef 61
-GL glIsList 62
-GL glDeleteLists 63
-GL glGenLists 64
-GL glNewList 65
-GL glEndList 66
-GL glCallList 67
-GL glCallLists 68
-GL glListBase 69
-GL glBegin 70
-GL glEnd 71
-GL glVertex2d 72
-GL glVertex2f 73
-GL glVertex2i 74
-GL glVertex2s 75
-GL glVertex3d 76
-GL glVertex3f 77
-GL glVertex3i 78
-GL glVertex3s 79
-GL glVertex4d 80
-GL glVertex4f 81
-GL glVertex4i 82
-GL glVertex4s 83
-GL glVertex2dv 84
-GL glVertex2fv 85
-GL glVertex2iv 86
-GL glVertex2sv 87
-GL glVertex3dv 88
-GL glVertex3fv 89
-GL glVertex3iv 90
-GL glVertex3sv 91
-GL glVertex4dv 92
-GL glVertex4fv 93
-GL glVertex4iv 94
-GL glVertex4sv 95
-GL glNormal3b 96
-GL glNormal3d 97
-GL glNormal3f 98
-GL glNormal3i 99
-GL glNormal3s 100
-GL glNormal3bv 101
-GL glNormal3dv 102
-GL glNormal3fv 103
-GL glNormal3iv 104
-GL glNormal3sv 105
-GL glIndexd 106
-GL glIndexf 107
-GL glIndexi 108
-GL glIndexs 109
-GL glIndexdv 110
-GL glIndexfv 111
-GL glIndexiv 112
-GL glIndexsv 113
-GL glColor3b 114
-GL glColor3d 115
-GL glColor3f 116
-GL glColor3i 117
-GL glColor3s 118
-GL glColor3ub 119
-GL glColor3ui 120
-GL glColor3us 121
-GL glColor4b 122
-GL glColor4d 123
-GL glColor4f 124
-GL glColor4i 125
-GL glColor4s 126
-GL glColor4ub 127
-GL glColor4ui 128
-GL glColor4us 129
-GL glColor3bv 130
-GL glColor3dv 131
-GL glColor3fv 132
-GL glColor3iv 133
-GL glColor3sv 134
-GL glColor3ubv 135
-GL glColor3uiv 136
-GL glColor3usv 137
-GL glColor4bv 138
-GL glColor4dv 139
-GL glColor4fv 140
-GL glColor4iv 141
-GL glColor4sv 142
-GL glColor4ubv 143
-GL glColor4uiv 144
-GL glColor4usv 145
-GL glTexCoord1d 146
-GL glTexCoord1f 147
-GL glTexCoord1i 148
-GL glTexCoord1s 149
-GL glTexCoord2d 150
-GL glTexCoord2f 151
-GL glTexCoord2i 152
-GL glTexCoord2s 153
-GL glTexCoord3d 154
-GL glTexCoord3f 155
-GL glTexCoord3i 156
-GL glTexCoord3s 157
-GL glTexCoord4d 158
-GL glTexCoord4f 159
-GL glTexCoord4i 160
-GL glTexCoord4s 161
-GL glTexCoord1dv 162
-GL glTexCoord1fv 163
-GL glTexCoord1iv 164
-GL glTexCoord1sv 165
-GL glTexCoord2dv 166
-GL glTexCoord2fv 167
-GL glTexCoord2iv 168
-GL glTexCoord2sv 169
-GL glTexCoord3dv 170
-GL glTexCoord3fv 171
-GL glTexCoord3iv 172
-GL glTexCoord3sv 173
-GL glTexCoord4dv 174
-GL glTexCoord4fv 175
-GL glTexCoord4iv 176
-GL glTexCoord4sv 177
-GL glRasterPos2d 178
-GL glRasterPos2f 179
-GL glRasterPos2i 180
-GL glRasterPos2s 181
-GL glRasterPos3d 182
-GL glRasterPos3f 183
-GL glRasterPos3i 184
-GL glRasterPos3s 185
-GL glRasterPos4d 186
-GL glRasterPos4f 187
-GL glRasterPos4i 188
-GL glRasterPos4s 189
-GL glRasterPos2dv 190
-GL glRasterPos2fv 191
-GL glRasterPos2iv 192
-GL glRasterPos2sv 193
-GL glRasterPos3dv 194
-GL glRasterPos3fv 195
-GL glRasterPos3iv 196
-GL glRasterPos3sv 197
-GL glRasterPos4dv 198
-GL glRasterPos4fv 199
-GL glRasterPos4iv 200
-GL glRasterPos4sv 201
-GL glRectd 202
-GL glRectf 203
-GL glRecti 204
-GL glRects 205
-GL glRectdv 206
-GL glRectfv 207
-GL glRectiv 208
-GL glRectsv 209
-GL glShadeModel 210
-GL glLightf 211
-GL glLighti 212
-GL glLightfv 213
-GL glLightiv 214
-GL glGetLightfv 215
-GL glGetLightiv 216
-GL glLightModelf 217
-GL glLightModeli 218
-GL glLightModelfv 219
-GL glLightModeliv 220
-GL glMaterialf 221
-GL glMateriali 222
-GL glMaterialfv 223
-GL glMaterialiv 224
-GL glGetMaterialfv 225
-GL glGetMaterialiv 226
-GL glColorMaterial 227
-GL glPixelZoom 228
-GL glPixelStoref 229
-GL glPixelStorei 230
-GL glPixelTransferf 231
-GL glPixelTransferi 232
-GL glPixelMapfv 233
-GL glPixelMapuiv 234
-GL glPixelMapusv 235
-GL glGetPixelMapfv 236
-GL glGetPixelMapuiv 237
-GL glGetPixelMapusv 238
-GL glBitmap 239
-GL glReadPixels 240
-GL glDrawPixels 241
-GL glCopyPixels 242
-GL glStencilFunc 243
-GL glStencilMask 244
-GL glStencilOp 245
-GL glClearStencil 246
-GL glTexGend 247
-GL glTexGenf 248
-GL glTexGeni 249
-GL glTexGendv 250
-GL glTexGenfv 251
-GL glTexGeniv 252
-GL glGetTexGendv 253
-GL glGetTexGenfv 254
-GL glGetTexGeniv 255
-GL glTexEnvf 256
-GL glTexEnvi 257
-GL glTexEnvfv 258
-GL glTexEnviv 259
-GL glGetTexEnvfv 260
-GL glGetTexEnviv 261
-GL glTexParameterf 262
-GL glTexParameteri 263
-GL glTexParameterfv 264
-GL glTexParameteriv 265
-GL glGetTexParameterfv 266
-GL glGetTexParameteriv 267
-GL glGetTexLevelParameterfv 268
-GL glGetTexLevelParameteriv 269
-GL glTexImage1D 270
-GL glTexImage2D 271
-GL glGetTexImage 272
-GL glMap1d 273
-GL glMap1f 274
-GL glMap2d 275
-GL glMap2f 276
-GL glGetMapdv 277
-GL glGetMapfv 278
-GL glGetMapiv 279
-GL glEvalCoord1d 280
-GL glEvalCoord1f 281
-GL glEvalCoord1dv 282
-GL glEvalCoord1fv 283
-GL glEvalCoord2d 284
-GL glEvalCoord2f 285
-GL glEvalCoord2dv 286
-GL glEvalCoord2fv 287
-GL glMapGrid1d 288
-GL glMapGrid1f 289
-GL glMapGrid2d 290
-GL glMapGrid2f 291
-GL glEvalPoint1 292
-GL glEvalPoint2 293
-GL glEvalMesh1 294
-GL glEvalMesh2 295
-GL glFogf 296
-GL glFogi 297
-GL glFogfv 298
-GL glFogiv 299
-GL glFeedbackBuffer 300
-GL glPassThrough 301
-GL glSelectBuffer 302
-GL glInitNames 303
-GL glLoadName 304
-GL glPushName 305
-GL glPopName 306
-; glBlendEquationEXT 307
-; glBlendColorEXT 308
-GL glPolygonOffset 309
-GL glVertexPointerEXT 310
-GL glNormalPointerEXT 311
-; glColorPointerEXT 312
-; glIndexPointerEXT 313
-; glTexCoordPointerEXT 314
-; glEdgeFlagPointerEXT 315
-; glGetPointervEXT 316
-; glArrayElementEXT 317
-GL glDrawArraysEXT 318
-; OSMesaCreateContext 319
-; OSMesaDestroyContext 320
-; OSMesaMakeCurrent 321
-GL XMesaCreateContext 322
-; XMesaDestroyContext 323
-GL XMesaMakeCurrent 326
-; XMesaGetCurrentContext 327
-; XMesaSwapBuffers 328
-; XMesaGetBackBuffer 329
-GL glXChooseVisual 330
-GL glXCreateContext 331
-GL glXDestroyContext 332
-GL glXMakeCurrent 333
-GL glXCopyContext 334
-GL glXSwapBuffers 335
-GL glXCreateGLXPixmap 336
-GL glXDestroyGLXPixmap 337
-GL glXQueryExtension 338
-GL glXQueryVersion 339
-GL glXIsDirect 340
-GL glXGetConfig 341
-GL glXGetCurrentContext 342
-GL glXGetCurrentDrawable 343
-GL glXWaitGL 344
-GL glXWaitX 345
-GL glXUseXFont 346
-GL glXQueryExtensionsString 347
-GL glXQueryServerString 348
-GL glXGetClientString 349
-GL glPushClientAttrib 350
-GL glPopClientAttrib 351
-GL glIndexub 352
-GL glIndexubv 353
-GL glVertexPointer 354
-GL glNormalPointer 355
-GL glColorPointer 356
-GL glIndexPointer 357
-GL glTexCoordPointer 358
-GL glEdgeFlagPointer 359
-GL glGetPointerv 360
-GL glArrayElement 361
-GL glDrawArrays 362
-GL glDrawElements 363
-GL glInterleavedArrays 364
-GL glGenTextures 365
-GL glDeleteTextures 366
-GL glBindTexture 367
-GL glPrioritizeTextures 368
-GL glAreTexturesResident 369
-GL glIsTexture 370
-GL glTexSubImage1D 371
-GL glTexSubImage2D 372
-GL glCopyTexImage1D 373
-GL glCopyTexImage2D 374
-GL glCopyTexSubImage1D 375
-GL glCopyTexSubImage2D 376
-; glWindowPos2iMESA 377
-; glWindowPos2sMESA 378
-GL glWindowPos2fMESA 379
-; glWindowPos2dMESA 380
-; glWindowPos2ivMESA 381
-; glWindowPos2svMESA 382
-; glWindowPos2fvMESA 383
-; glWindowPos2dvMESA 384
-; glWindowPos3iMESA 385
-; glWindowPos3sMESA 386
-; glWindowPos3fMESA 387
-; glWindowPos3dMESA 388
-; glWindowPos3ivMESA 389
-; glWindowPos3svMESA 390
-; glWindowPos3fvMESA 391
-; glWindowPos3dvMESA 392
-; glWindowPos4iMESA 393
-; glWindowPos4sMESA 394
-; glWindowPos4fMESA 395
-; glWindowPos4dMESA 396
-; glWindowPos4ivMESA 397
-; glWindowPos4svMESA 398
-; glWindowPos4fvMESA 399
-; glWindowPos4dvMESA 400
-GL glXCreateGLXPixmapMESA 401
-; glXReleaseBuffersMESA 402
-; OSMesaGetCurrentContext 403
-; OSMesaPixelStore 404
-; OSMesaGetIntegerv 405
-GL XMesaCreateVisual 406
-; XMesaDestroyVisual 407
-GL XMesaCreateWindowBuffer 408
-; XMesaCreatePixmapBuffer 409
-; XMesaDestroyBuffer 410
-; XMesaGetCurrentBuffer 411
-; XMesaFlush 412
-; XMesaGetString 413
-; glPolygonOffsetEXT 414
-GL glDisableClientState 450
-GL glEnableClientState 451
-GL glXFreeContextEXT 452
-GL glXGetContextIDEXT 453
-GL glXGetCurrentDisplay 454
-GL glXImportContextEXT 455
-GL glXQueryContextInfoEXT 456
-GL glXGetCurrentDrawableEXT 457
-GL glCopyTexSubImage3D 458
-GL glDrawRangeElements 459
-GL glTexSubImage3D 460
-GL glBlendColorEXT 461
-GL glBlendEquationEXT 462
-GL glTexImage3D 463
-GL _glapi_Context 500
-GL _glapi_Dispatch 501
-GL glMultiTexCoord1svARB 502
-GL glMultiTexCoord1ivARB 503
-GL glMultiTexCoord1fvARB 504
-GL glMultiTexCoord1dvARB 505
-GL glMultiTexCoord2svARB 506
-GL glMultiTexCoord2ivARB 507
-GL glMultiTexCoord2fvARB 508
-GL glMultiTexCoord2dvARB 509
-GL glMultiTexCoord3svARB 510
-GL glMultiTexCoord3ivARB 511
-GL glMultiTexCoord3fvARB 512
-GL glMultiTexCoord3dvARB 513
-GL glMultiTexCoord4svARB 514
-GL glMultiTexCoord4ivARB 515
-GL glMultiTexCoord4fvARB 516
-GL glMultiTexCoord4dvARB 517
-GL glMultiTexCoord1fARB 518
-GL glMultiTexCoord2fARB 519
-GL glMultiTexCoord3fARB 520
-GL glMultiTexCoord4fARB 521
-GL _glapi_set_dispatch 522
-GL _glapi_noop_enable_warnings 523
-GL _glapi_add_entrypoint 524
-GL _glapi_get_dispatch_table_size 525
-GL _glapi_check_multithread 526
-GL _glapi_set_context 527
-GL _glapi_get_context 528
-GL glColorTable 529
-GL glColorSubTable 530
-GL glConvolutionFilter1D 531
-GL glConvolutionFilter2D 532
-GL glXGetProcAddressARB 533
-GL glLockArraysEXT 534
-GL glUnlockArraysEXT 535
-GL glActiveTextureARB 536
-GL glColorTableEXT 537
-GL glPointParameterfEXT 538
-GL glPointParameterfvEXT 539
-GL glXMakeContextCurrent 540
-GL _glapi_get_proc_address 541
-GL _glapi_set_warning_func 542
-LIBRARY ICE ICE
-ICE IceAcceptConnection 1
-ICE IceAddConnectionWatch 2
-ICE IceAllocScratch 3
-ICE IceAppLockConn 4
-ICE IceAppUnlockConn 5
-ICE IceAuthFileName 6
-ICE IceCheckShutdownNegotiation 7
-ICE IceCloseConnection 8
-ICE IceComposeNetworkIdList 9
-ICE IceConnectionNumber 10
-ICE IceConnectionStatus 11
-ICE IceConnectionString 12
-ICE IceFlush 13
-ICE IceFreeAuthFileEntry 14
-ICE IceFreeListenObjs 15
-ICE IceGenerateMagicCookie 16
-ICE IceGetAuthFileEntry 17
-ICE IceGetConnectionContext 18
-ICE IceGetInBufSize 19
-ICE IceGetListenConnectionNumber 20
-ICE IceGetListenConnectionString 21
-ICE IceGetOutBufSize 22
-ICE IceInitThreads 23
-ICE IceLastReceivedSequenceNumber 24
-ICE IceLastSentSequenceNumber 25
-ICE IceListenForConnections 26
-ICE IceLockAuthFile 27
-ICE IceOpenConnection 28
-ICE IcePing 29
-ICE IceProcessMessages 30
-ICE IceProtocolRevision 31
-ICE IceProtocolSetup 32
-ICE IceProtocolShutdown 33
-ICE IceProtocolVersion 34
-ICE IceReadAuthFileEntry 35
-ICE IceRegisterForProtocolReply 36
-ICE IceRegisterForProtocolSetup 37
-ICE IceRelease 38
-ICE IceRemoveConnectionWatch 39
-ICE IceSetErrorHandler 40
-ICE IceSetHostBasedAuthProc 41
-ICE IceSetIOErrorHandler 42
-ICE IceSetPaAuthData 43
-ICE IceSetShutdownNegotiation 44
-ICE IceSwapping 45
-ICE IceUnlockAuthFile 46
-ICE IceVendor 47
-ICE IceWriteAuthFileEntry 48
-ICE _IceTransGetPeerAddr 49
-ICE _IceTransGetPeerNetworkId 50
-ICE _IceErrorBadMinor 51
-ICE _IceErrorBadLength 52
-ICE _IceErrorBadState 53
-ICE _IceErrorBadValue 54
-ICE _IcePaMagicCookie1Proc 55
-ICE _IcePoMagicCookie1Proc 56
-ICE _IceRead 57
-ICE _IceReadSkip 58
-ICE _IceWrite 59
-ICE _IceErrorNoAuthentication 60
-ICE _IceErrorNoVersion 61
-ICE _IceErrorAuthenticationRejected 62
-ICE _IceErrorAuthenticationFailed 63
-ICE _IceErrorProtocolDuplicate 64
-ICE _IceErrorMajorOpcodeDuplicate 65
-ICE _IceErrorUnknownProtocol 66
-ICE _IceErrorBadMajor 67
-ICE _IceDefaultErrorHandler 68
-ICE _IceDefaultIOErrorHandler 69
-ICE _IceGetPoValidAuthIndices 70
-ICE _IceGetPaValidAuthIndices 71
-ICE _IceAddOpcodeMapping 72
-ICE _IceGetPeerName 73
-ICE _IceProcessCoreMessage 74
-ICE _IceAddReplyWait 75
-ICE _IceSearchReplyWaits 76
-ICE _IceCheckReplyReady 77
-ICE _IceFreeConnection 78
-ICE _IceConnectionOpened 79
-ICE _IceConnectionClosed 80
-ICE _IceErrorSetupFailed 81
-ICE _IceGetPoAuthData 82
-ICE _IceGetPaAuthData 83
-ICE _IceTransOpenCOTSClient 84
-ICE _IceTransOpenCOTSServer 85
-ICE _IceTransOpenCLTSClient 86
-ICE _IceTransOpenCLTSServer 87
-ICE _IceTransSetOption 88
-ICE _IceTransCreateListener 89
-ICE _IceTransResetListener 90
-ICE _IceTransAccept 91
-ICE _IceTransConnect 92
-ICE _IceTransBytesReadable 93
-ICE _IceTransRead 94
-ICE _IceTransWrite 95
-ICE _IceTransReadv 96
-ICE _IceTransWritev 97
-ICE _IceTransDisconnect 98
-ICE _IceTransClose 99
-ICE _IceTransCloseForCloning 100
-ICE _IceTransIsLocal 101
-ICE _IceTransGetMyAddr 102
-ICE _IceTransGetConnectionNumber 103
-ICE _IceTransMakeAllCOTSServerListeners 104
-ICE _IceTransMakeAllCLTSServerListeners 105
-ICE _IceTransGetHostname 106
-ICE _IceTransGetMyNetworkId 107
-ICE _IceConnectionCount 108
-ICE _IceLastMajorOpcode 109
-ICE _IceAuthCount 110
-ICE _IceAuthNames 111
-ICE _IcePoAuthProcs 112
-ICE _IcePaAuthProcs 113
-ICE _IcePaAuthDataEntryCount 114
-ICE _IceVersionCount 115
-ICE _IceVersions 116
-ICE _IceWatchProcs 117
-ICE _IceErrorHandler 118
-ICE _IceIOErrorHandler 119
-ICE _IceConnectionObjs 120
-ICE _IceConnectionStrings 121
-ICE _IceProtocols 122
-ICE _IcePaAuthDataEntries 123
-ICE _IceTransSocketINETFuncs 124
-ICE _IceTransSocketTCPFuncs 125
-ICE IceListenForWellKnownConnections 126
-LIBRARY SM SM
-SM SmFreeProperty 1
-SM SmFreeReasons 2
-SM SmcClientID 3
-SM SmcCloseConnection 4
-SM SmcDeleteProperties 5
-SM SmcGetIceConnection 6
-SM SmcGetProperties 7
-SM SmcInteractDone 8
-SM SmcInteractRequest 9
-SM SmcModifyCallbacks 10
-SM SmcOpenConnection 11
-SM SmcProtocolRevision 12
-SM SmcProtocolVersion 13
-SM SmcRelease 14
-SM SmcRequestSaveYourself 15
-SM SmcRequestSaveYourselfPhase2 16
-SM SmcSaveYourselfDone 17
-SM SmcSetErrorHandler 18
-SM SmcSetProperties 19
-SM SmcVendor 20
-SM SmsCleanUp 21
-SM SmsClientHostName 22
-SM SmsClientID 23
-SM SmsDie 24
-SM SmsGenerateClientID 25
-SM SmsGetIceConnection 26
-SM SmsInitialize 27
-SM SmsInteract 28
-SM SmsProtocolRevision 29
-SM SmsProtocolVersion 30
-SM SmsRegisterClientReply 31
-SM SmsReturnProperties 32
-SM SmsSaveComplete 33
-SM SmsSaveYourself 34
-SM SmsSaveYourselfPhase2 35
-SM SmsSetErrorHandler 36
-SM SmsShutdownCancelled 37
-SM _SmcProcessMessage 38
-SM _SmsProcessMessage 39
-SM _SmcDefaultErrorHandler 40
-SM _SmsDefaultErrorHandler 41
-SM _SmsProtocolSetupProc 42
-SM _SmcOpcode 43
-SM _SmsOpcode 44
-SM _SmVersionCount 45
-SM _SmcVersions 46
-SM _SmsVersions 47
-SM _SmAuthCount 48
-SM _SmAuthNames 49
-SM _SmcAuthProcs 50
-SM _SmsAuthProcs 51
-SM _SmcErrorHandler 52
-SM _SmsErrorHandler 53
-SM _SmsNewClientProc 54
-SM _SmsNewClientData 55
-LIBRARY Xft Xft
-Xft XftColorAllocName 1
-Xft XftColorAllocValue 2
-Xft XftColorFree 3
-Xft XftDefaultGetBool 4
-Xft XftDefaultGetDouble 5
-Xft XftDefaultGetInteger 6
-Xft XftDefaultHasRender 7
-Xft XftDefaultParseBool 8
-Xft XftDefaultSet 9
-Xft XftDefaultSubstitute 10
-Xft XftDrawChange 11
-Xft XftDrawCreate 12
-Xft XftDrawCreateBitmap 13
-Xft XftDrawDestroy 14
-Xft XftDrawRect 15
-Xft XftDrawSetClip 16
-Xft XftDrawString16 17
-Xft XftDrawString32 18
-Xft XftDrawString8 19
-Xft XftDrawStringUtf8 20
-Xft XftTextExtents16 21
-Xft XftTextExtents32 22
-Xft XftTextExtents8 23
-Xft XftTextExtentsUtf8 24
-Xft XftFontClose 25
-Xft XftFontMatch 26
-Xft XftFontOpen 27
-Xft XftFontOpenName 28
-Xft XftFontOpenPattern 29
-Xft XftFontOpenXlfd 30
-Xft XftInit 31
-Xft XftListFonts 32
-Xft XftListFontsPatternObjects 33
-Xft XftNameParse 34
-Xft XftNameUnparse 35
-Xft _XftMatchSymbolic 36
-Xft XftXlfdParse 37
-Xft XftInitFtLibrary 38
-Xft XftDrawPicture 39
-Xft XftDrawSrcPicture 40
-Xft XftCharExists 41
-Xft XftDrawCharSpec 42
-LIBRARY Xmuu Xmuu
-Xmuu XmuClientWindow 1
-Xmuu XmuCursorNameToIndex 2
-Xmuu XmuPrintDefaultErrorMessage 3
-Xmuu XmuSimpleErrorHandler 4
-Xmuu XmuGetHostname 5
-Xmuu XmuCompareISOLatin1 6
-Xmuu XmuCopyISOLatin1Lowered 7
-Xmuu XmuCopyISOLatin1Uppered 8
-Xmuu XmuNCopyISOLatin1Lowered 9
-Xmuu XmuNCopyISOLatin1Uppered 10
-Xmuu XmuSnprintf 11
-LIBRARY GLU GLU
-GLU bezierPatchDelete 1
-GLU bezierPatchDeleteList 2
-GLU bezierPatchDraw 3
-GLU bezierPatchEval 4
-GLU bezierPatchEvalNormal 5
-GLU bezierPatchInsert 6
-GLU bezierPatchListDraw 7
-GLU bezierPatchMake 8
-GLU bezierPatchMake2 9
-GLU bezierPatchPrint 10
-GLU bezierPatchPrintList 11
-GLU bezierPatchMeshBeginStrip 12
-GLU bezierPatchMeshDelDeg 13
-GLU bezierPatchMeshDelete 14
-GLU bezierPatchMeshDraw 15
-GLU bezierPatchMeshEndStrip 16
-GLU bezierPatchMeshEval 17
-GLU bezierPatchMeshInsertUV 18
-GLU bezierPatchMeshListCollect 19
-GLU bezierPatchMeshListDelDeg 20
-GLU bezierPatchMeshListDelete 21
-GLU bezierPatchMeshListDraw 22
-GLU bezierPatchMeshListEval 23
-GLU bezierPatchMeshListInsert 24
-GLU bezierPatchMeshListNumTriangles 25
-GLU bezierPatchMeshListPrint 26
-GLU bezierPatchMeshListReverse 27
-GLU bezierPatchMeshListTotalStrips 28
-GLU bezierPatchMeshListTotalVert 29
-GLU bezierPatchMeshMake 30
-GLU bezierPatchMeshMake2 31
-GLU bezierPatchMeshNumTriangles 32
-GLU bezierPatchMeshPrint 33
-GLU bezierPatchMeshPutPatch 34
-GLU drawStrips 35
-GLU gluBeginCurve 36
-GLU gluBeginSurface 37
-GLU gluBeginTrim 38
-GLU gluDeleteNurbsRenderer 39
-GLU gluDeleteNurbsTessellatorEXT 40
-GLU gluEndCurve 41
-GLU gluEndSurface 42
-GLU gluEndTrim 43
-GLU gluGetNurbsProperty 44
-GLU gluLoadSamplingMatrices 45
-GLU gluNewNurbsRenderer 46
-GLU gluNurbsCallback 47
-GLU gluNurbsCallbackData 48
-GLU gluNurbsCallbackDataEXT 49
-GLU gluNurbsCurve 50
-GLU gluNurbsProperty 51
-GLU gluNurbsSurface 52
-GLU gluPwlCurve 53
-GLU glu_LOD_eval_list 54
-GLU __gl_dictListDelete 55
-GLU __gl_dictListDeleteDict 56
-GLU __gl_dictListInsertBefore 57
-GLU __gl_dictListNewDict 58
-GLU __gl_dictListSearch 59
-GLU __gl_edgeEval 60
-GLU __gl_edgeIntersect 61
-GLU __gl_edgeSign 62
-GLU __gl_transEval 63
-GLU __gl_transSign 64
-GLU __gl_vertCCW 65
-GLU __gl_vertLeq 66
-GLU __gl_memInit 67
-GLU __gl_meshAddEdgeVertex 68
-GLU __gl_meshConnect 69
-GLU __gl_meshDelete 70
-GLU __gl_meshDeleteMesh 71
-GLU __gl_meshMakeEdge 72
-GLU __gl_meshNewMesh 73
-GLU __gl_meshSplice 74
-GLU __gl_meshSplitEdge 75
-GLU __gl_meshUnion 76
-GLU __gl_meshZapFace 77
-GLU __gl_projectPolygon 78
-GLU __gl_pqHeapDelete 79
-GLU __gl_pqHeapDeletePriorityQ 80
-GLU __gl_pqHeapExtractMin 81
-GLU __gl_pqHeapInit 82
-GLU __gl_pqHeapInsert 83
-GLU __gl_pqHeapNewPriorityQ 84
-GLU __gl_pqSortDelete 85
-GLU __gl_pqSortDeletePriorityQ 86
-GLU __gl_pqSortExtractMin 87
-GLU __gl_pqSortInit 88
-GLU __gl_pqSortInsert 89
-GLU __gl_pqSortIsEmpty 90
-GLU __gl_pqSortMinimum 91
-GLU __gl_pqSortNewPriorityQ 92
-GLU __gl_renderBoundary 93
-GLU __gl_renderCache 94
-GLU __gl_renderMesh 95
-GLU __gl_computeInterior 96
-GLU __gl_noBeginData 97
-GLU __gl_noCombineData 98
-GLU __gl_noEdgeFlagData 99
-GLU __gl_noEndData 100
-GLU __gl_noErrorData 101
-GLU __gl_noVertexData 102
-GLU gluBeginPolygon 103
-GLU gluDeleteTess 104
-GLU gluEndPolygon 105
-GLU gluGetTessProperty 106
-GLU gluNewTess 107
-GLU gluNextContour 108
-GLU gluTessBeginContour 109
-GLU gluTessBeginPolygon 110
-GLU gluTessCallback 111
-GLU gluTessEndContour 112
-GLU gluTessEndPolygon 113
-GLU gluTessNormal 114
-GLU gluTessProperty 115
-GLU gluTessVertex 116
-GLU __gl_meshDiscardExterior 117
-GLU __gl_meshSetWindingNumber 118
-GLU __gl_meshTessellateInterior 119
-GLU __gl_meshTessellateMonoRegion 120
-GLU gluErrorString 121
-GLU gluBuild1DMipmapLevels 122
-GLU gluBuild1DMipmaps 123
-GLU gluBuild2DMipmapLevels 124
-GLU gluBuild2DMipmaps 125
-GLU gluBuild3DMipmapLevels 126
-GLU gluBuild3DMipmaps 127
-GLU gluScaleImage 128
-GLU gluScaleImage3D 129
-GLU gluLookAt 130
-GLU gluOrtho2D 131
-GLU gluPerspective 132
-GLU gluPickMatrix 133
-GLU gluProject 134
-GLU gluUnProject 135
-GLU gluUnProject4 136
-GLU gluCylinder 137
-GLU gluDeleteQuadric 138
-GLU gluDisk 139
-GLU gluNewQuadric 140
-GLU gluPartialDisk 141
-GLU gluQuadricCallback 142
-GLU gluQuadricDrawStyle 143
-GLU gluQuadricNormals 144
-GLU gluQuadricOrientation 145
-GLU gluQuadricTexture 146
-GLU gluSphere 147
-GLU gluCheckExtension 148
-GLU gluGetString 149
-LIBRARY Xrandr Xrandr
-Xrandr XRRCurrentConfig 1
-Xrandr XRRFindDisplay 2
-Xrandr XRRFreeScreenInfo 3
-Xrandr XRRGetScreenInfo 4
-Xrandr XRRQueryExtension 5
-Xrandr XRRQueryVersion 6
-Xrandr XRRRootToScreen 7
-Xrandr XRRRotations 8
-Xrandr XRRScreenChangeSelectInput 9
-Xrandr XRRSetScreenConfig 10
-Xrandr XRRSizes 11
-Xrandr XRRTimes 12
-Xrandr XRRVisualIDToVisual 13
-Xrandr XRRVisualToDepth 14
-Xrandr XRRConfigCurrentConfiguration 15
-Xrandr XRRConfigSizes 16
-Xrandr XRRConfigRotations 17
-Xrandr XRRSelectInput 18
-Xrandr XRRFreeScreenConfigInfo 19
-Xrandr XRRUpdateConfiguration 20
-Xrandr XRRConfigCurrentRate 21
-Xrandr XRRConfigRates 22
-Xrandr XRRSetScreenConfigAndRate 23
-LIBRARY freetype frtype
-freetype ah_arctan 1
-freetype autohint_module_class 2
-freetype autohinter_interface 3
-freetype cff_driver_class 4
-freetype FT_Access_Frame 5
-freetype FT_Add64 6
-freetype FT_Add_Module 7
-freetype FT_Alloc 8
-freetype FT_Attach_File 9
-freetype FT_Attach_Stream 10
-freetype FT_Create_Extensions 11
-freetype FT_Destroy_Extensions 12
-freetype FT_Div64by32 13
-freetype FT_DivFix 14
-freetype FT_Done_Extensions 15
-freetype FT_Done_Face 16
-freetype FT_Done_GlyphSlot 17
-freetype FT_Done_Library 18
-freetype FT_Done_Size 19
-freetype FT_Done_Stream 20
-freetype FT_Extract_Frame 21
-freetype FT_Forget_Frame 22
-freetype FT_Free 23
-freetype FT_Get_Char 24
-freetype FT_Get_Char_Index 25
-freetype FT_Get_Extension 26
-freetype FT_Get_Glyph_Name 27
-freetype FT_Get_Kerning 28
-freetype FT_Get_Long 29
-freetype FT_Get_LongLE 30
-freetype FT_Get_Module 31
-freetype FT_Get_Module_Interface 32
-freetype FT_Get_Offset 33
-freetype FT_Get_Renderer 34
-freetype FT_Get_Sfnt_Name 35
-freetype FT_Get_Sfnt_Name_Count 36
-freetype FT_Get_Sfnt_Table 37
-freetype FT_Get_Short 38
-freetype FT_Get_ShortLE 39
-freetype FT_GlyphLoader_Add 40
-freetype FT_GlyphLoader_Check_Points 41
-freetype FT_GlyphLoader_Check_Subglyphs 42
-freetype FT_GlyphLoader_Copy_Points 43
-freetype FT_GlyphLoader_Create_Extra 44
-freetype FT_GlyphLoader_Done 45
-freetype FT_GlyphLoader_New 46
-freetype FT_GlyphLoader_Prepare 47
-freetype FT_GlyphLoader_Reset 48
-freetype FT_GlyphLoader_Rewind 49
-freetype FT_Init_Extensions 50
-freetype FT_List_Add 51
-freetype FT_List_Finalize 52
-freetype FT_List_Find 53
-freetype FT_List_Insert 54
-freetype FT_List_Iterate 55
-freetype FT_List_Remove 56
-freetype FT_List_Up 57
-freetype FT_Load_Char 58
-freetype FT_Load_Glyph 59
-freetype FT_Lookup_Renderer 60
-freetype FT_MulDiv 61
-freetype FT_MulFix 62
-freetype FT_MulTo64 63
-freetype FT_New_Face 64
-freetype FT_New_GlyphSlot 65
-freetype FT_New_Library 66
-freetype FT_New_Memory_Face 67
-freetype FT_New_Memory_Stream 68
-freetype FT_New_Size 69
-freetype FT_Open_Face 70
-freetype FT_Outline_Copy 71
-freetype FT_Outline_Decompose 72
-freetype FT_Outline_Done 73
-freetype FT_Outline_Done_Internal 74
-freetype FT_Outline_Get_Bitmap 75
-freetype FT_Outline_Get_CBox 76
-freetype FT_Outline_New 77
-freetype FT_Outline_New_Internal 78
-freetype FT_Outline_Render 79
-freetype FT_Outline_Reverse 80
-freetype FT_Outline_Transform 81
-freetype FT_Outline_Translate 82
-freetype FT_Read_Char 83
-freetype FT_Read_Fields 84
-freetype FT_Read_Long 85
-freetype FT_Read_LongLE 86
-freetype FT_Read_Offset 87
-freetype FT_Read_Short 88
-freetype FT_Read_ShortLE 89
-freetype FT_Read_Stream 90
-freetype FT_Read_Stream_At 91
-freetype FT_Realloc 92
-freetype FT_Register_Extension 93
-freetype FT_Release_Frame 94
-freetype FT_Remove_Module 95
-freetype FT_Render_Glyph 96
-freetype FT_Render_Glyph_Internal 97
-freetype FT_Seek_Stream 98
-freetype FT_Select_Charmap 99
-freetype FT_Set_Char_Size 100
-freetype FT_Set_Charmap 101
-freetype FT_Set_Debug_Hook 102
-freetype FT_Set_Pixel_Sizes 103
-freetype FT_Set_Renderer 104
-freetype FT_Set_Transform 105
-freetype FT_Skip_Stream 106
-freetype FT_Sqrt64 107
-freetype FT_SqrtFixed 108
-freetype FT_Stream_Pos 109
-freetype FT_Vector_Transform 110
-freetype FT_Outline_Get_BBox 111
-freetype FT_Done_Glyph 112
-freetype FT_Get_Glyph 113
-freetype FT_Glyph_Copy 114
-freetype FT_Glyph_Get_CBox 115
-freetype FT_Glyph_To_Bitmap 116
-freetype FT_Glyph_Transform 117
-freetype FT_Matrix_Invert 118
-freetype FT_Matrix_Multiply 119
-freetype ft_bitmap_glyph_class 120
-freetype ft_outline_glyph_class 121
-freetype FT_Add_Default_Modules 122
-freetype FT_Done_FreeType 123
-freetype FT_Init_FreeType 124
-freetype FT_Get_Multi_Master 125
-freetype FT_Set_MM_Blend_Coordinates 126
-freetype FT_Set_MM_Design_Coordinates 127
-freetype FT_Done_Memory 128
-freetype FT_New_Memory 129
-freetype FT_New_Stream 130
-freetype ps_table_funcs 131
-freetype psaux_module_class 132
-freetype t1_builder_funcs 133
-freetype t1_decoder_funcs 134
-freetype t1_parser_funcs 135
-freetype psnames_module_class 136
-freetype ft_raster1_renderer_class 137
-freetype ft_raster5_renderer_class 138
-freetype ft_standard_raster 139
-freetype sbit_metrics_fields 140
-freetype sfnt_module_class 141
-freetype ft_grays_raster 142
-freetype ft_smooth_renderer_class 143
-freetype grays_raster_render 144
-freetype TT_New_Context 145
-freetype TT_RunIns 146
-freetype tt_default_graphics_state 147
-freetype tt_driver_class 148
-freetype t1_driver_class 149
-freetype t1cid_driver_class 150
-freetype winfnt_driver_class 151
-freetype FT_Get_First_Char 152
-freetype FT_Get_Next_Char 153
-freetype FT_Get_PS_Font_Info 154
-freetype FT_Has_PS_Glyph_Names 155
-freetype FT_Get_Name_Index 156
-freetype FT_Get_BDF_Property 157
-freetype FT_Activate_Size 158
-freetype FT_Get_X11_Font_Format 159
-freetype FT_Get_BDF_Charset_ID 160
-freetype FT_Get_Postscript_Name 161
-LIBRARY XTrap XTrap
-XTrap XEAddEventCB 1
-XTrap XEAddEventCBs 2
-XTrap XEAddRequestCB 3
-XTrap XEAddRequestCBs 4
-XTrap XERemoveAllEventCBs 5
-XTrap XERemoveAllRequestCBs 6
-XTrap XERemoveEventCB 7
-XTrap XERemoveEventCBs 8
-XTrap XERemoveRequestCB 9
-XTrap XERemoveRequestCBs 10
-XTrap XEChangeTC 11
-XTrap XECreateTC 12
-XTrap XEFreeTC 13
-XTrap XESetCmdGateState 14
-XTrap XETrapSetColorReplies 15
-XTrap XETrapSetCommandKey 16
-XTrap XETrapSetCursor 17
-XTrap XETrapSetEvents 18
-XTrap XETrapSetGrabServer 19
-XTrap XETrapSetMaxPacket 20
-XTrap XETrapSetRequests 21
-XTrap XETrapSetStatistics 22
-XTrap XETrapSetTimestamps 23
-XTrap XETrapSetWinXY 24
-XTrap XETrapSetXInput 25
-XTrap XETrapDispatchXLib 26
-XTrap XEPrintAvail 27
-XTrap XEPrintAvailFlags 28
-XTrap XEPrintAvailPktSz 29
-XTrap XEPrintCfgFlags 30
-XTrap XEPrintCmdKey 31
-XTrap XEPrintCurPktSz 32
-XTrap XEPrintCurXY 33
-XTrap XEPrintCurrent 34
-XTrap XEPrintEvents 35
-XTrap XEPrintEvtStats 36
-XTrap XEPrintLastTime 37
-XTrap XEPrintMajOpcode 38
-XTrap XEPrintPlatform 39
-XTrap XEPrintRelease 40
-XTrap XEPrintReqStats 41
-XTrap XEPrintRequests 42
-XTrap XEPrintStateFlags 43
-XTrap XEPrintStatistics 44
-XTrap XEPrintTkFlags 45
-XTrap XEPrintTkRelease 46
-XTrap XEPrintTkState 47
-XTrap XEFlushConfig 48
-XTrap XEGetAvailableRequest 49
-XTrap XEGetCurrentRequest 50
-XTrap XEGetLastInpTimeRequest 51
-XTrap XEGetStatisticsRequest 52
-XTrap XEGetVersionRequest 53
-XTrap XEResetRequest 54
-XTrap XESimulateXEventRequest 55
-XTrap XEStartTrapRequest 56
-XTrap XEStopTrapRequest 57
-XTrap XEEventIDToString 58
-XTrap XEEventStringToID 59
-XTrap XEPlatformIDToString 60
-XTrap XEPlatformStringToID 61
-XTrap XERequestIDToExtString 62
-XTrap XERequestIDToString 63
-XTrap XERequestStringToID 64
-XTrap XETrapQueryExtension 65
-XTrap XETrapAppMainLoop 66
-XTrap XETrapAppPending 67
-XTrap XETrapAppWhileLoop 68
-XTrap XETrapDispatchEvent 69
-XTrap XETrapGetEventHandler 70
-XTrap XETrapSetEventHandler 71
-XTrap XETrapWaitForSomething 72
-LIBRARY fontconfig fontcfg
-fontconfig FcAtomicCreate 1
-fontconfig FcAtomicDeleteNew 2
-fontconfig FcAtomicDestroy 3
-fontconfig FcAtomicLock 4
-fontconfig FcAtomicNewFile 5
-fontconfig FcAtomicOrigFile 6
-fontconfig FcAtomicReplaceOrig 7
-fontconfig FcAtomicUnlock 8
-fontconfig FcBlanksAdd 9
-fontconfig FcBlanksCreate 10
-fontconfig FcBlanksDestroy 11
-fontconfig FcBlanksIsMember 12
-fontconfig FcFileCacheCreate 13
-fontconfig FcFileCacheDestroy 14
-fontconfig FcFileCacheFind 15
-fontconfig FcFileCacheLoad 16
-fontconfig FcFileCacheReadDir 17
-fontconfig FcFileCacheSave 18
-fontconfig FcFileCacheUpdate 19
-fontconfig FcFileCacheWriteDir 20
-fontconfig FcConfigAddBlank 21
-fontconfig FcConfigAddConfigFile 22
-fontconfig FcConfigAddDir 23
-fontconfig FcConfigAddEdit 24
-fontconfig FcConfigAppFontAddDir 25
-fontconfig FcConfigAppFontAddFile 26
-fontconfig FcConfigAppFontClear 27
-fontconfig FcConfigBuildFonts 28
-fontconfig FcConfigCompareValue 29
-fontconfig FcConfigCreate 30
-fontconfig FcConfigDestroy 31
-fontconfig FcConfigFilename 32
-fontconfig FcConfigGetBlanks 33
-fontconfig FcConfigGetCache 34
-fontconfig FcConfigGetConfigFiles 35
-fontconfig FcConfigGetCurrent 36
-fontconfig FcConfigGetFonts 37
-fontconfig FcConfigSetCache 38
-fontconfig FcConfigSetCurrent 39
-fontconfig FcConfigSetFonts 40
-fontconfig FcConfigSubstitute 41
-fontconfig FcCharSetAddChar 42
-fontconfig FcCharSetCopy 43
-fontconfig FcCharSetCount 44
-fontconfig FcCharSetCoverage 45
-fontconfig FcCharSetCreate 46
-fontconfig FcCharSetDestroy 47
-fontconfig FcCharSetEqual 48
-fontconfig FcCharSetHasChar 49
-fontconfig FcCharSetIntersect 50
-fontconfig FcCharSetIntersectCount 51
-fontconfig FcCharSetNew 52
-fontconfig FcCharSetSubtract 53
-fontconfig FcCharSetSubtractCount 54
-fontconfig FcCharSetUnion 55
-fontconfig FcFreeTypeCharIndex 56
-fontconfig FcFreeTypeCharSet 57
-fontconfig FcNameParseCharSet 58
-fontconfig FcNameUnparseCharSet 59
-fontconfig FcDebug 60
-fontconfig FcEditPrint 61
-fontconfig FcExprPrint 62
-fontconfig FcFontSetPrint 63
-fontconfig FcOpPrint 64
-fontconfig FcPatternPrint 65
-fontconfig FcSubstPrint 66
-fontconfig FcTestPrint 67
-fontconfig FcValueListPrint 68
-fontconfig FcValuePrint 69
-fontconfig FcDefaultSubstitute 70
-fontconfig FcDirSave 71
-fontconfig FcDirScan 72
-fontconfig FcFileScan 73
-fontconfig FcFreeTypeQuery 74
-fontconfig FcFontSetAdd 75
-fontconfig FcFontSetCreate 76
-fontconfig FcFontSetDestroy 77
-fontconfig FcInit 78
-fontconfig FcMemAlloc 79
-fontconfig FcMemFree 80
-fontconfig FcMemReport 81
-fontconfig FcFontList 82
-fontconfig FcFontSetList 83
-fontconfig FcObjectSetAdd 84
-fontconfig FcObjectSetBuild 85
-fontconfig FcObjectSetCreate 86
-fontconfig FcObjectSetDestroy 87
-fontconfig FcObjectSetVaBuild 88
-fontconfig FcFontMatch 89
-fontconfig FcFontRenderPrepare 90
-fontconfig FcFontSetMatch 91
-fontconfig FcFontSetSort 92
-fontconfig FcMatrixCopy 93
-fontconfig FcMatrixEqual 94
-fontconfig FcMatrixFree 95
-fontconfig FcMatrixMultiply 96
-fontconfig FcMatrixRotate 97
-fontconfig FcMatrixScale 98
-fontconfig FcMatrixShear 99
-fontconfig FcNameBool 100
-fontconfig FcNameConstant 101
-fontconfig FcNameGetConstant 102
-fontconfig FcNameGetObjectType 103
-fontconfig FcNameParse 104
-fontconfig FcNameRegisterConstants 105
-fontconfig FcNameRegisterObjectTypes 106
-fontconfig FcNameUnparse 107
-fontconfig FcNameUnregisterConstants 108
-fontconfig FcNameUnregisterObjectTypes 109
-fontconfig FcPatternAdd 110
-fontconfig FcPatternAddBool 111
-fontconfig FcPatternAddCharSet 112
-fontconfig FcPatternAddDouble 113
-fontconfig FcPatternAddInteger 114
-fontconfig FcPatternAddMatrix 115
-fontconfig FcPatternAddString 116
-fontconfig FcPatternBuild 117
-fontconfig FcPatternCreate 118
-fontconfig FcPatternDel 119
-fontconfig FcPatternDestroy 120
-fontconfig FcPatternDuplicate 121
-fontconfig FcPatternGet 122
-fontconfig FcPatternGetBool 123
-fontconfig FcPatternGetCharSet 124
-fontconfig FcPatternGetDouble 125
-fontconfig FcPatternGetInteger 126
-fontconfig FcPatternGetMatrix 127
-fontconfig FcPatternGetString 128
-fontconfig FcPatternVaBuild 129
-fontconfig FcValueDestroy 130
-fontconfig FcValueListDestroy 131
-fontconfig FcValueSave 132
-fontconfig FcStrBufChar 133
-fontconfig FcStrBufData 134
-fontconfig FcStrBufDestroy 135
-fontconfig FcStrBufDone 136
-fontconfig FcStrBufInit 137
-fontconfig FcStrBufString 138
-fontconfig FcStrCmpIgnoreCase 139
-fontconfig FcStrCopy 140
-fontconfig FcStrFree 141
-fontconfig FcStrPlus 142
-fontconfig FcUtf8Len 143
-fontconfig FcUtf8ToUcs4 144
-fontconfig FcConfigParseAndLoad 145
-fontconfig FcConfigSaveField 146
-fontconfig FcEditCreate 147
-fontconfig FcEditDestroy 148
-fontconfig FcExprCreateBool 149
-fontconfig FcExprCreateConst 150
-fontconfig FcExprCreateDouble 151
-fontconfig FcExprCreateField 152
-fontconfig FcExprCreateInteger 153
-fontconfig FcExprCreateMatrix 154
-fontconfig FcExprCreateNil 155
-fontconfig FcExprCreateOp 156
-fontconfig FcExprCreateString 157
-fontconfig FcExprDestroy 158
-fontconfig FcTestCreate 159
-fontconfig FcTestDestroy 160
-fontconfig FcStrListCreate 161
-fontconfig FcStrListNext 162
-fontconfig FcStrListDone 163
-fontconfig FcStrSetCreate 164
-fontconfig FcDirCacheValid 165
-fontconfig FcStrSetDestroy 166
-fontconfig FcInitLoadConfig 167
-fontconfig FcStrSetAdd 168
-fontconfig FcConfigGetConfigDirs 169
-fontconfig FcPatternAddFTFace 170
-fontconfig FcPatternGetFTFace 171
-fontconfig FcPatternFindElt 172
-fontconfig FcPatternInsertElt 173
-fontconfig FcCharSetFirstPage 174
-fontconfig FcCharSetNextPage 175
-fontconfig FcUtf16ToUcs4 176
-LIBRARY expat expat
-expat XML_DefaultCurrent 1
-expat XML_ErrorString 2
-expat XML_ExpatVersion 3
-expat XML_ExpatVersionInfo 4
-expat XML_ExternalEntityParserCreate 5
-expat XML_GetBase 6
-expat XML_GetBuffer 7
-expat XML_GetCurrentByteCount 8
-expat XML_GetCurrentByteIndex 9
-expat XML_GetCurrentColumnNumber 10
-expat XML_GetCurrentLineNumber 11
-expat XML_GetErrorCode 12
-expat XML_GetIdAttributeIndex 13
-expat XML_GetInputContext 14
-expat XML_GetSpecifiedAttributeCount 15
-expat XML_Parse 16
-expat XML_ParseBuffer 17
-expat XML_ParserCreate 18
-expat XML_ParserCreateNS 19
-expat XML_ParserCreate_MM 20
-expat XML_ParserFree 21
-expat XML_SetAttlistDeclHandler 22
-expat XML_SetBase 23
-expat XML_SetCdataSectionHandler 24
-expat XML_SetCharacterDataHandler 25
-expat XML_SetCommentHandler 26
-expat XML_SetDefaultHandler 27
-expat XML_SetDefaultHandlerExpand 28
-expat XML_SetDoctypeDeclHandler 29
-expat XML_SetElementDeclHandler 30
-expat XML_SetElementHandler 31
-expat XML_SetEncoding 32
-expat XML_SetEndCdataSectionHandler 33
-expat XML_SetEndDoctypeDeclHandler 34
-expat XML_SetEndElementHandler 35
-expat XML_SetEndNamespaceDeclHandler 36
-expat XML_SetEntityDeclHandler 37
-expat XML_SetExternalEntityRefHandler 38
-expat XML_SetExternalEntityRefHandlerArg 39
-expat XML_SetNamespaceDeclHandler 40
-expat XML_SetNotStandaloneHandler 41
-expat XML_SetNotationDeclHandler 42
-expat XML_SetParamEntityParsing 43
-expat XML_SetProcessingInstructionHandler 44
-expat XML_SetReturnNSTriplet 45
-expat XML_SetStartCdataSectionHandler 46
-expat XML_SetStartDoctypeDeclHandler 47
-expat XML_SetStartElementHandler 48
-expat XML_SetStartNamespaceDeclHandler 49
-expat XML_SetUnknownEncodingHandler 50
-expat XML_SetUnparsedEntityDeclHandler 51
-expat XML_SetUserData 52
-expat XML_SetXmlDeclHandler 53
-expat XML_UseParserAsHandlerArg 54
-expat XmlPrologStateInit 55
-expat XmlPrologStateInitExternalEntity 56
-expat XmlGetUtf16InternalEncoding 57
-expat XmlGetUtf16InternalEncodingNS 58
-expat XmlGetUtf8InternalEncoding 59
-expat XmlGetUtf8InternalEncodingNS 60
-expat XmlInitEncoding 61
-expat XmlInitEncodingNS 62
-expat XmlInitUnknownEncoding 63
-expat XmlInitUnknownEncodingNS 64
-expat XmlParseXmlDecl 65
-expat XmlParseXmlDeclNS 66
-expat XmlSizeOfUnknownEncoding 67
-expat XmlUtf16Encode 68
-expat XmlUtf8Encode 69
-LIBRARY OSMesa OSMesa
-OSMesa OSMesaCreateContext 1
-OSMesa OSMesaDestroyContext 2
-OSMesa OSMesaGetColorBuffer 3
-OSMesa OSMesaGetCurrentContext 4
-OSMesa OSMesaGetDepthBuffer 5
-OSMesa OSMesaGetIntegerv 6
-OSMesa OSMesaMakeCurrent 7
-OSMesa OSMesaPixelStore 8
-OSMesa OSMesaCreateContextExt 9
-LIBRARY Xcursor Xcursor
-Xcursor XcursorCursorsCreate 1
-Xcursor XcursorCursorsDestroy 2
-Xcursor XcursorAnimateCreate 3
-Xcursor XcursorAnimateDestroy 4
-Xcursor XcursorAnimateNext 5
-Xcursor XcursorImageLoadCursor 6
-Xcursor XcursorImagesLoadCursors 7
-Xcursor XcursorFilenameLoadCursor 8
-Xcursor XcursorFilenameLoadCursors 9
-Xcursor XcursorLibraryLoadCursor 10
-Xcursor XcursorLibraryLoadCursors 11
-Xcursor _XcursorCreateGlyphCursor 12
-Xcursor XcursorShapeLoadCursor 13
-Xcursor XcursorShapeLoadCursors 14
-Xcursor _XcursorGetDisplayInfo 15
-Xcursor XcursorSupportsARGB 16
-Xcursor XcursorSetDefaultSize 17
-Xcursor XcursorGetDefaultSize 18
-Xcursor XcursorSetTheme 19
-Xcursor XcursorGetTheme 20
-Xcursor XcursorGetThemeCore 21
-Xcursor XcursorSetThemeCore 22
-Xcursor XcursorImageCreate 23
-Xcursor XcursorImageDestroy 24
-Xcursor XcursorImagesCreate 25
-Xcursor XcursorImagesDestroy 26
-Xcursor XcursorCommentCreate 27
-Xcursor XcursorCommentDestroy 28
-Xcursor XcursorCommentsCreate 29
-Xcursor XcursorCommentsDestroy 30
-Xcursor XcursorXcFileLoadImage 31
-Xcursor XcursorXcFileLoadImages 32
-Xcursor XcursorXcFileLoadAllImages 33
-Xcursor XcursorXcFileLoad 34
-Xcursor XcursorXcFileSave 35
-Xcursor XcursorFileLoadImage 36
-Xcursor XcursorFileLoadImages 37
-Xcursor XcursorFileLoadAllImages 38
-Xcursor XcursorFileLoad 39
-Xcursor XcursorFileSaveImages 40
-Xcursor XcursorFileSave 41
-Xcursor XcursorFilenameLoadImage 42
-Xcursor XcursorFilenameLoadImages 43
-Xcursor XcursorFilenameLoadAllImages 44
-Xcursor XcursorFilenameLoad 45
-Xcursor XcursorFilenameSaveImages 46
-Xcursor XcursorFilenameSave 47
-Xcursor XcursorLibraryLoadImage 48
-Xcursor XcursorLibraryLoadImages 49
-Xcursor XcursorShapeLoadImage 50
-Xcursor XcursorShapeLoadImages 51
-Xcursor XcursorTryShapeCursor 52
-Xcursor XcursorNoticeCreateBitmap 53
-Xcursor XcursorImageHash 54
-Xcursor XcursorNoticePutBitmap 55
-Xcursor XcursorTryShapeBitmapCursor 56
-LIBRARY Xv Xv
-Xv XvCreateImage 1
-Xv XvFreeAdaptorInfo 2
-Xv XvFreeEncodingInfo 3
-Xv XvGetPortAttribute 4
-Xv XvGetStill 5
-Xv XvGetVideo 6
-Xv XvGrabPort 7
-Xv XvListImageFormats 8
-Xv XvPutImage 9
-Xv XvPutStill 10
-Xv XvPutVideo 11
-Xv XvQueryAdaptors 12
-Xv XvQueryBestSize 13
-Xv XvQueryEncodings 14
-Xv XvQueryExtension 15
-Xv XvQueryPortAttributes 16
-Xv XvSelectPortNotify 17
-Xv XvSelectVideoNotify 18
-Xv XvSetPortAttribute 19
-Xv XvShmCreateImage 20
-Xv XvShmPutImage 21
-Xv XvStopVideo 22
-Xv XvUngrabPort 23
-LIBRARY xkbfile xkbfile
-xkbfile XkbAccessXDetailText 1
-xkbfile XkbActionText 2
-xkbfile XkbActionTypeText 3
-xkbfile XkbAtomGetString 4
-xkbfile XkbAtomText 5
-xkbfile XkbBehaviorText 6
-xkbfile XkbCFAddModByName 7
-xkbfile XkbCFAddPrivate 8
-xkbfile XkbCFApplyMods 9
-xkbfile XkbCFApplyRtrnValues 10
-xkbfile XkbCFBindMods 11
-xkbfile XkbCFDup 12
-xkbfile XkbCFFree 13
-xkbfile XkbCFFreeRtrn 14
-xkbfile XkbCFParse 15
-xkbfile XkbCFReportError 16
-xkbfile XkbCFScan 17
-xkbfile XkbChangeAtomDisplay 18
-xkbfile XkbChangeKbdDisplay 19
-xkbfile XkbConfigText 20
-xkbfile XkbControlsMaskText 21
-xkbfile XkbConvertGetByNameComponents 22
-xkbfile XkbConvertXkbComponents 23
-xkbfile XkbDetermineFileType 24
-xkbfile XkbDoodadTypeText 25
-xkbfile XkbEnsureSafeMapName 26
-xkbfile XkbFindKeycodeByName 27
-xkbfile XkbFreeOrderedDrawables 28
-xkbfile XkbGeomFPText 29
-xkbfile XkbGetOrderedDrawables 30
-xkbfile XkbIMWhichStateMaskText 31
-xkbfile XkbIndentText 32
-xkbfile XkbInitAtoms 33
-xkbfile XkbInternAtom 34
-xkbfile XkbKeyNameText 35
-xkbfile XkbKeysymText 36
-xkbfile XkbLookupCanonicalRGBColor 37
-xkbfile XkbLookupGroupAndLevel 38
-xkbfile XkbMergeFile 39
-xkbfile XkbModIndexText 40
-xkbfile XkbModMaskText 41
-xkbfile XkbNKNDetailMaskText 42
-xkbfile XkbNameMatchesPattern 43
-xkbfile XkbRF_AddGroup 44
-xkbfile XkbRF_AddRule 45
-xkbfile XkbRF_AddVarDesc 46
-xkbfile XkbRF_AddVarDescCopy 47
-xkbfile XkbRF_AddVarToDescribe 48
-xkbfile XkbRF_Create 49
-xkbfile XkbRF_Free 50
-xkbfile XkbRF_GetComponents 51
-xkbfile XkbRF_GetNamesProp 52
-xkbfile XkbRF_Load 53
-xkbfile XkbRF_LoadDescriptions 54
-xkbfile XkbRF_LoadDescriptionsByName 55
-xkbfile XkbRF_LoadRules 56
-xkbfile XkbRF_LoadRulesByName 57
-xkbfile XkbRF_SetNamesProp 58
-xkbfile XkbReadFromServer 59
-xkbfile XkbSIMatchText 60
-xkbfile XkbStdBell 61
-xkbfile XkbStdBellEvent 62
-xkbfile XkbStringText 63
-xkbfile XkbVModIndexText 64
-xkbfile XkbVModMaskText 65
-xkbfile XkbWriteCFile 66
-xkbfile XkbWriteToServer 67
-xkbfile XkbWriteXKBCompatMap 68
-xkbfile XkbWriteXKBFile 69
-xkbfile XkbWriteXKBGeometry 70
-xkbfile XkbWriteXKBKeyTypes 71
-xkbfile XkbWriteXKBKeycodes 72
-xkbfile XkbWriteXKBKeymap 73
-xkbfile XkbWriteXKBKeymapForNames 74
-xkbfile XkbWriteXKBLayout 75
-xkbfile XkbWriteXKBSemantics 76
-xkbfile XkbWriteXKBSymbols 77
-xkbfile XkbWriteXKMFile 78
-xkbfile XkmFindTOCEntry 79
-xkbfile XkmProbe 80
-xkbfile XkmReadFile 81
-xkbfile XkmReadFileSection 82
-xkbfile XkmReadFileSectionName 83
-xkbfile XkmReadTOC 84
-xkbfile _XkbStrCaseCmp 85
-xkbfile XkbCFDflts 86
-xkbfile _XkbErrLocation 87
-xkbfile _XkbErrCode 88
-xkbfile _XkbErrMessages 89
-xkbfile _XkbKSCheckCase 90
-LIBRARY xkbui xkbui
-xkbui XbUI_GetViewOpts 1
-xkbui XkbUI_DrawChanged 2
-xkbui XkbUI_DrawRegion 3
-xkbui XkbUI_GetCanvasSize 4
-xkbui XkbUI_Init 5
-xkbui XkbUI_ResetKeyAppearance 6
-xkbui XkbUI_Select 7
-xkbui XkbUI_SetCanvasSize 8
-xkbui XkbUI_SetKeyAppearance 9
-xkbui XkbUI_SetKeyAppearanceByName 10
-xkbui XkbUI_SetViewOpts 11
-xkbui XkbUI_SimpleInit 12
-LIBRARY Xinerama Xinerama
-Xinerama XPanoramiXAllocInfo 1
-Xinerama XPanoramiXGetScreenCount 2
-Xinerama XPanoramiXGetScreenSize 3
-Xinerama XPanoramiXGetState 4
-Xinerama XPanoramiXQueryExtension 5
-Xinerama XPanoramiXQueryVersion 6
-Xinerama XineramaIsActive 7
-Xinerama XineramaQueryExtension 8
-Xinerama XineramaQueryScreens 9
-Xinerama XineramaQueryVersion 10
-LIBRARY XvMC XvMC
-XvMC XvMCListSubpictureTypes 1
-XvMC XvMCListSurfaceTypes 2
-XvMC XvMCQueryExtension 3
-XvMC XvMCQueryVersion 4
-LIBRARY XRes XRes
-XRes XResQueryClientPixmapBytes 1
-XRes XResQueryClientResources 2
-XRes XResQueryClients 3
-XRes XResQueryExtension 4
-XRes XResQueryVersion 5
-LIBRARY FS FS
-FS FSErrorList 1
-FS FSErrorListSize 2
-FS FSCloseFont 3
-FS FSCloseServer 4
-FS FSFlush 5
-FS FSFree 6
-FS FSFreeCatalogues 7
-FS FSFreeExtensionList 8
-FS FSFreeFontNames 9
-FS FSGetCatalogues 10
-FS FSGetErrorDatabaseText 11
-FS FSGetErrorText 12
-FS FSListCatalogues 13
-FS FSListExtensions 14
-FS FSListFonts 15
-FS FSListFontsWithXInfo 16
-FS FSMalloc 17
-FS FSMaxRequestSize 18
-FS FSNextEvent 19
-FS FSOpenBitmapFont 20
-FS FSOpenServer 21
-FS FSQueryExtension 22
-FS FSQueryXBitmaps16 23
-FS FSQueryXBitmaps8 24
-FS FSQueryXExtents16 25
-FS FSQueryXExtents8 26
-FS FSQueryXInfo 27
-FS FSServerName 28
-FS FSSetAfterFunction 29
-FS FSSetCatalogues 30
-FS FSSetErrorHandler 31
-FS FSSetIOErrorHandler 32
-FS FSSync 33
-FS FSSynchronize 34
-LIBRARY fontenc fontenc
-fontenc FontEncDirectory 1
-fontenc FontEncIdentify 2
-fontenc FontEncReallyLoad 3
-fontenc FontEncFind 4
-fontenc FontEncFromXLFD 5
-fontenc FontEncMapFind 6
-fontenc FontEncName 7
-fontenc FontEncRecode 8
-fontenc FontEncSimpleName 9
-fontenc FontEncSimpleRecode 10
-fontenc FontEncUndefinedName 11
-fontenc FontEncUndefinedRecode 12
-fontenc FontMapFind 13
-fontenc FontMapReverse 14
-fontenc FontMapReverseFree 15
-LIBRARY Xfontcache Fntcache
-Xfontcache FontCacheChangeCacheSettings 1
-Xfontcache FontCacheGetCacheSettings 2
-Xfontcache FontCacheGetCacheStatistics 3
-Xfontcache FontCacheQueryExtension 4
-Xfontcache FontCacheQueryVersion 5
diff --git a/nx-X11/config/cf/osf1.cf b/nx-X11/config/cf/osf1.cf
deleted file mode 100644
index 9bb8cdc42..000000000
--- a/nx-X11/config/cf/osf1.cf
+++ /dev/null
@@ -1,211 +0,0 @@
-XCOMM platform: $Xorg: osf1.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-/* only tested with Digital OSF/1 */
-
-
-
-XCOMM platform: $XFree86$
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
-
-#define StandardCppDefines -D__osf__ StandardDefines
-#define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY_PATH
-#define HasPutenv YES
-#define Malloc0ReturnsNull YES
-#define HasNdbm YES
-#define HasShm YES
-#define AvoidNullMakeCommand YES
-#define NullMakeCommand @ echo
-#define HasPosixThreads YES
-#define SystemMTDefines -D_REENTRANT
-#define CplusplusSystemMTDefines -D_REENTRANT
-#define HasPoll YES
-#define HasVFork NO
-#define HasPlugin YES
-#define InstallCmd installbsd
-#define RanlibCmd ranlib -t
-#if OSMajorVersion > 1 || OSMinorVersion > 0
-#define ModernOSF1 YES
-#else
-#define ModernOSF1 NO
-#define ShLibDir /usr/shlib
-#endif
-
-#define InstallXloadSetGID NO
-
-#define ThreadedX ModernOSF1
-
-#if ThreadedX
-#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-#if OSMajorVersion < 4
-#define ThreadsLibraries -lpthreads -lmach -lc_r
-#define ThreadsCplusplusLibraries -lpthreads -lmach
-#define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
-#else
-#define ThreadsLibraries -lpthread -lmach -lexc -lc
-#define ThreadsCplusplusLibraries -lpthread -lmach -lexc
-#define LibraryMTDefines -DUSE_TIS_SUPPORT
-#endif
-#endif
-
-#if ModernOSF1
-#ifndef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2 -Olimit 2000
-#endif
-#ifndef ExtraLoadFlags
-/*
- * In OSF/1 3.0 Digital has shared libXdmcp and libXau. What's more,
- * the link editor has different search semantics, i.e. it will search
- * for shared libraries first, then, if it can't find a shared lib, it
- * will use a static lib. By using -oldstyle_liblookup the linker will
- * follow "normal" semantics for linking libraries and will get the
- * static libraries we really want. By 3.2 they no longer have libXdmcp
- * and libXau as shared libraries and we can omit -oldstyle_liblookup.
- * (What did they have in 3.1?)
- */
-#if OSMajorVersion == 3 && OSMinorVersion == 0
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH),-oldstyle_liblookup
-#else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-#if OSMajorVersion > 3
-#define TermcapLibrary -lcurses
-#endif
-#if OSMajorVersion >= 3
-#define HasMkstemp YES
-#endif
-#endif
-
-/*
- * C++ compiler setup. This file knows what options to use with the
- * DEC C++ compiler, and may learn about other compilers in the future.
- *
- * For DEC C++, define HasDECCplusplus to YES in site.def.
- *
- * For g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def.
- *
- * For other compilers, define HasCplusplus to YES in site.def, and
- * check to see if you need to provide values for CplusplusOptions
- * and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * Note: For DEC C++, the -call_shared option really only needs to
- * appear when linking C++ executables, not when actually compiling
- * the C++ sources. But since there's no imake variable that lets
- * us insert flags only into the C++ link stage, we use -call_shared
- * on all compilations when building executables. This could be
- * considered a deficiency in the current imake configuration
- */
-
-#if HasDECCplusplus
-#ifndef HasCplusplus
-#define HasCplusplus YES
-#endif
-#ifndef CplusplusCmd
-#define CplusplusCmd /usr/bin/cxx
-#endif
-#ifndef CplusplusFilt
-# define CplusplusFilt /usr/bin/demangle
-#endif
-#ifndef CplusplusDependIncludes
-#define CplusplusDependIncludes -D__DECCXX -I/usr/include/cxx
-#endif
-#ifndef CplusplusLibDir
-#define CplusplusLibDir /usr/lib/cmplrs/cxx
-#endif
-#ifndef CplusplusLibC
-#define CplusplusLibC -L/usr/lib/cmplrs/cxx -lcxx
-#endif
-#ifndef CplusplusOptions
-#define CplusplusOptions -call_shared
-#endif
-#endif /* HasDECCplusplus */
-
-
-#if HasGcc2ForCplusplus
-#ifndef CplusplusLibC
-#define CplusplusLibC `$(CXX) -print-libgcc-file-name`
-#endif
-#endif /* HasGcc2ForCplusplus */
-
-#ifdef CplusplusLibDir
-# define SystemBuildLibPath \
-/usr/shlib:/usr/ccs/lib:CplusplusLibDir:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib:/var/shlib
-#else
-# define SystemBuildLibPath \
-/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib:/var/shlib
-#endif
-
-#include <osfLib.rules>
-#define NoRConst YES
-
-#ifdef AlphaArchitecture
-#ifndef HasWChar32
-#define HasWChar32 YES
-#endif
-#define ServerExtraDefines -D_XSERVER64
-#define ServerOSDefines -DDDXTIME
-#ifndef DefaultCCOptions
-#define DefaultCCOptions -std1
-#endif
-#ifndef XawI18nDefines
-#define XawI18nDefines -DHAS_WCHAR_H
-#endif
-#ifndef BuildServer
-#define BuildServer NO
-#endif
-
-/* For DtHelp's TIFF processing routines. */
-#define LSBBitOrder YES
-
-#define MotifDefines -DNO_REGCOMP -DNO_REGEX -DSTRINGS_ALIGNED
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-#define DtMailDefines \
- -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-
-#define ArchitectureDefines -DALPHA_ARCHITECTURE
-#endif
-
-#ifdef MipsArchitecture
-#define DefaultCCOptions -Xa
-#define XdecServer YES
-#define ServerOSDefines -DDDXTIME
-#define NormalLibObjCompile(options) ClearmakeOSName \
- $(RM) $@ $*.os \ @@\
- && $(CC) -c options $(CFLAGS) $*.c \ @@\
- && $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
- && $(MV) $*.os $@
-#endif
-
-#if !HasClearmake
-#ifndef HasMakefileSafeInclude
-#define HasMakefileSafeInclude YES
-#endif
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@-include file
-#endif
-#endif
-
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- catman -M $(DESTDIR)manpath -w
-#endif
-
-#define CdeTicDefines -DHAS_KNL -DHAS_KTAB
-#define CdeProjectDefines \
- -DDEC -DMULTIBYTE -DNLS16 \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
diff --git a/nx-X11/config/cf/osfLib.rules b/nx-X11/config/cf/osfLib.rules
deleted file mode 100644
index 7f9a386d0..000000000
--- a/nx-X11/config/cf/osfLib.rules
+++ /dev/null
@@ -1,163 +0,0 @@
-XCOMM $Xorg: osfLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * OSF/1 shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile NO
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <osfLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared -no_archive
-#endif
-
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags /**/
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef PackageName(libname)
-#if ModernOSF1
-#define PackageName(libname) /**/
-#define Objects(objlist) -all objlist -none
-#else
-#define PackageName(libname) -package libname
-#define Objects(objlist) objlist
-#endif
-#endif
-#if ThreadedX && ModernOSF1 && OSMajorVersion < 4
-#define BaseShLibReqs -lc_r -lc
-#else
-#define BaseShLibReqs -lc
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#if SeparateSharedCompile
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) \ @@\
- -soname $@ Objects(solist) \ @@\
- $(REQUIREDLIBS) BaseShLibReqs) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#else
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) \ @@\
- -soname $@ Objects(solist) \ @@\
- $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif /* SeparateSharedCompile */
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#if SeparateSharedCompile
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) \ @@\
- -soname $@ Objects(solist) \ @@\
- $(REQUIREDLIBS) BaseShLibReqs) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#else
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- $(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) \ @@\
- -soname $@ Objects(solist) \ @@\
- $(REQUIREDLIBS) BaseShLibReqs @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif /* SeparateSharedCompile */
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
diff --git a/nx-X11/config/cf/osfLib.tmpl b/nx-X11/config/cf/osfLib.tmpl
deleted file mode 100644
index 82b7f92b7..000000000
--- a/nx-X11/config/cf/osfLib.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-XCOMM $Xorg: osfLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * OSF/1 shared library template
- */
-
-XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.3tsi Exp $
-
-#if ThreadedX && ModernOSF1
-#if OSMajorVersion < 4
-#define SharedX11Reqs -lpthreads -lmach
-#endif
-#endif
-#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
-
-#if ThreadedX && ModernOSF1 && OSMajorVersion < 4
-#define SharedThreadReqs -lpthreads -lmach
-#else
-#define SharedThreadReqs /**/
-#endif
-#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
-#if ModernOSF1
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB)
-#else
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) -init _XawFixupVendorShell
-#endif
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-#define SharedXpmReqs $(LDPRELIBS) $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) SharedThreadReqs $(CXXLIB)
-#define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtSearchReqs $(LDPRELIBS) -lm
-#define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm -liconv
-#define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtTermReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMailReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv -lm $(CXXLIB)
-#define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-
-ICONVSYSLIB = -liconv
diff --git a/nx-X11/config/cf/pegasus.cf b/nx-X11/config/cf/pegasus.cf
deleted file mode 100644
index 0a6f53a37..000000000
--- a/nx-X11/config/cf/pegasus.cf
+++ /dev/null
@@ -1,34 +0,0 @@
-XCOMM platform: $Xorg: pegasus.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-#ifndef OSName
-#define OSName UTek 4.0
-#endif
-XCOMM operating system: OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-
-#define HasNdbm YES
-#define HasVoidSignalReturn NO
-
-#define BootstrapCFlags -DM4310 -DUTEK
-#define StandardDefines -DM4310 -DUTEK -Dpegasus
-
-#if HasGcc
-/* put back all of the -Ds which -ansi removes */
-#define CcCmd gcc -ansi -fstrength-reduce -fpcc-struct-return -Dmc68000 -Dtektronix -Dutek -Dunix -Dm68k
-#endif
-
-#define BuildServer NO
-/* #define XtekServer YES */
-
-#define ServerExtraDefines -DM4310 -DM4317
-#define ServerOSDefines -DDDXTIME
-#define FontFilters BDFTOSNFFILT SHELLPATH
-#define PrimaryScreenResolution 95
-
-.DIRECTORIES: /* Turn off directory search for RCS */
-
diff --git a/nx-X11/config/cf/sco.cf b/nx-X11/config/cf/sco.cf
deleted file mode 100644
index dff6a659f..000000000
--- a/nx-X11/config/cf/sco.cf
+++ /dev/null
@@ -1,206 +0,0 @@
-XCOMM platform: $Xorg: sco.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes Exp $
-
-/*
- * This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX.
- * Please mail hug@netcom.com with any questions.
- *
- * This section is common to all versions of SCO
- */
-
-#ifndef ScoOsMouse
-# define ScoOsMouse YES
-#endif
-
-#ifndef OSVendor
-#define OSVendor Santa Cruz Operation
-#endif
-
-#define PosixLibraries /**/
-#define Malloc0ReturnsNull YES
-#define RemoveDSDENroffMacros NO
-#define ExtraLibraries -lsocket -lmalloc -lpt
-
-#define ManSourcePath $(MANPATH)/cat.
-
-#ifndef CompressManPages
-#define CompressManPages YES
-#endif
-
-#if ScoOsMouse
-# define ServerExtraDefines -DUSE_OSMOUSE XFree86ServerDefines
-# define ServerExtraSysLibs $(CBRT) -lm -levent
-#else
-# define ServerExtraSysLibs $(CBRT) -lm
-#endif
-
-/*
- * XBSDLIB is included with the Socket libraries, because SCO needs Xbsd
- * as its bcopy routine doesn't handle overlapping regions. If HasSockets
- * If HasSockets is false the XINETLIB does it for us anyway.
- */
-#define SocketLibraries $(XBSDLIB) -lsocket
-
-#define ConnectionFlags -DLOCALCONN -DTCPCONN -DFD_SETSIZE=256
-
-#if defined(i386Sco324Architecture) || defined(i386Sco325Architecture)
-# ifndef HasSymLinks
-# define HasSymLinks YES
-# endif
-# define CompressManCmd $(COMPRESS) -v
-#else /* SCO 3.2.2 */
-# ifndef HasSymLinks
-# define HasSymLinks NO
-# endif
-# define CommpressManCmd pack
-#endif
-
-/*
- * Due to the extra '.' chars in the SCO man pages file name we have
- * to provide our own version of this macro.
- */
-
-#define InstallManPageAliases(file,destdir,aliases) @@\
-install.man:: @@\
- @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \ @@\
- for i in aliases; do (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.*; \ @@\
- (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
- $$i.$${SUFFIX})); \ @@\
- done)
-
-/*
- * This is the SCO Open Server 5.0.2 section. BOOTSTRAPCFLAGS is computed
- * automatically. You can simply run make World.
- */
-#ifdef i386Sco325Architecture
-#ifndef OSName
-#define OSName OpenServer Release 5
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 2
-#endif
-
-#define StandardDefines -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DSCO324
-#ifdef HasGcc2
-# define DefaultCCOptions -melf
-# define CcCmd gcc
-# define ExtraLoadOptions -melf
-# define DefaultCDebugFlags DefaultGcc2i386Opt
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define DefaultCCOptions -dy
-# define CcCmd cc
-# define ExtraLoadOptions -b elf
-# define DefaultCDebugFlags -O2
-# define OptimizedCDebugFlags -O2
-#endif
-
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define NeedWidePrototypes NO
-#define ServerOSDefines -DDDXTIME
-#define ToolkitStringsABIOptions -intelabi
-#define ThreadedX NO
-#define HasThreadSafeAPI NO
-#define HasNdbm YES
-#define HasVFork YES
-#define HasPutenv YES
-#define ExecableScripts YES
-#define HasShadowPasswd YES
-
-#ifndef HasLibCrypt
-# define HasLibCrypt YES
-# define SpecialLibCrypt -lcrypt
-#endif
-
-#ifndef ForceNormalLib
-# define ForceNormalLib YES
-#endif
-
-#define SharedLibXmu NO
-#define SystemV YES
-#define LdCombineFlags -r
-
-#define HasLdRunPath YES
-#define HasPoll YES
-#define PatheticCpp YES
-
-#define ArCmdBase ar
-#define AsCmd as
-#define CppCmd /lib/cpp
-#define LdCmd ld
-#define LexCmd lex
-#define MakeCmd make
-#define YaccCmd yacc
-
-#include <scoLib.rules> /* minor changes to sv4Lib.rules */
-#include <sv4Lib.rules>
-
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-
-#else /* !i386Sco325Architecture */
-/*
- * This is the SCO 3.2v4.x and SCO 3.2v2.x section
- */
-
-/* You must manually compute BootstrapCFlags for initial build */
-
-#define OSMinorVersion 2
-
-#ifdef i386Sco324Architecture
-# define BootstrapCFlags -DSYSV -Di386 -DSCO -DSCO324
-# define OSTeenyVersion 4
-# define OSName (SCO Version 3.2.4)
-# define OSDefines -DSCO -DSCO324 -Dsco -Dsco324 -DBROKEN_FTOL \
- -D_NO_PROTOTYPE -D_SVID
-#else
-# define BootstrapCFlags -DSYSV -Di386 -DSCO
-# define OSTeenyVersion 2
-# define OSName (SCO Version 3.2.2)
-# define OSDefines -DSCO -Dsco -DBROKEN_FTOL -DNO_PROTOTYPE \
- -D_SVID
-#endif
-
-#ifdef i386Sco324Architecture
-/*
- * if your gcc is compiled with STDC_VALUE=0 then change the 1 to 0
- */
-# define GCC_STDC_VALUE 1
-# if !GCC_STDC_VALUE
-# define OSDefines -DSCO -DSCO324 -Dsco -Dsco324 -DBROKEN_FTOL \
- -D_NO_PROTOTYPE -D_SVID -D__STDC__=1
-# undef StandardCppDefines
-# define StandardCppDefines -DUNIXCPP=1 StandardDefines
-# endif
-#endif
-
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-/*
- * The user should override this in their site.def if they have the real
- * crypt library. We default to the international crypt library here as
- * anyone may obtain that.
- */
-
-#ifndef HasLibCrypt
-# define HasLibCrypt YES
-# define SpecialLibCrypt -lcrypt_i
-#endif
-
-#include <svr3.cf>
-
-#endif /* SCO 3.2.4 and SCO 3.2.2 section */
-
-#ifdef i386Architecture
-#include <xorg.cf>
-#endif
-
diff --git a/nx-X11/config/cf/sco5.cf b/nx-X11/config/cf/sco5.cf
deleted file mode 100644
index c6fa54bad..000000000
--- a/nx-X11/config/cf/sco5.cf
+++ /dev/null
@@ -1,380 +0,0 @@
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
-XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.9 2005/12/20 22:30:48 alanc Exp $
-
-/*
- * This is for SCO Open Server 5.0.6A or later. You must have the
- * Execution Environment update (OSS646) installed on 5.0.6 (it
- * ships standard in 5.0.7 and later), as well as the Graphics,
- * Web and X11 (gwxlibs) package OSS631 installed, which also ships
- * standard with 5.0.7 and later.
- *
- * It is suggested that you use the GNU Development Tools for compiling
- * XFree86. Almost no testing has been done with the native development
- * system.
- */
-
-#ifndef OSName
-#define OSName UNIX System V/386 Open Server Release 5
-#endif
-#ifndef OSVendor
-#define OSVendor SCO-Group
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 7
-#endif
-
-/*
- * Note: We define FD_SETSIZE here (as opposed to in ConnectionFlags) to
- * guarantee that the same FD_SETSIZE is used. Havoc abounds if we do not
- * do this, as some files which include sys/socket.h and sys/types.h will
- * have different values for FD_SETSIZE.
- *
- * Note 2: We also define _SVID3, as this seems to enable more Streams
- * based options which are closer to the "desired" state for X11. A by-
- * product of this is that we get better signals too.
- */
-
-#ifndef HasGcc2
-# define HasGcc2 YES
-#endif
-#ifndef HasGcc3
-# define HasGcc3 NO
-#endif
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus YES
-#endif
-
-#ifndef HasGcc
-# if HasGcc2 || HasGcc3
-# define HasGcc YES
-# endif
-#endif
-
-/*
- * Although OpenServer does not currently have threads, there are plans
- * for it in the near future, and libc/libsocket are already thread
- * safe, so use -D_REENTRANT when compiling libraries so that if an
- * app that has either the new forthcoming threads, or one that uses
- * GNU PTH or FSU pthreads is linked against X, that the libraries are
- * safe at least with regards to things like errno and various _r functions.
- */
-#ifndef LibraryCCOptions
-# define LibraryCCOptions -D_REENTRANT -DFD_SETSIZE=11000 -D_NO_STATIC -DMAXPATHLEN=1024
-#endif
-
-#ifndef UseExportLists
-# define UseExportLists NO
-#endif
-
-#define StandardDefines -DSYSV -Di386 -DSCO325 -D__SCO__
-#if HasGcc
-# define DefaultCCOptions GccWarningOptions
-# ifndef CcCmd
-# define CcCmd gcc
-# endif
-# ifndef DefaultCDebugFlags
-# define DefaultCDebugFlags -O6 -fomit-frame-pointer -march=i586 -mcpu=i586
-# endif
-# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O6 -fomit-frame-pointer -march=i586 -mcpu=i586
-# endif
-#else
-# ifndef CcCmd
-# define CcCmd cc -belf
-# endif
-# define DefaultCCOptions -dy
-# ifndef DefaultCDebugFlags
-# define DefaultCDebugFlags -O2
-# endif
-# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2
-# endif
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-
-#ifndef HasNCurses
-# define HasNCurses YES
-#endif
-#ifndef NCursesLibName
-# define NCursesLibName -lcurses
-#endif
-#ifndef TermcapLibrary
-# define TermcapLibrary -lcurses
-#endif
-
-#ifndef BuildXterm
-# define BuildXterm BuildClients
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver NO
-#endif
-
-#ifndef SCOHasGWXLIBS
-# define SCOHasGWXLIBS YES
-#endif
-
-#ifndef LogDirectory
-# define LogDirectory /var/adm
-#endif
-
-#ifndef DoLoadableServer
-# define DoLoadableServer YES
-#endif
-
-#if DoLoadableServer
-# if HasGcc
-# define SCODynamicFlags -rdynamic
-# else
-# define SCODynamicFlags -Wl,-Bexport
-# endif
-#else
-# define SCODynamicFlags /**/
-#endif
-
-#ifndef BuildFreetypeDlModule
-# define BuildFreetypeDlModule NO
-#endif
-
-#ifndef AsmDefines
-# define AsmDefines -D__ELF__ -D__PIC__
-#endif
-
-#ifndef XawI18nDefines
-# define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#endif
-
-#ifndef ServerExtraSysLibs
-# define ServerExtraSysLibs $(CBRT) -lm SCODynamicFlags
-#endif
-
-#ifndef ExtraLibraries
-# define ExtraLibraries -lsocket
-#endif
-
-#ifndef NeedWidePrototypes
-# define NeedWidePrototypes YES
-#endif
-
-#define SCOBuildFlags -DFD_SETSIZE=11000 -DMAXPATHLEN=1024 -DPATH_MAX=1024
-
-#define ServerExtraDefines -D_REENTRANT SCOBuildFlags -DDDXTIME XFree86ServerDefines
-
-#ifndef ThreadedX
-# define ThreadedX NO
-#endif
-
-#ifndef HasThreadSafeAPI
-# define HasThreadSafeAPI NO
-#endif
-
-#define HasNdbm YES
-#define HasVFork YES
-#define HasPutenv YES
-#define HasSnprintf NO
-#define ToolkitStringsABIOptions -intelabi
-#define HasSetenv NO
-#define HasMkstemp YES
-#define ExecableScripts YES
-#define HasShadowPasswd YES
-
-#define HasSymLinks YES
-#define HasDlopen YES
-#define HasShm YES
-#define HasStrcasecmp YES
-#define HasLdRunPath YES
-#define HasPoll YES
-
-#ifndef HasGnuMake
-# define HasGnuMake YES
-#endif
-
-#if SCOHasGWXLIBS
-# define HasExpat YES
-# define HasFreetype2 YES
-# define HasLibpng YES
-# define HasZlib YES
-# define HasFontconfig YES
-#endif
-
-#define InstallHardcopyDocs NO
-
-#define HasPerl YES
-#define HasPerl5 YES
-
-#ifndef ManSourcePath
-# define ManSourcePath $(MANPATH)/man
-#endif
-
-#define Malloc0ReturnsNull YES
-#define RemoveDSDENroffMacros NO
-
-#ifndef CompressManPages
-# define CompressManPages NO
-#endif
-
-#ifndef HasLibCrypt
-# define HasLibCrypt YES
-# define SpecialLibCrypt -lcrypt
-#endif
-
-#ifndef PosixLibraries
-# define PosixLibraries /**/
-#endif
-
-#ifndef ForceNormalLib
-# define ForceNormalLib NO
-#endif
-
-#define SharedLibXmu YES
-#define SystemV YES
-#define LdCombineFlags -r
-
-#define AvoidNullMakeCommand YES
-#define PatheticCpp YES
-
-#define MesaUseX86Asm NO
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
-#define ArCmdBase ar
-
-#ifndef AsCmd
-# define AsCmd CcCmd
-#endif
-
-#ifndef CppCmd
-# define CppCmd /lib/cpp
-#endif
-
-#ifndef PreProcessCmd
-# define PreProcessCmd CppCmd
-#endif
-
-#ifndef RawCppCmd
-# define RawCppCmd CppCmd
-#endif
-
-#ifndef LdCmd
-# define LdCmd CcCmd
-#endif
-
-#ifdef HasGcc2
-# ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -shared
-# endif
-# undef LdCombineFlags
-# define LdCombineFlags -nostdlib -r
-#endif
-
-#ifndef LexCmd
-# define LexCmd /usr/gnu/bin/flex
-#endif
-
-#ifndef MakeCmd
-# define MakeCmd /usr/gnu/bin/gmake
-#endif
-
-#ifndef YaccCmd
-# define YaccCmd /usr/gnu/bin/bison -y
-#endif
-
-#ifndef InstallCmd
-# define InstallCmd /usr/gnu/bin/ginstall
-#endif
-
-#ifndef UseSeparateConfDir
-# define UseSeparateConfDir NO
-#endif
-
-#ifndef BuildHtmlManPages
-# define BuildHtmlManPages NO
-#endif
-
-#ifndef DefaultUserPath
-# define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/gnu/bin:/usr/local/bin:/etc
-#endif
-
-#ifndef DefaultSystemPath
-# define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11
-#endif
-
-#define ConnectionFlags -DLOCALCONN -DTCPCONN -DUNIXCONN
-
-#define ExportListGenSource elistgen.usl
-#define ShlibExportListOpt(filename) Concat(-Bexport:,filename)
-
-/*
- * These settings control the interdependence of the shared libraries.
- * Mostly borrowed from darwinLib.tmpl.
- */
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
-
-#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedX11Reqs $(LDPRELIB) -lsocket
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXpReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-#define SharedXssReqs $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB)
-#define SharedXmReqs $(LDPRELIB) SharedXReqs
-#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIB) $(XMLIB) SharedXReqs
-
-#define ObjectFromAsmSource(src,flags) @@\
- @@\
-src.o: src.S @@\
- RemoveFile(src.o) @@\
- $(CC) -c AsmDefines $(DEFINES) $(INCLUDES) flags src.S
-
-#include <scoLib.rules> /* minor changes to sv4Lib.rules */
-#include <sv4Lib.rules>
-
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/scoLib.rules b/nx-X11/config/cf/scoLib.rules
deleted file mode 100644
index ddbe99d30..000000000
--- a/nx-X11/config/cf/scoLib.rules
+++ /dev/null
@@ -1,68 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/scoLib.rules,v 1.3 2005/11/08 06:33:24 jkj Exp $
-XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
-
-#ifndef UseExportLists
-# define UseExportLists YES
-#endif
-
-#ifndef SCOAbsShlibPath
-# define SCOAbsShlibPath NO
-#endif
-
-#if SCOAbsShlibPath
-# define SCOShlibFlags -h $(SHLIBDIR)/$@
-#else
-# ifndef ExtraLoadFlags
-# define ExtraLoadFlags -R $(USRLIBDIRPATH)
-# endif
-# define SCOShlibFlags -R $(SHLIBDIR) -h $@
-#endif
-
-/*
- * SharedLibraryTarget3 - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- *
- * Work around SCO sh enviroment size problem.
- */
-#ifndef SharedLibraryTarget3
-#define SharedLibraryTarget3(libname,rev,solist1,solist2,solist3,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist1 " " > Concat(down/lib,cmd) @@\
- echo -n solist2 " " >> Concat(down/lib,cmd) @@\
- echo -n solist3 " " >> Concat(down/lib,cmd) @@\
- echo -n $(REQUIREDLIBS) >> Concat(down/lib,cmd) @@\
- (cd down; $(SHELL) Concat(./lib,cmd)) @@\
- $(RM) $@ Concat(lib,tmp1) Concat(lib,tmp2) @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-#ifndef LinkWithExports
-# if UseExportLists
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS)) @@\
- if [ -f Concat(lib,libname.elist) ]; then \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\
- $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- fi;
-# else
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))
-# endif
-#endif
diff --git a/nx-X11/config/cf/sequent.cf b/nx-X11/config/cf/sequent.cf
deleted file mode 100644
index 99ba9b461..000000000
--- a/nx-X11/config/cf/sequent.cf
+++ /dev/null
@@ -1,444 +0,0 @@
-XCOMM platform: $XConsortium: sequent.cf$
-
-/*
- * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install
- * util/scripts/bsdinstall.sh before doing a "make install"
- */
-
-/*
- * Version numbers are set one of two ways:
- *
- * If the target version is different than the machine you are building on,
- * set the target versions using the environmental variable IMAKEINCLUDES.
- * Example: IMAKEINCLUDES="-I. -DOSMajorVersion=4 -DOSMinorVersion=4"
- * This is usually only done at Sequent when building a product using
- * cross compiling tools and target headers and libraries.
- *
- * Otherwise, the imake will use uname(2) to calculate the default to be
- * the same as the machine you are building on. The X11R6 imake will set
- * DefaultOS*Version macros to be these default values.
- * Those default values will be used in the assignments below.
- * This is the recommended method to be used by customers.
- */
-
- /* defaults from imake via uname(2) */
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion
-
-/*
- * Sequent Dynix/PTX 4.x.x (SVR4) and later operating systems.
- *
- * Sequent Dynix/PTX 4.2.3 and later operating systems are supported with
- * the X11R6 sequent.cf and other X11R6 configuration files.
- * Specifically 4.4.2 and later have been tested.
- *
- * Attempting to use these X11R6 configuration files and X11R6 source files
- * with early versions of Dynix/PTX 4.x.x may work, however that will not be
- * tested or supported at Sequent.
- * Sequent Dynix/PTX 2.1.x has been retired so support for it and earlier
- * releases has been removed.
- */
-
-#if OSMajorVersion >= 4
-
-#define SystemV4 YES
-#define SequentVersionDefines -DSVR4
-#define ExtraLibraries
-#define ForceNormalLib YES
-#define HasRequiredLibs YES
-#define NeedBerklib NO /* gettimeofday in libc */
-
-#define XmExtraLibraries /* for ABI-compliance do not use -lgen here */
-#define MotifDefines -DXM_STRINGS_1_2_2_STATE /* code review */
-
-/* initial port does not use multiple socket libs, default libsocket.so.1.1 */
-#define HasMultipleSockets NO /* obsolete */ /* only libsocket.so.1.1 */
-
-#endif /* OSMajorVersion >= 4 */
-
-/*
- * Below this line are generic defines that apply to all Sequent systems.
- * However they are currently tested with only OSMajorVersion >= 4
- */
-
-/*
- * The following cpp macro defines are order independent,
- * since the right-hand-side is constant.
- * Therefore these are simply listed in alphabetical order.
- * Macros defined later may use these definitions.
- */
-
-/*
- * Threads.tmpl cpp macros.
- * Sequent overrides the Threads.tmpl defaults with the values below.
- * Sequent has native threads for ptx 4.5.0 and higher.
- */
-
-#if ( OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 5) )
-
-#define HasPosixThreads YES
-#define HasThreadSafeAPI YES
-#define ThreadedX YES
-#define ThreadsLibraries /**/
-#define ThreadsCplusplusLibraries /**/
-#define ThreadPreStdAPIDefines /**/
-#define ThreadsCompileFlags -Kthread
-#define ThreadsCplusplusCompileFlags -Kthread
-#define SharedThreadReqs /**/
-
-/*
- * THREADS macro and environment variable used with Sequent commands only.
- * We use THREADS rather than the generic X11 THREADS_CFLAGS because we
- * want to ensure that the macro is defined for all compiles and not just
- * those Makefiles built from a Imakefile that includes Threads.tmpl.
- *
- * Sequent compiler option -Kthread will also define -D_SEQUENT_THREADS.
- * Currently using -Kthread is the recommended interface to this define.
- * Currently there are no extra includes files using -D_SEQUENT_THREADS.
- * Currently no reason for makedepend or cpp to use -D_SEQUENT_THREADS.
- * If needed in the future, we would add to ProjectThreadsDefines
- *
- * #define ProjectThreadsDefines -DXTHREADS -D_SEQUENT_THREADS
- */
-
- THREADS = -Kthread
-
-#endif /* ptx 4.5.0 or greater has threads */
-
-/*
- * Imake.tmpl cpp macros.
- * Sequent overrides the Imake.tmpl defaults with the values below.
- */
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define DefaultCCOptions -Xa
-#define ExpandManNames YES
-#define ExtraFilesToClean *.z
-#define HasNdbm YES
-#define HasShadowPasswd YES
-#define HasSockets YES /* default */
-#define HasVarDirectory NO
-#ifdef UseInstalled
-#define InstallCmd $(BINDIR)/ptxinst -t "$(TOOLS)"
-#else
-#define InstallCmd $(SHELL) $(SCRIPTSRC)/ptxinst.sh
-#endif /* UseInstalled */
-#define InstPgmFlags -s -m 0555 -o bin -g bin
-#define InstBinFlags -s -m 0555 -o bin -g bin
-#define InstLibFlags -m 0444 -o bin -g bin
-#define InstShLibFlags -m 0555 -o bin -g bin
-#define Malloc0ReturnsNull YES
-#define ManSuffix 1 /* use just one tab or cpp will die */
-#define LibManSuffix 3x /* use just one tab or cpp will die */
-#define LibmanDir $(MANSOURCEPATH)3
-#define MiscManSuffix 5x /* use just one tab or cpp will die */
-#define MiscManDir $(MANSOURCEPATH)5
-#define MkdirHierCmd mkdir -p
-#define NeedConstPrototypes YES
-#define NeedFunctionPrototypes YES
-#define NeedNestedPrototypes YES
-#define NeedVarargsPrototypes YES
-#define StripInstalledPrograms YES
-#define SystemManDirectory /usr/catman
-#define TermcapLibrary -lcurses /* code review for SVR4 ? */
-#define TerminfoDir /usr/lib/terminfo /* Sequent addition */
-#define ToolkitStringsABIOptions -intelabi
-
-
-/*
- * X11.tmpl cpp macros.
- * Sequent overrides the X11.tmpl defaults with the values below.
- */
-
-#define BuildDps YES
-#define BuildServer YES
-#define BuildXF86DGA NO /* DGA has no meaning on Sequent HW */
-#define BuildXF86MiscExt NO /* turn off the server portion */
-#define BuildXF86VidModeExt NO /* turn off the server portion */
-#define BuildXInputExt YES
-#define BuildXKBuilib YES /* override NO set in xorg.cf */
-#define ConnectionFlags -DTCPCONN
-#define DefaultSystemPath /bin:/etc:/usr/bin:$(BINDIR)
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR)
-#define HasPlugin YES
-#define HasXServer NO
-#define InstallFSConfig YES /* safe since we install to DESTDIR */
-#define InstallXdmConfig YES /* safe since we install to DESTDIR */
-#define MotifBC NO /* default, code review from X11R5 */
-#define XdmServersType fs /* One tab here. Needed if BuildServer YES */
-#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC
-#define XprtServer YES
-#define XVirtualFramebufferServer YES
-#define XF86SVGAServer NO /* Don't build the XFree86 servers */
-#define XF86S3Server NO
-#define XF86S3VServer NO
-#define XF86I8514Server NO
-#define XF86Mach8Server NO
-#define XF86Mach32Server NO
-#define XF86Mach64Server NO
-#define XF86P9000Server NO
-#define XF86AGXServer NO
-#define XF86I128Server NO
-#define XF86GLINTServer NO
-#define XF86REALimageServer NO
-
-/*
- * Motif.tmpl cpp macros.
- * Sequent overrides the Motif.tmpl default with the values below.
- */
-
-#define GencatCmd /usr/lbin/gencat
-
-/* Port Sequent macro DontBuildMotifConfig to Motif 2.1 */
-/*
- * #ifndef MetroLink
- * #define DontBuildMotifConfig
- * #endif
- */
-
-/*
- * Sequent added cpp macros.
- *
- * The following cpp macro defines have been introduced by Sequent.
- * They will be referenced in Sequent patches sent to TOG.
- * They may be moved above if accepted by TOG or X.org.
- */
-
-#define AdminBaseDir /usr/admin.ptx/etc/base.dir
-#define MessageCatDir /usr/lib/message/C
-#define NeedXinputAlias YES
-#define UseHidesymsLists YES
-#define XlbiffMailPath /usr/mail/%s /* used by contrib xlbiff */
-
-/*
- * Imake.tmpl, X11.tmpl, or other order dependent cpp defines.
- *
- * The following cpp macro defines are order dependent.
- * They depend on previously defined cpp macros.
- * Do not change the order.
- */
-#define SharedLibraryCCOptions DefaultCCOptions
-#define StandardDefines SequentVersionDefines -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion -DANSICPP -DDYNIX_C2 -DMetroLink
-#define StandardCppDefines StandardDefines -D_SOCKET_VERSION=11 -DUnixCpp
-
-#ifdef ProjectRoot
-#define ManDirectoryRoot ProjectRoot/**//catman
-#else
-#define ManDirectoryRoot SystemManDirectory
-#endif
-#define XmanSearchPath ManDirectoryRoot /* for X11R5 xman */
-
-/*
- * Sequent configuration environment specific to building X11 and Motif.
- * This environment is only available when UseInstalled is not defined.
- * Therefore this environment is not used by customers using xmkmf.
- */
-
-#ifndef UseInstalled
-
-/* Product builds using local X11 and Motif trees */
-
-/*
- * Provide libraries needed by nonX programs in the X11 build tree.
- * These are not standard so the customer will be forced to add them to their
- * Imakefile SYS_LIBRARIES if needed. An ABI program may not want or need them,
- * so we do not include them in the ExtraLibraries provided to customers
- * when UseInstalled is defined. We add them here as a convenience when
- * building the entire X11 tree (at Sequent or the contractor).
- */
-#undef ExtraLibraries
-#define ExtraLibraries -lsocket -lnsl
-
-/*
- * Sequent builds X11 and Motif in the same tree.
- * The Motif project files include the X11 project files.
- *
- * Later we may use the Local project files similer the the lynx.cf
- *
- * #define LocalTmplFile <Motif.tmpl>
- * #define LocalRulesFile <Motif.rules>
- */
-
-/* Try the Metro Link method. */
-
-#ifndef MetroLink
-#undef ProjectTmplFile
-#define ProjectTmplFile <Motif.tmpl>
-#undef ProjectRulesFile
-#define ProjectRulesFile <Motif.rules>
-#endif
-
-/*
- * Later change to Metro Link directory layout,
- * or allow $(TOP)/../motif21
- */
-
-/* Try the Metro Link method. */
-
-#ifndef MetroLink
-#define MTop $(TOP)/motif21
-#endif
-
-/*
- * Set the Program macros to be correct for the target machine.
- * This will avoid using any crosstools as hardwired strings
- * built into binaries that will run on the target machine.
- *
- * These macro names need to be ported from X11R5 to X11R6.
- */
-#define ArProgramBase ar
-#define CppProgram /lib/cpp
-#define CcProgram cc
-#define RanlibProgram ranlib
-
-/*
- * Build all the X11 debug libaries *_d.a for use by Sequent Service
- */
-
-/*
- * Set DebugLibDefault YES for Sequent to build all debug libs.
- * If we move this to generic code to *.tmpl files,
- * use the default code below that sets the default NO
- */
-
-#define DebugLibDefault NO
-
-#ifndef DebugLibDefault
-#define DebugLibDefault NO
-#endif
-
-#define DebugLibX11 DebugLibDefault /* debugged X library */
-#define DebugLibXext DebugLibDefault /* debugged Xext library */
-#define DebugLibXau DebugLibDefault /* debugged auth library */
-#define DebugLibXdmcp DebugLibDefault /* debugged XDMCP library */
-#define DebugLibXmu DebugLibDefault /* debugged Xmu library */
-#define DebugLibXp DebugLibDefault /* debugged Xp library */
-#define DebugLibXt DebugLibDefault /* debugged toolkit library */
-#define DebugLibXa DebugLibDefault /* debugged audio library */
-#define DebugLibXaw DebugLibDefault /* debugged widget library */
-#define DebugLibXi DebugLibDefault /* debugged Xi library */
-#define DebugLibXtst DebugLibDefault /* debugged Xtst library */
-#define DebugLibICE DebugLibDefault /* debugged ICE library */
-#define DebugLibSM DebugLibDefault /* debugged SM library */
-#define DebugLibXkey DebugLibDefault /* debugged Xkey library */
-#define DebugLibFS DebugLibDefault /* debugged FS library */
-
-/*
- * Build all the Motif debug libaries *_d.a for use by Service
- */
-#define DebugLibXm DebugLibDefault
-#define DebugLibMrm DebugLibDefault
-#define DebugLibUil DebugLibDefault
-
-/*
- * Build all the Adobe DPS debug libaries *_d.a for use by Service
- */
-#define DebugLibDps DebugLibDefault
-
-#endif /* ! UseInstalled */
-
-/*
- * Sequent general make macros.
- * X11R6.5 should migrate these to Imake.tmpl.
- */
-
-XCOMM Sequent general make macros.
-
-#ifndef PackCmd
-#define PackCmd pack
-#endif
- PACK = PackCmd
-
-/*
- * Sequent unique make macros. These will always be unique to Sequent.
- * We introduce them here in sequent.cf since cpp macros are set in sequent.cf.
- * We may later move them to sequentLib.tmpl.
- */
-
-XCOMM Sequent unique make macros.
-
- ADMINBASEDIR = AdminBaseDir
- MESSAGECATDIR = MessageCatDir
-
-/*
- * DPS default values (unique to sequent)
- */
-#ifndef PswrapCmd
-#define PswrapCmd pswrap
-#endif
-
-#ifdef UseHidesymsLists
-
-#ifndef HidesymsCmd
-#define HidesymsCmd /usr/lib/hidesyms/hidesyms
-#endif
-#ifndef HsAcppCmd
-#define HsAcppCmd /lib/acpp
-#endif
-/*
- * When building in the X11 tree.
- * For shared libs, hidesyms executes in a subdir.
- * For unshared libs, hidesyms executes in a subsubdir.
- * Therefore we add both of these to the acpp path:
- * ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms
- */
-#ifndef HsAcppLocalPath
-# define HsAcppLocalPath ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms
-#endif
-#ifndef HsAcppSystemPath
-# define HsAcppSystemPath /usr/lib/hidesyms
-#endif
-#ifndef HsAcppPath
-# ifdef UseInstalled
-# define HsAcppPath HsAcppSystemPath
-# else
-# define HsAcppPath HsAcppLocalPath:HsAcppSystemPath
-# endif /* UseInstalled */
-#endif
-/*
- * note: -DABI_SHARED_OBJECT requires a temporary fix added to
- * Xt/Error.c to provide missing _abi_* routines not in libc.so.1.
- * When the base adds those missing _abi_* to libc.so.1,
- * then the code in Xt/Error.c can be removed and the corresponding
- * symbols added to Xt/libXt.hs can be removed.
- */
-#ifndef HsAcppDefines
-#define HsAcppDefines -DABI_SHARED_OBJECT -D_SOCKET_VERSION=11 $(THREADS_DEFINES)
-#endif
-
-/*
- * For shared libs, hidesyms executes in a subdir,
- * therefore we add a -L../$(BUILDLIBDIR)
- */
-#ifndef LdPreLib
-#ifndef UseInstalled
-#define LdPreLib -L$(BUILDLIBDIR) -L../$(BUILDLIBDIR)
-#endif
-#endif
-
-XCOMM HIDESYMS is for filtering system library symbols.
-
- HIDESYMS = HidesymsCmd
- HSACPPPATH = HsAcppPath
- HSACPPCMD = HsAcppCmd
- HSACPPDEFINES = HsAcppDefines
- HSACPP = $(HSACPPCMD) -Y $(HSACPPPATH) $(HSACPPDEFINES)
- HSCMD = $(HIDESYMS) -z -p "$(HSACPP)"
-
-#endif /* UseHidesymsLists */
-
-#if OSMajorVersion >= 4
-#include <xorg.cf>
-#include <sequentLib.rules> /* include after macros, before Motif.rules */
-#endif /* OSMajorVersion >= 4 */
diff --git a/nx-X11/config/cf/sequentLib.rules b/nx-X11/config/cf/sequentLib.rules
deleted file mode 100644
index 7f77e3feb..000000000
--- a/nx-X11/config/cf/sequentLib.rules
+++ /dev/null
@@ -1,323 +0,0 @@
-XCOMM $Xorg: sequentLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * SVR4 shared library rules
- */
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <sequentLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-/* Sequent may need to implement the X11R5 HasMultipleSockets ? */
-# if HasMultipleSockets
-# define SharedLibraryLoadFlags -G -z text $(DEFAULTSOCKETLDOPTIONS)
-# define ExtraLoadOptions $(DEFAULTSOCKETLDOPTIONS)
-# else
-/* # define SharedLibraryLoadFlags -G -z text */
-# define SharedLibraryLoadFlags -G
-# define ExtraLoadOptions
-# endif
-#endif
-#ifndef PositionIndependentCFlags
-# if HasGcc2
-# define PositionIndependentCFlags -fpic
-# else
-# define PositionIndependentCFlags -K PIC
-# endif
-#endif
-#ifndef PositionIndependentCplusplusFlags
-# if HasGcc2ForCplusplus
-# define PositionIndependentCplusplusFlags -fpic
-# else
-# define PositionIndependentCplusplusFlags -K PIC
-# endif
-#endif
-#ifndef UseExportLists
-# define UseExportLists NO
-#endif
-#ifndef UseHidesymsLists
-# define UseHidesymsLists NO
-#endif
-
-#if UseHidesymsLists
-
-#ifndef BuildHidesyms
-#define BuildHidesyms(libname) @@\
-includes:: @@\
- MakeDir($(BUILDLIBDIR)/hidesyms) @@\
- @( if [ -f Concat(lib,libname.hs) ]; \ @@\
- then \ @@\
- (set -x; cd $(BUILDLIBDIR)/hidesyms && \ @@\
- RemoveFile(Concat(lib,libname.hs)) && \ @@\
- $(LN) $(BUILDLIBTOP)/../$(CURRENT_DIR)/Concat(lib,libname.hs) .); \ @@\
- fi; )
-#endif /* BuildHidesyms */
-
-/*
- * InstallHidesyms - install library hidesyms directive file. (Sequent only)
- * Logic cloned from InstallNonExecFile.
- * We do not list the hidesyms directive file as a dependency since it
- * may not exist.
- */
-#ifndef InstallHidesyms
-#define InstallHidesyms(libname) @@\
-install:: @@\
- MakeDir($(DESTDIR)/usr/lib/hidesyms) @@\
- @( if [ -f Concat(lib,libname.hs) ]; then \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) Concat(lib,libname.hs) $(DESTDIR)/usr/lib/hidesyms; fi; )
-#endif /* InstallHidesyms */
-
-/*
- * InstallLibrary - generate rules to install the indicated library.
- *
- * Sequent includes an extra "install::" target to install hidesyms files
- * and an extra "includes::" target to export library hidesyms files.
- * Therefore whenever InstallLibrary is expanded the hidesyms targets
- * will also be expanded. This avoids changes to generic cf *.tmpl files.
- */
-#ifndef InstallLibrary
-#define InstallLibrary(libname,dest) @@\
-install:: LibraryTargetName(libname) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
- RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname)) @@\
- @@\
-InstallHidesyms(libname) @@\
- @@\
-BuildHidesyms(libname)
-#endif /* InstallLibrary */
-
-/*
- * Sequent additions to MakeLibrary for filtering objects
- * with hidesyms before making a normal archive library.
- */
-
-#ifndef MakeLibrary
-#define MakeLibrary(libname,objlist) ( $(RM) -r tmp_hs ; \ @@\
- LIBNAME_HS=`dirname libname`/`basename libname .a`.hs ; \ @@\
- (if [ -f $$LIBNAME_HS ]; \ @@\
- then \ @@\
- LIBNAME_AR=../libname; \ @@\
- $(MKDIRHIER) tmp_hs && \ @@\
- $(CP) *.o tmp_hs && \ @@\
- cd tmp_hs && \ @@\
- $(HSCMD) -i ../$$LIBNAME_HS *.o ; \ @@\
- else \ @@\
- LIBNAME_AR=libname; \ @@\
- fi; \ @@\
- $(AR) $$LIBNAME_AR objlist ) ;\ @@\
- $(RM) -r tmp_hs )
-#endif
-
-#endif /* UseHidesymsLists */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-# define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTSHLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
- $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef LinkWithExports
-# if UseHidesymsLists
-# define LinkWithExports(libname,rev,solist,down,up) \
- $(RM) -r tmp_hs @@\
- ( if [ -f Concat(lib,libname.hs) ]; \ @@\
- then \ @@\
- LIBNAME_SO=../$@~; \ @@\
- mkdir tmp_hs; \ @@\
- cd down; \ @@\
- $(CP) *.o up/tmp_hs && \ @@\
- cd up/tmp_hs && \ @@\
- $(HSCMD) -i ../Concat(lib,libname.hs) *.o; \ @@\
- else \ @@\
- LIBNAME_SO=up/$@~; \ @@\
- cd down; \ @@\
- fi; \ @@\
- $(CCENVSETUP) $(LD) -o $$LIBNAME_SO $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS) ) @@\
- $(RM) -r tmp_hs
-# else
-# if UseExportLists
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\
- if [ -f Concat(lib,libname.elist) ]; then \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\
- $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- fi;
-# else
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
-# endif /* UseExportLists */
-# endif /* UseHidesymsLists */
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- LinkWithExports(libname,rev,solist,down,up) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-/*
- * Sequent does not use the InstallManPageAliases rule.
- * Sequent customer installation procedure uses makealiases(1M)
- * after the initial product manpages are installed in system directories.
- */
-#define InstallManPageAliases(file,destdir,aliases) /* use makealiases(1M) */
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#if defined(UseInstalled)
-MANCAT = cat
-#else
-MANCAT = sed -f $(CONFIGSRC)/util/installman.sed
-#endif
-
-#define InstallManPageLong(file,destdir,dest) @@\
-all:: file.$(MANSUFFIX).z @@\
- @@\
-file.$(MANSUFFIX).z:: file.man @@\
- @if [ -f file.man ]; \ @@\
- then \ @@\
- $(MANCAT) file.man | $(NEQN) | \ @@\
- $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.$(MANSUFFIX); \ @@\
- $(RM) file.$(MANSUFFIX).z; \ @@\
- $(PACK) -f file.$(MANSUFFIX); \ @@\
- fi @@\
- @@\
-file.man:: @@\
- @@\
-install.man:: @@\
- MakeDir($(DESTDIR)destdir) @@\
- @if [ -f file.$(MANSUFFIX).z ]; \ @@\
- then \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)destdir/dest.$(MANSUFFIX).z; \@@\
- fi
-
-#define InstallMultipleManSuffix(list,dest,suff) @@\
-install.man:: @@\
- MakeDir($(DESTDIR)dest) @@\
- MakeFlagsToShellFlags(i,set +e); \ @@\
- @for i in list; do \ @@\
- (set -x; \ @@\
- $(MANCAT) $$i.suff | $(NEQN) | \ @@\
- $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$i.suff; \ @@\
- $(PACK) -f /tmp/$$i.suff; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i.suff.z $(DESTDIR)dest/$$i.$(MANSUFFIX).z; \ @@\
- $(RM) /tmp/$$i.suff.z); \ @@\
- done
-
-#define InstallMultipleMan(list,dest) @@\
- InstallMultipleManSuffix(list,dest,man)
-
-/*
- * InstallMotifManPage relies on the fact that all the
- * Imakefiles where it is used (or Makefile default value)
- * will correctly define MANSUFFIX which may be
- * either "section" or "section"x.
- * Since we rely on MANSUFFIX being defined correctly in each Makefile
- * we can also rely on MANDIR = $(MANSOURCEPATH)section
- *
- * CAUTION:
- * The source file "file.section" may have the same name as
- * the target file "file.$(MANSUFFIX)" so we must use temporary files
- * so that we do not overwrite "file.section".
- */
-#define InstallMotifManPage(file,section) @@\
-all:: file.$(MANSUFFIX).z @@\
- @@\
-file.$(MANSUFFIX).z: file.section @@\
- @$(MANCAT) file.section | $(NEQN) | \ @@\
- $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > /tmp/file.man; \ @@\
- $(RM) /tmp/file.man.z; \ @@\
- $(PACK) -f /tmp/file.man; \ @@\
- $(CP) /tmp/file.man.z file.$(MANSUFFIX).z; \ @@\
- $(RM) /tmp/file.man.z @@\
- @@\
-install.man:: file.$(MANSUFFIX).z @@\
- MakeDir($(DESTDIR)$(MANDIR)) @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)$(MANDIR)/file.$(MANSUFFIX).z
-
-/*
- * The Real_MessageCatalogRule defined in Motif.rules does not
- * install the generated catalog file. This rule adds an install
- * clause to do that.
- */
-#define Real_MessageCatalogRule(prefix) @@\
-prefix.cat Concat(prefix,MsgCatI.h): @@\
- $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\
- $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\
- $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\
- @@\
-includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\
- @@\
-depend:: prefix.cat Concat(prefix,MsgCatI.h) @@\
- @@\
-all:: prefix.cat @@\
- @@\
-install:: prefix.cat @@\
- MakeDir($(DESTDIR)$(MESSAGECATDIR)) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix.cat @@\
- $(RM) $(DESTDIR)$(MESSAGECATDIR)/prefix @@\
- $(LN) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix @@\
- MakeDir($(DESTDIR)$(NLSDIR)) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(NLSDIR)/prefix.cat @@\
- $(RM) $(DESTDIR)$(NLSDIR)/prefix @@\
- $(LN) prefix.cat $(DESTDIR)$(NLSDIR)/prefix @@\
- @@\
-clean:: @@\
- $(RM) prefix.cat Concat(prefix,MsgCatI.h)
-
diff --git a/nx-X11/config/cf/sgi.cf b/nx-X11/config/cf/sgi.cf
deleted file mode 100644
index 70e727c60..000000000
--- a/nx-X11/config/cf/sgi.cf
+++ /dev/null
@@ -1,318 +0,0 @@
-XCOMM platform: $Xorg: sgi.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.12tsi Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#if OSMajorVersion < 4
-/* We do not guarantee this will work */
-#define BootstrapCFlags -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define StandardDefines -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define SetTtyGroup NO
-#else
-#define HasPlugin YES
-#define SetTtyGroup YES
-#define ExtraFilesToClean so_locations
-#endif
-
-#if OSMajorVersion < 5
-#define SystemV YES
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#else
-#define BootstrapCFlags -DSVR4
-#define StandardDefines -DSVR4
-#define SystemV4 YES
-#define HasWChar32 YES
-#define HasVFork NO
-#if OSMajorVersion < 6
-#define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#else
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define HasSetenv NO
-#define HasSnprintf YES
-#endif
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-
-/*
- * To build 64-bit binaries define Mips64Architecture in your site.def or
- * host.def file. This is usually on done at the X Consortium to test
- * big endian 64-bit cleanliness.
- * To build 32-bit binaries using the old 32-bit mode, define
- * NoMipsN32Archtecture in your site.def or host.def file.
- * Otherwise the default is to use the "new 32" mode as requested by SGI.
- */
-#ifndef MipsN32Architecture
-#if !defined(Mips64Architecture) && !defined(NoMipsN32Architecture)
-#define MipsN32Architecture YES
-#endif
-#endif
-
-#ifdef Mips64Architecture
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY64_PATH
-# define SystemBuildLibPath /usr/lib64:/lib64
-# define LdCmd ld -64
-# define AsCmd as -64
-#elif defined(MipsN32Architecture)
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARYN32_PATH
-# define SystemBuildLibPath /usr/lib32:/lib32
-# define LdCmd ld -n32
-# define AsCmd as -n32
-#else
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY_PATH
-# define SystemBuildLibPath /usr/lib:/lib
-# define LdCmd ld -32
-# define AsCmd as -32
-#endif
-#define HasCplusplus YES
-#define Malloc0ReturnsNull YES /* IRIX [56].x -lmalloc needs this */
-#define HasPutenv YES
-#define ExecableScripts YES
-#define HasNdbm YES
-#define HasPoll YES
-#define ExpandManNames YES
-#define LexLib /* Not needed */
-#ifndef BuildXInputExt
-#define BuildXInputExt YES
-#endif
-
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
-#define NeedVarargsPrototypes YES
-#define NeedConstPrototypes YES
-#define NeedWidePrototypes NO
-#endif
-
-#include <sgiLib.rules>
-
-#if OSMajorVersion < 5
-#define SymbolTables -Wf,-XNp16000,-XNd16000,-XNh2000
-#define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000
-#else
-#define SymbolTables
-#define ServerSymbolTables
-#endif
-
-/* this is for floating point, ANSI cpp */
-#if OSMajorVersion < 5
-/* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */
-# define ExtraLibraries -lsun -lmalloc -lc_s -lw
-# define sgiCCOptions -xansi -D__STDC__=1 -float
-#else
-# if OSMajorVersion < 6
-# define sgiCCOptions -xansi
-# else
-# define CppCmd cc -E -cckr
-# ifdef Mips64Architecture
-/* set Mips64Architecture in host.def. Usually don't need it but we
- * (the X Consortium) want a 64-bit big-endian machine to test on. */
-# define sgiCCOptions -xansi -mips3 -64
-# define DlLibrary /**/
-# elif defined(MipsN32Architecture)
-/* Set MipsN32Architecture to build "new" 32-bit objs with a 32-bit kernel. */
-# define sgiCCOptions -xansi -mips3 -n32
-# else
-# define sgiCCOptions -xansi -32
-# endif
-# if OSMinorVersion == 2
-/* if you haven't installed patch 1361, 1403, or 1645 on IRIX 6.2 then you
- * must add "#define HasPosixThreads NO" in your site.def or host.def file
- */
-# ifndef HasPosixThreads
-# define HasPosixThreads YES
-# endif
-# define ThreadedX HasPosixThreads
-# define ThreadsLibraries -lpthread
-/*
- * Add "#define HasSgiThreadsPatch1403 YES" to your site.def or host.def if
- * that's which patch you have.
- */
-# ifndef HasSgiThreadsPatch1403
-# define HasSgiThreadsPatch1403 NO
-# endif
-# if (HasSgiThreadsPatch1403)
-# define SystemMTDefines -D_POSIX_THREAD_SAFE_FUNCTIONS
-# endif
-# endif
-# endif
-/* SGI's -lsocket -lnsl is broken, at least in 5.2, so override here */
-# define ExtraLibraries /**/
-#endif
-
-/* IRIX 6.5 doesn't support IPv6, but #define's AF_INET6. Go figure... */
-#ifndef BuildIPv6
-#define BuildIPv6 NO
-#endif
-
-#undef BuildXF86DRI
-#define BuildXF86DRI NO
-
-#if !HasGcc
-#if !defined(OptimizedCDebugFlags)
-#if defined(MipsN32Architecture) || defined(Mips64Architecture)
-#define OptimizedCDebugFlags -O -OPT:Olimit=0
-#else
-#define OptimizedCDebugFlags -O -Olimit 2048
-#endif
-#endif
-#if !defined(RawCppCmd)
-#define RawCppCmd CppCmd
-#endif
-#endif
-
-#ifndef DefaultCCOptions
-#define DefaultCCOptions sgiCCOptions SymbolTables
-#endif
-#ifndef ServerCCOptions
-#define ServerCCOptions sgiCCOptions ServerSymbolTables
-#endif
-#ifndef DefaultCplusplusOptions
-#define DefaultCplusplusOptions DefaultCCOptions
-#endif
-
-/* For SGI C++ compiler, need to search extra dirs in make depend */
-#ifndef CplusplusDependIncludes
-#define CplusplusDependIncludes -I/usr/include/CC
-#endif
-
-/* At SGI, we don't need this */
-#define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */
-
-/* Used only for compressed fonts */
-#define UNCOMPRESSPATH /usr/bsd/uncompress /* obsolete */
-
-/* Normally used only to conditionally chose the default font path order */
-#define PrimaryScreenResolution 96
-
-/* Override Imake.tmpl's "-X" flag */
-#define LdCombineFlags -r
-
-/* Installation Build Parameters */
-#define InstKmemFlags -m 2711 -g sys
-
-#define ArCmd ar scq
-
-/* for xdm or anyone else to use */
-#define DefaultUserPath :/usr/sbin:/usr/bsd:/usr/bin:/bin:$(BINDIR):/etc:/usr/etc
-#define DefaultSystemPath /usr/sbin:/usr/bsd:/bin:/etc:/usr/bin:/usr/etc:$(BINDIR)
-
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-
-#ifndef ServerExtraDefines
-#ifndef Mips64Architecture
-#define ServerExtraDefines -DNEED_LINEHELPER AllocateLocalDefines \
- XFree86ServerDefines
-#else
-#define ServerExtraDefines -DNEED_LINEHELPER AllocateLocalDefines \
- XFree86ServerDefines -D_XSERVER64
-#endif
-#endif
-
-/* Changed to a single shell command for pmake/smake */
-#if OSMajorVersion < 5
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) ClearmakeOSName \
- $(RM) $@ $*.os \ @@\
- && $(CC) -c options $(CFLAGS) $*.c \ @@\
- && $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
- && $(MV) $*.os $@
-#endif
-
-#define LibObjCompile(dir,options) ClearmakeOSName \
- $(RM) $@ dir/$@ \ @@\
- && $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \ @@\
- && $(MV) $@ dir/$@
-
-#ifndef HasMakefileSafeInclude
-#define HasMakefileSafeInclude YES
-#endif
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@sinclude file
-#endif
-
-/* needs to find nroff on the system to work */
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- /usr/lib/makewhatis -M $(DESTDIR)manpath $(DESTDIR)manpath/whatis
-#endif
-
-#define MotifDefines -DSYS_DIR -DPORT_NOVFORK -DNO_REGCOMP
-
-#if !defined(HasGcc) || !HasGcc
-
-#ifndef CppFileTarget
-#define CppFileTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- $(CPP) CppNoLineInfoOption defs src 2>/dev/null | CppSedMagic >$@; @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-#endif /* CppFileTarget */
-
-#ifndef CppScriptTarget
-#if ExecableScripts /* can use #! instead of colon */
-#define CppScriptTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- $(CPP) CppNoLineInfoOption defs src | CppSedMagic >$@ @@\
- chmod a+x $@ @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-#else
-#define CppScriptTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- echo \: >$@ @@\
- sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\
- chmod a+x $@ @@\
- @@\
-clean:: @@\
- RemoveFile(dst)
-#endif /* ExecableScripts */
-#endif /* CppScriptTarget */
-
-/* Like CppFileTarget, but don't add any default defines */
-#ifndef CppRawFileTarget
-#define CppRawFileTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- $(RAWCPP) CppNoLineInfoOption defs src | CppSedMagic >$@ @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-#endif /* CppFileTarget */
-
-#endif /* !HasGcc */
-
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#include <xorg.cf>
diff --git a/nx-X11/config/cf/sgiLib.rules b/nx-X11/config/cf/sgiLib.rules
deleted file mode 100644
index 2d5cd7dfd..000000000
--- a/nx-X11/config/cf/sgiLib.rules
+++ /dev/null
@@ -1,204 +0,0 @@
-XCOMM $Xorg: sgiLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#if OSMajorVersion < 5
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#define SharedCodeDef -DSHAREDCODE
-#define SharedLibraryDef -DATTSHAREDLIB
-#define PositionIndependentCFlags -G 0
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we don't hose people by having
- * the library gone for long periods.
- */
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat3(lib,libname,_s)) @@\
- @@\
-Concat3(lib,libname,_s): sharedlib.o solist Concat(lib,libname.spec) $(EXTRALIBRARYDEPS) @@\
- $(RM) $@ $@.a \ @@\
- && cd down \ @@\
- && mkshlib -s Concat(up/lib,libname.spec) -t up/$@ -h up/$@.a \ @@\
- && ar rs up/$@.a sharedlib.o @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary($@.a) @@\
- @@\
-clean:: @@\
- $(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat3(lib,libname,_s)) @@\
- @@\
-Concat3(lib,libname,_s): deplist sharedlib.o Concat(lib,libname.spec) $(EXTRALIBRARYDEPS) @@\
- $(RM) $@ $@.a \ @@\
- && cd down \ @@\
- && mkshlib -s Concat(up/lib,libname.spec) -t up/$@ -h up/$@.a \ @@\
- && ar rs up/$@.a sharedlib.o @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary($@.a) @@\
- @@\
-clean:: @@\
- $(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat3(lib,libname,_s) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat3(lib,libname,_s) $(DESTDIR)dest
-
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#define InstallSharedLibraryData(libname,rev,dest) @@\
-InstallTarget(install,Concat3(lib,libname,_s.a),$(INSTLIBFLAGS),dest)
-
-#else /* OSMajorVersion >= 5 */
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sgiLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#if OSMajorVersion < 6
-#define SharedLibraryLoadFlags -shared
-#else
-#ifndef Mips64Architecture
-#define SharedLibraryLoadFlags -shared
-#else
-#define SharedLibraryLoadFlags -shared -mips3
-#endif
-#endif
-#endif
-/* -KPIC is redundant, PIC is always used unless you specify -non_shared */
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -KPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -KPIC
-#endif
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1. And it can't be turned off. Sigh.
- * So we install one of those, too, in the shared library install target.
- */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@\
- if [ "libname" = X11 ]; then \ @@\
- RemoveFile(Concat($(DESTDIR)dest/lib,libname.so.1)); \ @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so.1);\ @@\
- fi
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1. Sigh. So we make one of those, too,
- * in the shared library build target.
- */
-
-#ifndef sgiX11soHack
-#ifdef UseInstalled
-#define sgiX11soHack(libname) /**/
-#else
-#define sgiX11soHack(libname) if [ "libname" = X11 ]; then \ @@\
- RemoveFile($(BUILDLIBDIR)/Concat(lib,libname.so.1)); \ @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$@ Concat(lib,libname.so.1); \ @@\
- fi
-#endif
-#endif /* sgiX11soHack */
-
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- sgiX11soHack(libname) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- sgiX11soHack(libname) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
-
-#endif /* SharedDepLibraryTarget */
-
-#endif /* OsMajorVersion < 5 else */
diff --git a/nx-X11/config/cf/sgiLib.tmpl b/nx-X11/config/cf/sgiLib.tmpl
deleted file mode 100644
index 7ef4f1494..000000000
--- a/nx-X11/config/cf/sgiLib.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-XCOMM $Xorg: sgiLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/config/cf/sgiLib.tmpl,v 3.3tsi Exp $
-
-/*
- * SGI shared library template
- */
-#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) -delay_load $(SMLIB) -delay_load $(ICELIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB)
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) -lgen
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
diff --git a/nx-X11/config/cf/site.sample b/nx-X11/config/cf/site.sample
deleted file mode 100644
index e712f7dbf..000000000
--- a/nx-X11/config/cf/site.sample
+++ /dev/null
@@ -1,125 +0,0 @@
-XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/***************************************************************************
- * *
- * SITE-SPECIFIC DEFINITIONS *
- * *
- * This file contains two halves, one included before the vendor-specific *
- * configuration file (.cf file), and one included after the .cf file. *
- * The before-half should be protected by #ifdef BeforeVendorCF, and the *
- * after-half should be protected by #ifdef AfterVendorCF. *
- * *
- * The before-half should only set things that the .cf file depends on. *
- * For the .cf files shipped in this release, the main variables in this *
- * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, *
- * OSMinorVersion, and OSTeenyVersion. *
- * *
- * The after-half should contain all other definitions. For example, *
- * place your ProjectRoot definition here. *
- * *
- * OS Major and Minor version numbers should be changed directly in the *
- * .cf file, not overridden in site.def. *
- * *
- ***************************************************************************/
-
-/* if you want host-specific customization, this is one way to do it */
-/*
-#ifndef SiteIConfigFiles
-#define SiteIConfigFiles $(IRULESRC)/host.def
-#define LocalConfigFiles host.def
-#endif
-*/
-
-
-#ifdef BeforeVendorCF
-
-/* #include <host.def> */
-
-/* On systems where cpp doesn't expand correctly macros in include directives
- * the two following macros need to be defined directly (where "X11" is
- * really whatever the TopLevelProject macro is defined to be).
- */
-# if defined(AIXArchitecture) || defined(SVR4Architecture) || \
- defined(SCOArchitecture) || defined(Win32Architecture) || \
- defined(UXPArchitecture) || defined(SunArchitecture)
-# ifndef ProjectRulesFile
-# define ProjectRulesFile <X11.rules>
-# endif
-# ifndef ProjectTmplFile
-# define ProjectTmplFile <X11.tmpl>
-# endif
-# endif
-
-/*
-#ifndef HasGcc2
-#define HasGcc2 YES
-#endif
-*/
-
-#endif /* BeforeVendorCF */
-
-#ifdef AfterVendorCF
-
-#define ProjectRoot Concat(/usr/X11R,XORG_VERSION_MAJOR.XORG_VERSION_MINOR)
-
-/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
-/* #define HasXdmAuth YES */
-
-/*
-#if defined(SunArchitecture) && defined(SparcArchitecture)
-#define HasCodeCenter YES
-#ifndef SVR4Architecture
-#define HasTestCenter YES
-#endif
-#endif
-*/
-
-/*
-#ifdef __hp9000s800
-#define HasCodeCenter YES
-#endif
-*/
-
-/*
-#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture)
-#define HasPurify YES
-#endif
-*/
-
-/*
-#define HasSentinel YES
-*/
-
-/*
-#undef DefaultUserPath
-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
-*/
-
-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#if defined(SunArchitecture) && OSMajorVersion > 4
-#define InstallXserverSetUID YES
-#endif
-*/
-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#if defined(XFree86Version) || defined(XorgVersion)
-#define InstallXserverSetUID YES
-#endif
-*/
-
-#ifndef XnestServer
-#undef BuildServer
-#define BuildServer YES
-#define XnestServer YES
-#endif
-
-/* #include <host.def> */
-
-#endif /* AfterVendorCF */
diff --git a/nx-X11/config/cf/sony.cf b/nx-X11/config/cf/sony.cf
deleted file mode 100644
index 014cedcf7..000000000
--- a/nx-X11/config/cf/sony.cf
+++ /dev/null
@@ -1,100 +0,0 @@
-XCOMM platform: $Xorg: sony.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-#ifdef SonyBsdArchitecture
-
-#ifndef OSName
-#define OSName NEWS-OS 4.2.1C
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 2
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 1
-#endif
-#define SetTtyGroup YES
-#define HasVoidSignalReturn NO
-#define HasNdbm YES
-#define DirFailPrefix -
-#define InstKmemFlags -g kmem -m 2711
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
-#define DefaultSystemPath /etc:/usr/etc:/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
-#ifdef MipsArchitecture
-#define ExtraLibraries -lmld
-#define LintOpts -ax
-#define LintLibFlag -o
-#define DefaultCCOptions -Wf,-XNh2000,-XNd6000,-XNp10000 -Olimit 2000
-#else
-#define HasFortran YES
-#endif
-#if OSMajorVersion >= 4
-#define HasShm YES
-#define HasPutenv YES
-#define HasSecureRPC YES
-#define XdmDir /etc/xdm
-#if OSMinorVersion >= 1
-#define HasBsearch YES
-#else
-#define HasBsearch NO
-#endif
-#else
-#define StandardDefines -DNOSTDHDRS
-#define HasBsearch NO
-#endif
-
-#else
-
-#ifndef OSName
-#define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#define BootstrapCFlags -Dsony
-#define SystemV4 YES
-#define HasVFork NO
-#define CcCmd /usr/bin/cc
-#define LdCmd /usr/bin/ld
-#if OSMajorVersion >= 6
-#define DefaultCCOptions -Xa -Wf,-XNp9000,-XNd6000
-#define SharedLibraryLoadFlags -G -rpath $(USRLIBDIRPATH)
-#define PositionIndependentCFlags -K PIC -Wx,-G 0
-#define PositionIndependentCplusplusFlags -K PIC -Wx,-G 0
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define FixupLibReferences() /**/
-#include <sv4Lib.rules>
-#else
-#define DefaultCCOptions -Wf,-XNp9000,-XNd6000
-#endif
-
-#endif
-
-/*
- * SONY C++ compiler is based on vanilla cfront, which means it
- * refuses to compile files unless their names end in ".C". We
- * have to completely override .SUFFIXES to avoid using the builtin
- * .C to .o rule in cases where the link to foo.C is already there,
- * because the builtin rule doesn't use the right compilation flags.
- */
-
-.SUFFIXES:
-.SUFFIXES: .o .c .y .l .s .sh .h .f .Y .L .cxx
-
-#define NormalLibObjCplusplusCompile(options) test -r $*.C || $(LN) $*.CCsuf $*.C @@\
- $(CXX) -c $(CXXFLAGS) options $*.C
-
-XCOMM operating system: OSName
-
-#ifndef BuildServer
-#define BuildServer NO
-#endif
diff --git a/nx-X11/config/cf/sun.cf b/nx-X11/config/cf/sun.cf
deleted file mode 100644
index cc9fbf503..000000000
--- a/nx-X11/config/cf/sun.cf
+++ /dev/null
@@ -1,966 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.34 2005/12/03 17:20:48 alanc Exp $
-XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.70 2004/01/13 02:42:51 tsi Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/* For various reasons, Sun uses different settings when compiling the
- * X Window System packages included in Solaris than are normally used
- * by most people building the X.Org software releases. Sun also has
- * two different X server hierarchies in Solaris - Xsun in /usr/openwin
- * and Xorg in /usr/X11.
- *
- * If you want to try to match Sun's settings as closely as possible
- * add this setting to your host.def:
- * #define BuildLikeSun YES
- *
- * If you're trying to match the openwin directory layout as well, you'll
- * need to also add:
- * #define ProjectRoot /usr/openwin
- * otherwise it will use /usr/X11. (Note that these settings match closer
- * to Sun's Xorg delivery in /usr/X11 than the older X11R6.6-based delivery
- * in /usr/openwin though.)
- */
-#ifndef BuildLikeSun
-# define BuildLikeSun NO
-#endif
-
-#if BuildLikeSun
-# ifndef ProjectRoot
-# define ProjectRoot /usr/X11
-# endif
-# ifndef DocDir
-# define DocDir Concat(ProjectRoot,/share/doc)
-# endif
-# ifndef ManDirectoryRoot
-# define ManDirectoryRoot Concat(ProjectRoot,/share/man)
-# endif
-# ifndef ManSuffix
-# define ManSuffix 1
-# endif
-# ifndef LibraryCCOptions
-# if DoSharedLib && defined(SharedLibraryCCOptions)
-# define LibraryCCOptions SharedLibraryCCOptions ArchLibraryCCOptions
-# else
-# define LibraryCCOptions DefaultCCOptions ArchLibraryCCOptions
-# endif
-# endif
-#endif
-
-/* Flag passed to makestrs in Xt build to control string array names in the
- * libXt headers. -solarisabinames matches those used in the libXt in
- * Solaris, but not in other OS'es.
- */
-#ifndef SolarisABIFlag
-# if BuildLikeSun
-# define SolarisABIFlag -solarisabinames
-# else
-# define SolarisABIFlag /**/
-# endif
-#endif
-
-/*
- * Compiler setup. This sun.cf file knows what options to use with
- * certain compilers, including Sun C, CenterLine C, and gcc. It
- * also understands how to set some of the options for various C++
- * compilers, including Sun C++ and CenterLine C++.
- *
- * === C Compiler Setup ==========================================
- *
- * For SunPro C, define HasSunC to YES in site.def.
- * For CenterLine C, define HasCenterLineC to YES in site.def
- * For gcc, gcc2 or gcc3, define HasGcc, HasGcc2 or HasGcc3 to YES in site.def
- * For other compilers, define HasSunC to NO in site.def, then
- * provide appropriate values for the various compiler related
- * configuration varibles used here.
- *
- * If you don't tell us which C compiler you have, we assume you have
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc
- * under SunOS 4.1.x
- *
- * === C++ Compiler Setup ==========================================
- *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
- * For other compilers, define HasCplusplus to YES in site.def, and
- * check to see if you need to provide values for CplusplusOptions
- * and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * If you say you have the SunPro C++ compiler, we assume you have
- * version 3.0.x of the compiler. If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in site.def.
- *
- */
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasSunC
-# if HasCenterLineC || HasGcc || HasGcc2 || HasGcc3 || (OSMajorVersion < 5)
-# define HasSunC NO
-# else
-# define HasSunC YES
-# endif
-#endif
-
-#if HasSunC
-# ifndef CCompilerMajorVersion
-# define CCompilerMajorVersion DefaultSunProCCompilerMajorVersion
-# endif
-# ifndef CCompilerMinorVersion
-# define CCompilerMinorVersion DefaultSunProCCompilerMinorVersion
-# endif
-XCOMM SunPro C CCompilerMajorVersion./**/CCompilerMinorVersion
-
-/* Choose some reasonable default optimizer flags based on compiler &
- OS versions */
-# ifndef OptimizedCDebugFlags
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion > 2)
-# define OptimizedCDebugFlags -xO4 -xbuiltin=%all -xlibmil -xstrconst ArchOptimizedFlags
-# else
-# define OptimizedCDebugFlags -xO4 -xstrconst ArchOptimizedFlags
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# if OSMajorVersion == 5
-# if defined(SparcArchitecture) && !defined(Sparc64Architecture)
-# if OSMinorVersion > 9 /* Solaris 10 and later only run on UltraSPARC's */
-# define ArchOptimizedFlags -xarch=v8plus
-# else
-# define ArchOptimizedFlags -xarch=v8
-# endif
-# elif defined(i386Architecture) || defined(AMD64Architecture)
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 7)
-/* -xregs=no%frameptr is required on x86 when compiling at -xO4 or higher to
- * avoid losing stack frame pointers so you can't get stack traces or debug.
- * This may lose a small bit of performance, so you can override by adding
- * #define FramePtrFlags -xregs=frameptr if you care about performance more
- * than debuggability.
- */
-# ifndef FramePtrFlags
-# define FramePtrFlags -xregs=no%frameptr
-# endif
-# endif
-# ifndef FramePtrFlags
-# define FramePtrFlags /* */
-# endif
-# if defined(i386Architecture) && (OSMinorVersion > 8)
- /* Solaris 9 and later require Pentium or better */
-# define ArchOptimizedFlags -xpentium FramePtrFlags
-# else
-# define ArchOptimizedFlags FramePtrFlags
-# endif
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# define ArchOptimizedFlags /**/
-# endif
-# endif
-# ifndef DefaultCDebugFlags
-# define DefaultCDebugFlags OptimizedCDebugFlags
-# endif
-# ifndef SharedLibraryLdCmd
-# define SharedLibraryLdCmd $(CC)
-# endif
-/* Flags for lint version included with Sun C compilers */
-# if OSMajorVersion >= 5
-# ifndef LintLibFlag
-# define LintLibFlag -y -o
-# endif
-# ifndef LintOpts
-# define LintOpts -b -h -u -erroff=E_INDISTING_FROM_TRUNC2 $(LINTSECFLAG) ExtraLibraries MathLibrary -lc
-# endif
-# ifndef LintSecFlag
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 6)
-# define LintSecFlag -errsecurity=standard
-# else
-# define LintSecFlag /**/
-# endif
-# endif
- LINTSECFLAG = LintSecFlag
-# ifndef LintLibReferences
-# define LintLibReferences(varname,libname,libsource) @@\
- Concat(LINT,varname) = _UseCat(-L $(LINTLIBDIR) -l, -L libsource -l,libname)
-# endif
-
-# endif /* Lint Flags for Solaris */
-
-#endif /* HasSunC */
-
-#ifndef ArchLibraryCCOptions
-# if HasSunC && defined(SparcArchitecture) && CCompilerMajorVersion > 3
-# define ArchLibraryCCOptions -xregs=no%appl
-# else
-# define ArchLibraryCCOptions
-# endif
-#endif /* ArchLibraryCCOptions */
-
-/* we used to have this here :
- *
- * #if HasSunC
- * # ifndef CCompilerMajorVersion
- * # define CCompilerMajorVersion 3
- * # define DefaultCDebugFlags -xO3
- * # define OptimizedCDebugFlags -xO3
- * # endif
- * #endif
- */
-
-#ifndef HasSunCplusplus
-# define HasSunCplusplus HasSunC /* ??? */
-#endif
-#if HasSunCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# define OptimizedCplusplusDebugFlags -xO4 -xbuiltin=%all -xlibmil
-# endif
-# ifndef CplusplusCompilerMajorVersion
-# ifdef DefaultSunProCplusplusCompilerMajorVersion
-# define CplusplusCompilerMajorVersion DefaultSunProCplusplusCompilerMajorVersion
-# else
-# define CplusplusCompilerMajorVersion 3
-# endif
-# endif
-# ifndef CplusplusCompilerMinorVersion
-# ifdef DefaultSunProCplusplusCompilerMinorVersion
-# define CplusplusCompilerMinorVersion DefaultSunProCplusplusCompilerMinorVersion
-# else
-# define CplusplusCompilerMinorVersion 0
-# endif
-# endif
-# ifndef CplusplusLibC
-# if CplusplusCompilerMajorVersion >= 5
-# define CplusplusLibC -norunpath -lCrun
-# endif
-# endif
-XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
-#endif
-
-/* we used to have this here :
- *
- * # ifndef CplusplusCompilerMajorVersion
- * # define CplusplusCompilerMajorVersion 4
- * # endif
- */
-
-#if HasCenterLineC
-# ifndef CcCmd
-# define CcCmd clcc
-# endif
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions -Xa
-# endif
-# ifndef CplusplusOptions
-# define CplusplusOptions -Xa
-# endif
-#endif
-
-#if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
-/* We do not guarantee this will work */
-# define BootstrapCFlags -DNOSTDHDRS
-# define StandardDefines -DNOSTDHDRS
-# define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if OSMajorVersion == 4
-# if OSMinorVersion == 1
-/*
- * Currently the NX transport only works with select().
- *
-# define HasPoll YES
- */
-# define HasPoll NO
-# endif
-# if OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1)
-/* You ALSO need this if you have Sun ld patch 100170-06 or later to 4.1.1 */
-# define SunPost411FCSLd YES
-# endif
-#endif
-
-/* The Xsun server was not building for SunOS 5.7 due to
- includes of <sys/cg2reg.h>.
-*/
-#if OSMajorVersion < 5
-# define IncludeCG2HeaderDefine -DINCLUDE_CG2_HEADER
-#else
-# define IncludeCG2HeaderDefine /**/
-#endif
-
-#if defined(i386Architecture) || defined(AMD64Architecture)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define OSServerExtraDefines -D__SOL8__
-# endif
-#endif
-
-#if !HasGcc
-# if HasSunC
-# if defined(AMD64Architecture)
-# define AsmArch amd64
-# define AsmFlags -xarch=amd64
-# elif defined(i386Architecture)
-# define AsmArch ia32
-# define AsmFlags /**/
-# elif defined(Sparc64Architecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v9
-# elif defined(SparcArchitecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v8plus
-# endif
-# ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines $(SERVERSRC)/hw/xfree86/os-support/sunos/AsmArch.il
-# endif
-# endif
-#endif
-
-#ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines /**/
-#endif
-
-#ifndef OSServerExtraDefines
-# define OSServerExtraDefines /**/
-#endif
-
-#ifndef ArchServerExtraDefines
-# if defined(Sparc64Architecture) || defined(AMD64Architecture)
-# define ArchServerExtraDefines -D_XSERVER64
-# else
-# define ArchServerExtraDefines /**/
-# endif
-#endif
-
-#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine \
- -DPIXPRIV
-#define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \
- CompilerServerExtraDefines \
- OSServerExtraDefines ArchServerExtraDefines \
- -DPIXPRIV
-
-#ifndef HasPerl
-/* Solaris 8 comes with perl. Earlier versions don't. */
-# if (OSMajorVersion == 5) && (OSMinorVersion >= 8)
-# define HasPerl YES
-# else
-# define HasPerl NO
-# endif
-#endif
-
-#ifndef XkbServerDefines
-# if BuildLikeSun
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT \
- -DXKM_OUTPUT_DIR='"/var/run/xkb/"' -DXKM_OUTPUT_DIR_MODE=0775 \
- -DMAKE_XKM_OUTPUT_DIR
-# else
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-# endif
-#endif
-
-#if OSMajorVersion > 4
-/* #define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN */
-#define ConnectionFlags -DUNIXCONN -DTCPCONN
-# if HasSunC
-# ifdef DefaultSunProCCompilerDir
-# ifndef CcCmd
-# define CcCmd DefaultSunProCCompilerDir/cc
-# endif
-# endif
-# ifdef DefaultSunProCplusplusCompilerDir
-# ifndef CplusplusCmd
-# define CplusplusCmd DefaultSunProCplusplusCompilerDir/CC
-# endif
-# ifndef CplusplusFilt
-# define CplusplusFilt DefaultSunProCplusplusCompilerDir/c++filt
-# endif
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir DefaultSunProCplusplusCompilerDir/whatdir
-# endif
-# else /* DefaultSunProCplusplusCompilerDir not defined */
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir whatdir
-# endif
-# endif /* DefaultSunProCplusplusCompilerDir */
-# ifndef CplusplusDependIncludes
-# if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes -I`CplusplusWhatdir CC`/../include/CC
-# elif CplusplusCompilerMajorVersion > 2
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
-# else
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC2.0.1/include/CC
-# endif
-# endif
-# endif /* HasSunC */
-
-# if HasSunC && (CCompilerMajorVersion < 3)
-# define BootstrapCFlags -DSVR4
-# else
-# define BootstrapCFlags /* none needed */
-# endif
-# ifndef XawI18nDefines
-# if OSMinorVersion < 4
-# define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-# else
-# define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-# endif
-# endif
-# if OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install
-# endif
-#ifndef LargefileDefines
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define LargefileDefines -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-# else
-# define LargefileDefines /* */
-# endif
-#endif
-# ifdef AMD64Architecture
-# define StandardDefines -Dsun -DSVR4 -D__EXTENSIONS__ -D__amd64
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# elif defined(i386Architecture)
-# if (OSMajorVersion < 4) || ((OSMajorVersion == 5) && (OSMinorVersion <= 5))
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- -D__SOL64__ LargefileDefines
-# else
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- LargefileDefines
-# endif
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# else
-# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines \
- -DPIXPRIV
-# define ToolkitStringsABIOptions -sparcabi SolarisABIFlag
-# endif
-# define ExtraLibraries -lsocket -lnsl
-# define HasWeakSymbols YES
-# if OSMinorVersion > 1
-# ifndef ThreadedX
-# define ThreadedX YES
-# endif
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-# if HasSunC && CCompilerMajorVersion > 2
-# define ThreadsCompileFlags -mt
-# else
-# define SystemMTDefines -D_REENTRANT
-# define ThreadsLibraries -lthread
-# endif
-# if HasSunCplusplus && CplusplusCompilerMajorVersion > 3
-# define ThreadsCplusplusCompileFlags -mt
-# else
-# define CplusplusSystemMTDefines -D_REENTRANT
-# define ThreadsCplusplusLibraries -lthread
-# endif
-# endif /* OSMinorVersion > 1 */
-# ifndef UseExportLists
-# if (OSMinorVersion > 4) && !HasGcc2
-# define UseExportLists YES
-# else
-# define UseExportLists NO
-# endif
-# endif
-# if OSMinorVersion > 5 /* Solaris 2.6 and later */
-# define HasSnprintf YES
-# endif
-# if OSMinorVersion > 7 /* Solaris 8 and later */
-# define HasStrlcat YES
-# define HasStrcasecmp YES
-# define HasVarRun YES
-# endif
-# if OSMinorVersion > 9 /* Solaris 10 and later */
-# define HasSetenv YES
-# define HasGetpeerucred YES
-# define HasGetoptLong YES
-# define DlLibrary -lc /* dlopen() is in libc in Solaris 10 */
-# endif
-# define HasVFork NO
-# define HasDlopen YES
-# define InstallXloadSetGID NO /* libkstat doesn't require gid kmem */
-# define InstKmemFlags -g sys -m 2711
-# define ShLibIncludeFile <sunLib.tmpl>
-# define LinkerRuntimeLibraryPathFlag(path) Concat(-R,path)
-# define RpathLoadFlags LinkerRuntimeLibraryPathFlag($(USRLIBDIRPATH))
-/*
- * Set flags for position independent code before including sv4Lib.rules
- * if the compiler in use doesn't use standard SVR4 flags
- */
-# if HasSunC || HasCenterLineC
-# define PositionIndependentCFlags -Kpic
-# define LargePositionIndependentCFlags -KPIC
-# ifdef Sparc64Architecture
-# define LargePICTable YES
-# endif
-# endif
-# if HasSunCplusplus || HasCenterLineCplusplus
-# define PositionIndependentCplusplusFlags -pic
-# define LargePositionIndependentCplusplusFlags -PIC
-# endif
-/* As is done in sco5.cf, we lie and say Solaris has NCURSES, since
- * the system curses is close enough for xorgcfg's purposes. xorgcfg
- * should not depend on the NCURSES package but rather on a "capable curses",
- * of which NCURSES is just one.
- */
-#define HasNCurses YES
-#define NCursesLibName -lcurses
-#else /* not OSMajorVersion > 4 */
-#define InstKmemFlags -g kmem -m 2711
-#include <sunLib.rules>
-#endif /* OSMajorVersion > 4 (else) */
-
-/* Solaris 10 includes FreeType already. It's also available in GNOME 2.0 for
- * Solaris 8 & 9, and in Solaris 9 4/03 and later, but there's no easy way to
- * detect that in imake, so users of those releases who want to use the
- * installed FreeType instead of the one in this tree should copy the following
- * two settings to their host.def. Those who want to use the in-tree copy
- * regardless of OS version should add "#define HasFreetype2 NO" to host.def.
- */
-#ifndef HasFreetype2
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasFreetype2 YES
-# ifndef Freetype2Dir
-# define Freetype2Dir /usr/sfw
-# endif
-# else
-# define HasFreetype2 NO
-# endif
-#endif
-
-#ifndef HasExpat
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasExpat YES
-# ifndef ExpatDir
-# define ExpatDir /usr/sfw
-# endif
-# else
-# define HasExpat NO
-# endif
-#endif
-
-/* Solaris 10 includes fontconfig, but not the fcprivate.h header needed by
- * Xft1 library.
- */
-#ifndef HasFontconfig
-# define HasFontconfig NO
-#endif
-
-/* libpng was in /usr/sfw/lib on Solaris 9, moved to /usr/lib in Solaris 10 */
-#ifndef HasLibpng
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasLibpng YES
-# if !defined(LibpngDir) && ((OSMajorVersion == 5) && (OSMinorVersion == 9))
-# define LibpngDir /usr/sfw
-# endif
-# else
-# define HasLibpng NO
-# endif
-#endif
-
-#ifndef HasZlib
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define HasZlib YES
-# else
-# define HasZlib NO
-# endif
-#endif
-
-#ifndef TroffCmd
-# if !(HasGroff)
-# define TroffCmd troff -Tpost
-# endif
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define HasNdbm YES
-#define HasShm YES
-#define HasSecureRPC YES
-#define SetTtyGroup YES
-#define HasPutenv YES
-#define HasMkstemp YES
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-#define HasDevRandom YES /* /dev/random is in Solaris 8 patches */
-#define PollDevRandom YES /* /dev/random is poll()able on Solaris */
-#endif
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasIssetugid YES
-#endif
-#if defined(Sun3Architecture) || defined(SparcArchitecture) || defined(Sparc64Architecture)
-# ifndef Xsun24Server
-# define Xsun24Server NO /* color, mono, multiple depths */
-# endif
-# ifndef XsunServer
-# define XsunServer NO /* color and mono, 8 bit only */
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer NO /* monochrome only */
-# endif
-# ifndef XorgServer
-# define XorgServer (!(Xsun24Server || XsunServer || XsunMonoServer))
-# endif
-# undef BuildXF86DRI
-# define BuildXF86DRI NO
-# if (OSMajorVersion > 4)
-# if !defined(AsOutputArchSize) || \
- ((AsOutputArchSize != 32) && (AsOutputArchSize != 64))
-# undef AsOutputArchSize
-# define AsOutputArchSize 32
-# endif
-# ifndef AsVISOption
-# if AsOutputArchSize == 32
-# ifdef UseGas
-# define AsVISOption -Av8plusa
-# else
-# define AsVISOption -xarch=v8plusa
-# endif
-# else
-# ifdef UseGas
-# define AsVISOption -Av9a
-# else
-# define AsVISOption -xarch=v9a
-# endif
-# endif
-# endif
-# endif
-#endif /* SPARC or Sun3/M68k */
-
-#if OSMajorVersion >= 4
-#define HasUsableFileMap YES
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#if HasGcc
-# if OSMajorVersion > 4
-# ifndef DefaultCCOptions
-# ifdef UseInstalled
-# define DefaultCCOptions -DNO_ASM
-# elif OSMinorVersion > 6
-# define DefaultCCOptions -DNO_ASM GccWarningOptions
-# elif OSMinorVersion > 3
-# define DefaultCCOptions -DNO_ASM GccWarningOptions -ansi -pedantic
-# else
-# define DefaultCCOptions -DNO_ASM
-# endif
-# endif
-# endif
-# if HasGcc2
-# ifndef CcCmd
-# define CcCmd gcc
-# endif
-# ifndef AsCmd
-# define AsCmd CcCmd -c -x assembler
-# endif
-# ifndef OptimizedCDebugFlags
-# ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# elif defined(AMD64Architecture)
-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-# endif
-# if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
-# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
- /* This is to work around what appears to be a PIC bug in some gcc/egcs
- versions that shows up with the Solaris 7/x86 <ctype.h>. */
-# define SharedLibraryLdCmd $(LD)
-# define SharedLibraryLoadFlags -G -z textwarn
-# else
-# define SharedLibraryLdCmd $(CC)
-# define SharedLibraryLoadFlags -shared -z text
-# endif
-# endif
-# else
-# define SharedLibraryCcCmd cc
-# define ExtraLoadFlags -B/usr/bin/
-# define AllocateLocalDefines /**/
-
-.c.o:
- ClearmakeOSName $(CC) -c $(CFLAGS) $*.c
-
-# endif /* HasGcc2 (else) */
-
-#else /* not HasGcc */
-
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/* Set up compiler-dependent options for Sun C */
-/*
- * To build 64-bit binaries define Sparc64Architecture or AMD64Architecture
- * in your site.def or host.def file.
- */
-# if HasSunC
-# ifdef Sun3Architecture
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -f68881 -pipe
-# endif
-# else /* not defined(Sun3Architecture) */
-# if OSMajorVersion < 5
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -pipe
-# endif
-# else /* OSMajorVersion >= 5*/
-# ifndef DefaultXArchOptions
-# ifdef Sparc64Architecture
-# define DefaultXArchOptions -xarch=v9
-# elif defined(AMD64Architecture)
-# define DefaultXArchOptions -xarch=generic64
-# else
-# define DefaultXArchOptions /* */
-# endif
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xa -v DefaultXArchOptions -z lazyload -z combreloc -xstrconst -xildoff
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions DefaultXArchOptions -z lazyload -z combreloc -xildoff
-# endif
-# ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -G DefaultXArchOptions -z text $(EXTRA_LOAD_FLAGS)
-# endif
-# endif
-# endif
-# endif
-# endif
-
-/* Set compiler-dependent options for CenterLine C */
-
-# if HasCenterLineC
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-# endif
-# ifndef NeedConstPrototypes
-# define NeedConstPrototypes YES
-# endif
-# ifndef NeedNestedPrototypes
-# define NeedNestedPrototypes YES
-# endif
-# ifndef NeedVarargsPrototypes
-# define NeedVarargsPrototypes YES
-# endif
-# endif
-
-
-#endif /* HasGcc (else) */
-
-#if OSMajorVersion < 5
-# define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
-# define LibraryCCOptions /* don't want special floating point */
-#else /* OSMajorVersion >= 5, i.e. Solaris 2.0 & later */
-/* Only load libraries when needed on Solaris 7 & later */
-# if OSMinorVersion >= 7
-# define LazyLoadFlag -z lazyload -z combreloc
-# else
-# define LazyLoadFlag /* */
-# endif
-/* Link with extra mapfiles for some performance & security enhancements */
-#ifndef MapfileFlag
-# if HasSunC
-# define MapfileFlag -M
-# else
-# define MapfileFlag -Wl,-M,
-# endif
-#endif
-#ifndef Mapfile_BssAlign
-# if OSMinorVersion >= 9
-# define Mapfile_BssAlign $(MAPFILEFLAG)/usr/lib/ld/map.bssalign
-# else
-# define Mapfile_BssAlign /**/
-# endif
-#endif
-#ifndef Mapfile_PageAlign
-# if OSMinorVersion >= 10
-# define Mapfile_PageAlign $(MAPFILEFLAG)/usr/lib/ld/map.pagealign
-# else
-# define Mapfile_PageAlign /**/
-# endif
-#endif
-#ifndef Mapfile_NoExStack
-# if OSMinorVersion >= 9
-# define Mapfile_NoExStack $(MAPFILEFLAG)/usr/lib/ld/map.noexstk
-# else
-# define Mapfile_NoExStack /**/
-# endif
-#endif
-#ifndef Mapfile_NoExData
-# if defined(SparcArchitecture)
-/* SPARC archictecture requires PLT section in .data be executable, so
- we can only make .bss, not all of .data no-exec on SPARC */
-# define Mapfile_NoExData /**/
-# else
-# if OSMinorVersion >= 10
-# define Mapfile_NoExData $(MAPFILEFLAG)/usr/lib/ld/map.noexdata
-# else
-# define Mapfile_NoExData /**/
-# endif
-# endif
-#endif
- MAPFILEFLAG = MapfileFlag
- MAPFILES_FOR_ALL = Mapfile_PageAlign Mapfile_NoExData
-MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
-/* ExtraLoadFlags apply to all binaries - programs & libraries */
-# ifndef ExtraLoadFlags
-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
-# endif
-/* ExtraLoadOptions only apply to programs */
-# ifndef ExtraLoadOptions
-# define ExtraLoadOptions -B direct $(MAPFILES_FOR_PROGS)
-# endif
-#endif /* OSMajorVersion < 5 */
-
-/* 64-bit build support */
-#ifndef Solaris64bitSubdir
-# ifdef Sparc64Architecture
-# define Solaris64bitSubdir sparcv9
-# elif defined(AMD64Architecture)
-# define Solaris64bitSubdir amd64
-# endif
-#endif
-
-#ifdef Solaris64bitSubdir
-# define LibDirName Concat3(lib,/,Solaris64bitSubdir)
-#endif
-
-#if OSMajorVersion > 4
-# include <svr4.cf>
-#endif
-
-#ifndef ManKeywordsTarget
-# define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- catman -M $(DESTDIR)manpath -w
-#endif
-
-#if !defined(UsePamLibrary)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
-# define UsePamLibrary YES
-# endif
-#endif
-
-/* PAM appeared in SunOS 5.6 */
-#if !defined(HasPam)
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define HasPam YES
-# endif
-#endif
-
-#ifndef PamLibraries
-#define PamLibraries -lpam
-#endif
-
-#ifndef HasMotif
-/* Solaris's Motif depends on Solaris libX11 and won't work with libX11 built
- * from this tree, so only use it when using libX11 from outside the tree.
- */
-# define HasMotif (defined(UseInstalled) || UseInstalledX11)
-# define MotifDir /usr/dt
-#endif /* !HasMotif */
-#ifndef HasMotif2
-/* Solaris's Motif2 version is broken and misses XmPrintShell
- * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1366) */
-# define HasMotif2 NO
-#endif /* !HasMotif2 */
-
-#define MotifDefines \
- -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
-#define PamUnixDefines -DPAM_NIS
-#define TtLargePICTable YES
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-
-#define baseDtMailDefines \
- -DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
-#if !defined(i386Architecture) && !defined(AMD64Architecture)
-# define DtMailDefines baseDtMailDefines
-#else
-# define DtMailDefines -DBIG_ENDIAN baseDtMailDefines
-#endif
-
-#define ArchitectureDefines -DSUN_ARCHITECTURE
-
-#define TtClientExtraLibs ExtraLibraries -ldl -lintl
-
-#define ExportListGenSource elistgen.sun
-#define ShlibExportListOpt(filename) -M filename
-
-#define CdeProjectDefines \
- -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
- -D_XOPEN_SOURCE -D__EXTENSIONS__ \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-
-
-/*
- * Turn off HTML manpages like we do under NetBSD.
- */
-#ifndef BuildHtmlManPages
-#define BuildHtmlManPages NO
-#endif
-
-/*
- * Turn off seperate configuration directories.
- */
-#ifndef UseSeparateConfDir
-#define UseSeparateConfDir NO
-#endif
-
-/* Hackery for building modules as Solaris shared objects with dependencies */
-#if MakeDllModules && DoLoadableServer
-
-/* If you change this, you will need to change find-deps.pl to match */
-#define DlModuleDependencyName(module) Concat(module,_deps)
-
-#define DlModuleTarget(module,deplist,modlist) @@\
-DepDynamicModuleTarget(module,deplist DlModuleDependencyName(module),modlist LazyLoadFlag `cat DlModuleDependencyName(module)`) @@\
- @@\
-DlModuleDependencyName(module): @@\
- touch $@ @@\
- @@\
-clean:: @@\
- RemoveFile(DlModuleDependencyName(module))
-
-#define ObjectModuleTarget(module,objects) @@\
-DlModuleTarget(Concat(module,_drv.so), objects, objects)
-
-#define LibraryModuleTarget(module,objects) @@\
-NormalLibraryTarget(module, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), objects, objects)
-
-#define DepLibraryModuleTarget(module,deplist,objects) @@\
-NormalDepLibraryTarget(module, deplist, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), deplist, objects)
-
-#endif
diff --git a/nx-X11/config/cf/sun.cf.NX.original b/nx-X11/config/cf/sun.cf.NX.original
deleted file mode 100644
index cc9fbf503..000000000
--- a/nx-X11/config/cf/sun.cf.NX.original
+++ /dev/null
@@ -1,966 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.34 2005/12/03 17:20:48 alanc Exp $
-XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.70 2004/01/13 02:42:51 tsi Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/* For various reasons, Sun uses different settings when compiling the
- * X Window System packages included in Solaris than are normally used
- * by most people building the X.Org software releases. Sun also has
- * two different X server hierarchies in Solaris - Xsun in /usr/openwin
- * and Xorg in /usr/X11.
- *
- * If you want to try to match Sun's settings as closely as possible
- * add this setting to your host.def:
- * #define BuildLikeSun YES
- *
- * If you're trying to match the openwin directory layout as well, you'll
- * need to also add:
- * #define ProjectRoot /usr/openwin
- * otherwise it will use /usr/X11. (Note that these settings match closer
- * to Sun's Xorg delivery in /usr/X11 than the older X11R6.6-based delivery
- * in /usr/openwin though.)
- */
-#ifndef BuildLikeSun
-# define BuildLikeSun NO
-#endif
-
-#if BuildLikeSun
-# ifndef ProjectRoot
-# define ProjectRoot /usr/X11
-# endif
-# ifndef DocDir
-# define DocDir Concat(ProjectRoot,/share/doc)
-# endif
-# ifndef ManDirectoryRoot
-# define ManDirectoryRoot Concat(ProjectRoot,/share/man)
-# endif
-# ifndef ManSuffix
-# define ManSuffix 1
-# endif
-# ifndef LibraryCCOptions
-# if DoSharedLib && defined(SharedLibraryCCOptions)
-# define LibraryCCOptions SharedLibraryCCOptions ArchLibraryCCOptions
-# else
-# define LibraryCCOptions DefaultCCOptions ArchLibraryCCOptions
-# endif
-# endif
-#endif
-
-/* Flag passed to makestrs in Xt build to control string array names in the
- * libXt headers. -solarisabinames matches those used in the libXt in
- * Solaris, but not in other OS'es.
- */
-#ifndef SolarisABIFlag
-# if BuildLikeSun
-# define SolarisABIFlag -solarisabinames
-# else
-# define SolarisABIFlag /**/
-# endif
-#endif
-
-/*
- * Compiler setup. This sun.cf file knows what options to use with
- * certain compilers, including Sun C, CenterLine C, and gcc. It
- * also understands how to set some of the options for various C++
- * compilers, including Sun C++ and CenterLine C++.
- *
- * === C Compiler Setup ==========================================
- *
- * For SunPro C, define HasSunC to YES in site.def.
- * For CenterLine C, define HasCenterLineC to YES in site.def
- * For gcc, gcc2 or gcc3, define HasGcc, HasGcc2 or HasGcc3 to YES in site.def
- * For other compilers, define HasSunC to NO in site.def, then
- * provide appropriate values for the various compiler related
- * configuration varibles used here.
- *
- * If you don't tell us which C compiler you have, we assume you have
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc
- * under SunOS 4.1.x
- *
- * === C++ Compiler Setup ==========================================
- *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
- * For other compilers, define HasCplusplus to YES in site.def, and
- * check to see if you need to provide values for CplusplusOptions
- * and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * If you say you have the SunPro C++ compiler, we assume you have
- * version 3.0.x of the compiler. If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in site.def.
- *
- */
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasSunC
-# if HasCenterLineC || HasGcc || HasGcc2 || HasGcc3 || (OSMajorVersion < 5)
-# define HasSunC NO
-# else
-# define HasSunC YES
-# endif
-#endif
-
-#if HasSunC
-# ifndef CCompilerMajorVersion
-# define CCompilerMajorVersion DefaultSunProCCompilerMajorVersion
-# endif
-# ifndef CCompilerMinorVersion
-# define CCompilerMinorVersion DefaultSunProCCompilerMinorVersion
-# endif
-XCOMM SunPro C CCompilerMajorVersion./**/CCompilerMinorVersion
-
-/* Choose some reasonable default optimizer flags based on compiler &
- OS versions */
-# ifndef OptimizedCDebugFlags
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion > 2)
-# define OptimizedCDebugFlags -xO4 -xbuiltin=%all -xlibmil -xstrconst ArchOptimizedFlags
-# else
-# define OptimizedCDebugFlags -xO4 -xstrconst ArchOptimizedFlags
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# if OSMajorVersion == 5
-# if defined(SparcArchitecture) && !defined(Sparc64Architecture)
-# if OSMinorVersion > 9 /* Solaris 10 and later only run on UltraSPARC's */
-# define ArchOptimizedFlags -xarch=v8plus
-# else
-# define ArchOptimizedFlags -xarch=v8
-# endif
-# elif defined(i386Architecture) || defined(AMD64Architecture)
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 7)
-/* -xregs=no%frameptr is required on x86 when compiling at -xO4 or higher to
- * avoid losing stack frame pointers so you can't get stack traces or debug.
- * This may lose a small bit of performance, so you can override by adding
- * #define FramePtrFlags -xregs=frameptr if you care about performance more
- * than debuggability.
- */
-# ifndef FramePtrFlags
-# define FramePtrFlags -xregs=no%frameptr
-# endif
-# endif
-# ifndef FramePtrFlags
-# define FramePtrFlags /* */
-# endif
-# if defined(i386Architecture) && (OSMinorVersion > 8)
- /* Solaris 9 and later require Pentium or better */
-# define ArchOptimizedFlags -xpentium FramePtrFlags
-# else
-# define ArchOptimizedFlags FramePtrFlags
-# endif
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# define ArchOptimizedFlags /**/
-# endif
-# endif
-# ifndef DefaultCDebugFlags
-# define DefaultCDebugFlags OptimizedCDebugFlags
-# endif
-# ifndef SharedLibraryLdCmd
-# define SharedLibraryLdCmd $(CC)
-# endif
-/* Flags for lint version included with Sun C compilers */
-# if OSMajorVersion >= 5
-# ifndef LintLibFlag
-# define LintLibFlag -y -o
-# endif
-# ifndef LintOpts
-# define LintOpts -b -h -u -erroff=E_INDISTING_FROM_TRUNC2 $(LINTSECFLAG) ExtraLibraries MathLibrary -lc
-# endif
-# ifndef LintSecFlag
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 6)
-# define LintSecFlag -errsecurity=standard
-# else
-# define LintSecFlag /**/
-# endif
-# endif
- LINTSECFLAG = LintSecFlag
-# ifndef LintLibReferences
-# define LintLibReferences(varname,libname,libsource) @@\
- Concat(LINT,varname) = _UseCat(-L $(LINTLIBDIR) -l, -L libsource -l,libname)
-# endif
-
-# endif /* Lint Flags for Solaris */
-
-#endif /* HasSunC */
-
-#ifndef ArchLibraryCCOptions
-# if HasSunC && defined(SparcArchitecture) && CCompilerMajorVersion > 3
-# define ArchLibraryCCOptions -xregs=no%appl
-# else
-# define ArchLibraryCCOptions
-# endif
-#endif /* ArchLibraryCCOptions */
-
-/* we used to have this here :
- *
- * #if HasSunC
- * # ifndef CCompilerMajorVersion
- * # define CCompilerMajorVersion 3
- * # define DefaultCDebugFlags -xO3
- * # define OptimizedCDebugFlags -xO3
- * # endif
- * #endif
- */
-
-#ifndef HasSunCplusplus
-# define HasSunCplusplus HasSunC /* ??? */
-#endif
-#if HasSunCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# define OptimizedCplusplusDebugFlags -xO4 -xbuiltin=%all -xlibmil
-# endif
-# ifndef CplusplusCompilerMajorVersion
-# ifdef DefaultSunProCplusplusCompilerMajorVersion
-# define CplusplusCompilerMajorVersion DefaultSunProCplusplusCompilerMajorVersion
-# else
-# define CplusplusCompilerMajorVersion 3
-# endif
-# endif
-# ifndef CplusplusCompilerMinorVersion
-# ifdef DefaultSunProCplusplusCompilerMinorVersion
-# define CplusplusCompilerMinorVersion DefaultSunProCplusplusCompilerMinorVersion
-# else
-# define CplusplusCompilerMinorVersion 0
-# endif
-# endif
-# ifndef CplusplusLibC
-# if CplusplusCompilerMajorVersion >= 5
-# define CplusplusLibC -norunpath -lCrun
-# endif
-# endif
-XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
-#endif
-
-/* we used to have this here :
- *
- * # ifndef CplusplusCompilerMajorVersion
- * # define CplusplusCompilerMajorVersion 4
- * # endif
- */
-
-#if HasCenterLineC
-# ifndef CcCmd
-# define CcCmd clcc
-# endif
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions -Xa
-# endif
-# ifndef CplusplusOptions
-# define CplusplusOptions -Xa
-# endif
-#endif
-
-#if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
-/* We do not guarantee this will work */
-# define BootstrapCFlags -DNOSTDHDRS
-# define StandardDefines -DNOSTDHDRS
-# define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if OSMajorVersion == 4
-# if OSMinorVersion == 1
-/*
- * Currently the NX transport only works with select().
- *
-# define HasPoll YES
- */
-# define HasPoll NO
-# endif
-# if OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1)
-/* You ALSO need this if you have Sun ld patch 100170-06 or later to 4.1.1 */
-# define SunPost411FCSLd YES
-# endif
-#endif
-
-/* The Xsun server was not building for SunOS 5.7 due to
- includes of <sys/cg2reg.h>.
-*/
-#if OSMajorVersion < 5
-# define IncludeCG2HeaderDefine -DINCLUDE_CG2_HEADER
-#else
-# define IncludeCG2HeaderDefine /**/
-#endif
-
-#if defined(i386Architecture) || defined(AMD64Architecture)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define OSServerExtraDefines -D__SOL8__
-# endif
-#endif
-
-#if !HasGcc
-# if HasSunC
-# if defined(AMD64Architecture)
-# define AsmArch amd64
-# define AsmFlags -xarch=amd64
-# elif defined(i386Architecture)
-# define AsmArch ia32
-# define AsmFlags /**/
-# elif defined(Sparc64Architecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v9
-# elif defined(SparcArchitecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v8plus
-# endif
-# ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines $(SERVERSRC)/hw/xfree86/os-support/sunos/AsmArch.il
-# endif
-# endif
-#endif
-
-#ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines /**/
-#endif
-
-#ifndef OSServerExtraDefines
-# define OSServerExtraDefines /**/
-#endif
-
-#ifndef ArchServerExtraDefines
-# if defined(Sparc64Architecture) || defined(AMD64Architecture)
-# define ArchServerExtraDefines -D_XSERVER64
-# else
-# define ArchServerExtraDefines /**/
-# endif
-#endif
-
-#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine \
- -DPIXPRIV
-#define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \
- CompilerServerExtraDefines \
- OSServerExtraDefines ArchServerExtraDefines \
- -DPIXPRIV
-
-#ifndef HasPerl
-/* Solaris 8 comes with perl. Earlier versions don't. */
-# if (OSMajorVersion == 5) && (OSMinorVersion >= 8)
-# define HasPerl YES
-# else
-# define HasPerl NO
-# endif
-#endif
-
-#ifndef XkbServerDefines
-# if BuildLikeSun
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT \
- -DXKM_OUTPUT_DIR='"/var/run/xkb/"' -DXKM_OUTPUT_DIR_MODE=0775 \
- -DMAKE_XKM_OUTPUT_DIR
-# else
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-# endif
-#endif
-
-#if OSMajorVersion > 4
-/* #define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN */
-#define ConnectionFlags -DUNIXCONN -DTCPCONN
-# if HasSunC
-# ifdef DefaultSunProCCompilerDir
-# ifndef CcCmd
-# define CcCmd DefaultSunProCCompilerDir/cc
-# endif
-# endif
-# ifdef DefaultSunProCplusplusCompilerDir
-# ifndef CplusplusCmd
-# define CplusplusCmd DefaultSunProCplusplusCompilerDir/CC
-# endif
-# ifndef CplusplusFilt
-# define CplusplusFilt DefaultSunProCplusplusCompilerDir/c++filt
-# endif
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir DefaultSunProCplusplusCompilerDir/whatdir
-# endif
-# else /* DefaultSunProCplusplusCompilerDir not defined */
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir whatdir
-# endif
-# endif /* DefaultSunProCplusplusCompilerDir */
-# ifndef CplusplusDependIncludes
-# if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes -I`CplusplusWhatdir CC`/../include/CC
-# elif CplusplusCompilerMajorVersion > 2
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
-# else
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC2.0.1/include/CC
-# endif
-# endif
-# endif /* HasSunC */
-
-# if HasSunC && (CCompilerMajorVersion < 3)
-# define BootstrapCFlags -DSVR4
-# else
-# define BootstrapCFlags /* none needed */
-# endif
-# ifndef XawI18nDefines
-# if OSMinorVersion < 4
-# define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-# else
-# define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-# endif
-# endif
-# if OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install
-# endif
-#ifndef LargefileDefines
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define LargefileDefines -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-# else
-# define LargefileDefines /* */
-# endif
-#endif
-# ifdef AMD64Architecture
-# define StandardDefines -Dsun -DSVR4 -D__EXTENSIONS__ -D__amd64
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# elif defined(i386Architecture)
-# if (OSMajorVersion < 4) || ((OSMajorVersion == 5) && (OSMinorVersion <= 5))
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- -D__SOL64__ LargefileDefines
-# else
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- LargefileDefines
-# endif
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# else
-# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines \
- -DPIXPRIV
-# define ToolkitStringsABIOptions -sparcabi SolarisABIFlag
-# endif
-# define ExtraLibraries -lsocket -lnsl
-# define HasWeakSymbols YES
-# if OSMinorVersion > 1
-# ifndef ThreadedX
-# define ThreadedX YES
-# endif
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-# if HasSunC && CCompilerMajorVersion > 2
-# define ThreadsCompileFlags -mt
-# else
-# define SystemMTDefines -D_REENTRANT
-# define ThreadsLibraries -lthread
-# endif
-# if HasSunCplusplus && CplusplusCompilerMajorVersion > 3
-# define ThreadsCplusplusCompileFlags -mt
-# else
-# define CplusplusSystemMTDefines -D_REENTRANT
-# define ThreadsCplusplusLibraries -lthread
-# endif
-# endif /* OSMinorVersion > 1 */
-# ifndef UseExportLists
-# if (OSMinorVersion > 4) && !HasGcc2
-# define UseExportLists YES
-# else
-# define UseExportLists NO
-# endif
-# endif
-# if OSMinorVersion > 5 /* Solaris 2.6 and later */
-# define HasSnprintf YES
-# endif
-# if OSMinorVersion > 7 /* Solaris 8 and later */
-# define HasStrlcat YES
-# define HasStrcasecmp YES
-# define HasVarRun YES
-# endif
-# if OSMinorVersion > 9 /* Solaris 10 and later */
-# define HasSetenv YES
-# define HasGetpeerucred YES
-# define HasGetoptLong YES
-# define DlLibrary -lc /* dlopen() is in libc in Solaris 10 */
-# endif
-# define HasVFork NO
-# define HasDlopen YES
-# define InstallXloadSetGID NO /* libkstat doesn't require gid kmem */
-# define InstKmemFlags -g sys -m 2711
-# define ShLibIncludeFile <sunLib.tmpl>
-# define LinkerRuntimeLibraryPathFlag(path) Concat(-R,path)
-# define RpathLoadFlags LinkerRuntimeLibraryPathFlag($(USRLIBDIRPATH))
-/*
- * Set flags for position independent code before including sv4Lib.rules
- * if the compiler in use doesn't use standard SVR4 flags
- */
-# if HasSunC || HasCenterLineC
-# define PositionIndependentCFlags -Kpic
-# define LargePositionIndependentCFlags -KPIC
-# ifdef Sparc64Architecture
-# define LargePICTable YES
-# endif
-# endif
-# if HasSunCplusplus || HasCenterLineCplusplus
-# define PositionIndependentCplusplusFlags -pic
-# define LargePositionIndependentCplusplusFlags -PIC
-# endif
-/* As is done in sco5.cf, we lie and say Solaris has NCURSES, since
- * the system curses is close enough for xorgcfg's purposes. xorgcfg
- * should not depend on the NCURSES package but rather on a "capable curses",
- * of which NCURSES is just one.
- */
-#define HasNCurses YES
-#define NCursesLibName -lcurses
-#else /* not OSMajorVersion > 4 */
-#define InstKmemFlags -g kmem -m 2711
-#include <sunLib.rules>
-#endif /* OSMajorVersion > 4 (else) */
-
-/* Solaris 10 includes FreeType already. It's also available in GNOME 2.0 for
- * Solaris 8 & 9, and in Solaris 9 4/03 and later, but there's no easy way to
- * detect that in imake, so users of those releases who want to use the
- * installed FreeType instead of the one in this tree should copy the following
- * two settings to their host.def. Those who want to use the in-tree copy
- * regardless of OS version should add "#define HasFreetype2 NO" to host.def.
- */
-#ifndef HasFreetype2
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasFreetype2 YES
-# ifndef Freetype2Dir
-# define Freetype2Dir /usr/sfw
-# endif
-# else
-# define HasFreetype2 NO
-# endif
-#endif
-
-#ifndef HasExpat
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasExpat YES
-# ifndef ExpatDir
-# define ExpatDir /usr/sfw
-# endif
-# else
-# define HasExpat NO
-# endif
-#endif
-
-/* Solaris 10 includes fontconfig, but not the fcprivate.h header needed by
- * Xft1 library.
- */
-#ifndef HasFontconfig
-# define HasFontconfig NO
-#endif
-
-/* libpng was in /usr/sfw/lib on Solaris 9, moved to /usr/lib in Solaris 10 */
-#ifndef HasLibpng
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasLibpng YES
-# if !defined(LibpngDir) && ((OSMajorVersion == 5) && (OSMinorVersion == 9))
-# define LibpngDir /usr/sfw
-# endif
-# else
-# define HasLibpng NO
-# endif
-#endif
-
-#ifndef HasZlib
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define HasZlib YES
-# else
-# define HasZlib NO
-# endif
-#endif
-
-#ifndef TroffCmd
-# if !(HasGroff)
-# define TroffCmd troff -Tpost
-# endif
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define HasNdbm YES
-#define HasShm YES
-#define HasSecureRPC YES
-#define SetTtyGroup YES
-#define HasPutenv YES
-#define HasMkstemp YES
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-#define HasDevRandom YES /* /dev/random is in Solaris 8 patches */
-#define PollDevRandom YES /* /dev/random is poll()able on Solaris */
-#endif
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasIssetugid YES
-#endif
-#if defined(Sun3Architecture) || defined(SparcArchitecture) || defined(Sparc64Architecture)
-# ifndef Xsun24Server
-# define Xsun24Server NO /* color, mono, multiple depths */
-# endif
-# ifndef XsunServer
-# define XsunServer NO /* color and mono, 8 bit only */
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer NO /* monochrome only */
-# endif
-# ifndef XorgServer
-# define XorgServer (!(Xsun24Server || XsunServer || XsunMonoServer))
-# endif
-# undef BuildXF86DRI
-# define BuildXF86DRI NO
-# if (OSMajorVersion > 4)
-# if !defined(AsOutputArchSize) || \
- ((AsOutputArchSize != 32) && (AsOutputArchSize != 64))
-# undef AsOutputArchSize
-# define AsOutputArchSize 32
-# endif
-# ifndef AsVISOption
-# if AsOutputArchSize == 32
-# ifdef UseGas
-# define AsVISOption -Av8plusa
-# else
-# define AsVISOption -xarch=v8plusa
-# endif
-# else
-# ifdef UseGas
-# define AsVISOption -Av9a
-# else
-# define AsVISOption -xarch=v9a
-# endif
-# endif
-# endif
-# endif
-#endif /* SPARC or Sun3/M68k */
-
-#if OSMajorVersion >= 4
-#define HasUsableFileMap YES
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#if HasGcc
-# if OSMajorVersion > 4
-# ifndef DefaultCCOptions
-# ifdef UseInstalled
-# define DefaultCCOptions -DNO_ASM
-# elif OSMinorVersion > 6
-# define DefaultCCOptions -DNO_ASM GccWarningOptions
-# elif OSMinorVersion > 3
-# define DefaultCCOptions -DNO_ASM GccWarningOptions -ansi -pedantic
-# else
-# define DefaultCCOptions -DNO_ASM
-# endif
-# endif
-# endif
-# if HasGcc2
-# ifndef CcCmd
-# define CcCmd gcc
-# endif
-# ifndef AsCmd
-# define AsCmd CcCmd -c -x assembler
-# endif
-# ifndef OptimizedCDebugFlags
-# ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# elif defined(AMD64Architecture)
-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-# endif
-# if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
-# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
- /* This is to work around what appears to be a PIC bug in some gcc/egcs
- versions that shows up with the Solaris 7/x86 <ctype.h>. */
-# define SharedLibraryLdCmd $(LD)
-# define SharedLibraryLoadFlags -G -z textwarn
-# else
-# define SharedLibraryLdCmd $(CC)
-# define SharedLibraryLoadFlags -shared -z text
-# endif
-# endif
-# else
-# define SharedLibraryCcCmd cc
-# define ExtraLoadFlags -B/usr/bin/
-# define AllocateLocalDefines /**/
-
-.c.o:
- ClearmakeOSName $(CC) -c $(CFLAGS) $*.c
-
-# endif /* HasGcc2 (else) */
-
-#else /* not HasGcc */
-
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/* Set up compiler-dependent options for Sun C */
-/*
- * To build 64-bit binaries define Sparc64Architecture or AMD64Architecture
- * in your site.def or host.def file.
- */
-# if HasSunC
-# ifdef Sun3Architecture
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -f68881 -pipe
-# endif
-# else /* not defined(Sun3Architecture) */
-# if OSMajorVersion < 5
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -pipe
-# endif
-# else /* OSMajorVersion >= 5*/
-# ifndef DefaultXArchOptions
-# ifdef Sparc64Architecture
-# define DefaultXArchOptions -xarch=v9
-# elif defined(AMD64Architecture)
-# define DefaultXArchOptions -xarch=generic64
-# else
-# define DefaultXArchOptions /* */
-# endif
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xa -v DefaultXArchOptions -z lazyload -z combreloc -xstrconst -xildoff
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions DefaultXArchOptions -z lazyload -z combreloc -xildoff
-# endif
-# ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -G DefaultXArchOptions -z text $(EXTRA_LOAD_FLAGS)
-# endif
-# endif
-# endif
-# endif
-# endif
-
-/* Set compiler-dependent options for CenterLine C */
-
-# if HasCenterLineC
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-# endif
-# ifndef NeedConstPrototypes
-# define NeedConstPrototypes YES
-# endif
-# ifndef NeedNestedPrototypes
-# define NeedNestedPrototypes YES
-# endif
-# ifndef NeedVarargsPrototypes
-# define NeedVarargsPrototypes YES
-# endif
-# endif
-
-
-#endif /* HasGcc (else) */
-
-#if OSMajorVersion < 5
-# define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
-# define LibraryCCOptions /* don't want special floating point */
-#else /* OSMajorVersion >= 5, i.e. Solaris 2.0 & later */
-/* Only load libraries when needed on Solaris 7 & later */
-# if OSMinorVersion >= 7
-# define LazyLoadFlag -z lazyload -z combreloc
-# else
-# define LazyLoadFlag /* */
-# endif
-/* Link with extra mapfiles for some performance & security enhancements */
-#ifndef MapfileFlag
-# if HasSunC
-# define MapfileFlag -M
-# else
-# define MapfileFlag -Wl,-M,
-# endif
-#endif
-#ifndef Mapfile_BssAlign
-# if OSMinorVersion >= 9
-# define Mapfile_BssAlign $(MAPFILEFLAG)/usr/lib/ld/map.bssalign
-# else
-# define Mapfile_BssAlign /**/
-# endif
-#endif
-#ifndef Mapfile_PageAlign
-# if OSMinorVersion >= 10
-# define Mapfile_PageAlign $(MAPFILEFLAG)/usr/lib/ld/map.pagealign
-# else
-# define Mapfile_PageAlign /**/
-# endif
-#endif
-#ifndef Mapfile_NoExStack
-# if OSMinorVersion >= 9
-# define Mapfile_NoExStack $(MAPFILEFLAG)/usr/lib/ld/map.noexstk
-# else
-# define Mapfile_NoExStack /**/
-# endif
-#endif
-#ifndef Mapfile_NoExData
-# if defined(SparcArchitecture)
-/* SPARC archictecture requires PLT section in .data be executable, so
- we can only make .bss, not all of .data no-exec on SPARC */
-# define Mapfile_NoExData /**/
-# else
-# if OSMinorVersion >= 10
-# define Mapfile_NoExData $(MAPFILEFLAG)/usr/lib/ld/map.noexdata
-# else
-# define Mapfile_NoExData /**/
-# endif
-# endif
-#endif
- MAPFILEFLAG = MapfileFlag
- MAPFILES_FOR_ALL = Mapfile_PageAlign Mapfile_NoExData
-MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
-/* ExtraLoadFlags apply to all binaries - programs & libraries */
-# ifndef ExtraLoadFlags
-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
-# endif
-/* ExtraLoadOptions only apply to programs */
-# ifndef ExtraLoadOptions
-# define ExtraLoadOptions -B direct $(MAPFILES_FOR_PROGS)
-# endif
-#endif /* OSMajorVersion < 5 */
-
-/* 64-bit build support */
-#ifndef Solaris64bitSubdir
-# ifdef Sparc64Architecture
-# define Solaris64bitSubdir sparcv9
-# elif defined(AMD64Architecture)
-# define Solaris64bitSubdir amd64
-# endif
-#endif
-
-#ifdef Solaris64bitSubdir
-# define LibDirName Concat3(lib,/,Solaris64bitSubdir)
-#endif
-
-#if OSMajorVersion > 4
-# include <svr4.cf>
-#endif
-
-#ifndef ManKeywordsTarget
-# define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- catman -M $(DESTDIR)manpath -w
-#endif
-
-#if !defined(UsePamLibrary)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
-# define UsePamLibrary YES
-# endif
-#endif
-
-/* PAM appeared in SunOS 5.6 */
-#if !defined(HasPam)
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define HasPam YES
-# endif
-#endif
-
-#ifndef PamLibraries
-#define PamLibraries -lpam
-#endif
-
-#ifndef HasMotif
-/* Solaris's Motif depends on Solaris libX11 and won't work with libX11 built
- * from this tree, so only use it when using libX11 from outside the tree.
- */
-# define HasMotif (defined(UseInstalled) || UseInstalledX11)
-# define MotifDir /usr/dt
-#endif /* !HasMotif */
-#ifndef HasMotif2
-/* Solaris's Motif2 version is broken and misses XmPrintShell
- * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1366) */
-# define HasMotif2 NO
-#endif /* !HasMotif2 */
-
-#define MotifDefines \
- -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
-#define PamUnixDefines -DPAM_NIS
-#define TtLargePICTable YES
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-
-#define baseDtMailDefines \
- -DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
-#if !defined(i386Architecture) && !defined(AMD64Architecture)
-# define DtMailDefines baseDtMailDefines
-#else
-# define DtMailDefines -DBIG_ENDIAN baseDtMailDefines
-#endif
-
-#define ArchitectureDefines -DSUN_ARCHITECTURE
-
-#define TtClientExtraLibs ExtraLibraries -ldl -lintl
-
-#define ExportListGenSource elistgen.sun
-#define ShlibExportListOpt(filename) -M filename
-
-#define CdeProjectDefines \
- -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
- -D_XOPEN_SOURCE -D__EXTENSIONS__ \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-
-
-/*
- * Turn off HTML manpages like we do under NetBSD.
- */
-#ifndef BuildHtmlManPages
-#define BuildHtmlManPages NO
-#endif
-
-/*
- * Turn off seperate configuration directories.
- */
-#ifndef UseSeparateConfDir
-#define UseSeparateConfDir NO
-#endif
-
-/* Hackery for building modules as Solaris shared objects with dependencies */
-#if MakeDllModules && DoLoadableServer
-
-/* If you change this, you will need to change find-deps.pl to match */
-#define DlModuleDependencyName(module) Concat(module,_deps)
-
-#define DlModuleTarget(module,deplist,modlist) @@\
-DepDynamicModuleTarget(module,deplist DlModuleDependencyName(module),modlist LazyLoadFlag `cat DlModuleDependencyName(module)`) @@\
- @@\
-DlModuleDependencyName(module): @@\
- touch $@ @@\
- @@\
-clean:: @@\
- RemoveFile(DlModuleDependencyName(module))
-
-#define ObjectModuleTarget(module,objects) @@\
-DlModuleTarget(Concat(module,_drv.so), objects, objects)
-
-#define LibraryModuleTarget(module,objects) @@\
-NormalLibraryTarget(module, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), objects, objects)
-
-#define DepLibraryModuleTarget(module,deplist,objects) @@\
-NormalDepLibraryTarget(module, deplist, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), deplist, objects)
-
-#endif
diff --git a/nx-X11/config/cf/sun.cf.X.original b/nx-X11/config/cf/sun.cf.X.original
deleted file mode 100644
index 55bf2c1e2..000000000
--- a/nx-X11/config/cf/sun.cf.X.original
+++ /dev/null
@@ -1,957 +0,0 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.34 2005/12/03 17:20:48 alanc Exp $
-XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.70 2004/01/13 02:42:51 tsi Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/* For various reasons, Sun uses different settings when compiling the
- * X Window System packages included in Solaris than are normally used
- * by most people building the X.Org software releases. Sun also has
- * two different X server hierarchies in Solaris - Xsun in /usr/openwin
- * and Xorg in /usr/X11.
- *
- * If you want to try to match Sun's settings as closely as possible
- * add this setting to your host.def:
- * #define BuildLikeSun YES
- *
- * If you're trying to match the openwin directory layout as well, you'll
- * need to also add:
- * #define ProjectRoot /usr/openwin
- * otherwise it will use /usr/X11. (Note that these settings match closer
- * to Sun's Xorg delivery in /usr/X11 than the older X11R6.6-based delivery
- * in /usr/openwin though.)
- */
-#ifndef BuildLikeSun
-# define BuildLikeSun NO
-#endif
-
-#if BuildLikeSun
-# ifndef ProjectRoot
-# define ProjectRoot /usr/X11
-# endif
-# ifndef DocDir
-# define DocDir Concat(ProjectRoot,/share/doc)
-# endif
-# ifndef ManDirectoryRoot
-# define ManDirectoryRoot Concat(ProjectRoot,/share/man)
-# endif
-# ifndef ManSuffix
-# define ManSuffix 1
-# endif
-# ifndef LibraryCCOptions
-# if DoSharedLib && defined(SharedLibraryCCOptions)
-# define LibraryCCOptions SharedLibraryCCOptions ArchLibraryCCOptions
-# else
-# define LibraryCCOptions DefaultCCOptions ArchLibraryCCOptions
-# endif
-# endif
-#endif
-
-/* Flag passed to makestrs in Xt build to control string array names in the
- * libXt headers. -solarisabinames matches those used in the libXt in
- * Solaris, but not in other OS'es.
- */
-#ifndef SolarisABIFlag
-# if BuildLikeSun
-# define SolarisABIFlag -solarisabinames
-# else
-# define SolarisABIFlag /**/
-# endif
-#endif
-
-/*
- * Compiler setup. This sun.cf file knows what options to use with
- * certain compilers, including Sun C, CenterLine C, and gcc. It
- * also understands how to set some of the options for various C++
- * compilers, including Sun C++ and CenterLine C++.
- *
- * === C Compiler Setup ==========================================
- *
- * For SunPro C, define HasSunC to YES in site.def.
- * For CenterLine C, define HasCenterLineC to YES in site.def
- * For gcc, gcc2 or gcc3, define HasGcc, HasGcc2 or HasGcc3 to YES in site.def
- * For other compilers, define HasSunC to NO in site.def, then
- * provide appropriate values for the various compiler related
- * configuration varibles used here.
- *
- * If you don't tell us which C compiler you have, we assume you have
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc
- * under SunOS 4.1.x
- *
- * === C++ Compiler Setup ==========================================
- *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
- * For other compilers, define HasCplusplus to YES in site.def, and
- * check to see if you need to provide values for CplusplusOptions
- * and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * If you say you have the SunPro C++ compiler, we assume you have
- * version 3.0.x of the compiler. If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in site.def.
- *
- */
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasSunC
-# if HasCenterLineC || HasGcc || HasGcc2 || HasGcc3 || (OSMajorVersion < 5)
-# define HasSunC NO
-# else
-# define HasSunC YES
-# endif
-#endif
-
-#if HasSunC
-# ifndef CCompilerMajorVersion
-# define CCompilerMajorVersion DefaultSunProCCompilerMajorVersion
-# endif
-# ifndef CCompilerMinorVersion
-# define CCompilerMinorVersion DefaultSunProCCompilerMinorVersion
-# endif
-XCOMM SunPro C CCompilerMajorVersion./**/CCompilerMinorVersion
-
-/* Choose some reasonable default optimizer flags based on compiler &
- OS versions */
-# ifndef OptimizedCDebugFlags
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion > 2)
-# define OptimizedCDebugFlags -xO4 -xbuiltin=%all -xlibmil -xstrconst ArchOptimizedFlags
-# else
-# define OptimizedCDebugFlags -xO4 -xstrconst ArchOptimizedFlags
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# if OSMajorVersion == 5
-# if defined(SparcArchitecture) && !defined(Sparc64Architecture)
-# if OSMinorVersion > 9 /* Solaris 10 and later only run on UltraSPARC's */
-# define ArchOptimizedFlags -xarch=v8plus
-# else
-# define ArchOptimizedFlags -xarch=v8
-# endif
-# elif defined(i386Architecture) || defined(AMD64Architecture)
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 7)
-/* -xregs=no%frameptr is required on x86 when compiling at -xO4 or higher to
- * avoid losing stack frame pointers so you can't get stack traces or debug.
- * This may lose a small bit of performance, so you can override by adding
- * #define FramePtrFlags -xregs=frameptr if you care about performance more
- * than debuggability.
- */
-# ifndef FramePtrFlags
-# define FramePtrFlags -xregs=no%frameptr
-# endif
-# endif
-# ifndef FramePtrFlags
-# define FramePtrFlags /* */
-# endif
-# if defined(i386Architecture) && (OSMinorVersion > 8)
- /* Solaris 9 and later require Pentium or better */
-# define ArchOptimizedFlags -xpentium FramePtrFlags
-# else
-# define ArchOptimizedFlags FramePtrFlags
-# endif
-# endif
-# endif
-# ifndef ArchOptimizedFlags
-# define ArchOptimizedFlags /**/
-# endif
-# endif
-# ifndef DefaultCDebugFlags
-# define DefaultCDebugFlags OptimizedCDebugFlags
-# endif
-# ifndef SharedLibraryLdCmd
-# define SharedLibraryLdCmd $(CC)
-# endif
-/* Flags for lint version included with Sun C compilers */
-# if OSMajorVersion >= 5
-# ifndef LintLibFlag
-# define LintLibFlag -y -o
-# endif
-# ifndef LintOpts
-# define LintOpts -b -h -u -erroff=E_INDISTING_FROM_TRUNC2 $(LINTSECFLAG) ExtraLibraries MathLibrary -lc
-# endif
-# ifndef LintSecFlag
-# if (CCompilerMajorVersion > 5) || \
- (CCompilerMajorVersion == 5 && CCompilerMinorVersion >= 6)
-# define LintSecFlag -errsecurity=standard
-# else
-# define LintSecFlag /**/
-# endif
-# endif
- LINTSECFLAG = LintSecFlag
-# ifndef LintLibReferences
-# define LintLibReferences(varname,libname,libsource) @@\
- Concat(LINT,varname) = _UseCat(-L $(LINTLIBDIR) -l, -L libsource -l,libname)
-# endif
-
-# endif /* Lint Flags for Solaris */
-
-#endif /* HasSunC */
-
-#ifndef ArchLibraryCCOptions
-# if HasSunC && defined(SparcArchitecture) && CCompilerMajorVersion > 3
-# define ArchLibraryCCOptions -xregs=no%appl
-# else
-# define ArchLibraryCCOptions
-# endif
-#endif /* ArchLibraryCCOptions */
-
-/* we used to have this here :
- *
- * #if HasSunC
- * # ifndef CCompilerMajorVersion
- * # define CCompilerMajorVersion 3
- * # define DefaultCDebugFlags -xO3
- * # define OptimizedCDebugFlags -xO3
- * # endif
- * #endif
- */
-
-#ifndef HasSunCplusplus
-# define HasSunCplusplus HasSunC /* ??? */
-#endif
-#if HasSunCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# define OptimizedCplusplusDebugFlags -xO4 -xbuiltin=%all -xlibmil
-# endif
-# ifndef CplusplusCompilerMajorVersion
-# ifdef DefaultSunProCplusplusCompilerMajorVersion
-# define CplusplusCompilerMajorVersion DefaultSunProCplusplusCompilerMajorVersion
-# else
-# define CplusplusCompilerMajorVersion 3
-# endif
-# endif
-# ifndef CplusplusCompilerMinorVersion
-# ifdef DefaultSunProCplusplusCompilerMinorVersion
-# define CplusplusCompilerMinorVersion DefaultSunProCplusplusCompilerMinorVersion
-# else
-# define CplusplusCompilerMinorVersion 0
-# endif
-# endif
-# ifndef CplusplusLibC
-# if CplusplusCompilerMajorVersion >= 5
-# define CplusplusLibC -norunpath -lCrun
-# endif
-# endif
-XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
-#endif
-
-/* we used to have this here :
- *
- * # ifndef CplusplusCompilerMajorVersion
- * # define CplusplusCompilerMajorVersion 4
- * # endif
- */
-
-#if HasCenterLineC
-# ifndef CcCmd
-# define CcCmd clcc
-# endif
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-# define HasCplusplus YES
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions -Xa
-# endif
-# ifndef CplusplusOptions
-# define CplusplusOptions -Xa
-# endif
-#endif
-
-#if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
-/* We do not guarantee this will work */
-# define BootstrapCFlags -DNOSTDHDRS
-# define StandardDefines -DNOSTDHDRS
-# define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if OSMajorVersion == 4
-# if OSMinorVersion == 1
-# define HasPoll YES
-# endif
-# if OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1)
-/* You ALSO need this if you have Sun ld patch 100170-06 or later to 4.1.1 */
-# define SunPost411FCSLd YES
-# endif
-#endif
-
-/* The Xsun server was not building for SunOS 5.7 due to
- includes of <sys/cg2reg.h>.
-*/
-#if OSMajorVersion < 5
-# define IncludeCG2HeaderDefine -DINCLUDE_CG2_HEADER
-#else
-# define IncludeCG2HeaderDefine /**/
-#endif
-
-#if defined(i386Architecture) || defined(AMD64Architecture)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define OSServerExtraDefines -D__SOL8__
-# endif
-#endif
-
-#if !HasGcc
-# if HasSunC
-# if defined(AMD64Architecture)
-# define AsmArch amd64
-# define AsmFlags -xarch=amd64
-# elif defined(i386Architecture)
-# define AsmArch ia32
-# define AsmFlags /**/
-# elif defined(Sparc64Architecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v9
-# elif defined(SparcArchitecture)
-# define AsmArch sparcv8plus
-# define AsmFlags -xarch=v8plus
-# endif
-# ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines $(SERVERSRC)/hw/xfree86/os-support/sunos/AsmArch.il
-# endif
-# endif
-#endif
-
-#ifndef CompilerServerExtraDefines
-# define CompilerServerExtraDefines /**/
-#endif
-
-#ifndef OSServerExtraDefines
-# define OSServerExtraDefines /**/
-#endif
-
-#ifndef ArchServerExtraDefines
-# if defined(Sparc64Architecture) || defined(AMD64Architecture)
-# define ArchServerExtraDefines -D_XSERVER64
-# else
-# define ArchServerExtraDefines /**/
-# endif
-#endif
-
-#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine
-#define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \
- CompilerServerExtraDefines \
- OSServerExtraDefines ArchServerExtraDefines
-
-#ifndef HasPerl
-/* Solaris 8 comes with perl. Earlier versions don't. */
-# if (OSMajorVersion == 5) && (OSMinorVersion >= 8)
-# define HasPerl YES
-# else
-# define HasPerl NO
-# endif
-#endif
-
-#ifndef XkbServerDefines
-# if BuildLikeSun
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT \
- -DXKM_OUTPUT_DIR='"/var/run/xkb/"' -DXKM_OUTPUT_DIR_MODE=0775 \
- -DMAKE_XKM_OUTPUT_DIR
-# else
-# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
-# endif
-#endif
-
-#if OSMajorVersion > 4
-# define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN
-# if HasSunC
-# ifdef DefaultSunProCCompilerDir
-# ifndef CcCmd
-# define CcCmd DefaultSunProCCompilerDir/cc
-# endif
-# endif
-# ifdef DefaultSunProCplusplusCompilerDir
-# ifndef CplusplusCmd
-# define CplusplusCmd DefaultSunProCplusplusCompilerDir/CC
-# endif
-# ifndef CplusplusFilt
-# define CplusplusFilt DefaultSunProCplusplusCompilerDir/c++filt
-# endif
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir DefaultSunProCplusplusCompilerDir/whatdir
-# endif
-# else /* DefaultSunProCplusplusCompilerDir not defined */
-# ifndef CplusplusWhatdir
-# define CplusplusWhatdir whatdir
-# endif
-# endif /* DefaultSunProCplusplusCompilerDir */
-# ifndef CplusplusDependIncludes
-# if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes -I`CplusplusWhatdir CC`/../include/CC
-# elif CplusplusCompilerMajorVersion > 2
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
-# else
-# define CplusplusDependIncludes -I/opt/SUNWspro/SC2.0.1/include/CC
-# endif
-# endif
-# endif /* HasSunC */
-
-# if HasSunC && (CCompilerMajorVersion < 3)
-# define BootstrapCFlags -DSVR4
-# else
-# define BootstrapCFlags /* none needed */
-# endif
-# ifndef XawI18nDefines
-# if OSMinorVersion < 4
-# define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-# else
-# define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-# endif
-# endif
-# if OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install
-# endif
-#ifndef LargefileDefines
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define LargefileDefines -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-# else
-# define LargefileDefines /* */
-# endif
-#endif
-# ifdef AMD64Architecture
-# define StandardDefines -Dsun -DSVR4 -D__EXTENSIONS__ -D__amd64
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# elif defined(i386Architecture)
-# if (OSMajorVersion < 4) || ((OSMajorVersion == 5) && (OSMinorVersion <= 5))
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- -D__SOL64__ LargefileDefines
-# else
-# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
- LargefileDefines
-# endif
-# define ToolkitStringsABIOptions -intelabi SolarisABIFlag
-# else
-# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines
-# define ToolkitStringsABIOptions -sparcabi SolarisABIFlag
-# endif
-# define ExtraLibraries -lsocket -lnsl
-# define HasWeakSymbols YES
-# if OSMinorVersion > 1
-# ifndef ThreadedX
-# define ThreadedX YES
-# endif
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-# if HasSunC && CCompilerMajorVersion > 2
-# define ThreadsCompileFlags -mt
-# else
-# define SystemMTDefines -D_REENTRANT
-# define ThreadsLibraries -lthread
-# endif
-# if HasSunCplusplus && CplusplusCompilerMajorVersion > 3
-# define ThreadsCplusplusCompileFlags -mt
-# else
-# define CplusplusSystemMTDefines -D_REENTRANT
-# define ThreadsCplusplusLibraries -lthread
-# endif
-# endif /* OSMinorVersion > 1 */
-# ifndef UseExportLists
-# if (OSMinorVersion > 4) && !HasGcc2
-# define UseExportLists YES
-# else
-# define UseExportLists NO
-# endif
-# endif
-# if OSMinorVersion > 5 /* Solaris 2.6 and later */
-# define HasSnprintf YES
-# endif
-# if OSMinorVersion > 7 /* Solaris 8 and later */
-# define HasStrlcat YES
-# define HasStrcasecmp YES
-# define HasVarRun YES
-# endif
-# if OSMinorVersion > 9 /* Solaris 10 and later */
-# define HasSetenv YES
-# define HasGetpeerucred YES
-# define HasGetoptLong YES
-# define DlLibrary -lc /* dlopen() is in libc in Solaris 10 */
-# endif
-# define HasVFork NO
-# define HasDlopen YES
-# define InstallXloadSetGID NO /* libkstat doesn't require gid kmem */
-# define InstKmemFlags -g sys -m 2711
-# define ShLibIncludeFile <sunLib.tmpl>
-# define LinkerRuntimeLibraryPathFlag(path) Concat(-R,path)
-# define RpathLoadFlags LinkerRuntimeLibraryPathFlag($(USRLIBDIRPATH))
-/*
- * Set flags for position independent code before including sv4Lib.rules
- * if the compiler in use doesn't use standard SVR4 flags
- */
-# if HasSunC || HasCenterLineC
-# define PositionIndependentCFlags -Kpic
-# define LargePositionIndependentCFlags -KPIC
-# ifdef Sparc64Architecture
-# define LargePICTable YES
-# endif
-# endif
-# if HasSunCplusplus || HasCenterLineCplusplus
-# define PositionIndependentCplusplusFlags -pic
-# define LargePositionIndependentCplusplusFlags -PIC
-# endif
-/* As is done in sco5.cf, we lie and say Solaris has NCURSES, since
- * the system curses is close enough for xorgcfg's purposes. xorgcfg
- * should not depend on the NCURSES package but rather on a "capable curses",
- * of which NCURSES is just one.
- */
-#define HasNCurses YES
-#define NCursesLibName -lcurses
-#else /* not OSMajorVersion > 4 */
-#define InstKmemFlags -g kmem -m 2711
-#include <sunLib.rules>
-#endif /* OSMajorVersion > 4 (else) */
-
-/* Solaris 10 includes FreeType already. It's also available in GNOME 2.0 for
- * Solaris 8 & 9, and in Solaris 9 4/03 and later, but there's no easy way to
- * detect that in imake, so users of those releases who want to use the
- * installed FreeType instead of the one in this tree should copy the following
- * two settings to their host.def. Those who want to use the in-tree copy
- * regardless of OS version should add "#define HasFreetype2 NO" to host.def.
- */
-#ifndef HasFreetype2
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasFreetype2 YES
-# ifndef Freetype2Dir
-# define Freetype2Dir /usr/sfw
-# endif
-# else
-# define HasFreetype2 NO
-# endif
-#endif
-
-#ifndef HasExpat
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
-# define HasExpat YES
-# ifndef ExpatDir
-# define ExpatDir /usr/sfw
-# endif
-# else
-# define HasExpat NO
-# endif
-#endif
-
-/* Solaris 10 includes fontconfig, but not the fcprivate.h header needed by
- * Xft1 library.
- */
-#ifndef HasFontconfig
-# define HasFontconfig NO
-#endif
-
-/* libpng was in /usr/sfw/lib on Solaris 9, moved to /usr/lib in Solaris 10 */
-#ifndef HasLibpng
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasLibpng YES
-# if !defined(LibpngDir) && ((OSMajorVersion == 5) && (OSMinorVersion == 9))
-# define LibpngDir /usr/sfw
-# endif
-# else
-# define HasLibpng NO
-# endif
-#endif
-
-#ifndef HasZlib
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-# define HasZlib YES
-# else
-# define HasZlib NO
-# endif
-#endif
-
-#ifndef TroffCmd
-# if !(HasGroff)
-# define TroffCmd troff -Tpost
-# endif
-#endif
-
-#define BuildLibPathVar LD_LIBRARY_PATH
-#define HasNdbm YES
-#define HasShm YES
-#define HasSecureRPC YES
-#define SetTtyGroup YES
-#define HasPutenv YES
-#define HasMkstemp YES
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 8))
-#define HasDevRandom YES /* /dev/random is in Solaris 8 patches */
-#define PollDevRandom YES /* /dev/random is poll()able on Solaris */
-#endif
-#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 9))
-# define HasIssetugid YES
-#endif
-#if defined(Sun3Architecture) || defined(SparcArchitecture) || defined(Sparc64Architecture)
-# ifndef Xsun24Server
-# define Xsun24Server NO /* color, mono, multiple depths */
-# endif
-# ifndef XsunServer
-# define XsunServer NO /* color and mono, 8 bit only */
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer NO /* monochrome only */
-# endif
-# ifndef XorgServer
-# define XorgServer (!(Xsun24Server || XsunServer || XsunMonoServer))
-# endif
-# undef BuildXF86DRI
-# define BuildXF86DRI NO
-# if (OSMajorVersion > 4)
-# if !defined(AsOutputArchSize) || \
- ((AsOutputArchSize != 32) && (AsOutputArchSize != 64))
-# undef AsOutputArchSize
-# define AsOutputArchSize 32
-# endif
-# ifndef AsVISOption
-# if AsOutputArchSize == 32
-# ifdef UseGas
-# define AsVISOption -Av8plusa
-# else
-# define AsVISOption -xarch=v8plusa
-# endif
-# else
-# ifdef UseGas
-# define AsVISOption -Av9a
-# else
-# define AsVISOption -xarch=v9a
-# endif
-# endif
-# endif
-# endif
-#endif /* SPARC or Sun3/M68k */
-
-#if OSMajorVersion >= 4
-#define HasUsableFileMap YES
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-#if HasGcc
-# if OSMajorVersion > 4
-# ifndef DefaultCCOptions
-# ifdef UseInstalled
-# define DefaultCCOptions -DNO_ASM
-# elif OSMinorVersion > 6
-# define DefaultCCOptions -DNO_ASM GccWarningOptions
-# elif OSMinorVersion > 3
-# define DefaultCCOptions -DNO_ASM GccWarningOptions -ansi -pedantic
-# else
-# define DefaultCCOptions -DNO_ASM
-# endif
-# endif
-# endif
-# if HasGcc2
-# ifndef CcCmd
-# define CcCmd gcc
-# endif
-# ifndef AsCmd
-# define AsCmd CcCmd -c -x assembler
-# endif
-# ifndef OptimizedCDebugFlags
-# ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# elif defined(AMD64Architecture)
-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-# endif
-# if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
-# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
- /* This is to work around what appears to be a PIC bug in some gcc/egcs
- versions that shows up with the Solaris 7/x86 <ctype.h>. */
-# define SharedLibraryLdCmd $(LD)
-# define SharedLibraryLoadFlags -G -z textwarn
-# else
-# define SharedLibraryLdCmd $(CC)
-# define SharedLibraryLoadFlags -shared -z text
-# endif
-# endif
-# else
-# define SharedLibraryCcCmd cc
-# define ExtraLoadFlags -B/usr/bin/
-# define AllocateLocalDefines /**/
-
-.c.o:
- ClearmakeOSName $(CC) -c $(CFLAGS) $*.c
-
-# endif /* HasGcc2 (else) */
-
-#else /* not HasGcc */
-
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/* Set up compiler-dependent options for Sun C */
-/*
- * To build 64-bit binaries define Sparc64Architecture or AMD64Architecture
- * in your site.def or host.def file.
- */
-# if HasSunC
-# ifdef Sun3Architecture
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -f68881 -pipe
-# endif
-# else /* not defined(Sun3Architecture) */
-# if OSMajorVersion < 5
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -pipe
-# endif
-# else /* OSMajorVersion >= 5*/
-# ifndef DefaultXArchOptions
-# ifdef Sparc64Architecture
-# define DefaultXArchOptions -xarch=v9
-# elif defined(AMD64Architecture)
-# define DefaultXArchOptions -xarch=generic64
-# else
-# define DefaultXArchOptions /* */
-# endif
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xa -v DefaultXArchOptions -z lazyload -z combreloc -xstrconst -xildoff
-# endif
-# ifndef DefaultCplusplusOptions
-# define DefaultCplusplusOptions DefaultXArchOptions -z lazyload -z combreloc -xildoff
-# endif
-# ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -G DefaultXArchOptions -z text $(EXTRA_LOAD_FLAGS)
-# endif
-# endif
-# endif
-# endif
-# endif
-
-/* Set compiler-dependent options for CenterLine C */
-
-# if HasCenterLineC
-# ifndef DefaultCCOptions
-# define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-# endif
-# ifndef NeedConstPrototypes
-# define NeedConstPrototypes YES
-# endif
-# ifndef NeedNestedPrototypes
-# define NeedNestedPrototypes YES
-# endif
-# ifndef NeedVarargsPrototypes
-# define NeedVarargsPrototypes YES
-# endif
-# endif
-
-
-#endif /* HasGcc (else) */
-
-#if OSMajorVersion < 5
-# define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
-# define LibraryCCOptions /* don't want special floating point */
-#else /* OSMajorVersion >= 5, i.e. Solaris 2.0 & later */
-/* Only load libraries when needed on Solaris 7 & later */
-# if OSMinorVersion >= 7
-# define LazyLoadFlag -z lazyload -z combreloc
-# else
-# define LazyLoadFlag /* */
-# endif
-/* Link with extra mapfiles for some performance & security enhancements */
-#ifndef MapfileFlag
-# if HasSunC
-# define MapfileFlag -M
-# else
-# define MapfileFlag -Wl,-M,
-# endif
-#endif
-#ifndef Mapfile_BssAlign
-# if OSMinorVersion >= 9
-# define Mapfile_BssAlign $(MAPFILEFLAG)/usr/lib/ld/map.bssalign
-# else
-# define Mapfile_BssAlign /**/
-# endif
-#endif
-#ifndef Mapfile_PageAlign
-# if OSMinorVersion >= 10
-# define Mapfile_PageAlign $(MAPFILEFLAG)/usr/lib/ld/map.pagealign
-# else
-# define Mapfile_PageAlign /**/
-# endif
-#endif
-#ifndef Mapfile_NoExStack
-# if OSMinorVersion >= 9
-# define Mapfile_NoExStack $(MAPFILEFLAG)/usr/lib/ld/map.noexstk
-# else
-# define Mapfile_NoExStack /**/
-# endif
-#endif
-#ifndef Mapfile_NoExData
-# if defined(SparcArchitecture)
-/* SPARC archictecture requires PLT section in .data be executable, so
- we can only make .bss, not all of .data no-exec on SPARC */
-# define Mapfile_NoExData /**/
-# else
-# if OSMinorVersion >= 10
-# define Mapfile_NoExData $(MAPFILEFLAG)/usr/lib/ld/map.noexdata
-# else
-# define Mapfile_NoExData /**/
-# endif
-# endif
-#endif
- MAPFILEFLAG = MapfileFlag
- MAPFILES_FOR_ALL = Mapfile_PageAlign Mapfile_NoExData
-MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
-/* ExtraLoadFlags apply to all binaries - programs & libraries */
-# ifndef ExtraLoadFlags
-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
-# endif
-/* ExtraLoadOptions only apply to programs */
-# ifndef ExtraLoadOptions
-# define ExtraLoadOptions -B direct $(MAPFILES_FOR_PROGS)
-# endif
-#endif /* OSMajorVersion < 5 */
-
-/* 64-bit build support */
-#ifndef Solaris64bitSubdir
-# ifdef Sparc64Architecture
-# define Solaris64bitSubdir sparcv9
-# elif defined(AMD64Architecture)
-# define Solaris64bitSubdir amd64
-# endif
-#endif
-
-#ifdef Solaris64bitSubdir
-# define LibDirName Concat3(lib,/,Solaris64bitSubdir)
-#endif
-
-#if OSMajorVersion > 4
-# include <svr4.cf>
-#endif
-
-#ifndef ManKeywordsTarget
-# define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- catman -M $(DESTDIR)manpath -w
-#endif
-
-#if !defined(UsePamLibrary)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
-# define UsePamLibrary YES
-# endif
-#endif
-
-/* PAM appeared in SunOS 5.6 */
-#if !defined(HasPam)
-# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-# define HasPam YES
-# endif
-#endif
-
-#ifndef PamLibraries
-#define PamLibraries -lpam
-#endif
-
-#ifndef HasMotif
-/* Solaris's Motif depends on Solaris libX11 and won't work with libX11 built
- * from this tree, so only use it when using libX11 from outside the tree.
- */
-# define HasMotif (defined(UseInstalled) || UseInstalledX11)
-# define MotifDir /usr/dt
-#endif /* !HasMotif */
-#ifndef HasMotif2
-/* Solaris's Motif2 version is broken and misses XmPrintShell
- * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1366) */
-# define HasMotif2 NO
-#endif /* !HasMotif2 */
-
-#define MotifDefines \
- -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
-#define PamUnixDefines -DPAM_NIS
-#define TtLargePICTable YES
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-
-#define baseDtMailDefines \
- -DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
-#if !defined(i386Architecture) && !defined(AMD64Architecture)
-# define DtMailDefines baseDtMailDefines
-#else
-# define DtMailDefines -DBIG_ENDIAN baseDtMailDefines
-#endif
-
-#define ArchitectureDefines -DSUN_ARCHITECTURE
-
-#define TtClientExtraLibs ExtraLibraries -ldl -lintl
-
-#define ExportListGenSource elistgen.sun
-#define ShlibExportListOpt(filename) -M filename
-
-#define CdeProjectDefines \
- -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
- -D_XOPEN_SOURCE -D__EXTENSIONS__ \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-
-
-/*
- * Turn off HTML manpages like we do under NetBSD.
- */
-#ifndef BuildHtmlManPages
-#define BuildHtmlManPages NO
-#endif
-
-/*
- * Turn off seperate configuration directories.
- */
-#ifndef UseSeparateConfDir
-#define UseSeparateConfDir NO
-#endif
-
-/* Hackery for building modules as Solaris shared objects with dependencies */
-#if MakeDllModules && DoLoadableServer
-
-/* If you change this, you will need to change find-deps.pl to match */
-#define DlModuleDependencyName(module) Concat(module,_deps)
-
-#define DlModuleTarget(module,deplist,modlist) @@\
-DepDynamicModuleTarget(module,deplist DlModuleDependencyName(module),modlist LazyLoadFlag `cat DlModuleDependencyName(module)`) @@\
- @@\
-DlModuleDependencyName(module): @@\
- touch $@ @@\
- @@\
-clean:: @@\
- RemoveFile(DlModuleDependencyName(module))
-
-#define ObjectModuleTarget(module,objects) @@\
-DlModuleTarget(Concat(module,_drv.so), objects, objects)
-
-#define LibraryModuleTarget(module,objects) @@\
-NormalLibraryTarget(module, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), objects, objects)
-
-#define DepLibraryModuleTarget(module,deplist,objects) @@\
-NormalDepLibraryTarget(module, deplist, objects) @@\
-DlModuleTarget(Concat3(lib,module,.so), deplist, objects)
-
-#endif
diff --git a/nx-X11/config/cf/sunLib.rules b/nx-X11/config/cf/sunLib.rules
deleted file mode 100644
index 11256b2ad..000000000
--- a/nx-X11/config/cf/sunLib.rules
+++ /dev/null
@@ -1,133 +0,0 @@
-XCOMM $Xorg: sunLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * SunOS shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef -DSHAREDCODE
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DSUNSHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sunLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -assert pure-text
-#endif
-#ifndef PositionIndependentCFlags
-#if HasGcc2
-#define PositionIndependentCFlags -fPIC
-#else
-#define PositionIndependentCFlags -pic
-#endif
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#if HasGcc2ForCplusplus
-#define PositionIndependentCplusplusFlags -fPIC
-#else
-#define PositionIndependentCplusplusFlags -pic
-#endif
-#endif
-
-/*
- * SharedDSLibDependencies - shared library dependencies with data separation
- */
-#ifndef SharedDSLibDependencies
-#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest) @@\
-install:: Concat(lib,libname.sa.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
- RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
-#endif /* InstallSharedLibraryData */
-
-#if HasPurify
-#define PureCleanSharedLibrary(libname,rev) @@\
-clean clean.pure:: @@\
- $(RM) Concat3(lib,libname,_pure_*.so.rev)
-#else
-#define PureCleanSharedLibrary(libname,rev) /**/
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) @@\
- @@\
-PureCleanSharedLibrary(libname,rev)
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) @@\
- @@\
-PureCleanSharedLibrary(libname,rev)
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist) @@\
-AllTarget(Concat(lib,libname.sa.rev)) @@\
- @@\
-Concat(lib,libname.sa.rev): salist @@\
- $(RM) $@ @@\
- $(AR) $@ salist @@\
- RanLibrary($@) @@\
- LinkBuildLibrary($@) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.sa.rev)
-#endif /* SharedLibraryDataTarget */
diff --git a/nx-X11/config/cf/sunLib.tmpl b/nx-X11/config/cf/sunLib.tmpl
deleted file mode 100644
index 0eaaa9144..000000000
--- a/nx-X11/config/cf/sunLib.tmpl
+++ /dev/null
@@ -1,145 +0,0 @@
-XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/sunLib.tmpl,v 1.14 2005/12/03 17:20:48 alanc Exp $
-
-
-
-
-
-XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
-
-/*
- * SunOS shared library template
- */
-
-#if OSMajorVersion <= 4
-
-# if SunPost411FCSLd
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-# endif
-
-#ifndef SharedX11Rev
-#define SharedX11Rev 4.30
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.20
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.20
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.10
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.20
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.50
-#endif
-#ifndef SharedXiRev
-#define SharedXiRev 4.20
-#endif
-#ifndef SharedXtstRev
-#define SharedXtstRev 1.20
-#endif
-
-#else /* else it's Solaris */
-
-# if ThreadedX
-# if OSMinorVersion > 3
-# define SharedThreadReqs /**/
-# endif
-# endif
-
-# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
-# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
-# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
-# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
-# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
-# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
-# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
-# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
-# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
-# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
-# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
-# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
-# define SharedPSResReqs -lc
-# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
-# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
-# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
-# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
-# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
-# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXauReqs -lc
-# define SharedXdmcpReqs -lsocket -lc
-# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
-# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
-# define SharedXevieReqs $(LDPRELIB) $(XLIB)
-
-# define FixupLibReferences() /**/
-
-# define SharedPamReqs DlLibrary
-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtSearchReqs -lm -lc
-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
-
-# define DtClientExtraLibs -lintl
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
-
-# if HasCplusplus
-# if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
-# elif HasSunCplusplus
-# if CplusplusCompilerMajorVersion > 3
-# ifdef CplusplusWhatdir
-UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
-# else
-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
-# endif
-# else
-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
-# endif
-# endif
-# endif
-
-# define IafSysLib /**/
-# include <sv4Lib.tmpl>
-
-#endif
diff --git a/nx-X11/config/cf/sunLib.tmpl.NX.original b/nx-X11/config/cf/sunLib.tmpl.NX.original
deleted file mode 100644
index 0eaaa9144..000000000
--- a/nx-X11/config/cf/sunLib.tmpl.NX.original
+++ /dev/null
@@ -1,145 +0,0 @@
-XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/sunLib.tmpl,v 1.14 2005/12/03 17:20:48 alanc Exp $
-
-
-
-
-
-XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
-
-/*
- * SunOS shared library template
- */
-
-#if OSMajorVersion <= 4
-
-# if SunPost411FCSLd
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-# endif
-
-#ifndef SharedX11Rev
-#define SharedX11Rev 4.30
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.20
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.20
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.10
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.20
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.50
-#endif
-#ifndef SharedXiRev
-#define SharedXiRev 4.20
-#endif
-#ifndef SharedXtstRev
-#define SharedXtstRev 1.20
-#endif
-
-#else /* else it's Solaris */
-
-# if ThreadedX
-# if OSMinorVersion > 3
-# define SharedThreadReqs /**/
-# endif
-# endif
-
-# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
-# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
-# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
-# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
-# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
-# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
-# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
-# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
-# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
-# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
-# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
-# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
-# define SharedPSResReqs -lc
-# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
-# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
-# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
-# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
-# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
-# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXauReqs -lc
-# define SharedXdmcpReqs -lsocket -lc
-# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
-# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
-# define SharedXevieReqs $(LDPRELIB) $(XLIB)
-
-# define FixupLibReferences() /**/
-
-# define SharedPamReqs DlLibrary
-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtSearchReqs -lm -lc
-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
-
-# define DtClientExtraLibs -lintl
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
-
-# if HasCplusplus
-# if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
-# elif HasSunCplusplus
-# if CplusplusCompilerMajorVersion > 3
-# ifdef CplusplusWhatdir
-UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
-# else
-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
-# endif
-# else
-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
-# endif
-# endif
-# endif
-
-# define IafSysLib /**/
-# include <sv4Lib.tmpl>
-
-#endif
diff --git a/nx-X11/config/cf/sunLib.tmpl.X.original b/nx-X11/config/cf/sunLib.tmpl.X.original
deleted file mode 100644
index 3b4613ad4..000000000
--- a/nx-X11/config/cf/sunLib.tmpl.X.original
+++ /dev/null
@@ -1,258 +0,0 @@
-XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/sunLib.tmpl,v 1.14 2005/12/03 17:20:48 alanc Exp $
-
-
-
-
-
-XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
-
-/*
- * SunOS shared library template
- */
-
-#if OSMajorVersion <= 4
-
-# if SunPost411FCSLd
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-# endif
-
-#ifndef SharedX11Rev
-#define SharedX11Rev 4.30
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.20
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.20
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.10
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.20
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.50
-#endif
-#ifndef SharedXiRev
-#define SharedXiRev 4.20
-#endif
-#ifndef SharedXtstRev
-#define SharedXtstRev 1.20
-#endif
-
-#else /* else it's Solaris */
-
-/* Solaris uses single digit library versions, and versions of libraries
- * defined in SVID specs should match the versions specified there.
- */
-
-#ifndef SharedX11Rev
-# define SharedX11Rev 4
-#endif
-#ifndef SharedOldXRev
-# define SharedOldXRev 6
-#endif
-#ifndef SharedXextRev
-# define SharedXextRev 0
-#endif
-#ifndef SharedXauRev
-# define SharedXauRev 6
-#endif
-#ifndef SharedXdmcpRev
-# define SharedXdmcpRev 6
-#endif
-#ifndef SharedXmuRev
-# define SharedXmuRev 4
-#endif
-#ifndef SharedXmuuRev
-# define SharedXmuuRev 1
-#endif
-#ifndef SharedXpRev
-# define SharedXpRev 1
-#endif
-#ifndef SharedXpmRev
-# define SharedXpmRev 4
-#endif
-#ifndef SharedXtRev
-# define SharedXtRev 4
-#endif
-#ifndef SharedXaw6Rev
-# define SharedXaw6Rev 5
-#endif
-#ifndef SharedXiRev
-# define SharedXiRev 5
-#endif
-#ifndef SharedXtstRev
-# define SharedXtstRev 1
-#endif
-#ifndef SharedFSRev
-# define SharedFSRev 5
-#endif
-#ifndef SharedICERev
-# define SharedICERev 6
-#endif
-#ifndef SharedSMRev
-# define SharedSMRev 6
-#endif
-#ifndef SharedXcursor
-# define SharedXcursorRev 1
-#endif
-#ifndef SharedXdamageRev
-# define SharedXdamageRev 1
-#endif
-#ifndef SharedXevieRev
-# define SharedXevieRev 1
-#endif
-#ifndef SharedXfixesRev
-# define SharedXfixesRev 1
-#endif
-#ifndef SharedXftRev
-# define SharedXftRev 2
-#endif
-#ifndef SharedXineramaRev
-# define SharedXineramaRev 1
-#endif
-#ifndef SharedXrenderRev
-# define SharedXrenderRev 1
-#endif
-#ifndef SharedXResRev
-# define SharedXResRev 1
-#endif
-#ifndef SharedXvRev
-# define SharedXvRev 1
-#endif
-#ifndef SharedXvMCRev
-# define SharedXvMCRev 1
-#endif
-#ifndef SharedXrandrRev
-# define SharedXrandrRev 2
-#endif
-#ifndef SharedXssRev
-# define SharedXssRev 1
-#endif
-#ifndef SharedFontconfigRev
-# define SharedFontconfigRev 1
-#endif
-#ifndef SharedGlxRev
-# define SharedGlxRev 1
-#endif
-#ifndef SharedGluRev
-# define SharedGluRev 1
-#endif
-#ifndef SharedGLwRev
-# define SharedGLwRev 1
-#endif
-#ifndef SharedOSMesaRev
-# define SharedOSMesaRev 4
-#endif
-#ifndef SharedxkbfileRev
-# define SharedxkbfileRev 5
-#endif
-#ifndef SharedXxf86miscRev
-# define SharedXxf86miscRev 1
-#endif
-#ifndef SharedXxf86vmRev
-# define SharedXxf86vmRev 1
-#endif
-
-# if ThreadedX
-# if OSMinorVersion > 3
-# define SharedThreadReqs /**/
-# endif
-# endif
-
-# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
-# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
-# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
-# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
-# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
-# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
-# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
-# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
-# define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
-# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
-# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
-# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
-# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
-# define SharedPSResReqs -lc
-# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
-# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
-# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
-# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
-# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
-# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
-# define SharedXauReqs -lc
-# define SharedXdmcpReqs -lsocket -lc
-# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
-# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
-# define SharedXevieReqs $(LDPRELIB) $(XLIB)
-
-# define FixupLibReferences() /**/
-
-# define SharedPamReqs DlLibrary
-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
-# define SharedDtSearchReqs -lm -lc
-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
-
-# define DtClientExtraLibs -lintl
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
-
-# if HasCplusplus
-# if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
-# elif HasSunCplusplus
-# if CplusplusCompilerMajorVersion > 3
-# ifdef CplusplusWhatdir
-UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
-# else
-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
-# endif
-# else
-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
-# endif
-# endif
-# endif
-
-# define IafSysLib /**/
-# include <sv4Lib.tmpl>
-
-#endif
diff --git a/nx-X11/config/cf/sv3Lib.rules b/nx-X11/config/cf/sv3Lib.rules
deleted file mode 100644
index 00c1d7d3d..000000000
--- a/nx-X11/config/cf/sv3Lib.rules
+++ /dev/null
@@ -1,252 +0,0 @@
-XCOMM $Xorg: sv3Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.5 2002/11/22 22:55:56 tsi Exp $
-/*
- * SVR3 shared library rules
- * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
- * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
- * Conception derived partially from work of Thomas Roell
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries NO /* JUST FOR NOW */
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef SharedLibSM
-#define SharedLibSM HasSharedLibraries
-#endif
-#ifndef SharedLibXau
-#define SharedLibXau HasSharedLibraries
-#endif
-#ifndef SharedLibXdmcp
-#define SharedLibXdmcp HasSharedLibraries
-#endif
-#ifndef SharedLibXi
-#define SharedLibXi HasSharedLibraries
-#endif
-#ifndef SharedLibXtst
-#define SharedLibXtst HasSharedLibraries
-#endif
-#ifndef SharedLibICE
-#define SharedLibICE HasSharedLibraries
-#endif
-#ifndef SharedLibFS
-#define SharedLibFS HasSharedLibraries
-#endif
-#ifndef SharedLibX11
-#define SharedLibX11 HasSharedLibraries
-#endif
-#ifndef SharedOldX
-#define SharedOldX NO /* it's obsolete */
-#endif
-#ifndef SharedLibXt
-#define SharedLibXt HasSharedLibraries
-#endif
-#ifndef SharedLibXaw
-#define SharedLibXaw HasSharedLibraries
-#endif
-#ifndef SharedLibXmu
-#define SharedLibXmu HasSharedLibraries
-#endif
-#ifndef SharedLibXext
-#define SharedLibXext HasSharedLibraries
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DSVR3SHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sv3Lib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -q
-#endif
-
-#ifndef PositionIndependentCFlags
-# if HasGcc2
-# define PositionIndependentCFlags -msvr3-shlib
-# else
-# define PositionIndependentCFlags /**/
-# endif
-#endif
-
-#ifndef PositionIndependentCplusplusFlags
-# if HasGcc2
-# define PositionIndependentCplusplusFlags -msvr3-shlib
-# else
-# define PositionIndependentCplusplusFlags /**/
-# endif
-#endif
-
-#ifndef StripInstalledPrograms
-# define StripInstalledPrograms NO
-#endif
-
-#if 0
-/*
- * LibCleanDir - helper for cleaning library object subdirectories
- */
-#ifndef LibCleanDir
-#define LibCleanDir(dir) -@if [ -d dir ]; then \ @@\
- (set -x; cd dir; $(RM) *.o *.sd); else exit 0; fi
-#endif
-
-/*
- * SharedLibObjCompile - compile fragment for shared objects
- */
-#ifndef SharedLibObjCompile
-#define SharedLibObjCompile(options) $(RM) shared/$@ @@\
- cat import.h $*.c >_$*.c @@\
- $(CC) -c $(ANSICCOPTIONS) $(CCOPTIONS) $(ALLDEFINES) options \ @@\
-$(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) \@@\
-_$*.c @@\
- $(MV) _$*.o shared/$@ @@\
- $(RM) _$*.c
-#endif
-
-/*
- * NormalSharedLibObjCompile - compile fragment for shared object when
- * a normal library is not being built
- */
-#ifndef NormalSharedLibObjCompile
-#define NormalSharedLibObjCompile(options) $(RM) $@ @@\
- cat import.h $*.c >_$*.c @@\
- $(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) _$*.c @@\
- $(MV) _$*.o $@ @@\
- $(RM) _$*.c
-#endif
-
-
-#ifndef LibraryObjectRule
-#define LibraryObjectRule() @@\
-all:: @@\
- _DebuggedLibMkdir() @@\
- _ProfiledLibMkdir() @@\
- _SharedLibMkdir() @@\
- @@\
-includes:: @@\
- _DebuggedLibMkdir() @@\
- _ProfiledLibMkdir() @@\
- _SharedLibMkdir() @@\
- @@\
-.c.o: @@\
- _DebuggedObjCompile($(_NOOP_)) @@\
- _ProfiledObjCompile($(_NOOP_)) @@\
- _SharedObjCompile($(_NOOP_)) @@\
- _NormalObjCompile($(_NOOP_)) @@\
- @@\
-.SUFFIXES: .sd @@\
-.c.sd: @@\
- _SharedDatCompile(-DSVR3SHDAT) @@\
- @@\
-clean:: @@\
- _DebuggedCleanDir() @@\
- _ProfiledCleanDir() @@\
- _SharedCleanDir() @@\
-
-#endif /* LibraryObjectRule */
-
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#if StripInstalledPrograms
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
- MakeDir($(DESTDIR)$(LIBDIR)/shlib) @@\
- $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \ @@\
- $(DESTDIR)$(LIBDIR)/shlib @@\
- strip Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev) @@\
- mcs -d Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev)
-#else
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
- MakeDir($(DESTDIR)$(LIBDIR)/shlib) @@\
- $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \ @@\
- $(DESTDIR)$(LIBDIR)/shlib
-#endif
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.rev)) @@\
- @@\
-Concat(lib,libname.rev): solist @@\
- $(RM) $@ Concat3(lib,libname,_s.a) @@\
- $(CPP) -DDOWN=down ConnectionFlags ShlibDefines Concat(lib,libname.def) | \ @@\
- sed -e '/^# *[0-9][0-9]* *.*$$/d; /^$$/d' >spec.cpp @@\
- sed -e '1,/#libraries/d; /#externals/,$$d' spec.cpp | \ @@\
- nawk '{ system("ar x " $$1 " " $$2 )}' @@\
- echo "#target " Concat($(LIBDIR)/shlib/lib,libname.rev) >spec @@\
- sed -e '/#libraries/,$$d' spec.cpp >>spec @@\
- mkshlib -s spec -t $@ -h Concat3(lib,libname,_s.a) $(SHLIBLDFLAGS) @@\
- ar rulv Concat3(lib,libname,_s.a) `sed -e '1,/#externals/d' spec.cpp` @@\
- $(RM) spec.cpp spec @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.rev) Concat3(lib,libname,_s.a)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.rev)) @@\
- @@\
-Concat(lib,libname.rev): deplist @@\
- $(RM) $@ Concat3(lib,libname,_s.a) @@\
- $(CPP) -DDOWN=down ConnectionFlags ShlibDefines Concat(lib,libname.def) | \ @@\
- sed -e '/^# *[0-9][0-9]* *.*$$/d; /^$$/d' >spec.cpp @@\
- sed -e '1,/#libraries/d; /#externals/,$$d' spec.cpp | \ @@\
- nawk '{ system("ar x " $$1 " " $$2 )}' @@\
- echo "#target " Concat($(LIBDIR)/shlib/lib,libname.rev) >spec @@\
- sed -e '/#libraries/,$$d' spec.cpp >>spec @@\
- mkshlib -s spec -t $@ -h Concat3(lib,libname,_s.a) $(SHLIBLDFLAGS) @@\
- ar rulv Concat3(lib,libname,_s.a) `sed -e '1,/#externals/d' spec.cpp` @@\
- $(RM) spec.cpp spec @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.rev) Concat3(lib,libname,_s.a)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#endif
diff --git a/nx-X11/config/cf/sv3Lib.tmpl b/nx-X11/config/cf/sv3Lib.tmpl
deleted file mode 100644
index c9fd32331..000000000
--- a/nx-X11/config/cf/sv3Lib.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-XCOMM $Xorg: sv3Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $
-/*
- * SVR3 shared library template
- * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
- * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
- * Conception derived partially from work of Thomas Roell
- */
-
-#ifndef SharedXlibRev
-#define SharedXlibRev 6.0.0
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 6.0
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 6.0
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.0
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 6.0
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 6.0
-#endif
-#ifndef SharedXinputRev
-#define SharedXinputRev 6.0
-#endif
-
- SHLIBLDFLAGS = SharedLibraryLoadFlags
- PICFLAGS = PositionIndependentCFlags
-
-/*
- * and now a little bit of magic for using imake without source tree; if we
- * are using shared libraries, we really do not need to depend on anything
- */
-#if SharedLibXext
- DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a)
- EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB))
-#endif
-#if SharedLibX
- DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a)
- XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a)
-#endif
-#if SharedLibXmu
- DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a)
- XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB))
-#endif
-#if SharedOldLibX
- DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a)
- OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB))
-#endif
-#if SharedLibXt
- DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a)
- XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB))
-#endif
-#if SharedLibXaw
- DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a)
- XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB))
-#endif
-#if SharedLibXinput
- DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a)
- XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB))
-#endif
-
diff --git a/nx-X11/config/cf/sv4Lib.rules b/nx-X11/config/cf/sv4Lib.rules
deleted file mode 100644
index e027fdbee..000000000
--- a/nx-X11/config/cf/sv4Lib.rules
+++ /dev/null
@@ -1,206 +0,0 @@
-XCOMM $Xorg: sv4Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * SVR4 shared library rules
- */
-
-XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.8tsi Exp $
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus HasGcc2
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <sv4Lib.tmpl>
-#endif
-#ifndef SharedLibraryLdCmd
-# define SharedLibraryLdCmd $(LD)
-#endif
-#ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -G -z text
-#endif
-#ifndef RpathLoadFlags
-#define RpathLoadFlags /**/
-#endif
-#ifndef LibraryRpathLoadFlags
-#define LibraryRpathLoadFlags RpathLoadFlags
-#endif
-#ifndef HardCodeLibdirFlag
-#define HardCodeLibdirFlag RpathLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-# if HasGcc2
-# define PositionIndependentCFlags -fPIC
-# else
-# define PositionIndependentCFlags -K PIC
-# endif
-#endif
-#ifndef PositionIndependentCplusplusFlags
-# if HasGcc2ForCplusplus
-# define PositionIndependentCplusplusFlags -fPIC
-# else
-# define PositionIndependentCplusplusFlags -K PIC
-# endif
-#endif
-#ifndef UseExportLists
-# define UseExportLists NO
-#endif
-#ifndef StripInstalledPrograms
-# define StripInstalledPrograms NO
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#if StripInstalledPrograms
-# define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- mcs -d Concat($(DESTDIR)dest/lib,libname.so.rev) @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- cd $(DESTDIR)dest; \ @@\
- $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)); fi
-#else
-# define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
- cd $(DESTDIR)dest; \ @@\
- $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)); fi
-#endif
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef LinkWithExports
-# if UseExportLists
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\
- if [ -f Concat(lib,libname.elist) ]; then \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\
- $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\
- (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\
- $(RM) down/$@.exports $@.list; \ @@\
- fi;
-# else
-# define LinkWithExports(libname,rev,solist,down,up) \
- (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
-# endif
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- LinkWithExports(libname,rev,solist,down,up) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedDepLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- LinkWithExports(libname,rev,solist,down,up) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedDepLibraryTarget */
-
-/*
- * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
- */
-#ifndef SharedDepCplusplusLibraryTarget
-#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @if $(SOSYMLINK); then (set -x; \ @@\
- $(RM) Concat(lib,libname.so); \ @@\
- $(LN) $@ Concat(lib,libname.so)); fi @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev)
-#endif /* SharedDepCplusplusLibraryTarget */
-
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist) @@\
-AllTarget(name) @@\
- @@\
-name: deps @@\
- $(RM) $@~ @@\
- SharedLibraryLdCmd -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- @@\
-clean:: @@\
- $(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
diff --git a/nx-X11/config/cf/sv4Lib.tmpl b/nx-X11/config/cf/sv4Lib.tmpl
deleted file mode 100644
index d209e83ff..000000000
--- a/nx-X11/config/cf/sv4Lib.tmpl
+++ /dev/null
@@ -1,89 +0,0 @@
-XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*
- * SVR4 shared library template
- */
-
-XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $
-
-/* SVR4 shared libraries are deficient in link semantics */
-XMULIBONLY = -lXmu
-#ifndef FixupLibReferences
-# define FixupLibReferences() @@\
-XMULIB = $(XMULIBONLY) -z nodefs
-#endif
-#ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-#if 0
-/* This causes problems on SVR4.0 */
-#ifndef SharedICEReqs
-# define SharedICEReqs -lsocket
-#endif
-#endif
-
-#if ThreadedX
-# ifndef SharedThreadReqs
-# define SharedThreadReqs -lthread
-# endif
-# ifndef SharedX11Reqs
-# define SharedX11Reqs -lthread
-# endif
-#else
-# ifndef SharedThreadReqs
-# define SharedThreadReqs
-# endif
-#endif
-
-#ifndef SharedXReqs
-# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
-#endif
-
-#ifndef SharedXlibi18nReqs
-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
-#endif
-
-#ifndef SharedXmReqs
-# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedMrmReqs
-# define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedUilReqs
-# define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedDtSvcReqs
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef SharedDtMmdbReqs
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef SharedDtHelpReqs
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef DtClientExtraLibs
-# define DtClientExtraLibs -lresolv
-#endif
-
-REGEXSYSLIB = -lgen
-DYNLIBSYSLIB = -ldl
-
-#ifndef IafSysLib
-# define IafSysLib -liaf
-#endif
-IAFSYSLIB = IafSysLib
-
-#ifndef SharedGLUReqs
-# if HasGcc2ForCplusplus
-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB)
-# else
-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB)
-# endif
-#endif
diff --git a/nx-X11/config/cf/svr3.cf b/nx-X11/config/cf/svr3.cf
deleted file mode 100644
index 88ee4faab..000000000
--- a/nx-X11/config/cf/svr3.cf
+++ /dev/null
@@ -1,348 +0,0 @@
-XCOMM $Xorg: svr3.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.15 2002/08/19 03:16:31 tsi Exp $
-
-#ifndef HasGcc
-#define HasGcc YES
-#endif
-#ifndef HasGcc2
-#define HasGcc2 YES
-#endif
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef GccUsesGas
-#define GccUsesGas NO
-#endif
-#ifndef UseGas
-#define UseGas NO
-#endif
-#ifndef GnuCpp
-#define GnuCpp NO
-#endif
-
-#ifndef Gcc2MOption
-# if HasGcc2
-# define Gcc2MOption /* */
-# else
-# define Gcc2MOption /* */
-# endif
-#endif
-
-#ifndef HasShadowPasswd
-# define HasShadowPasswd YES
-#endif
-
-#ifndef HasLibCrypt
-# define HasLibCrypt NO
-#endif
-
-#ifndef HasSVR3mmapDrv
-# define HasSVR3mmapDrv NO
-#endif
-
-#if HasSVR3mmapDrv
-# define SVR3mmapFlags -DHAS_SVR3_MMAPDRV
-#else
-# define SVR3mmapFlags /**/
-#endif
-
-#ifndef HasSockets
-# define HasSockets YES
-#endif
-
-#ifndef XmanSearchPath
-#define XmanSearchPath /usr/man
-#endif
-
-/*
- * Most SVR3 do not have symbolic links, only some of the newer ones
- */
-#ifndef HasSymLinks
-# define HasSymLinks NO
-#endif
-
-#ifndef MotifBC
-# define MotifBC YES
-#endif
-
-#ifndef CompressAllFonts
-# define CompressAllFonts YES
-#endif
-
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define OSName UNIX System V/386 Release 3
-#else
-#define OSName UNIX System V Release 3
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 3.0.0 which should be
- * the least common denominator of all SVR3
- */
-
-#ifndef OSMajorVersion
-#define OSMajorVersion 3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 0
-#endif
-#ifndef BootstrapCFlags
-#ifdef SYSV386
-#define BootstrapCFlags -DSYSV -DSYSV386
-#else
-#define BootstrapCFlags -DSYSV
-#endif
-#endif
-
-/* Some stuff that all SYSV's should have */
-
-#define SystemV YES
-
-#ifndef NeedBerklib
-#define NeedBerklib YES
-#endif
-#ifndef HasPoll
-#define HasPoll YES
-#endif
-#ifndef SVR3Architecture
-#define SVR3Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp YES
-#endif
-
-#ifndef StandardDefines
-#ifdef i386Architecture
-#define StandardDefines -DSYSV OSDefines -Di386
-#else
-#define StandardDefines -DSYSV OSDefines
-#endif
-#endif
-
-#ifndef ServerOSDefines
-# ifdef i386Architecture
-# define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-# else
-# define ServerOSDefines -DDDXTIME
-# endif
-#endif
-
-#ifndef XawI18nDefines
-# define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-
-#ifndef DefaultCDebugFlags
-# if HasGcc2
-# if defined(i386Architecture)
-# define DefaultCDebugFlags DefaultGcc2i386Opt
-# else
-# define DefaultCDebugFlags -O2
-# endif
-# else
-# define DefaultCDebugFlags -O
-# endif
-#endif
-
-#ifndef LdCombineFlags
-#define LdCombineFlags -r
-#endif
-
-#if HasGcc
-# if HasGcc2
-# define DefaultCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return \
- -fwritable-strings
-# define LibraryCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return
-# if defined(i386Architecture)
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
-# else
-# define DefaultCCOptions -DNO_ASM -fpcc-struct-return -fwritable-strings
-# define LibraryCCOptions -DNO_ASM -fpcc-struct-return
-# define OptimizedCDebugFlags -O -fstrength-reduce
-# endif
-# define ShlibDefines -D__GNUC__ $(XDMAUTHDEFS)
-#else
-# define ShlibDefines $(XDMAUTHDEFS)
-#endif
-
-#ifndef Malloc0ReturnsNull
-#define Malloc0ReturnsNull YES
-#endif
-
-#ifndef SocketLibraries
-# define SocketLibraries /**/
-#endif
-#ifndef LocalLibraries
-# define LocalLibraries /**/
-#endif
-#ifndef ExtraLibraries
-# if HasSockets
-# define ExtraLibraries SocketLibraries LocalLibraries
-# else
-# define ExtraLibraries LocalLibraries
-# endif
-#endif
-
-#if RemoveDSDENroffMacros
-# define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d'
-#else
-# define RemoveDSDENroffMacrosCmd cat
-#endif
-
-#ifndef ConnectionFlags
-# define ConnectionFlags -DLOCALCONN -DTCPCONN
-#endif
-
-#ifndef FormattedManPages
-# define FormattedManPages YES
-#endif
-
-#ifndef ManSuffix
-# define ManSuffix 1x
-# define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix 3x
-# define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix 4
-#endif
-
-/*
- * Compress manual pages, default on ISC and SCO
- */
-#ifndef CompressManPages
-# define CompressManPages YES
-#endif
-
-/*
- * The .DS and .DE macros used in some manual pages are obsolete
- * in the often used ISC's Textprocessing Workbench 2.1.0 and break it,
- * so it's better to remove these previously
- */
-#ifndef RemoveDSDENroffMacros
-# define RemoveDSDENroffMacros NO
-#endif
-
-#if RemoveDSDENroffMacros
-# define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d'
-#else
-# define RemoveDSDENroffMacrosCmd cat
-#endif
-
-#ifndef CompressManCmd
-# define CompressManCmd @true
-#endif
-
- RMDSDEMACCMD = RemoveDSDENroffMacrosCmd
- COMPRESSMANCMD = CompressManCmd
-
-#if FormattedManPages
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest) @@\
-BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
- @@\
-install.man:: file.man @@\
- MakeDir($(DESTDIR)destdir) @@\
- $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\
- $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
- -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
- $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
-BuildInstallHtmlManPage(file,dest,suffix) @@\
- @@\
-install.man:: file.man @@\
- MakeDir($(DESTDIR)destdir) @@\
- $(RM) $(DESTDIR)destdir/dest.suffix* @@\
- $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\
- -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix @@\
- $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest) @@\
-install.man:: list @@\
- MakeDir($(DESTDIR)dest) @@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in list; do \ @@\
- (MNAME=`echo $$i | cut -f1 -d.`; \ @@\
- set -x; \ @@\
- $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\
- $(RMDSDEMACCMD) $$i | neqn | nroff -man >/tmp/$$i; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
- $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
- $(RM) /tmp/$$i); \ @@\
- done
-#endif
-
-/*
- * InstallManPageAliases - generate rules to install manual page aliases.
- * (Make hard links on SVR3.)
- */
-#ifndef InstallManPageAliasesBase
-#define InstallManPageAliasesBase(file,destdir,aliases) @@\
-
-install.man:: @@\
- @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\
- for i in aliases; do (set -x; \ @@\
- $(RM) $(DESTDIR)destdir/$$i.*; \ @@\
- (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
- $$i.$${SUFFIX})); \ @@\
- done)
-#endif
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-#endif
-
-#ifndef InstallGenManPageAliases
-#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
-InstallHtmlManPageAliases(file,aliases,suffix) @@\
- @@\
-InstallManPageAliasesBase(file,destdir,aliases)
-#endif
-
-#endif /* FormattedManPages */
-
-/* If you have trouble with make bombing out in Xlib, try uncommenting this. */
-/* You will not get dependencies as a result, but better than nothing. */
-#ifndef MakeHashTableBug
-#define MakeHashTableBug NO
-#endif
-
-#if MakeHashTableBug
-#define DependTarget3(srcs1,srcs2,srcs3)
-#endif
-
-#include <sv3Lib.rules>
-
-#ifdef i386Architecture
-#include <xorg.cf>
-#endif
-
diff --git a/nx-X11/config/cf/svr4.cf b/nx-X11/config/cf/svr4.cf
deleted file mode 100644
index 8567b6caf..000000000
--- a/nx-X11/config/cf/svr4.cf
+++ /dev/null
@@ -1,295 +0,0 @@
-XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define OSName UNIX System V/386 Release 4
-#else
-#define OSName UNIX System V Release 4
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 4.0.0 which should be
- * the least common denominator of all SVR4
- */
-
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 0
-#endif
-#ifndef BootstrapCFlags
-#ifdef i386Architecture
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#ifdef SYSV386
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#define BootstrapCFlags -DSVR4
-#endif
-#endif
-#endif
-
-/* Some stuff that all SVR4s should have */
-
-#ifndef SystemV4
-#define SystemV4 YES
-#endif
-#ifndef HasLdRunPath
-#define HasLdRunPath YES
-#endif
-/*
- * Currently the NX transport only works with select().
- *
-#define HasPoll YES
- */
-#define HasPoll NO
-#ifndef SVR4Architecture
-#define SVR4Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp YES
-#endif
-#define Malloc0ReturnsNull YES /* in case -lmalloc used */
-
-/*
- * Here are the default paths to use to pick up tools for building.
- */
-#ifndef ArCmdBase
-#define ArCmdBase /usr/ccs/bin/ar
-#endif
-#ifndef AsCmd
-#define AsCmd /usr/ccs/bin/as
-#endif
-#ifndef CppCmd
-#define CppCmd /usr/ccs/lib/cpp
-#endif
-#ifndef RawCppCmd
-#if !defined(SunArchitecture)
-#define RawCppCmd CppCmd -Uunix -Ui386
-#endif
-#endif
-#ifndef LdCmd
-#define LdCmd /usr/ccs/bin/ld
-#endif
-#ifndef LexCmd
-#define LexCmd /usr/ccs/bin/lex
-#endif
-#ifndef MakeCmd
-#define MakeCmd /usr/ccs/bin/make
-#endif
-#ifndef YaccCmd
-#define YaccCmd /usr/ccs/bin/yacc
-#endif
-#ifndef MkdirHierCmd
-#define MkdirHierCmd mkdir -p
-#endif
-
-/*
- * Add the s option to ArCmd and ArAddCmd so that empty archives can be created
- */
-#ifndef ArCmd
-#define ArCmd ArCmdBase cqs
-#endif
-#ifndef ArAddCmd
-#define ArAddCmd ArCmdBase rus
-#endif
-
-/* Libtool on SVR4 uses minor numbers */
-#ifndef LibtoolMinorVersions
-#define LibtoolMinorVersions YES
-#endif
-
-#ifndef SunArchitecture
-/*
- * These come from usl.cf, and at least some are required by other
- * SVR4 versions
- */
-#ifndef UseLocalRegex
-#define UseLocalRegex YES
-#endif
-#ifndef XmDefines
-#define XmDefines \
- -DNO_REGCOMP -DNEED_STRCASECMP \
- -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#endif
-#ifndef DtSvcDefines
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#endif
-#ifndef DtSearchDefines
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#endif
-#ifndef DtWidgetDefines
-#define DtWidgetDefines DtSearchDefines
-#endif
-#ifndef DtPrintDefines
-#define DtPrintDefines DtSearchDefines
-#endif
-#ifndef HasStrcasecmp
-#define HasStrcasecmp NO
-#endif
-#endif
-
-/* SVR4 (including Solaris) doesn't have setenv() and unsetenv() */
-#ifndef HasSetenv
-#define HasSetenv NO
-#endif
-
-#ifndef SunArchitecture
-#if (OSMinorVersion == 0)
-#ifndef XawI18nDefines
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-#ifndef UseSmartScheduler
-#define UseSmartScheduler NO
-#endif
-#endif
-#ifdef i386Architecture
-#ifndef HasPosixRegex
-#define HasPosixRegex NO
-#endif
-#endif
-#ifndef LogDirectory
-#define LogDirectory $(VARDIR)/adm
-#endif
-#endif
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasPerl
-#define HasPerl NO
-#endif
-
-#ifdef i386Architecture
-#ifndef SunArchitecture
-#if (OSMinorVersion > 2) || ((OSMinorVersion == 2) && (OSTeenyVersion >= 2))
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -DSVR42MP -Di386
-#endif
-#ifndef HasParallelMake
-#define HasParallelMake YES
-#endif
-#if HasParallelMake
-#define TopParallelDefines -P -B
-#define MutexDirective .MUTEX
-#endif
-#else /* SVR4 < 4.2.2 */
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -Di386
-#endif
-#endif
-#endif
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions -intelabi -earlyR6bc
-#endif
-#ifndef DefaultCCOptions
-#if !HasGcc
-#define DefaultCCOptions -Xa -Dasm=__asm
-#endif
-#endif
-#ifndef DefaultCDebugFlags
-#if HasGcc
-#if HasGcc2
-#ifndef CcCmd
-#define CcCmd gcc
-#endif
-#define DefaultCDebugFlags DefaultGcc2i386Opt
-#else
-#define DefaultCDebugFlags -O2
-#endif
-#else
-#define DefaultCDebugFlags -O
-#endif
-#endif
-#ifndef ServerOSDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#endif
-#endif
-
-/*
- * The TLI interface is more robust on most SVR4s, so it will be the default.
- */
-#if !defined(SunArchitecture)
-#ifndef ConnectionFlags
-#define ConnectionFlags -DSTREAMSCONN -DUNIXCONN -DLOCALCONN
-#endif
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix 1x
-#define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix 3x
-#define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-#define FileManSuffix 4
-#endif
-
-#ifndef StaticLibrary
-#if !HasGcc
-#define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
-#endif
-#endif
-
-#ifndef SharedLibXdmGreet
-#define SharedLibXdmGreet HasSharedLibraries
-#endif
-
-/*
- * At this point, an XFree86 port to Sparc/SunOS cannot be officially supported
- * because the system I am using to develop this is just a loaner from Sun.
- */
-#if defined(i386Architecture) || defined(AMD64Architecture) || \
- defined(PpcArchitecture) || \
- (defined(SparcArchitecture) && \
- defined(SunArchitecture) && \
- (!defined(XorgServer) || (XorgServer)))
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#include <xorg.cf>
-#endif
-
-#ifndef DoLoadableServer
-# define DoLoadableServer NO
-#endif
-#ifndef GccWarningOptions
-# define GccWarningOptions /* */
-#endif
-#ifndef XFree86ServerDefines
-# define XFree86ServerDefines /* */
-#endif
-#ifndef XFree86ServerOSDefines
-# define XFree86ServerOSDefines -DDDXOSINIT -DDDXOSFATALERROR -DDDXOSVERRORF
-#endif
-
-#if HasGcc2ForCplusplus
-# ifndef CplusplusLibCDir
-# define CplusplusLibCDir /usr/local/lib
-# endif
-#endif
-
-#include <sv4Lib.rules>
diff --git a/nx-X11/config/cf/svr4.cf.NX.original b/nx-X11/config/cf/svr4.cf.NX.original
deleted file mode 100644
index 8567b6caf..000000000
--- a/nx-X11/config/cf/svr4.cf.NX.original
+++ /dev/null
@@ -1,295 +0,0 @@
-XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define OSName UNIX System V/386 Release 4
-#else
-#define OSName UNIX System V Release 4
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 4.0.0 which should be
- * the least common denominator of all SVR4
- */
-
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 0
-#endif
-#ifndef BootstrapCFlags
-#ifdef i386Architecture
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#ifdef SYSV386
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#define BootstrapCFlags -DSVR4
-#endif
-#endif
-#endif
-
-/* Some stuff that all SVR4s should have */
-
-#ifndef SystemV4
-#define SystemV4 YES
-#endif
-#ifndef HasLdRunPath
-#define HasLdRunPath YES
-#endif
-/*
- * Currently the NX transport only works with select().
- *
-#define HasPoll YES
- */
-#define HasPoll NO
-#ifndef SVR4Architecture
-#define SVR4Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp YES
-#endif
-#define Malloc0ReturnsNull YES /* in case -lmalloc used */
-
-/*
- * Here are the default paths to use to pick up tools for building.
- */
-#ifndef ArCmdBase
-#define ArCmdBase /usr/ccs/bin/ar
-#endif
-#ifndef AsCmd
-#define AsCmd /usr/ccs/bin/as
-#endif
-#ifndef CppCmd
-#define CppCmd /usr/ccs/lib/cpp
-#endif
-#ifndef RawCppCmd
-#if !defined(SunArchitecture)
-#define RawCppCmd CppCmd -Uunix -Ui386
-#endif
-#endif
-#ifndef LdCmd
-#define LdCmd /usr/ccs/bin/ld
-#endif
-#ifndef LexCmd
-#define LexCmd /usr/ccs/bin/lex
-#endif
-#ifndef MakeCmd
-#define MakeCmd /usr/ccs/bin/make
-#endif
-#ifndef YaccCmd
-#define YaccCmd /usr/ccs/bin/yacc
-#endif
-#ifndef MkdirHierCmd
-#define MkdirHierCmd mkdir -p
-#endif
-
-/*
- * Add the s option to ArCmd and ArAddCmd so that empty archives can be created
- */
-#ifndef ArCmd
-#define ArCmd ArCmdBase cqs
-#endif
-#ifndef ArAddCmd
-#define ArAddCmd ArCmdBase rus
-#endif
-
-/* Libtool on SVR4 uses minor numbers */
-#ifndef LibtoolMinorVersions
-#define LibtoolMinorVersions YES
-#endif
-
-#ifndef SunArchitecture
-/*
- * These come from usl.cf, and at least some are required by other
- * SVR4 versions
- */
-#ifndef UseLocalRegex
-#define UseLocalRegex YES
-#endif
-#ifndef XmDefines
-#define XmDefines \
- -DNO_REGCOMP -DNEED_STRCASECMP \
- -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#endif
-#ifndef DtSvcDefines
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#endif
-#ifndef DtSearchDefines
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#endif
-#ifndef DtWidgetDefines
-#define DtWidgetDefines DtSearchDefines
-#endif
-#ifndef DtPrintDefines
-#define DtPrintDefines DtSearchDefines
-#endif
-#ifndef HasStrcasecmp
-#define HasStrcasecmp NO
-#endif
-#endif
-
-/* SVR4 (including Solaris) doesn't have setenv() and unsetenv() */
-#ifndef HasSetenv
-#define HasSetenv NO
-#endif
-
-#ifndef SunArchitecture
-#if (OSMinorVersion == 0)
-#ifndef XawI18nDefines
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-#ifndef UseSmartScheduler
-#define UseSmartScheduler NO
-#endif
-#endif
-#ifdef i386Architecture
-#ifndef HasPosixRegex
-#define HasPosixRegex NO
-#endif
-#endif
-#ifndef LogDirectory
-#define LogDirectory $(VARDIR)/adm
-#endif
-#endif
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasPerl
-#define HasPerl NO
-#endif
-
-#ifdef i386Architecture
-#ifndef SunArchitecture
-#if (OSMinorVersion > 2) || ((OSMinorVersion == 2) && (OSTeenyVersion >= 2))
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -DSVR42MP -Di386
-#endif
-#ifndef HasParallelMake
-#define HasParallelMake YES
-#endif
-#if HasParallelMake
-#define TopParallelDefines -P -B
-#define MutexDirective .MUTEX
-#endif
-#else /* SVR4 < 4.2.2 */
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -Di386
-#endif
-#endif
-#endif
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions -intelabi -earlyR6bc
-#endif
-#ifndef DefaultCCOptions
-#if !HasGcc
-#define DefaultCCOptions -Xa -Dasm=__asm
-#endif
-#endif
-#ifndef DefaultCDebugFlags
-#if HasGcc
-#if HasGcc2
-#ifndef CcCmd
-#define CcCmd gcc
-#endif
-#define DefaultCDebugFlags DefaultGcc2i386Opt
-#else
-#define DefaultCDebugFlags -O2
-#endif
-#else
-#define DefaultCDebugFlags -O
-#endif
-#endif
-#ifndef ServerOSDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#endif
-#endif
-
-/*
- * The TLI interface is more robust on most SVR4s, so it will be the default.
- */
-#if !defined(SunArchitecture)
-#ifndef ConnectionFlags
-#define ConnectionFlags -DSTREAMSCONN -DUNIXCONN -DLOCALCONN
-#endif
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix 1x
-#define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix 3x
-#define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-#define FileManSuffix 4
-#endif
-
-#ifndef StaticLibrary
-#if !HasGcc
-#define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
-#endif
-#endif
-
-#ifndef SharedLibXdmGreet
-#define SharedLibXdmGreet HasSharedLibraries
-#endif
-
-/*
- * At this point, an XFree86 port to Sparc/SunOS cannot be officially supported
- * because the system I am using to develop this is just a loaner from Sun.
- */
-#if defined(i386Architecture) || defined(AMD64Architecture) || \
- defined(PpcArchitecture) || \
- (defined(SparcArchitecture) && \
- defined(SunArchitecture) && \
- (!defined(XorgServer) || (XorgServer)))
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#include <xorg.cf>
-#endif
-
-#ifndef DoLoadableServer
-# define DoLoadableServer NO
-#endif
-#ifndef GccWarningOptions
-# define GccWarningOptions /* */
-#endif
-#ifndef XFree86ServerDefines
-# define XFree86ServerDefines /* */
-#endif
-#ifndef XFree86ServerOSDefines
-# define XFree86ServerOSDefines -DDDXOSINIT -DDDXOSFATALERROR -DDDXOSVERRORF
-#endif
-
-#if HasGcc2ForCplusplus
-# ifndef CplusplusLibCDir
-# define CplusplusLibCDir /usr/local/lib
-# endif
-#endif
-
-#include <sv4Lib.rules>
diff --git a/nx-X11/config/cf/svr4.cf.X.original b/nx-X11/config/cf/svr4.cf.X.original
deleted file mode 100644
index 46410f091..000000000
--- a/nx-X11/config/cf/svr4.cf.X.original
+++ /dev/null
@@ -1,290 +0,0 @@
-XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define OSName UNIX System V/386 Release 4
-#else
-#define OSName UNIX System V Release 4
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 4.0.0 which should be
- * the least common denominator of all SVR4
- */
-
-#ifndef OSMajorVersion
-#define OSMajorVersion 4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion 0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion 0
-#endif
-#ifndef BootstrapCFlags
-#ifdef i386Architecture
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#ifdef SYSV386
-#define BootstrapCFlags -DSVR4 -Di386
-#else
-#define BootstrapCFlags -DSVR4
-#endif
-#endif
-#endif
-
-/* Some stuff that all SVR4s should have */
-
-#ifndef SystemV4
-#define SystemV4 YES
-#endif
-#ifndef HasLdRunPath
-#define HasLdRunPath YES
-#endif
-#define HasPoll YES
-#ifndef SVR4Architecture
-#define SVR4Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp YES
-#endif
-#define Malloc0ReturnsNull YES /* in case -lmalloc used */
-
-/*
- * Here are the default paths to use to pick up tools for building.
- */
-#ifndef ArCmdBase
-#define ArCmdBase /usr/ccs/bin/ar
-#endif
-#ifndef AsCmd
-#define AsCmd /usr/ccs/bin/as
-#endif
-#ifndef CppCmd
-#define CppCmd /usr/ccs/lib/cpp
-#endif
-#ifndef RawCppCmd
-#if !defined(SunArchitecture)
-#define RawCppCmd CppCmd -Uunix -Ui386
-#endif
-#endif
-#ifndef LdCmd
-#define LdCmd /usr/ccs/bin/ld
-#endif
-#ifndef LexCmd
-#define LexCmd /usr/ccs/bin/lex
-#endif
-#ifndef MakeCmd
-#define MakeCmd /usr/ccs/bin/make
-#endif
-#ifndef YaccCmd
-#define YaccCmd /usr/ccs/bin/yacc
-#endif
-#ifndef MkdirHierCmd
-#define MkdirHierCmd mkdir -p
-#endif
-
-/*
- * Add the s option to ArCmd and ArAddCmd so that empty archives can be created
- */
-#ifndef ArCmd
-#define ArCmd ArCmdBase cqs
-#endif
-#ifndef ArAddCmd
-#define ArAddCmd ArCmdBase rus
-#endif
-
-/* Libtool on SVR4 uses minor numbers */
-#ifndef LibtoolMinorVersions
-#define LibtoolMinorVersions YES
-#endif
-
-#ifndef SunArchitecture
-/*
- * These come from usl.cf, and at least some are required by other
- * SVR4 versions
- */
-#ifndef UseLocalRegex
-#define UseLocalRegex YES
-#endif
-#ifndef XmDefines
-#define XmDefines \
- -DNO_REGCOMP -DNEED_STRCASECMP \
- -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#endif
-#ifndef DtSvcDefines
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#endif
-#ifndef DtSearchDefines
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#endif
-#ifndef DtWidgetDefines
-#define DtWidgetDefines DtSearchDefines
-#endif
-#ifndef DtPrintDefines
-#define DtPrintDefines DtSearchDefines
-#endif
-#ifndef HasStrcasecmp
-#define HasStrcasecmp NO
-#endif
-#endif
-
-/* SVR4 (including Solaris) doesn't have setenv() and unsetenv() */
-#ifndef HasSetenv
-#define HasSetenv NO
-#endif
-
-#ifndef SunArchitecture
-#if (OSMinorVersion == 0)
-#ifndef XawI18nDefines
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-#ifndef UseSmartScheduler
-#define UseSmartScheduler NO
-#endif
-#endif
-#ifdef i386Architecture
-#ifndef HasPosixRegex
-#define HasPosixRegex NO
-#endif
-#endif
-#ifndef LogDirectory
-#define LogDirectory $(VARDIR)/adm
-#endif
-#endif
-
-#ifndef HasGcc3
-#define HasGcc3 NO
-#endif
-#ifndef HasGcc2
-#define HasGcc2 HasGcc3
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasPerl
-#define HasPerl NO
-#endif
-
-#ifdef i386Architecture
-#ifndef SunArchitecture
-#if (OSMinorVersion > 2) || ((OSMinorVersion == 2) && (OSTeenyVersion >= 2))
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -DSVR42MP -Di386
-#endif
-#ifndef HasParallelMake
-#define HasParallelMake YES
-#endif
-#if HasParallelMake
-#define TopParallelDefines -P -B
-#define MutexDirective .MUTEX
-#endif
-#else /* SVR4 < 4.2.2 */
-#ifndef StandardDefines
-#define StandardDefines -DSVR4 -Di386
-#endif
-#endif
-#endif
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions -intelabi -earlyR6bc
-#endif
-#ifndef DefaultCCOptions
-#if !HasGcc
-#define DefaultCCOptions -Xa -Dasm=__asm
-#endif
-#endif
-#ifndef DefaultCDebugFlags
-#if HasGcc
-#if HasGcc2
-#ifndef CcCmd
-#define CcCmd gcc
-#endif
-#define DefaultCDebugFlags DefaultGcc2i386Opt
-#else
-#define DefaultCDebugFlags -O2
-#endif
-#else
-#define DefaultCDebugFlags -O
-#endif
-#endif
-#ifndef ServerOSDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#endif
-#endif
-
-/*
- * The TLI interface is more robust on most SVR4s, so it will be the default.
- */
-#if !defined(SunArchitecture)
-#ifndef ConnectionFlags
-#define ConnectionFlags -DSTREAMSCONN -DUNIXCONN -DLOCALCONN
-#endif
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix 1x
-#define ManDir $(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix 3x
-#define LibmanDir $(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-#define FileManSuffix 4
-#endif
-
-#ifndef StaticLibrary
-#if !HasGcc
-#define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
-#endif
-#endif
-
-#ifndef SharedLibXdmGreet
-#define SharedLibXdmGreet HasSharedLibraries
-#endif
-
-/*
- * At this point, an XFree86 port to Sparc/SunOS cannot be officially supported
- * because the system I am using to develop this is just a loaner from Sun.
- */
-#if defined(i386Architecture) || defined(AMD64Architecture) || \
- defined(PpcArchitecture) || \
- (defined(SparcArchitecture) && \
- defined(SunArchitecture) && \
- (!defined(XorgServer) || (XorgServer)))
-#ifndef DoLoadableServer
-#define DoLoadableServer YES
-#endif
-#include <xorg.cf>
-#endif
-
-#ifndef DoLoadableServer
-# define DoLoadableServer NO
-#endif
-#ifndef GccWarningOptions
-# define GccWarningOptions /* */
-#endif
-#ifndef XFree86ServerDefines
-# define XFree86ServerDefines /* */
-#endif
-#ifndef XFree86ServerOSDefines
-# define XFree86ServerOSDefines -DDDXOSINIT
-#endif
-
-#if HasGcc2ForCplusplus
-# ifndef CplusplusLibCDir
-# define CplusplusLibCDir /usr/local/lib
-# endif
-#endif
-
-#include <sv4Lib.rules>
diff --git a/nx-X11/config/cf/ultrix.cf b/nx-X11/config/cf/ultrix.cf
deleted file mode 100644
index 51bd20dba..000000000
--- a/nx-X11/config/cf/ultrix.cf
+++ /dev/null
@@ -1,82 +0,0 @@
-XCOMM platform: $Xorg: ultrix.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-XCOMM $XFree86$
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
-
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasShm YES
-#define LintLibFlag -o
-#define LintOpts -ax
-
-#ifndef HasDECnet
-#define HasDECnet NO
-#endif
-#if HasDECnet
-#define ExtraLibraries -ldnet
-#endif
-
-#if ThreadedX
-/* if you want to experiment, turn this on, but no guarantees */
-#define HasThreadSafeAPI NO
-#define HasPosixThreads YES
-#define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
-#define ExtraLibraries -lpthreads -li
-#endif
-
-#ifdef VaxArchitecture
-#define NativeFPFormat DEC_F_Float
-#define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */
-#define BuildServer NO
-#endif
-
-#ifdef MipsArchitecture
-#if OSMajorVersion > 4 || (OSMajorVersion == 4 && OSMinorVersion >= 2)
-#define XdecServer YES
-#define ServerOSDefines -DDDXTIME
-/* Even under ultrix 4.2, the compiler miscompiles some alloca calls */
-#define AllocateLocalDefines /* -DINCLUDE_ALLOCA_H */
-#else
-#define BuildServer NO
-#define AllocateLocalDefines /**/
-#endif
-#if !HasGcc
-#define NeedFunctionPrototypes YES
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) $(RM) $@ $*.os \ @@\
- && $(CC) -c options $(CFLAGS) $*.c \ @@\
- && $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
- && $(MV) $*.os $@
-#endif
-#endif
-
-#if HasGcc
-#ifdef VaxArchitecture
-#define CcCmd gcc -ansi -Dvax -Dultrix -fpcc-struct-return
-#endif
-#ifdef MipsArchitecture
-#define CcCmd gcc -ansi -Dmips -Dultrix -fpcc-struct-return
-#endif
-#define ServerCCOptions /* */
-#define AllocateLocalDefines /* */
-#endif
-
-#define ServerExtraDefines AllocateLocalDefines
-#define HasWChar32 YES
-
-#define MotifDefines -DNO_REGEX -DNO_REGCOMP -DNO_CONST
diff --git a/nx-X11/config/cf/usl.cf b/nx-X11/config/cf/usl.cf
deleted file mode 100644
index e54476bee..000000000
--- a/nx-X11/config/cf/usl.cf
+++ /dev/null
@@ -1,318 +0,0 @@
-XCOMM platform: $Xorg: usl.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.22 2001/01/12 19:28:24 dawes Exp $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#ifndef CcCmd
-# define CcCmd /usr/ccs/bin/cc
-#endif
-#ifndef LexCmd
-# define LexCmd /usr/ccs/bin/lex
-#endif
-#ifndef YaccCmd
-# define YaccCmd /usr/ccs/bin/yacc
-#endif
-#ifndef MakeCmd
-# define MakeCmd /usr/gnu/bin/gmake
-#endif
-
-#ifndef HasGcc2ForCplusplus
-# ifndef CplusplusCmd
-# define CplusplusCmd /usr/ccs/bin/CC
-# endif
-# ifndef CplusplusFilt
-# define CplusplusFilt /usr/ccs/bin/c++filt
-# endif
-# ifndef CplusplusDependIncludes
-# define CplusplusDependIncludes -I/usr/include/CC
-# endif
-#else
-# ifndef CplusplusCmd
-# define CplusplusCmd /usr/gnu/bin/g++
-# endif
-# ifndef CplusplusFilt
-# define CplusplusFilt /usr/gnu/bin/c++filt
-# endif
-#endif
-
-#ifndef LibraryCCOptions
-# define LibraryCCOptions -D_REENTRANT -DFD_SETSIZE=16384
-#endif
-
-#define BootstrapCFlags /* none needed */
-#define StandardDefines -DSVR4 -DSVR5 -Di386 -D__UNIXWARE__
-#define NeedWidePrototypes YES
-
-#ifdef HasGcc2
-# define DefaultCCOptions GccWarningOptions
-# ifndef CcCmd
-# define CcCmd /usr/gnu/bin/gcc
-# endif
-# define DefaultCDebugFlags -O6 -fomit-frame-pointer -march=i586 -mcpu=i586
-# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O6 -fomit-frame-pointer -march=i586 -mcpu=i586
-# endif
-#else
-# ifndef CcCmd
-# define CcCmd /usr/ccs/bin/cc
-# endif
-# define DefaultCCOptions -dy -O -Kalloca -Dasm=__asm
-# define DefaultCDebugFlags -O
-# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O
-# endif
-#endif
-
-#ifndef DoLoadableServer
-# define DoLoadableServer YES
-#endif
-
-#if DoLoadableServer
-# if HasGcc
-# define USLDynamicFlags -rdynamic
-# else
-# define USLDynamicFlags -Wl,-Bexport
-# endif
-#else
-# define USLDynamicFlags /**/
-#endif
-
-#define ServerExtraDefines XFree86ServerDefines
-#ifndef ServerExtraSysLibs
-# define ServerExtraSysLibs $(CBRT) -lm USLDynamicFlags
-#endif
-
-#define ServerOSDefines -D_REENTRANT -DFD_SETSIZE=16384 -DDDXTIME XFree86ServerOSDefines
-#define ToolkitStringsABIOptions -intelabi
-#if OSMajorVersion < 2
-#define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#else
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#endif
-#if OSMajorVersion > 1 || OSTeenyVersion > 1
-# if OSMajorVersion >= 7
-# define ExtraLibraries -lsocket -lnsl -lgen
-# else
-# define ExtraLibraries -lsocket -lnsl -lgen -lw
-# endif
-# define ThreadedX YES
-# define HasThreadSafeAPI NO
-/* UnixWare does not have MT-safe pwd routines. */
-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -DXNO_MTSAFE_GRPAPI
-# define SystemMTDefines -D_REENTRANT
-# ifdef HasGcc2
-# define ThreadsLoadFlags -pthread
-# else
-# define ThreadsLoadFlags -Kpthread
-# endif
-#endif
-#define BuildLibPathVar LD_LIBRARY_PATH
-
-#ifndef BuildXterm
-# define BuildXterm BuildClients
-#endif
-
-#ifndef HasNCurses
-# define HasNCurses YES
-#endif
-#ifndef NCursesLibName
-# define NCursesLibName -lcurses
-#endif
-#ifndef TermcapLibrary
-# define TermcapLibrary -lcurses
-#endif
-
-#ifndef BuildFreetypeDlModule
-# define BuildFreetypeDlModule NO
-#endif
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver NO
-#endif
-
-#ifndef ManSuffix
-# define ManSuffix 1
-#endif
-
-#ifndef LibManSuffix
-# define LibManSuffix 3
-#endif
-
-#ifndef FileManSuffix
-# define FileManSuffix 4
-#endif
-
-#ifndef UseExportLists
-# define UseExportLists NO
-#endif
-
-#define GencatFlags -m
-
-#ifndef HasCplusplus
-# define HasCplusplus YES
-#endif
-
-#ifndef HasDlopen
-# define HasDlopen YES
-#endif
-
-#ifndef HasShm
-# define HasShm YES
-#endif
-
-#ifndef HasStrcasecmp
-# define HasStrcasecmp YES
-#endif
-
-#ifndef HasSnprintf
-# define HasSnprintf NO
-#endif
-
-#ifndef UseSmartScheduler
-# define UseSmartScheduler NO
-#endif
-
-#define SharedLibXmu YES
-
-#ifndef NothingOutsideProjectRoot
-# define NothingOutsideProjectRoot YES
-#endif
-
-#ifndef UseSeparateConfDir
-# define UseSeparateConfDir NO
-#endif
-
-#ifndef BuildHtmlManPages
-# define BuildHtmlManPages NO
-#endif
-
-#ifndef SCOHasGWXLIBS
-# define SCOHasGWXLIBS YES
-#endif
-
-#if SCOHasGWXLIBS
-#define HasExpat YES
-#define HasFreetype2 YES
-#define HasLibpng YES
-#define HasZlib YES
-#define HasFontconfig YES
-#define HasXpm YES
-#endif /* SCOHasGWXLIBS */
-
-#define InstallHardcopyDocs NO
-
-#define HasPerl YES
-#define HasPerl5 YES
-
-/*
- * When generating templates the UnixWare 2.02 C++ compiler leaves
- * protected .i files behind. Remove them so other people can
- * compile too.
- */
-#ifndef ObjectCplusplusCompile
-#define ObjectCplusplusCompile(options) RemoveFiles($@ $*.i) @@\
- ClearmakeOSName \
- $(CXX) -c $(CXXFLAGS) options $*.CCsuf
-#endif
-
-/* USL does not have a shared regex library. */
-#define UseLocalRegex YES
-
-#define XmDefines -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE
-#define DtSearchDefines -DI18N_MSG DtSvcDefines
-#define DtWidgetDefines DtSearchDefines
-#define DtPrintDefines DtSearchDefines
-
-/* For DtHelp's TIFF processing routines. */
-#define LSBBitOrder YES
-
-#define ArchitectureDefines -DUSL_ARCHITECTURE
-
-#define ExportListGenSource elistgen.usl
-#define ShlibExportListOpt(filename) Concat(-Bexport:,filename)
-
-/* <X11/Xos_r.h> requires process locking for missing _r functions */
-#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
-#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-#define CdeProjectDefines \
- -DANSICPP -DMULTIBYTE -DNLS16 \
- -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-
-/*
- * These settings control the interdependence of the shared libraries.
- * Mostly borrowed from darwinLib.tmpl.
- */
-#ifndef FixupLibReferences
-#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
-#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
-
-#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-#define SharedGLReqs $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedX11Reqs $(LDPRELIB) -lsocket -lnsl
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXieReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXpReqs $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs $(LDPRELIB) $(XLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
-#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedXvReqs $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-#define SharedXssReqs $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB)
-#define SharedXmReqs $(LDPRELIB) SharedXReqs
-#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIB) $(XMLIB) SharedXReqs
-
-#include <scoLib.rules> /* minor changes to sv4Lib.rules */
-#include <svr4.cf>
diff --git a/nx-X11/config/cf/x386.cf b/nx-X11/config/cf/x386.cf
deleted file mode 100644
index d7d4c803f..000000000
--- a/nx-X11/config/cf/x386.cf
+++ /dev/null
@@ -1,153 +0,0 @@
-XCOMM platform: $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-/*****************************************************************************
- * Site-specfic parameters *
- *****************************************************************************/
-
-/*
- * there are some switches to set appropriate...
- */
-
-#define HasGcc YES /* doesn't work for SVR4 */
-#define HasNdbm YES /* correct for GNU dbm & SVR4 */
-#define StripInstalledPrograms YES
-#define X386Server YES
-#define ExtensionOSDefines -DXTESTEXT1
-#define MotifBC YES
-
-/*****************************************************************************
- * Do not change anything below *
- *****************************************************************************/
-
-/* You mus manually compute BootstrapCFlags for initial build */
-#define BootstrapCFlags OSDefines OSRelease
-
-#define StandardDefines OSDefines OSRelease
-#define LdCombineFlags -r
-
-#if defined(i386SVR3Architecture)
-
-#define SystemV YES
-
-#define NeedBerklib YES
-#define HasSymLinks NO
-
-#ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
-#endif
-
-/*
- * V/386 Release 3.2
- */
-#ifdef ISC
-/* INTERACTIVE UNIX Version 2.2.1 */
-# define OSVendor "Interactive System Corp."
-# define OSDefines -DISC
-# define LocalLibraries -lpt
-# define PosixLibraries -lcposix
-# define SocketLibraries -linet
-#endif
-
-#ifdef ESIX
-#define OSVendor "ESIX System Inc."
-#define OSDefines -DESIX
-#define LocalLibraries -lpt
-#define SocketLibraries -lnet -lnsl_s
-#define PosixLibraries /**/
-#endif
-
-#ifdef ATT
-#define OSDefines -DATT
-#define OSVendor "AT&T"
-#define LocalLibraries -lpt
-#define SocketLibraries -lnet -lnsl_s /* just a guess */
-#define PosixLibraries /**/
-#endif
-
-#define OSName Unix System V/386 Release 3.2
-#define OSMajorVersion 3
-#define OSMinorVersion 2
-#define OSRelease -DSYSV -DSYSV386
-
-#if HasGcc
-# define CcCmd gcc -DNO_ASM -fstrength-reduce -fpcc-struct-return -fwritable-strings
-# define LibraryCcCmd gcc -DNO_ASM -fstrength-reduce -fpcc-struct-return
-# define ShlibDefines -D__GNUC__ -DGNULIB=/usr/local/lib/gcc-gnulib
-#else
-# define ShlibDefines /**/
-#endif
-
-#if HasSockets
-/* # define ConnectionFlags -DLOCALCONN -DTCPCONN */
-# define ConnectionFlags -DTCPCONN
-# define ExtraLibraries SocketLibraries LocalLibraries -lc_s PosixLibraries
-#else
-# define ConnectionFlags -DLOCALCONN
-# define ExtraLibraries $(LIBDIR)/etc/inetemul.o LocalLibraries -lc_s PosixLibraries
-#endif
-
-/* #include <sv3Lib.rules> */ /* not working yet */
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define InstallManPageLong(file,destdir,dest) @@\
-install.man:: file.man @@\
- $(RM) destdir/dest.$(MANSUFFIX) @@\
- cat file.man | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/file.man @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man destdir/dest.$(MANSUFFIX) @@\
- $(RM) /tmp/file.man
-
-#define InstallMultipleMan(list,dest) @@\
-install.man:: list @@\
- @MakeFlagsToShellFlags(i,set +e); \ @@\
- for i in list; do \ @@\
- (set -x; \ @@\
- $(RM) dest/$$i; \ @@\
- cat $$i | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/$$i; \ @@\
- $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i dest/$$i; \ @@\
- $(RM) /tmp/$$i); \ @@\
- done
-
-/* If you have trouble with make bombing out in Xlib, try uncommenting this. */
-/* You will not get dependencies as a result, but better than nothing. */
-/* #define DependTarget3(srcs1,srcs2,srcs3) */
-
-#endif /* i386SVR3Architecture */
-
-
-/*
- * V/386 Release 4.0
- */
-#if defined(i386SVR4Architecture)
-
-#define SystemV4 YES
-
-/* this is now just for Dell's one */
-
-#ifdef DELL
-#define OSDefines -DDELL
-#define OSVendor "DELL Computer Corp."
-#endif
-
-#define OSName Unix System V/386 Release 4.0
-#define OSMajorVersion 4
-#define OSMinorVersion 0
-#define OSRelease -DSVR4 -DSYSV386
-
-#if HasGcc
-# define CcCmd gcc -ansi -fstrength-reduce -fpcc-struct-return -Di386
-# if HasSharedLibraries
-# define LibraryCcCmd cc -Xa -Di386 -Dasm=__asm
-# endif
-#else
-# define CcCmd cc -Xa -Di386 -Dasm=__asm
-#endif
-
-#include <sv4Lib.rules>
-
-#endif /* i386SVR4Architecture */
-
-
-XCOMM operating system: OSName OSVendor
diff --git a/nx-X11/config/cf/xprint_host.def b/nx-X11/config/cf/xprint_host.def
deleted file mode 100644
index a9b4cee2f..000000000
--- a/nx-X11/config/cf/xprint_host.def
+++ /dev/null
@@ -1,305 +0,0 @@
-/* host.def config for the Xprint server standalone packages */
-
-/*
- * Enable this if you want to build the GISWxprintglue package...
- * #define BuildGISWxprintglue YES
- * Then do a % make World ; cd packager/solaris/GISWxprintglue/ ; make make_GISWxprintglue
- */
-
-/*
- * Enable this if you want to build the GISWxprint package...
- * #define BuildGISWxprint YES
- * Then do a % make World ; cd packager/solaris/GISWxprint/ ; make make_GISWxprint
- */
-
-/*
- * Enable this if you want to build the Debian Xprint server package
- * #define BuildDebianXprintPackage YES
- */
-
-/*
- * If you build a RPM package from this tree the xprint.spec file
- * will set BuildXprintRPMPackage to YES
- */
-
-/*
- * Enable this if you want to build the Mozilla Xprint XPI server package
- * #define BuildMozillaXprintXPIPackage YES
- */
-
-/* HasDocBookTools - set to YES if "xsltproc", "xmllint", "docbook2man",
- * "lynx" and the docbook-xsl-stylesheets are installed.
- * #define HasDocBookTools YES
- */
-
-/* #########################################################################
- * ############ xprint.mozdev.org defaults start (do not edit!) ############
- * #########################################################################
- */
-
-#ifndef BuildGISWxprintglue
-# define BuildGISWxprintglue NO
-#endif /* BuildGISWxprintglue */
-
-#ifndef BuildGISWxprint
-# define BuildGISWxprint NO
-#endif /* BuildGISWxprint */
-
-#ifndef BuildDebianXprintPackage
-# define BuildDebianXprintPackage NO
-#endif /* BuildDebianXprintPackage */
-
-#ifndef BuildXprintRPMPackage
-# define BuildXprintRPMPackage NO
-#endif /* BuildXprintRPMPackage */
-
-#ifndef BuildMozillaXprintXPIPackage
-# define BuildMozillaXprintXPIPackage NO
-#endif /* BuildMozillaXprintXPIPackage */
-
-/* If we do not build any of the special packages then build and
- * install everything */
-#ifndef BuildFullXprintDistrib
-# if BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage
-# define BuildFullXprintDistrib NO
-# else
-# define BuildFullXprintDistrib YES
-# endif /* BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage */
-#endif /* BuildFullXprintDistrib */
-
-/* Verify that only one package is enabled at the same time */
-#if (BuildGISWxprintglue + BuildGISWxprint + BuildDebianXprintPackage + BuildXprintRPMPackage + BuildFullXprintDistrib + BuildMozillaXprintXPIPackage) > 1
-# error Building more than one special package is not allowed.
-#endif /* Verify */
-
-/* Some flags to build the Xprint server (Xprt), the tools and the fonts */
-#define BuildServer YES
-#define XprtServer YES
-
-/* Needed to build encoding files */
-#define BuildFonts YES
-#define BuildSpeedoFonts NO
-#define BuildType1Fonts NO
-#define BuildCIDFonts NO
-#define BuildTrueTypeFonts NO
-#define BuildEthiopicFonts NO
-#define BuildBethMarduthoFonts NO
-
-/* X extensions not needed (or not supported yet by Xprt) */
-#define BuildXKB NO
-#define BuildRECORD NO
-#define BuildDPMS NO
-#define BuildXF86VidModeExt NO
-#define BuildXInputExt NO
-#define BuildScreenSaverExt NO
-#define BuildXvExt NO
-#define BuildXvMCExt NO
-#define BuildDmx NO
-#define BuildXF86DRI NO
-#define BuildRender NO
-#define BuildXfixes NO
-#define BuildDamage NO
-#define BuildComposite NO
-#define BuildXevie NO
-#define BuildXF86DGA NO
-#define BuildRandR NO
-#define BuildXinerama NO
-
-/* X extensions needed */
-#define BuildGlxExt YES
-/* LBX is needed for compatibility to the XWeb stuff */
-#define BuildLBX YES
-
-/* Xprt's non-bitmap based DDX (PS, PCL, PDF, SVGprint etc.) cannot support MIT-SHM */
-#undef HasShm
-#define HasShm NO
-/* Disable stipple code due portability issues
- * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=2220) */
-#define BuildStippleCode NO
-
-/* Temporary for Xorg tree */
-#define BuildFontconfigLibrary NO
-#define XorgServer NO
-#define XF86Server NO
-#define XnestServer NO
-#define XVirtualFramebufferServer NO
-#define XdmxServer NO
-
-#define GzipFontCompression YES
-#define BuildFreeType YES
-#define BuildFreetype2Library YES
-#define SharedLibFreetype2 NO
-#define NormalLibFreetype2 YES
-#define HasFreetype2 NO
-#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-#define BuildType1 NO
-#define BuildCID NO
-#define BuildSpeedo NO
-#define BuildFontCache NO
-#define BuildRender NO
-#define BuildRenderLibrary NO
-#define BuildRandRLibrary NO
-#define BuildXcursorLibrary NO
-#define BuildXcursorgen NO
-#define SharedLibFontEnc NO
-#define SharedLibFont NO
-#define XserverStaticFontLib YES
-
-/* Build only Xprint applications */
-#ifndef BuildXprintAppsOnly
-#define BuildXprintAppsOnly YES
-#endif /* BuildXprintAppsOnly */
-
-/* Set our own XVendorString/XVendorRelease
- * (and to avoid that xorg.cf sets it's own stuff here) */
-#define XVendorString "xprint.mozdev.org"
-#define XVendorRelease 100000
-
-#define UseHackLinkAgainstInstalledX11Libs NO
-#if UseHackLinkAgainstInstalledX11Libs
-/* "Hack" to reuse an already installed X11 distribution when linking our
- * programs (this assumes that the installed X version is at least X11R6.4) */
-# ifndef IBMArchitecture
-# define LdPreLib -L$(USRLIBDIR) -R$(USRLIBDIR) -L$(BUILDLIBDIR)
-# endif /* !IBMArchitecture */
-#endif /* UseHackLinkAgainstInstalledX11Libs */
-
-XCOMM #### Sun/Solaris-specifc stuff ... ####
-#if defined(SunArchitecture) && (OSMajorVersion > 4)
-#undef XsunServer
-#define XsunServer NO
-
-XCOMM X11R6.7's sun.cf does not set ProjectRoot to /usr/openwin anymore - why ?
-#define ProjectRoot /usr/openwin
-#define ServerConfigDir /usr/openwin/server/etc
-
-XCOMM Some build hacks for the GISWxprintglue package
-#if BuildGISWxprintglue
-# define ProjectRoot /usr/openwin
-# define ServerConfigDir /usr/openwin/server/etc
-# define BinDir /opt/GISWxprintglue/bin
-# define ManDirectoryRoot /opt/GISWxprintglue/man
-# undef XPrintDir
-# define XPrintDir /opt/GISWxprintglue/server/etc/XpConfig
- /* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
- * config files for now */
-# undef XpColorPclDDX
-# define XpColorPclDDX NO
-# undef XpMonoPclDDX
-# define XpMonoPclDDX NO
- /* GISWxprintglue uses the Solaris Xprt server which uses the Solaris
- * encoding/ttmap files for font encodings
- */
-# define InstallXF86EncodingFiles NO
-#endif /* BuildGISWxprintglue */
-
-XCOMM Some build hacks for the GISWxprint package
-#if BuildGISWxprint
-# define ProjectRoot /usr/openwin
-# define ServerConfigDir /usr/openwin/server/etc
-# define BinDir /opt/GISWxprint/bin
-# define ManDirectoryRoot /opt/GISWxprint/man
-# undef XPrintDir
-# define XPrintDir /opt/GISWxprint/server/etc/XpConfig
- /* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
- * config files for now */
-# undef XpColorPclDDX
-# define XpColorPclDDX NO
-# undef XpMonoPclDDX
-# define XpMonoPclDDX NO
- /* Make sure we install our own encoding files since Solaris uses a format we
- * (currently) do not support (yet).
- */
-# define InstallXF86EncodingFiles YES
-# undef XF86EncodingsPath
-# define XF86EncodingsPath /opt/GISWxprint/lib/X11/fonts/encodings
-#endif /* GISWxprint */
-
-/* Install XF86 encoding files since that's the only format we currently support */
-#ifndef InstallXF86EncodingFiles
-#define InstallXF86EncodingFiles YES
-#endif /* InstallXF86EncodingFiles */
-
-#define HasVarDirectory NO
-#undef HasMotif2
-#define HasMotif2 YES
-
-#if 1 /* Switch for 32bit binaries or 64bit binaries */
- /* 32bit SPARC */
-# define CcCmd /opt/SUNWspro/bin/cc
-# define CplusplusCmd /opt/SUNWspro/bin/CC
-#else
- /* 64bit sparc (Doesn't really work yet because the Xservers cannot link properly... ;-( */
-# define ServerExtraDefines -D_XSERVER64
-# define CcCmd /opt/SUNWspro/bin/cc -xarch=v9a
-# define CplusplusCmd /opt/SUNWspro/bin/CC -xarch=v9a
-# define UsrLibDir /usr/openwin/lib/sparcv9
-#endif
-
-#if 0 /* Development only */
- XCOMM Explicitly use "-xs" to make Rational Purify "happy"
-# undef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -xs -g -DDEBUG_$(LOGNAME)
-#endif
-
-XCOMM #### FreeBSD-specifc stuff ... ####
-#elif defined(FreeBSDArchitecture)
-#define ProjectRoot /usr/X11R6
-#define XPrintDir /etc/X11/xserver
-#define DlLibrary -lc
-#undef XF86SVGAServer
-#define XF86SVGAServer NO
-#define HasVarDirectory NO
-#define HasMotif2 YES
-#define HasGhostScript YES
-#define InstallXF86EncodingFiles NO
-
-XCOMM #### NetBSD-specifc stuff ... ####
-#elif defined(NetBSDArchitecture)
-#define ProjectRoot /usr/X11R6
-#define XPrintDir /etc/X11/xserver
-#undef XF86SVGAServer
-#define XF86SVGAServer NO
-#define HasVarDirectory NO
-#define HasMotif2 YES
-#define HasGhostScript YES
-#define InstallXF86EncodingFiles NO
-
-XCOMM #### Linux-specifc stuff ... ####
-#elif defined(LinuxArchitecture)
-#define ProjectRoot /usr/X11R6
-#define XPrintDir /etc/X11/xserver
-#undef XF86SVGAServer
-#define XF86SVGAServer NO
-#define HasVarDirectory NO
-#define HasMotif2 YES
-#define HasGhostScript YES
-#define InstallXF86EncodingFiles NO
-/* Debian Xprint package puts the Xprt config files elsewhere */
-#if (LinuxDistribution == LinuxDebian)
-# define XPrintDir /usr/share/Xprint/xserver
-#endif
-
-#endif
-
-/* Do not strip binaries to ensure usefull stacktraces in bug reports
- * (http://xprint.mozdev.org/bugs/show_bug.cgi?id=2264)
- */
-#define StripInstalledPrograms NO
-
-/* Does the X11 installation have the Xfree86 encoding files ? */
-#ifndef InstallXF86EncodingFiles
-#define InstallXF86EncodingFiles YES
-#endif /* InstallXF86EncodingFiles */
-
-INSTALLXF86ENCODINGFILES = InstallXF86EncodingFiles
-
-#ifndef XF86EncodingsPath
-#define XF86EncodingsPath $(FONTDIR)/encodings
-#endif /* XF86EncodingsPath *
-
-/* #########################################################################
- * ################ xprint.mozdev.org defaults end ################
- * #########################################################################
- */
diff --git a/nx-X11/config/docbook/docbookconv.sh b/nx-X11/config/docbook/docbookconv.sh
deleted file mode 100755
index e58f05b78..000000000
--- a/nx-X11/config/docbook/docbookconv.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-fatal_error()
-{
- echo "$1" 1>&2
- exit 1
-}
-
-debug_echo()
-{
- echo "$1" 1>&2
-}
-
-verbose_echo()
-{
- echo "$1" 1>&2
-}
-
-which_tool()
-{
- echo "${PATH}" | tr ":" "\n" | while read i ;
- do ls -1ad "${i}/${1}" 2>/dev/null ; done | sort | uniq
-}
-
-which_program()
-{
- echo "${1}" | tr ":" "\n" | while read i ;
- do
- which_tool "${i}"
- done | sort | uniq
-}
-
-which_xsl()
-{
- ls -1ad ${1}/docbook-xsl-stylesheets*/ 2>/dev/null | head -1
-}
-
-# Fix HTML generated by the DocBook XSL stylesheets
-# In many cases <nsxyz:p> is used instead of <p>, screwing-up
-# display (this stuff only works for XHTML)
-fix_docbook_html()
-{
- sed "s/<ns[0-9]*:p>/<p>/g;s/<\/ns[0-9]*:p>/<\/p>/g"
-}
-
-# main
-infile="${1}"
-outputformat="${2}"
-outputfile="${3}"
-
-# xsl processing
-case "`uname -s`" in
- FreeBSD)
- PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
- export PATH
- stylesheetbase="/usr/local/share/xsl/"
- ;;
- *)
- stylesheetbase="/usr/share/sgml/docbook/"
- ;;
-esac
-xsltproc="`which_tool xsltproc`"
-stylesheetdir="`which_xsl ${stylesheetbase}`"
-docbook2man="`which_tool docbook2man`"
-verbose_echo "# Using xsltproc=${xsltproc}."
-verbose_echo "# Using stylesheetdir=${stylesheetdir}."
-verbose_echo "# Using docbook2man=${docbook2man}."
-
-# Prechecks
-[ "${infile}" = "" ] && fatal_error "$0: No input file."
-[ "${outputfile}" = "" ] && fatal_error "$0: No output file."
-[ "${outputformat}" = "" ] && fatal_error "$0: No format given."
-[ ! -r "${infile}" ] && fatal_error "$0: Input file not found or readable."
-[ ! -x "${xsltproc}" ] && fatal_error "$0: No xsltproc found."
-[ ! -r "${stylesheetdir}" ] && fatal_error "$0: No DocBook/XSL style sheets found."
-[ ! -x "${docbook2man}" ] && fatal_error "$0: No docbook2man found."
-
-
-# this is hack style to work around the problem that "docbook2man"
-# writes lots of files into the current dir
-MYTMPDIR="/tmp/docbookconv_${RANDOM}"
-MYCURRDIR="${PWD}"
-
-(
- mkdir "${MYTMPDIR}"
- cd "${MYTMPDIR}"
-
- case "${outputformat}" in
- "html")
- cp "${MYCURRDIR}/${infile}" "${infile}.tmp"
- if [ "${infile}" != "${infile%.sgml}" ] ; then
- verbose_echo "# processing as SGML document"
- ${xsltproc} --docbook ${stylesheetdir}/html/docbook.xsl "${infile}.tmp" | fix_docbook_html >"${MYCURRDIR}/${outputfile}"
- else
- verbose_echo "# processing as XML document"
- ${xsltproc} ${stylesheetdir}/html/docbook.xsl "${infile}.tmp" | fix_docbook_html >"${MYCURRDIR}/${outputfile}"
- fi
- ;;
- "man")
- if [ "${infile}" != "${infile%.sgml}" ] ; then
- #cp "${MYCURRDIR}/${infile}" "${infile%.sgml}.xml"
- #${docbook2man} --network "${infile%.sgml}.xml"
- cp "${MYCURRDIR}/${infile}" "${infile}.tmp"
- ${docbook2man} --network "${infile}.tmp"
- else
- cp "${MYCURRDIR}/${infile}" "${infile}.tmp"
- ${docbook2man} --network "${infile}.tmp"
- fi
- manfile="$(ls -1 ${infile%.*}.__*)"
-
- verbose_echo "manfile=${manfile}"
- [ ! -r "${manfile}" ] && fatal_error "$0: manfile not found."
- cp "${manfile}" "${MYCURRDIR}/${outputfile}"
- ;;
- *)
- fatal_error "Unsupported output format ${outputformat}."
- ;;
- esac
-)
-
-# EOF.
-
diff --git a/nx-X11/config/pswrap/Imakefile b/nx-X11/config/pswrap/Imakefile
deleted file mode 100644
index 98f845d62..000000000
--- a/nx-X11/config/pswrap/Imakefile
+++ /dev/null
@@ -1,27 +0,0 @@
-XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.8tsi Exp $
-
- FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsfriends.h>"'
- DEFINES = -DXENVIRONMENT
- DEPLIBS =
- YFLAGS = -d
-EXTRA_LIBRARIES = LexLib
-
-SRCS = main.c pswdict.c pswfile.c \
- systemnames.c psw.c pswstring.c pswsemantics.c
-
-OBJS = main.o pswparser.o lexer.o pswdict.o pswfile.o \
- systemnames.o psw.o pswstring.o pswsemantics.o
-
-#if CrossCompiling
-ComplexHostProgramTarget(pswrap)
-#else
-ComplexProgramTarget(pswrap)
-#endif
-
-pswraponly:: $(PROGRAM)
-
-SpecialObjectRule(pswfile.o,pswfile.c,$(FRIENDSDEF))
-
-LexFile(lexer)
-
-YaccFile(pswparser,$(YFLAGS))
diff --git a/nx-X11/config/pswrap/lexer.l b/nx-X11/config/pswrap/lexer.l
deleted file mode 100644
index fdd6d03c2..000000000
--- a/nx-X11/config/pswrap/lexer.l
+++ /dev/null
@@ -1,814 +0,0 @@
-%{
-/*
- * lexer.l
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/lexer.l,v 1.10 2001/10/28 03:32:03 tsi Exp $ */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "pswpriv.h"
-#include "pswparser.h"
-
-/* flex of EMX seems to be too old */
-#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
-int yylineno = 1;
-#endif
-
-static int parens = 0; /* current paren balancing */
-static char *sbody; /* cur pointer into string_temp */
-static int curleng = 0; /* current scanned string length */
-static int strlineno; /* start line of current string */
-
-static int nonComment = true; /* are we outside C comments? */
-static int newLine = true; /* are we starting a new line? */
-static int hexstringerrs = 0; /* found an error in this hex string */
-
-int errorCount = 0; /* number of non-fatal errors */
-
-#ifdef PSWDEBUG
-int lexdebug = 1; /* debug flag */
-#define DEBUGP(x) {if (lexdebug) { fprintf x ; };}
-#else /* PSWDEBUG */
-#define DEBUGP(x)
-#endif /* PSWDEBUG */
-
-#undef YYLMAX
-#define YYLMAX 16384
-
-/* ErrIntro prints a standard intro for error messages;
- * change it if your system uses something else. We have many options:
- *
- * to match Macintosh: #define FMT "File \"%s\"; Line %d # "
- * to match BSD cc: #define FMT "\"%s\", line %d: "
- * to match gcc: #define FMT "%s:%d: "
- * to match Mips cc: #define FMT "pswrap: Error: %s, line %d: "
- */
-#define INTRO "# In function %s -\n"
-
-#ifdef macintosh
-#define FMT "File \"%s\"; Line %d # "
-#else /* macintosh */
-#define FMT "\"%s\", line %d: "
-#endif /* macintosh */
-
-void ErrIntro(int line)
-{
- if (! reportedPSWName && currentPSWName) {
- reportedPSWName = 1;
- fprintf(stderr,INTRO,currentPSWName);
- }
- fprintf(stderr,FMT,ifile,line);
- errorCount++;
-}
-
-
-void yyerror(char *errmsg)
-{
- ErrIntro(yylineno);
- fprintf(stderr,"%s near text \"%s\"\n",errmsg,yytext);
-}
-%}
-
-%o 3500
-%a 2500
-
-%START PS STR HEX DEF SUB
-
-DIGIT ([0-9])
-HEXDIGIT ([a-fA-F0-9])
-RADIXDIGIT ([a-zA-Z0-9])
-LETTER ([a-zA-Z])
-SIGN ([+-])
-EXP ([eE]{SIGN}?{DIGIT}+)
-W ([ \t\n\r])
-
-%%
-
-<PS>^defineps { /* inside a wrap - just a PS token */
- if (nonComment) {
- newLine = false;
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- DEBUGP((stderr,"PSNAME ->%s\n",yytext));
- return PSNAME;
- }
-}
-
-<DEF>^defineps { /* treat as a C name inside the def part */
- if (nonComment) {
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- DEBUGP((stderr,"CNAME ->%s\n",yytext));
- return CNAME;
- }
-}
-
-<STR>^defineps { /* part of string text */
- register int i = yyleng;
- register unsigned char *c = (unsigned char *) yytext;
-
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
- for (; i > 0; --i) *sbody++ = *c++;
-}
-
-^{W}*defineps { /* start of a wrap definition */
- if (nonComment) {
- BEGIN DEF;
- DEBUGP((stderr,"DEFINEPS\n"));
- return DEFINEPS;
- } else ECHO;
-}
-
-<PS>endps { /* end of a wrap */
- if (nonComment){
- if (newLine) {
- newLine = false;
- DEBUGP((stderr,"ENDPS\n"));
- BEGIN 0;
- return ENDPS;
- } else {
- DEBUGP((stderr,"PSNAME %s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- return PSNAME;
- }
- }
-}
-
-<DEF>^endps { /* treat as a C name inside the def part? */
- if (nonComment) {
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- DEBUGP((stderr,"CNAME ->%s\n",yytext));
- return CNAME;
- }
-}
-
-<STR>^defineps { /* part of string text */
- register int i = yyleng;
- register unsigned char *c = (unsigned char *) yytext;
-
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
- for (; i > 0; --i) *sbody++ = *c++;
-}
-
-endps { /* BOGUS end of a wrap */
- if (nonComment) {
- ErrIntro(yylineno);
- fprintf(stderr,"endps without matching defineps\n");
- } else ECHO;
-}
-
-%{
- /* real definition stuff */
-%}
-
-<DEF>"/*" { /* C comments on */
- nonComment = false;
-}
-
-<DEF>"*/" { /* C comments off */
- nonComment = true;
-}
-
-<DEF>"(" { /* formals start */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->(\n"));
- return '(';
- }
-}
-
-<DEF>")" { /* formals end */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->)\n"));
- BEGIN PS;
- return ')';
- }
-}
-
-<DEF>[|,;[\]*:] { /* special single chars */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->%c\n",yytext[0]));
- return (yytext[0]);
- }
-}
-
-%{
- /* formals type names */
-%}
-
-<DEF>"static" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->static\n"));
- return STATIC;
- }
-}
-
-<DEF>"boolean" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->boolean\n"));
- return BOOLEAN;
- }
-}
-
-<DEF>"char" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->char\n"));
- return CHAR;
- }
-}
-
-<DEF>"int" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->int\n"));
- return INT;
- }
-}
-
-<DEF>"short" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->short\n"));
- return SHORT;
- }
-}
-
-<DEF>"long" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->long\n"));
- return LONG;
- }
-}
-
-<DEF>"unsigned" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->unsigned\n"));
- return UNSIGNED;
- }
-}
-
-<DEF>"float" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->float\n"));
- return FLOAT;
- }
-}
-
-<DEF>"double" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->double\n"));
- return DOUBLE;
- }
-}
-
-<DEF>"userobject" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->userobject\n"));
- return USEROBJECT;
- }
-}
-
-<DEF>"numstring" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->numstring\n"));
- return NUMSTRING;
- }
-}
-
-<DEF>"DPSContext" {
- if (nonComment) {
- DEBUGP((stderr,"DEF ->DPScontext\n"));
- return PSCONTEXT;
- }
-}
-
-%{
- /* C format numbers in formals part */
-%}
-
-<DEF>[1-9]{DIGIT}* { /* base 10 number */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext));
- yylval.intobj = atoi((char *) yytext);
- return CINTEGER;
- }
-}
-
-<DEF>0{DIGIT}* { /* octal number (and zero) */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext));
- /* I have no idea why the cast is needed in the next line,
- but it seems to make the compiler happy on alpha */
- sscanf((char *) yytext,"%lo",&yylval.intobj);
- return CINTEGER;
- }
-}
-
-<DEF>0[xX]{HEXDIGIT}+ { /* hex number */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext));
- /* See previous comment... */
- sscanf((char *) yytext,"0x%lx",&yylval.intobj);
- return CINTEGER;
- }
-}
-
-<DEF>[a-zA-Z_][a-zA-Z0-9_]* { /* C identifier */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->CNAME %s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- return CNAME;
- }
-}
-
-<DEF>{W}+ {
-}
-
-<DEF>[^a-zA-Z0-9_|,;[\]*:\(\)/ \t\n\r]+ { /* all else - ERROR */
- if (nonComment) {
- DEBUGP((stderr,"DEF ->JUNK %s\n",yytext));
- ErrIntro(yylineno);
- fprintf(stderr,"invalid characters '%s' in definition\n",
- yytext);
- }
-}
-
-
-%{
- /* body part - PostScript code */
-%}
-
-<PS>\%.* { /* a PS comment, ignore */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"comment %s\n",yytext));
- /* yylval = yytext; return PSCOMMENT; */
- }
-}
-
-<PS>{SIGN}?{DIGIT}+ { /* a decimal integer */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSINTEGER ->%s\n",yytext));
- yylval.intobj = atoi((char *) yytext);
- return PSINTEGER;
- }
-}
-
-<PS>{DIGIT}+#{RADIXDIGIT}+ { /* a radix number */
-#define MAX_ULONG ((unsigned long) -1)
- unsigned base = 0;
- unsigned char *s = (unsigned char *) yytext;
- register unsigned long x, limit;
- register unsigned long i = 0;
-
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSINTEGER radix->%s\n",yytext));
- while (*s != '#') {
- base *= 10;
- base += *s++ - '0';
- if (base > 32) break;
- }
-
- if ((base < 2) || (base > 36)) {goto error;}
- else {
- limit = MAX_ULONG / base;
- s++; /* skip # sign */
- while (*s != '\0') {
- if (i > limit) goto error;
- i *= base;
- if (isdigit(*s)) { x = *s - '0';}
- else { x = (*s | 040) - ('a'-10);}
- if (x >= base) goto error;
- if (x > (MAX_ULONG - i)) goto error;
- i += x;
- s++;
- }
- }
- yylval.intobj = i;
- return PSINTEGER;
-
- error:;
- ErrIntro(yylineno);
- fprintf(stderr,"invalid radix number %s\n",yytext);
- yylval.intobj = 0; /* ERROR */
- return PSINTEGER;
- }
-}
-
-<PS>(({SIGN}?{DIGIT}+(\.{DIGIT}*)?{EXP}?)|({SIGN}?{DIGIT}*\.{DIGIT}+{EXP}?)) {
- /* a float */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSREAL ->%s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object,yytext);
- return PSREAL;
- }
-}
-
-<PS>"(" { /* start PS string */
- if (nonComment) {
- newLine = false;
- BEGIN STR;
- parens=1;
- sbody = string_temp;
- curleng = 0;
- strlineno = yylineno;
- *sbody = '\0';
- }
-}
-
-%{
- /* inside PS strings */
-%}
-
-<STR>"(" { /* balancing parens */
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
- parens++;
- *sbody++ = '(';
-}
-
-<STR>")" { /* balancing parens or end string */
- if ((--parens) == 0) {
- BEGIN PS;
- *sbody = '\0';
- yylval.object = psw_malloc(strlen(string_temp) + 1);
- strcpy(yylval.object, string_temp);
- DEBUGP((stderr,"PSSTRING ->%s\n",string_temp));
- return PSSTRING;
- }
- else if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
- *sbody++ = ')';
-}
-
-<STR>"\\"[0-7]([0-7]?)([0-7]?) { /* quoted octal byte */
- if (4 + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += 4;
- sprintf(sbody,"\\%3.3s",(yytext + 1));
- while (*sbody) {
- if (*sbody == ' ') *sbody = '0';
- sbody++;
- }
-}
-
-
-<STR>"\\\n" { /* ignore quoted newline */
-}
-
-<STR>"\\\\" { /* keep quoted backslashes in */
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- *sbody++ = '\\';
- *sbody++ = '\\';
- curleng += 2;
-}
-
-
-<STR>("\\".) { /* other quoted char, including parens */
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- switch (yytext[1]) {
- case 'b':
- *sbody++ = '\b';
- break;
- case 'f':
- *sbody++ = '\f';
- break;
- case 'n':
- *sbody++ = '\012';
- break;
- case 'r':
- *sbody++ = '\015';
- break;
- case 't':
- *sbody++ = '\t';
- break;
- default:
- *sbody++ = yytext[1];
- break;
- }
- curleng++;
-}
-
-
-<STR>"\n" { /* newline in a string */
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
-
- *sbody++ = '\n';
-}
-
-<STR>[^()\\\n]+ { /* anything else */
- register int i = yyleng;
- register unsigned char *c = (unsigned char *) yytext;
-
- if (yyleng + curleng >= maxstring) {
- stringerr(1);
- BEGIN PS;
- *sbody = '\0';
- return PSSTRING;
- }
- curleng += yyleng;
- for (; i > 0; --i) *sbody++ = *c++;
-}
-
-%{
- /* hexidecimal strings "< >" */
-%}
-
-<PS>"<" { /* begin hex string */
- if (nonComment) {
- newLine = false;
- BEGIN HEX;
- sbody = string_temp;
- *sbody = '\0';
- curleng = 0;
- strlineno = yylineno;
- hexstringerrs = 0;
- }
-}
-
-<HEX>{W}+ { /* hex whitespace */
- /* ignore */
-}
-
-<HEX>[0-9A-Fa-f]+ { /* hex string data */
- if (yyleng + curleng >= maxstring) {
- stringerr(2);
- *sbody = '\0';
- BEGIN PS;
- return PSHEXSTRING;
- }
- curleng += yyleng;
- strcpy(sbody,yytext);
- sbody += yyleng;
-}
-
-<HEX>">" { /* end hex string */
- BEGIN PS;
- *sbody = '\0';
- DEBUGP((stderr,"PSHEXSTRING ->%s\n",string_temp));
- yylval.object = psw_malloc(strlen(string_temp) + 1);
- strcpy(yylval.object, string_temp);
- return PSHEXSTRING;
-}
-
-<HEX>[^a-fA-F0-9> \t\n\r]+ { /* ERROR */
- if (hexstringerrs == 0) { /* only complain once per string */
- ErrIntro(yylineno);
- fprintf(stderr,"invalid characters in hex string '%s'\n",yytext);
- hexstringerrs++;
- }
-}
-
-
-%{
- /* straight postscript */
-%}
-
-<PS>"<<" { /* just a PS token (for level 2 compatablity) */
- if (nonComment) {
- newLine = false;
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- DEBUGP((stderr,"PSNAME ->%s\n",yytext));
- return PSNAME;
- }
-}
-
-<PS>">>" { /* just a PS token (for level 2 compatablity) */
- if (nonComment) {
- newLine = false;
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- DEBUGP((stderr,"PSNAME ->%s\n",yytext));
- return PSNAME;
- }
-}
-
-<PS>[\[\]\{\}] { /* PS self delimiter */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PS ->%s\n",yytext));
- return (yytext[0]);
- }
-}
-
-<PS>"true"|"false" { /* boolean */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSBOOLEAN %s\n",yytext));
- yylval.intobj = (*yytext == 't');
- return PSBOOLEAN;
- }
-}
-
-<PS>"/"[^ <>\(\)\[\]\{\}\%\/\t\n\r]* { /* literal name */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSLITNAME %s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext));
- strcpy(yylval.object, yytext+1);
- return PSLITNAME;
- }
-}
-
-<PS>[^ <>\(\)\[\]\{\}\%\/\\\t\n\r]+ { /* executable name */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PSNAME %s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext) + 1);
- strcpy(yylval.object, yytext);
- return PSNAME;
- }
-}
-
-<PS>"*/" { /* special case */
- if (nonComment) {
- newLine = false;
- unput('/');
- yylval.object = psw_malloc(2);
- strcpy(yylval.object, "*");
- return PSNAME;
- }
-}
-
-<PS>"\\"[^ <>\(\)\[\]\{\}\%\/\\\t\n\r]+/"[" { /* \name[index] */
- if (nonComment) {
- DEBUGP((stderr,"\\PSNAME %s\n",yytext));
- yylval.object = psw_malloc(strlen(yytext));
- strcpy(yylval.object, yytext+1);
- BEGIN SUB;
- return PSSUBNAME;
- }
-}
-
-<SUB>[\[][^ \t\]]*[\]] { /* [index] */
- if (nonComment) {
- int len = strlen(yytext);
- DEBUGP((stderr,"PSINDEX %s\n",yytext));
- if (len == 2) {
- ErrIntro(yylineno);
- fprintf(stderr,"parameter index expression empty\n");
- yylval.object = "0";
- }
- else {
- yylval.object = psw_malloc(len);
- strncpy(yylval.object, yytext+1, len-2);
- yylval.object[len-2] = '\0';
- }
- BEGIN PS;
- return PSINDEX;
- }
-}
-
-<SUB>[\[][^\]]*[\]] { /* error */
- if (nonComment) {
- ErrIntro(yylineno);
- fprintf(stderr,"parameter index expression error\n");
- yylval.object = "0";
- BEGIN PS;
- return PSINDEX;
- }
-}
-
-<PS>[\)\>\\]+ { /* ERROR */
- if (nonComment) {
- newLine = false;
- DEBUGP((stderr,"PS JUNK ->%s\n",yytext));
- ErrIntro(yylineno);
- fprintf(stderr,"invalid characters '%s'\n",yytext);
- }
-}
-
-<PS>[ \t\r]+ { }
-
-<PS>[\n]+ {
- newLine = true;
-}
-
-[ \t]+ { /* passthru stuff */
- ECHO;
-}
-
-\n {
- outlineno++;
- ECHO;
-};
-
-"/*" { /* C comments on */
- nonComment = false;
- ECHO;
-}
-
-"*/" { /* C comments off */
- if (!nonComment) {
- nonComment = true;
- ECHO;
- }
-}
-
-%%
-
-int yywrap (void) {
- if (!feof(yyin))
- return (0);
-/* The following appears not to work with flex. As it is error
- handling code, we just comment it out. */
-#if !defined(FLEX_SCANNER)
- if (yybgin != (yysvec+1)) { /* make sure we are in state 0 */
- ErrIntro(yylineno);
- fprintf(stderr,"end of input file/missing endps\n");
- }
-#endif
- return (1);
-}
-
-void stringerr(int type)
-{
- ErrIntro(strlineno);
- fprintf(stderr,"%sstring too long (caught at line %d)\n",
- ((type==1)?"":"hex "),yylineno);
- errorCount++;
- return;
-}
diff --git a/nx-X11/config/pswrap/main.c b/nx-X11/config/pswrap/main.c
deleted file mode 100644
index 0f7227a6c..000000000
--- a/nx-X11/config/pswrap/main.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * main.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/main.c,v 1.4 2000/06/07 19:50:47 tsi Exp $ */
-
-#include <stdio.h>
-
-#ifdef XENVIRONMENT
-#include <X11/Xos.h>
-#else
-#include <string.h>
-#endif
-
-#define SLASH '/'
-#include <ctype.h>
-#include <stdlib.h>
-#include "pswpriv.h"
-
-#define MIN_MAXSTRING 80 /* min allowable value of maxstring */
-
-/* global data */
-char *prog; /* program name */
-char *special_h = NULL; /* -f option */
-char *hfile = NULL; /* name of -h file */
-char *ofile = NULL; /* name of -o file */
-char *ifile = NULL; /* name of input file */
-int gotInFile = 0; /* got an explicit input file name */
-int doANSI = 0; /* got -a (ansi) flag for -h file */
-int pad = 0; /* got -p (padding) flag */
-boolean noUserNames = false; /* got -n (don't use usernames) flag */
-int reentrant = 0; /* automatic vars for generated BOS */
-int bigFile = 0; /* got -b flag => call free */
-FILE *header; /* stream for -h file output */
-char headid[200]; /* id for header file #include */
-int maxstring = 2000; /* -s max string length to scan */
-char *string_temp; /* string buffer of above size */
-int outlineno = 1; /* output line number */
-int nWraps = 0; /* total number of wraps */
-#ifdef __MACH__
-char *shlibInclude = NULL; /* special file to be #included at top of */
- /* file. Used only when building shlibs */
-#endif /* __MACH__ */
-
-static void Usage(void)
-{
- fprintf(stderr,"Usage: pswrap [options] [input-file]\n");
- fprintf(stderr," -a produce ANSI C procedure prototypes\n");
- fprintf(stderr," -b process a big file\n");
- fprintf(stderr," -f filename include special header\n");
- fprintf(stderr," -h filename specify header filename\n");
- fprintf(stderr," -o filename specify output C filename\n");
- fprintf(stderr," -r make wraps re-entrant\n");
- fprintf(stderr," -s length set maximum string length\n");
- exit(1);
-}
-
-static void ScanArgs(int argc, char *argv[])
-{
- char *slash; /* index of last / in hfile */
- char *c; /* pointer into headid for conversion */
- int i = 0;
-
- prog = argv[i++];
- slash = rindex(prog,SLASH);
- if (slash)
- prog = slash + 1;
- while (i < argc) {
- if (*argv[i] != '-') {
- if (ifile != NULL) {
- fprintf(stderr, "%s: Only one input file can be specified.\n", prog);
- Usage();
- } else {
- ifile = argv[i];
- }
- } else {
- switch (*(argv[i]+1)) {
- case 'a':
- doANSI++;
- reentrant++;
- break;
- case 'b':
- bigFile++;
- break;
-#ifdef PSWDEBUG
- case 'd':
- lexdebug++;
- break;
-#endif /* PSWDEBUG */
- case 'f':
- special_h = argv[++i];
- break;
- case 'h':
- hfile = argv[++i];
- slash = rindex(hfile,SLASH);
- strcpy(headid, slash ? slash+1 : hfile);
- for (c = headid; *c != '\0'; c++) {
- if (*c == '.') *c = '_';
- else if (isascii(*c) && islower(*c)) *c = toupper(*c);
- }
- break;
- case 'o':
- ofile = argv[++i];
- break;
- case 'r':
- reentrant++;
- break;
- case 's':
- if ((maxstring = atoi(argv[++i])) < MIN_MAXSTRING) {
- fprintf(stderr,"%s: -s %d is the minimum\n", prog, MIN_MAXSTRING);
- maxstring = MIN_MAXSTRING;
- }
- break;
- case 'w':
- break;
-#ifdef __MACH__
- case 'S':
- shlibInclude = argv[++i];
- break;
-#endif /* __MACH__ */
- case 'n':
- noUserNames = true;
- break;
- case 'p':
- pad++;
- break;
- default:
- fprintf(stderr, "%s: bad option '-%c'\n", prog, *(argv[i]+1));
- Usage();
- break;
- } /* switch */
- } /* else */
- i++;
- } /* while */
-} /* ScanArgs */
-
-int main(int argc, char *argv[])
-{
- int retval; /* return from yyparse */
-
- ScanArgs(argc, argv);
-
- if (ifile == NULL)
- ifile = "stdin";
- else {
- gotInFile = 1;
- if (freopen(ifile,"r",stdin) == NULL) {
- fprintf(stderr, "%s: can't open %s for input\n", prog, ifile);
- exit(1);
- }
- }
- if ((string_temp = (char *) malloc((unsigned) (maxstring+1))) == 0) {
- fprintf(stderr, "%s: can't allocate %d char string; try a smaller -s value\n", prog, maxstring);
- exit(1);
- }
- if (ofile == NULL)
- ofile = "stdout";
- else {
-#ifdef __MACH__
- (void)unlink(ofile);
-#endif /* __MACH__ */
- if (freopen(ofile,"w",stdout) == NULL) {
- fprintf(stderr, "%s: can't open %s for output\n", prog, ofile);
- exit(1);
- }
- }
- InitOFile();
-
- if (hfile != NULL) {
-#ifdef __MACH__
- (void)unlink(hfile);
-#endif /* __MACH__ */
- if ((header = fopen(hfile,"w")) == NULL) {
- fprintf(stderr, "%s: can't open %s for output\n", prog, hfile);
- exit(1);
- }
- }
- if (header != NULL) InitHFile();
-
- InitWellKnownPSNames();
-
- if ((retval = yyparse()) != 0)
- fprintf(stderr,"%s: error in parsing %s\n",prog,ifile);
- else if (errorCount != 0) {
- fprintf(stderr,"%s: errors were encountered\n",prog);
- retval = errorCount;
- }
-
- if (hfile != NULL) FinishHFile();
-
- exit (retval);
-}
diff --git a/nx-X11/config/pswrap/psw.c b/nx-X11/config/pswrap/psw.c
deleted file mode 100644
index f50f87a8b..000000000
--- a/nx-X11/config/pswrap/psw.c
+++ /dev/null
@@ -1,1961 +0,0 @@
-/*
- * psw.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/psw.c,v 1.5 2000/06/07 21:36:56 tsi Exp $ */
-
-/***********/
-/* Imports */
-/***********/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef XENVIRONMENT
-#include <X11/Xos.h>
-#else
-#include <string.h>
-#endif
-
-#include "pswdict.h"
-#include "pswpriv.h"
-#include "pswsemantics.h"
-
-#define DPS_HEADER_SIZE 4
-#define DPS_LONG_HEADER_SIZE 8
-#define DPS_BINOBJ_SIZE 8 /* sizeof(DPSBinObjGeneric) */
-#define WORD_ALIGN 3
-#define HNUMTOKEN 149
-#define NUMSTR_HEADER_SIZE 4
-#define MAXSTRINGS 256 /* maximum number of non-duplcated strings */
-
-#define datafil stdout /* send statics to stdout (with code) */
-
-/********************/
-/* Global Variables */
-/********************/
-
-/* Wrap-specific globals */
-
-static char *ctxName;
-
-static TokenList nameTokens;
-static int nNames;
-static TokenList namedInputArrays, namedInputStrings;
-static TokenList literalStrings;
-static boolean writable; /* encoding is not constant */
-static boolean twoStatics; /* true if strings are separate from objects */
-static boolean large;
-static int dpsHeaderSize;
-static int stringBytes;
-
-/**************************/
-/* Procedure Declarations */
-/**************************/
-
-
-/**********************/
-/* Utility procedures */
-
-
-#define CantHappen() { fprintf(stderr, "CantHappen"); abort(); }
-
-#define Assert(b) if (!(b)) { CantHappen(); }
-
-#define SafeStrCpy(dst,src) \
- dst = psw_malloc(strlen(src)+1) , \
- strcpy(dst, src)
-
-static long NumArgs(Args args)
-{
- register long n = 0;
- register Arg arg;
- register Item item;
- for (arg = args; arg; arg = arg->next)
- for (item = arg->items; item; item = item->next)
- n++;
- return n;
-}
-
-static int NumTokens(Body body)
-{
- register int n = 0;
- while (body) { n++; body = body->next; }
- return n;
-}
-
-static TokenList ConsToken (Token t, TokenList ll)
-{
- TokenList tt = (TokenList) psw_calloc(sizeof(TokenListRec), 1);
- tt->token = t;
- tt->next = ll;
- return tt;
-}
-
-static TokenList ConsNameToken (Token t, TokenList ll)
-{
- TokenList temp, tt = (TokenList) psw_calloc(sizeof(TokenListRec), 1);
-
- tt->token = t;
- tt->next = ll;
- if(ll == NULL)
- return (tt);
- temp = ll;
- while((temp->next != NULL) && strcmp((char *)(temp->token->val), (char *)(t->val)))
- temp = temp->next;
- tt->next = temp->next;
- temp->next = tt;
- return (ll);
-}
-
-static boolean IsCharType(Type t)
-{
- return (t == T_CHAR || t == T_UCHAR);
-}
-
-static boolean IsNumStrType(Type t)
-{
- return (t == T_NUMSTR
- || t == T_FLOATNUMSTR
- || t == T_LONGNUMSTR
- || t == T_SHORTNUMSTR);
-}
-
-static boolean IsPadNumStrType(Type t)
-{
- return (t == T_NUMSTR || t == T_SHORTNUMSTR);
-}
-
-/*************************/
-/* Type-code conversions */
-
-static char *TypeToText(Type type)
-{
- switch ((int) type) {
- case T_CONTEXT:
- return "DPSContext";
- case T_BOOLEAN:
- return "int";
- case T_FLOAT:
- return "float";
- case T_DOUBLE:
- return "double";
- case T_CHAR:
- return "char";
- case T_UCHAR:
- return "unsigned char";
- case T_USEROBJECT:
- case T_INT:
- return "int";
- case T_LONGINT:
- return "long int";
- case T_SHORTINT:
- return "short int";
- case T_ULONGINT:
- return "unsigned long int";
- case T_USHORTINT:
- return "unsigned short int";
- case T_UINT:
- return "unsigned int";
- case T_NUMSTR:
- return "int";
- case T_FLOATNUMSTR:
- return "float";
- case T_LONGNUMSTR:
- return "long int";
- case T_SHORTNUMSTR:
- return "short int";
- default:
- CantHappen();
- }
- /*NOTREACHED*/
-}
-
-static char *CTypeToDPSType(int type)
-{
- switch (type) {
- case T_BOOLEAN:
- return("DPS_BOOL");
- case T_INT:
- case T_LONGINT:
- case T_SHORTINT:
- case T_UINT:
- case T_ULONGINT:
- case T_USHORTINT:
- case T_USEROBJECT:
- return("DPS_INT");
- case T_FLOAT:
- case T_DOUBLE:
- return("DPS_REAL");
- case T_CHAR:
- case T_UCHAR:
- return("DPS_STRING");
- default: CantHappen();
- }
- /*NOTREACHED*/
-}
-
-static char *CTypeToResultType(int type)
-{
- switch (type) {
- case T_BOOLEAN:
- return("dps_tBoolean");
- case T_USEROBJECT:
- case T_INT:
- return("dps_tInt");
- case T_LONGINT:
- return("dps_tLong");
- case T_SHORTINT:
- return("dps_tShort");
- case T_UINT:
- return("dps_tUInt");
- case T_ULONGINT:
- return("dps_tULong");
- case T_USHORTINT:
- return("dps_tUShort");
- case T_FLOAT:
- return("dps_tFloat");
- case T_DOUBLE:
- return("dps_tDouble");
- case T_CHAR:
- return("dps_tChar");
- case T_UCHAR:
- return("dps_tUChar");
- case T_NUMSTR:
- return("dps_tInt");
- case T_FLOATNUMSTR:
- return("dps_tFloat");
- case T_LONGNUMSTR:
- return("dps_tLong");
- case T_SHORTNUMSTR:
- return("dps_tShort");
- default: CantHappen();
- }
- /*NOTREACHED*/
-}
-
-static void FreeTokenList(TokenList tokenList)
-{
- register TokenList tl;
- if (bigFile)
- while (tokenList) {
- tl = tokenList->next;
- free((char *)tokenList);
- tokenList = tl;
- }
-}
-
-
-/********************************************/
-/* Support procedures that generate no code */
-
-static void SetNameTag(Token t)
-{
- PSWDictValue tag;
- Assert(t->type == T_NAME || t->type == T_LITNAME);
- tag = PSWDictLookup(wellKnownPSNames, (char *)(t->val));
- if (tag == -1) { /* this is not a well-known name */
- if (noUserNames)
- t->wellKnownName = false;
- else {
- nameTokens = ConsNameToken(t, nameTokens);
- nNames++;
- }
- }
- else { /* a well-known (system) name */
- t->wellKnownName = true;
- t->body.cnst = tag;
- }
-}
-
-/* If the wrap has result parameters, DPSAwaitReturnValues
- must be told when execution if the body is complete. The
- following boilerplate is tacked on to the end of the body
- for this purpose by AppendResultFlush:
- 0 doneTag printobject flush
- where doneTag = (last result parameter tag + 1).
-*/
-static Body AppendResultFlush(Body body, long n)
-{
- Token t, token;
- char *ss;
-
- if (body == NULL) return NULL;
- for (t = body; t->next; t = t->next) ;
-
- token = PSWToken(T_INT, 0L);
- token->next = PSWToken(T_INT, (char *)(long)n);
-
- SafeStrCpy(ss, "printobject");
- token->next->next = PSWToken(T_NAME, ss);
-
- SafeStrCpy(ss, "flush");
- token->next->next->next = PSWToken(T_NAME, ss);
-
- t->next = token;
- return body;
-}
-
-
-/*****************************************/
-/* Support procedures that generate code */
-
-static void EmitArgPrototypes(FILE *stm, Header hdr)
-{
- register Arg arg;
- register Item item;
- for (arg = hdr->inArgs; arg; arg = arg->next) {
- fprintf(stm, "%s ", TypeToText(arg->type));
- for (item = arg->items; item; item = item->next) {
- if (item->starred) fprintf(stm, "*");
- fprintf(stm, item->name);
- if (item->subscripted) fprintf(stm, "[]");
- if (item->next) fprintf(stm, ", ");
- }
- fprintf(stm, "; ");
- }
- for (arg = hdr->outArgs; arg; arg = arg->next) {
- fprintf(stm, "%s ", TypeToText(arg->type));
- for (item = arg->items; item; item = item->next) {
- if (item->starred) fprintf(stm, "*");
- fprintf(stm, item->name);
- if (item->subscripted) fprintf(stm, "[]");
- if (item->next) fprintf(stm, ", ");
- }
- fprintf(stm, "; ");
- }
-}
-
-/* use default promotions in prototypes unless it's a pointer/array */
-static char *TypeToDefault(int type)
-{
- char *result = TypeToText(type);
- switch (type) {
- case T_FLOAT: result = "double"; break;
- case T_USHORTINT: result = "unsigned"; break;
- case T_SHORTINT: result = "int"; break;
- }
- return result;
-}
-
-static void EmitANSIPrototypes(FILE *stm, Header hdr)
-{
- register Arg arg;
- register Item item;
- register char *type;
-
- if ((hdr->inArgs == NULL) && (hdr->outArgs == NULL)) {
- fprintf(stm, " void "); return;
- }
- for (arg = hdr->inArgs; arg; arg = arg->next) {
- type = TypeToText(arg->type);
- for (item = arg->items; item; item = item->next) {
- if (arg->type == T_CONTEXT) ctxName = item->name;
- fprintf(stm, "%s%s %s%s",
- (item->starred || item-> subscripted) ? "const " : "",
- (item->starred || item-> subscripted) ? type : TypeToDefault(arg->type),
- item->starred ? "*" : "", item->name);
- if (item->subscripted) fprintf(stm, "[]");
- if (item->next) fprintf(stm, ", ");
- }
- if (arg->next) fprintf(stm, ", ");
- }
- if (hdr->inArgs && hdr->outArgs) fprintf(stm, ", ");
- for (arg = hdr->outArgs; arg; arg = arg->next) {
- type = TypeToText(arg->type);
- for (item = arg->items; item; item = item->next) {
- fprintf(stm, "%s %s%s",
- (item->starred || item-> subscripted) ? type : TypeToDefault(arg->type),
- item->starred ? "*" : "",
- item->name);
- if (item->subscripted) fprintf(stm, "[]");
- if (item->next) fprintf(stm, ", ");
- }
- if (arg->next) fprintf(stm, ", ");
- }
-}
-
-/* Procedures for generating type declarations in the body */
-
-static void StartBinObjSeqDef(void)
-{
- /* start type defn of binobjseq */
- printf(" typedef struct {\n");
- printf(" unsigned char tokenType;\n");
- if(large) {
- printf(" unsigned char sizeFlag;\n");
- printf(" unsigned short topLevelCount;\n");
- printf(" unsigned int nBytes;\n\n");
- outlineno++;
- } else {
- printf(" unsigned char topLevelCount;\n");
- printf(" unsigned short nBytes;\n\n");
- }
- outlineno += 5;
-}
-
-static void EmitFieldType(Token t)
-{
- if ((t->type == T_FLOAT)
- || (t->type == T_NAME && t->namedFormal
- && (!t->namedFormal->subscripted)
- && (t->namedFormal->type == T_FLOAT || t->namedFormal->type == T_DOUBLE))
- || ((t->type == T_SUBSCRIPTED) && ((t->namedFormal->type == T_FLOAT)
- || (t->namedFormal->type == T_DOUBLE))))
- {
- printf(" DPSBinObjReal");
- } else {
- printf(" DPSBinObjGeneric");
- }
- printf (" obj%d;\n", t->tokenIndex); outlineno++;
-}
-
-static int CheckSize(Body body)
-{
- Adr nextAdr;
- register TokenList bodies = NULL;
- register TokenList tl;
- boolean firstBody = true;
- PSWDict wrapDict;
- int strCount = 0;
-
- bodies = ConsToken(body, (TokenList) NULL); /* the work list */
-
- wrapDict = CreatePSWDict(MAXSTRINGS); /* dictionary of strings in the wrap */
-
- nextAdr.cnst = 0;
- nextAdr.var = NULL;
- namedInputArrays = NULL;
- namedInputStrings = NULL;
- literalStrings = NULL;
-
- while (bodies) {
- register Token t;
- register TokenList c = bodies;
- bodies = c->next;
-
- if (firstBody) firstBody = false;
- else {
- c->token->body = nextAdr;
- c->token = (Body)c->token->val;
- }
- for (t = c->token; t; t = t->next) {
- /* foreach token in this body */
- nextAdr.cnst += DPS_BINOBJ_SIZE;
-
-
- switch (t->type) {
- case T_STRING: /* token is a string literal */
- case T_HEXSTRING: /* token is a hexstring literal */
- if (t->namedFormal == NULL) {
- if ((t->type == T_STRING) ? PSWStringLength(t->val)
- : PSWHexStringLength(t->val))
- literalStrings = ConsToken(t, literalStrings);
- }
- else {
- Assert(IsCharType(t->namedFormal->type));
- namedInputStrings = ConsToken(t, namedInputStrings);
- }
- break;
-
- case T_NAME:
- if (t->namedFormal != NULL) {
- if (IsCharType(t->namedFormal->type) ||
- IsNumStrType(t->namedFormal->type))
- namedInputStrings = ConsToken(t, namedInputStrings);
- else
- if (t->namedFormal->subscripted)
- namedInputArrays = ConsToken(t, namedInputArrays);
- } else {
- if (noUserNames) {
- SetNameTag(t);
- if (!t->wellKnownName)
- literalStrings = ConsToken(t, literalStrings);
- }
- }
- break;
-
- case T_LITNAME:
- if (t->namedFormal != NULL) {
- namedInputStrings = ConsToken(t, namedInputStrings);
- writable = true;
- } else {
- if (noUserNames) {
- SetNameTag(t);
- if (!t->wellKnownName)
- literalStrings = ConsToken(t, literalStrings);
- }
- }
- break;
-
- case T_SUBSCRIPTED:
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- break;
-
- case T_ARRAY:
- bodies = ConsToken(t, bodies);
- break;
- case T_PROC:
- bodies = ConsToken(t, bodies);
- break;
- default:
- CantHappen();
- } /* switch */
- } /* for */
- free(c);
- } /* while */
-
-
- for (tl = namedInputArrays; tl; tl = tl->next) {
- Token t = tl->token;
- if (t->namedFormal->subscript->constant)
- nextAdr.cnst += t->namedFormal->subscript->val * DPS_BINOBJ_SIZE;
- }
-
- for (tl = literalStrings; tl; tl = tl->next) {
- Token t = tl->token;
- int ln;
- if (PSWDictLookup(wrapDict, (char *)t->val) == -1) {
- if (strCount <= MAXSTRINGS) {
- PSWDictEnter(wrapDict, t->val, 0);
- strCount++;
- }
- if (t->type == T_STRING || t->type == T_NAME || t->type == T_LITNAME)
- ln = PSWStringLength((char *)t->val);
- else
- ln = PSWHexStringLength((char *)t->val);
- nextAdr.cnst += ln;
- }
- }
-
- /* process name and litname tokens that reference formal string arguments */
- for (tl = namedInputStrings; tl; tl = tl->next) {
- Token t = tl->token;
- if (t->namedFormal->subscripted && t->namedFormal->subscript->constant) {
- if (IsNumStrType(t->namedFormal->type))
- nextAdr.cnst += NUMSTR_HEADER_SIZE;
- else
- if(pad) {
- int length;
- length = t->namedFormal->subscript->val + WORD_ALIGN;
- length &= ~WORD_ALIGN;
- nextAdr.cnst += length;
- } else
- nextAdr.cnst += t->namedFormal->subscript->val;
- }
- }
-
- DestroyPSWDict(wrapDict);
- if (nextAdr.cnst > 0xffff)
- return(1);
- else
- return(0);
-
-} /* CheckSize */
-
-static void BuildTypesAndAssignAddresses(
- Body body, Adr *sz, long int *nObjs, unsigned *psize)
-{
- long int objN = 0;
- Adr nextAdr;
- register TokenList bodies = NULL;
- register TokenList tl;
- boolean firstBody = true;
- PSWDict wrapDict;
- int strCount = 0;
-
- bodies = ConsToken(body, (TokenList) NULL); /* the work list */
-
- wrapDict = CreatePSWDict(MAXSTRINGS); /* dictionary of strings in the wrap */
-
- nextAdr.cnst = 0;
- nextAdr.var = NULL;
- namedInputArrays = NULL;
- namedInputStrings = NULL;
- literalStrings = NULL;
- writable = false;
- stringBytes = 0;
-
- /* emit boilerplate for the binobjseq record type */
- StartBinObjSeqDef();
-
- while (bodies) {
- register Token t;
- register TokenList c = bodies;
- bodies = c->next;
-
- if (firstBody) firstBody = false;
- else {
- c->token->body = nextAdr;
- c->token = (Body)c->token->val;
- }
- for (t = c->token; t; t = t->next) {
- /* foreach token in this body */
- t->adr = nextAdr;
- nextAdr.cnst += DPS_BINOBJ_SIZE;
- t->tokenIndex = objN++;
-
- /* emit the token type as the next record field */
- EmitFieldType(t);
-
- switch (t->type) {
- case T_STRING: /* token is a string literal */
- case T_HEXSTRING: /* token is a hexstring literal */
- if (t->namedFormal == NULL) {
- if ((t->type == T_STRING) ? PSWStringLength(t->val)
- : PSWHexStringLength(t->val))
- literalStrings = ConsToken(t, literalStrings);
- }
- else {
- Assert(IsCharType(t->namedFormal->type));
- namedInputStrings = ConsToken(t, namedInputStrings);
- if (!(t->namedFormal->subscripted && t->namedFormal->subscript->constant))
- writable = true;
- }
- break;
-
- case T_NAME:
- if (t->namedFormal == NULL) {
- SetNameTag(t);
- if(noUserNames) {
- if (!t->wellKnownName)
- literalStrings = ConsToken(t, literalStrings);
- }
- } else
- if (IsCharType(t->namedFormal->type)
- || IsNumStrType(t->namedFormal->type)) {
- namedInputStrings = ConsToken(t, namedInputStrings);
- if (!(t->namedFormal->subscripted
- && t->namedFormal->subscript->constant))
- writable = true;
- } else
- if (t->namedFormal->subscripted) {
- namedInputArrays = ConsToken(t, namedInputArrays);
- if (!(t->namedFormal->subscript->constant))
- writable = true;
- } else
- writable = true;
- break;
-
- case T_LITNAME:
- Assert(t->namedFormal == NULL || IsCharType(t->namedFormal->type));
- if (t->namedFormal == NULL) {
- SetNameTag(t);
- if (noUserNames) {
- if (!t->wellKnownName)
- literalStrings = ConsToken(t, literalStrings);
- }
- } else {
- namedInputStrings = ConsToken(t, namedInputStrings);
- writable = true;
- }
- break;
-
- case T_SUBSCRIPTED:
- writable = true;
- break;
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- break;
-
- case T_ARRAY:
- bodies = ConsToken(t, bodies);
- break;
- case T_PROC:
- bodies = ConsToken(t, bodies);
- break;
- default:
- CantHappen();
- } /* switch */
- } /* for */
- free(c);
- } /* while */
-
- *psize = nextAdr.cnst;
-
- if(nNames)
- writable = true; /* SetNameTag couldn't find the name */
-
- if (namedInputArrays && literalStrings) {
- twoStatics = true;
- printf(" } _dpsQ;\n\n");
- printf(" typedef struct {\n");
- outlineno += 3;
- }
- else twoStatics = false;
-
- for (tl = namedInputArrays; tl; tl = tl->next) {
- Token t = tl->token;
- Assert(t && t->type == T_NAME && t->namedFormal);
- Assert(t->namedFormal->subscripted && !t->namedFormal->starred);
-
- /* this input array token requires its own write binobjs call */
- t->body = nextAdr;
- if (t->namedFormal->subscript->constant)
- nextAdr.cnst += t->namedFormal->subscript->val * DPS_BINOBJ_SIZE;
- }
-
- for (tl = literalStrings; tl; tl = tl->next) {
- Token t = tl->token;
- int ln;
- PSWDictValue loc;
-
- loc = PSWDictLookup(wrapDict, (char *)t->val);
- if (loc == -1) {
- t->body = nextAdr;
- if (strCount <= MAXSTRINGS) {
- PSWDictEnter(wrapDict, (char *)t->val, nextAdr.cnst);
- strCount++;
- }
- if (t->type == T_STRING || t->type == T_NAME || t->type == T_LITNAME)
- ln = PSWStringLength((char *)t->val);
- else
- ln = PSWHexStringLength((char *)t->val);
- nextAdr.cnst += ln;
- stringBytes += ln;
-
- /* emit the string type as the next record field */
- printf(" char obj%ld[%d];\n", objN++, ln); outlineno++;
- } else {
- t->body = nextAdr;
- t->body.cnst = loc;
- }
- }
-
- /* process name and litname tokens that reference formal string arguments */
- for (tl = namedInputStrings; tl; tl = tl->next) {
- Token t = tl->token;
- t->body = nextAdr;
- if (t->namedFormal->subscripted && t->namedFormal->subscript->constant) {
- if (IsNumStrType(t->namedFormal->type)) {
- nextAdr.cnst += NUMSTR_HEADER_SIZE;
- writable = true;
- } else
- if(pad) {
- int length;
- length = t->namedFormal->subscript->val + WORD_ALIGN;
- length &= ~WORD_ALIGN;
- nextAdr.cnst += length;
- } else
- nextAdr.cnst += t->namedFormal->subscript->val;
- }
- }
-
- /* emit boilerplate to end the last record type */
- if (twoStatics) printf(" } _dpsQ1;\n");
- else printf(" } _dpsQ;\n");
- outlineno++;
-
- *nObjs = objN;
- /* total number of objects plus string bodies in objrecs */
-
- *sz = nextAdr;
- DestroyPSWDict(wrapDict);
-} /* BuildTypesAndAssignAddresses */
-
-
-/* Procedures for generating static declarations for local types */
-
-static void StartStatic(boolean first)
-{
- /* start static def for bin obj seq or for array data (aux) */
- if (first) {
- if(reentrant && writable) {
- if(doANSI)
- printf(" static const _dpsQ _dpsStat = {\n");
- else
- printf(" static _dpsQ _dpsStat = {\n");
- } else {
- if (doANSI)
- printf(" static const _dpsQ _dpsF = {\n");
- else
- printf(" static _dpsQ _dpsF = {\n");
- }
- } else {
- if(doANSI)
- printf(" static const _dpsQ1 _dpsF1 = {\n");
- else
- printf(" static _dpsQ1 _dpsF1 = {\n");
- }
-
- outlineno++;
-}
-
-static void FirstStatic(int nTopObjects, Adr *sz)
-{
- char *numFormat = "DPS_DEF_TOKENTYPE";
-
- outlineno++;
- if(large) {
- fprintf(datafil, " %s, 0, %d, ", numFormat, nTopObjects);
- fprintf(datafil, "%ld,\n", sz->cnst + dpsHeaderSize);
- } else {
- fprintf(datafil, " %s, %d, ", numFormat, nTopObjects);
- fprintf(datafil, "%ld,\n", sz->cnst + dpsHeaderSize);
- }
-}
-
-static void EndStatic(boolean first)
-{
- /* end static template defn */
- if (first)
- printf(" }; /* _dpsQ */\n");
- else
- printf(" }; /* _dpsQ1 */\n");
- outlineno++;
-}
-
-/* char that separates object attributes */
-#define ATT_SEP '|'
-
-static void EmitFieldConstructor(Token t)
-{
- char *comment = NULL, *commentName = NULL;
- fprintf(datafil, " {");
-
- switch (t->type) {
- case T_BOOLEAN:
- fprintf(datafil, "DPS_LITERAL%cDPS_BOOL, 0, 0, %d", ATT_SEP, (int)(long)t->val);
- break;
- case T_INT:
- fprintf(datafil, "DPS_LITERAL%cDPS_INT, 0, 0, %d", ATT_SEP, (int)(long)t->val);
- break;
- case T_FLOAT:
- fprintf(datafil, "DPS_LITERAL%cDPS_REAL, 0, 0, %s", ATT_SEP, (char *)t->val);
- break;
-
- case T_ARRAY:
- fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %ld", ATT_SEP,
- NumTokens((Body) (t->val)), t->body.cnst);
- break;
- case T_PROC:
- fprintf(datafil, "DPS_EXEC%cDPS_ARRAY, 0, %d, %ld", ATT_SEP,
- NumTokens((Body) (t->val)), t->body.cnst);
- break;
-
- case T_STRING:
- case T_HEXSTRING:
- if (t->namedFormal == NULL) {
- int ln;
- if (t->type == T_STRING)
- ln = PSWStringLength((char *)t->val);
- else ln = PSWHexStringLength((char *)t->val);
- fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld", ATT_SEP,
- ln, t->body.cnst);
- } else {
- Item item = t->namedFormal;
- if (item->subscripted && item->subscript->constant) {
- fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld",
- ATT_SEP,item->subscript->val, t->body.cnst);
- comment = "param[const]: ";
- } else {
- fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %ld",
- ATT_SEP,t->body.cnst);
- comment = "param ";
- }
- commentName = (char *)t->val;
- }
- break;
-
- case T_LITNAME:
- commentName = (char *)t->val;
- if (t->wellKnownName) {
- fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, DPSSYSNAME, %ld", ATT_SEP, t->body.cnst);
- }
- else if (t->namedFormal == NULL) {
- int ln;
- if (noUserNames) {
- ln = PSWStringLength((char *)t->val);
- fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, %d, %ld", ATT_SEP, ln, t->body.cnst);
- } else
- fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, 0, 0", ATT_SEP);
- }
- else {
- fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, 0, %ld", ATT_SEP, t->body.cnst);
- comment = "param ";
- }
- break;
-
- case T_NAME:
- commentName = (char *)t->val;
- if (t->wellKnownName) {
- fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, DPSSYSNAME, %ld", ATT_SEP, t->body.cnst);
- }
- else if (t->namedFormal == NULL) {
- int ln;
- if (noUserNames) {
- ln = PSWStringLength((char *)t->val);
- fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %ld", ATT_SEP,
- ln, t->body.cnst);
- } else
- fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, 0, 0", ATT_SEP);
- }
- else {
- Item item = t->namedFormal;
- if (IsCharType(item->type)) {
- if (item->subscripted && t->namedFormal->subscript->constant) {
- fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %ld", ATT_SEP,
- t->namedFormal->subscript->val, t->body.cnst);
- comment = "param[const]: ";
- }
- else {
- fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, 0, %ld", ATT_SEP, t->body.cnst);
- comment = "param ";
- }
- }
- else {
- if (item->subscripted) {
- if (t->namedFormal->subscript->constant) {
- if(IsNumStrType(item->type))
- fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld",
- ATT_SEP, t->namedFormal->subscript->val
- + NUMSTR_HEADER_SIZE, t->body.cnst);
- else
- fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %ld",
- ATT_SEP, t->namedFormal->subscript->val,
- t->body.cnst);
- comment = "param[const]: ";
- } else {
- if(IsNumStrType(item->type))
- fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %ld",
- ATT_SEP, t->body.cnst);
- else
- fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, 0, %ld", ATT_SEP,
- t->body.cnst);
- comment = "param[var]: ";
- }
- }
- else {
- char *dt = CTypeToDPSType(item->type);
- fprintf(datafil, "DPS_LITERAL%c%s, 0, 0, 0", ATT_SEP, dt);
- comment = "param: ";
- }
- }
- }
- break;
- case T_SUBSCRIPTED: {
- Item item = t->namedFormal;
- char *dt = CTypeToDPSType(item->type);
-
- /* Assert(t->namedFormal) */
- fprintf(datafil, "DPS_LITERAL%c%s, 0, 0, 0", ATT_SEP, dt);
- comment = "indexed param: ";
- commentName = (char *)t->val;
- }
- break;
-
- default:
- CantHappen();
- } /* switch */
-
- if (comment == NULL) {
- if (commentName == NULL) fprintf(datafil, "},\n");
- else fprintf(datafil, "}, /* %s */\n", commentName);
- }
- else {
- if (commentName == NULL) fprintf(datafil, "}, /* %s */\n", comment);
- else fprintf(datafil, "}, /* %s%s */\n", comment, commentName);
- }
- outlineno++;
-} /* EmitFieldConstructor */
-
-static void ConstructStatics(Body body, Adr *sz, int nObjs)
-{
- int objN = 0;
- register TokenList strings = NULL, bodies = NULL;
- register TokenList tl;
- boolean isNamedInputArrays = false;
- PSWDict wrapDict;
- int strCount = 0;
-
- wrapDict = CreatePSWDict(MAXSTRINGS); /* dictionary of strings in the wrap */
-
- bodies = ConsToken(body, (TokenList) NULL); /* the work list */
-
- /* emit boilerplate for the binobjseq static */
- StartStatic(true);
- FirstStatic(NumTokens(body), sz);
-
- while (bodies) {
- register Token t;
- TokenList c = bodies;
- bodies = c->next;
-
- for (t = c->token; t; t = t->next) {
- /* foreach token in this body */
-
- /* emit the next record field constructor */
- EmitFieldConstructor(t);
- objN++;
-
- switch (t->type) {
- case T_STRING: /* token is a string literal */
- if ((t->namedFormal == NULL) && PSWStringLength(t->val))
- strings = ConsToken(t, strings);
- break;
-
- case T_HEXSTRING: /* token is a hexstring literal */
- if ((t->namedFormal == NULL) && PSWHexStringLength(t->val))
- strings = ConsToken(t, strings);
- break;
-
- case T_NAME:
- if (t->namedFormal == NULL) {
- if (noUserNames) {
- if (!t->wellKnownName)
- strings = ConsToken(t, strings);
- }
- } else
- if ((t->namedFormal->subscripted)
- && (!IsCharType(t->namedFormal->type))
- && (!IsNumStrType(t->namedFormal->type))
- )
- isNamedInputArrays = true;
- break;
-
- case T_LITNAME:
- if (noUserNames) {
- if (!t->namedFormal && !t->wellKnownName)
- strings = ConsToken(t, strings);
- break;
- }
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- case T_SUBSCRIPTED:
- break;
-
- case T_ARRAY:
- case T_PROC:
- bodies = ConsToken((Body)t->val, bodies);
- break;
- default:
- CantHappen();
- } /* switch */
- } /* for */
- free(c);
- } /* while */
-
- if (strings && isNamedInputArrays) {
- EndStatic(true);
- StartStatic(false);
- }
-
- for (tl = strings; tl; tl = tl->next) {
- Token t = tl->token;
- if (PSWDictLookup(wrapDict, (char *)t->val) == -1) {
- if (strCount <= MAXSTRINGS) {
- PSWDictEnter(wrapDict, (char *)t->val, 0);
- strCount++;
- }
- printf(" {");
- if (t->type == T_STRING || t->type == T_NAME || t->type == T_LITNAME)
- PSWOutputStringChars((char *)t->val);
- else
- PSWOutputHexStringChars((char *)t->val);
- printf("},\n"); outlineno++;
- objN++;
- }
- }
-
- FreeTokenList(strings); strings = NULL;
-
- EndStatic(! twoStatics); /* end the last static record */
-
- Assert(objN == nObjs);
-
- DestroyPSWDict(wrapDict);
-} /* ConstructStatics */
-
-
-/* Procedures for managing the result table */
-
-static void EmitResultTagTableDecls(Args outArgs)
-{
- register Arg arg;
- register Item item;
- int count = 0;
-
- if(reentrant) {
- for (arg = outArgs; arg; arg = arg->next)
- for (item = arg->items; item; item = item->next)
- count++;
- printf(" DPSResultsRec _dpsR[%d];\n", count); outlineno++;
- count = 0;
- if(doANSI)
- printf(" static const DPSResultsRec _dpsRstat[] = {\n");
- else
- printf(" static DPSResultsRec _dpsRstat[] = {\n");
- outlineno++;
- } else {
- printf(" static DPSResultsRec _dpsR[] = {\n"); outlineno++;
- }
- for (arg = outArgs; arg; arg = arg->next) {
- for (item = arg->items; item; item = item->next) {
- if (item->subscripted) {
- printf(" { %s },\n",CTypeToResultType(item->type));
- }
- else { /* not subscripted */
- printf(" { %s, -1 },\n",CTypeToResultType(item->type));
- }
- outlineno++;
- }
- }
- printf(" };\n"); outlineno++;
- for (arg = outArgs; arg; arg = arg->next) {
- for (item = arg->items; item; item = item->next) {
- if(reentrant) {
- printf(" _dpsR[%d] = _dpsRstat[%d];\n", count, count);
- outlineno++;
- }
- if (item->subscripted) {
- Subscript s = item->subscript;
- if (!(s->constant)) {
- printf(" _dpsR[%d].count = %s;\n",count, s->name);
- } else {
- printf(" _dpsR[%d].count = %d;\n",count, s->val);
- }
- outlineno++;
- } else { /* not subscripted */
- if (IsCharType(item->type)) {
- printf(" _dpsR[%d].count = -1;\n",count);
- outlineno++;
- }
- }
- printf(" _dpsR[%d].value = (char *)%s;\n",count++,item->name);
- outlineno++;
- }
- }
- printf("\n"); outlineno++;
-}
-
-static void EmitResultTagTableAssignments(Args outArgs)
-{
- printf(" DPSSetResultTable(%s, _dpsR, %ld);\n", ctxName, NumArgs(outArgs));
- outlineno++;
-}
-
-/* Procedure for acquiring name tags */
-
-static void EmitNameTagAcquisition(void)
-{
- register TokenList n;
- int i;
- char *last_str;
-
- last_str = (char *) psw_malloc((unsigned) (maxstring+1));
-
- printf(" {\n");
- if(!doANSI) {
- printf(" static int _dpsT = 1;\n\n");
- printf(" if (_dpsT) {\n");
- outlineno += 4;
- } else {
- printf("if (_dpsCodes[0] < 0) {\n");
- outlineno += 2;
- }
- if(doANSI)
- printf(" static const char * const _dps_names[] = {\n");
- else
- printf(" static char *_dps_names[] = {\n");
- outlineno ++;
-
- for (n = nameTokens; n!= NULL; n = n->next) {
- if (strcmp(last_str,(char *)n->token->val)) {
- strcpy(last_str,(char *)n->token->val);
- printf("\t\"%s\"", (char *)n->token->val);
- } else {
- printf("\t(char *) 0 ");
- }
- if (n->next) {printf(",\n"); outlineno++;}
- }
- printf("};\n"); outlineno++;
- printf(" int *_dps_nameVals[%d];\n",nNames);outlineno++;
- if (!doANSI) {
- if (!writable) {
- printf(" register DPSBinObjRec *_dpsP = (DPSBinObjRec *) &_dpsF.obj0;\n");
- outlineno++;
- } else {
- if (reentrant) {
- printf(" _dpsP = (DPSBinObjRec *) &_dpsStat.obj0;\n");
- outlineno++;
- }
- }
- }
- i = 0;
- if (doANSI) {
- for(i=0; i<nNames; i++) {
- printf(" _dps_nameVals[%d] = &_dpsCodes[%d];\n",i,i);
- outlineno ++;
- }
- } else {
- for (n = nameTokens; n!= NULL; n = n->next) {
- printf(" _dps_nameVals[%d] = (int *)&_dpsP[%d].val.nameVal;\n",
- i++, n->token->tokenIndex);
- outlineno++;
- }
- }
- printf("\n DPSMapNames(%s, %d, (char **) _dps_names, _dps_nameVals);\n",
- ctxName, nNames);
- outlineno += 2;
- if (reentrant && writable && !doANSI) {
- printf(" _dpsP = (DPSBinObjRec *) &_dpsF.obj0;\n");
- outlineno++;
- }
- if (!doANSI) {
- printf(" _dpsT = 0;\n");
- outlineno ++;
- }
- printf(" }\n }\n\n");
- outlineno += 3;
-} /* EmitNameTagAcquisition */
-
-
-/* Miscellaneous procedures */
-
-static void EmitLocals(unsigned sz)
-{
- if(reentrant && writable) {
- printf(" _dpsQ _dpsF; /* local copy */\n");
- outlineno++;
- }
- if (ctxName == NULL) {
- printf(" register DPSContext _dpsCurCtxt = DPSPrivCurrentContext();\n");
- ctxName = "_dpsCurCtxt";
- outlineno++;
- }
- if(pad) {
- printf(" char pad[3];\n");
- outlineno++;
- }
- if (writable) {
- printf(" register DPSBinObjRec *_dpsP = (DPSBinObjRec *)&_dpsF.obj0;\n");
- if(doANSI && nNames) {
- printf(" static int _dpsCodes[%d] = {-1};\n",nNames);
- outlineno++;
- }
- outlineno++;
- if (namedInputArrays || namedInputStrings) {
- printf(" register int _dps_offset = %d;\n",
- twoStatics ? sz : sz + stringBytes);
- outlineno++;
- }
- }
-}
-
-static boolean AllLiterals(Body body)
-{
- Token t;
-
- for (t = body; t; t = t->next) {
- switch (t->type) {
-
- case T_NAME:
- if (t->namedFormal == NULL) return false;
- break;
-
- case T_ARRAY:
- if (!AllLiterals((Body)t->val)) return false;
- break;
-
- case T_PROC:
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- case T_LITNAME:
- case T_HEXSTRING:
- case T_STRING:
- case T_SUBSCRIPTED:
- break;
-
- default:
- CantHappen();
- } /* switch */
- } /* for */
- return true;
-} /* AllLiterals */
-
-static void FlattenSomeArrays(Body body, boolean inSquiggles)
-{
- Token t;
- for (t = body; t; t = t->next) {
- switch (t->type) {
-
- case T_ARRAY:
- if (!AllLiterals((Body)t->val)) {
- Token t1, b, tlsq, trsq;
- char *s;
- t1 = t->next;
- b = (Body)t->val;
- SafeStrCpy(s, "[");
- tlsq = PSWToken(T_NAME, s);
- SafeStrCpy(s, "]");
- trsq = PSWToken(T_NAME, s);
- tlsq->sourceLine = t->sourceLine;
- trsq->sourceLine = t->sourceLine;
- *t = *tlsq;
- t->next = b;
- trsq->next = t1;
- if (b == NULL) t->next = trsq;
- else {
- Token last;
- for (last = b; last->next; last = last->next) ;
- last->next = trsq;
- }
- }
- else FlattenSomeArrays((Body)t->val, inSquiggles);
- break;
-
- case T_PROC:
- FlattenSomeArrays((Body)t->val, true);
- /* flatten all arrays below here */
- break;
-
- case T_NAME:
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- case T_LITNAME:
- case T_HEXSTRING:
- case T_STRING:
- case T_SUBSCRIPTED:
- case T_NUMSTR:
- case T_FLOATNUMSTR:
- case T_LONGNUMSTR:
- case T_SHORTNUMSTR:
- break;
-
- default:
- CantHappen();
- } /* switch */
- } /* for */
-} /* FlattenSomeArrays */
-
-
-static void FixupOffsets(void)
-{
- register TokenList tl; Token t;
- register Item item;
- int stringOffset = 0;
- PSWDict wrapDict;
- int strCount = 0;
-
- wrapDict = CreatePSWDict(MAXSTRINGS); /* dictionary of wrap strings */
-
- for (tl = namedInputArrays; tl; tl = tl->next) {
- t = tl->token; item = t->namedFormal;
- printf(" _dpsP[%d].val.arrayVal = _dps_offset;\n",t->tokenIndex);
- printf(" _dps_offset += ");
- if (item->subscript->constant)
- printf("%d * sizeof(DPSBinObjGeneric);\n",item->subscript->val);
- else
- printf("%s * sizeof(DPSBinObjGeneric);\n",item->subscript->name);
- outlineno += 2;
- } /* named input arrays */
-
- for (tl = namedInputStrings; tl; tl = tl->next) {
- t = tl->token; item = t->namedFormal;
- printf(" _dpsP[%d].val.stringVal = _dps_offset;\n",t->tokenIndex);
- printf(" _dps_offset += ");
- if (item->subscripted) {
- if (item->subscript->constant) {
- if(IsNumStrType(t->namedFormal->type)) {
- if(pad & IsPadNumStrType(t->namedFormal->type))
- printf("((%d * sizeof(%s)) + %d) & ~%d;\n",
- item->subscript->val,TypeToText(t->namedFormal->type),
- NUMSTR_HEADER_SIZE+WORD_ALIGN, WORD_ALIGN);
- else
- printf("(%d * sizeof(%s)) + %d;\n",
- item->subscript->val,TypeToText(t->namedFormal->type),
- NUMSTR_HEADER_SIZE);
- } else
- if(pad) {
- int val = item->subscript->val;
- val += WORD_ALIGN;
- val &= ~WORD_ALIGN;
- printf("%d;\n", val);
- } else
- printf("%d;\n",item->subscript->val);
- } else {
- if(IsNumStrType(t->namedFormal->type)) {
- if(pad & IsPadNumStrType(t->namedFormal->type))
- printf("((%s * sizeof(%s)) + %d) & ~%d;\n",
- item->subscript->name,TypeToText(t->namedFormal->type),
- NUMSTR_HEADER_SIZE+WORD_ALIGN, WORD_ALIGN);
- else
- printf("(%s * sizeof(%s)) + %d;\n",
- item->subscript->name,TypeToText(t->namedFormal->type),
- NUMSTR_HEADER_SIZE);
- } else
- if(pad)
- printf("(%s + %d) & ~%d;\n",
- item->subscript->name, WORD_ALIGN, WORD_ALIGN);
- else
- printf("%s;\n",item->subscript->name);
- }
- } else
- if(pad)
- printf("(_dpsP[%d].length + %d) & ~%d;\n",
- t->tokenIndex, WORD_ALIGN, WORD_ALIGN);
- else
- printf("_dpsP[%d].length;\n",t->tokenIndex);
- outlineno += 2;
- } /* named input strings */
-
- if (namedInputArrays) {
- PSWDictValue strOffset;
- for (tl = literalStrings; tl; tl = tl->next) {
- t = tl->token;
- strOffset = PSWDictLookup(wrapDict, (char *)t->val);
- if (strOffset == -1) {
- if (strCount <= MAXSTRINGS) {
- PSWDictEnter(wrapDict, (char *)t->val, stringOffset);
- strCount++;
- }
- if (stringOffset == 0)
- printf(" _dpsP[%d].val.stringVal = _dps_offset;\n",
- t->tokenIndex);
- else
- printf(" _dpsP[%d].val.stringVal = _dps_offset + %d;\n",
- t->tokenIndex,stringOffset);
- outlineno++;
- stringOffset +=
- (t->type == T_STRING || t->type == T_NAME || t->type == T_LITNAME)
- ? PSWStringLength((char *)t->val)
- : PSWHexStringLength((char *)t->val);
- } else {
- if (strOffset == 0)
- printf(" _dpsP[%d].val.stringVal = _dps_offset;\n",
- t->tokenIndex);
- else
- printf(" _dpsP[%d].val.stringVal = _dps_offset + %d;\n",
- t->tokenIndex, (int) strOffset);
- outlineno++;
- }
- } /* literalStrings */
- if (stringOffset) {
- printf(" _dps_offset += %d;\n",stringOffset);
- outlineno++;
- }
- }
- DestroyPSWDict(wrapDict);
-} /* FixupOffsets */
-
-
-static int EmitValueAssignments(Body body, Item item)
-{
- register Token t;
- int gotit = 0;
-
- for (t = body; t; t = t->next) {
- switch (t->type) {
- case T_STRING:
- case T_HEXSTRING:
- case T_LITNAME:
- if (t->namedFormal && t->namedFormal == item) {
- printf("\n _dpsP[%d].length =",t->tokenIndex);
- outlineno++;
- gotit++;
- }
- break;
- case T_NAME:
- if (t->namedFormal && t->namedFormal == item) {
- if ((item->subscripted && !item->subscript->constant) ||
- (item->starred && IsCharType(item->type)) ||
- IsNumStrType(item->type)) {
- printf("\n _dpsP[%d].length =",t->tokenIndex);
- outlineno++;
- gotit++;
- }
- switch (item->type) {
- case T_BOOLEAN:
- if (!item->subscripted) {
- printf("\n _dpsP[%d].val.booleanVal =",
- t->tokenIndex);
- gotit++; outlineno++;
- }
- break;
- case T_INT:
- case T_LONGINT:
- case T_SHORTINT:
- case T_UINT:
- case T_ULONGINT:
- case T_USHORTINT:
- case T_USEROBJECT:
- if (!item->subscripted) {
- printf("\n _dpsP[%d].val.integerVal =",
- t->tokenIndex);
- gotit++; outlineno++;
- }
- break;
- case T_FLOAT:
- case T_DOUBLE:
- if (!item->subscripted) {
- printf("\n _dpsP[%d].val.realVal =",
- t->tokenIndex);
- gotit++; outlineno++;
- }
- break;
- case T_CHAR:
- case T_UCHAR: /* the executable name is an arg */
- case T_NUMSTR:
- case T_FLOATNUMSTR:
- case T_LONGNUMSTR:
- case T_SHORTNUMSTR:
- break;
- default: CantHappen();
- }
- }
- break;
-
- case T_SUBSCRIPTED:
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- break;
-
- case T_ARRAY:
- case T_PROC:
- /* recurse */
- gotit += EmitValueAssignments((Body) (t->val),item);
- break;
- default:
- CantHappen();
- } /* switch */
- } /* token */
- return (gotit);
-} /* EmitValueAssignments */
-
-
-static void EmitElementValueAssignments(Body body, Item item)
-{
- register Token t;
-
- for (t = body; t; t = t->next) {
- if (t->type != T_SUBSCRIPTED) continue;
- if (t->namedFormal == item) {
- switch (item->type) {
- case T_BOOLEAN:
- printf("\n _dpsP[%d].val.booleanVal = (int)(0 != %s[%s]);",
- t->tokenIndex, item->name, t->body.var);
- outlineno++;
- break;
- case T_INT:
- case T_LONGINT:
- case T_SHORTINT:
- case T_UINT:
- case T_ULONGINT:
- case T_USHORTINT:
- printf("\n _dpsP[%d].val.integerVal = %s[%s];",
- t->tokenIndex, item->name, t->body.var);
- outlineno++;
- break;
- case T_FLOAT:
- case T_DOUBLE:
- printf("\n _dpsP[%d].val.realVal = %s[%s];",
- t->tokenIndex, item->name, t->body.var);
- outlineno++;
- break;
- case T_CHAR:
- case T_UCHAR:
- CantHappen();
- break;
- default: CantHappen();
- }
- }
- } /* token */
-} /* EmitElementValueAssignments */
-
-
-static void ScanParamsAndEmitValues(Body body, Args args)
-{
- register Arg arg; /* a list of parameters */
- register Item item; /* a parameter */
- int gotit; /* flag that we found some token with this length */
-
- /* for each arg */
- for (arg = args; arg; arg = arg->next) {
- /* for each arg item */
- for (item = arg->items; item; item = item->next) {
- if (item->type == T_CONTEXT) continue;
- gotit = EmitValueAssignments(body,item);
- if (gotit != 0) {
- if (item->subscripted) {
- if (item->subscript->constant) {
- if(IsNumStrType(item->type))
- printf(" (%d * sizeof(%s)) + %d;",item->subscript->val,
- TypeToText(item->type), NUMSTR_HEADER_SIZE);
- else
- printf(" %d;",item->subscript->val);
- } else {
- if(IsNumStrType(item->type))
- printf(" (%s * sizeof(%s)) + %d;",item->subscript->name,
- TypeToText(item->type), NUMSTR_HEADER_SIZE);
- else
- printf(" %s;",item->subscript->name);
- }
- } else switch(item->type) {
- case T_CHAR:
- case T_UCHAR:
- printf(" strlen(%s);",item->name);
- break;
- case T_INT:
- case T_LONGINT:
- case T_SHORTINT:
- case T_UINT:
- case T_ULONGINT:
- case T_USHORTINT:
- case T_FLOAT:
- case T_DOUBLE:
- case T_USEROBJECT:
- printf(" %s;",item->name);
- break;
- case T_BOOLEAN:
- printf(" (int) (0 != %s);",item->name);
- break;
- default: CantHappen();
- } /* switch */
- } /* gotit */
- if (item->subscripted) {
- EmitElementValueAssignments(body,item);
- }
- } /* item */
- } /* arg */
- printf("\n"); outlineno++;
-}
-
-static void EmitMappedNames(void)
-{
-register TokenList n;
-int i=0;
- for (n = nameTokens; n!= NULL; n = n->next) {
- printf(" _dpsP[%d].val.nameVal = _dpsCodes[%d];\n",
- n->token->tokenIndex, i++);
- outlineno++;
- }
-}
-
-static void WriteObjSeq(unsigned sz)
-{
- register TokenList tl;
-
- printf(" DPSBinObjSeqWrite(%s,(char *) &_dpsF,%d);\n",
- ctxName, (twoStatics ? sz : sz + stringBytes) + dpsHeaderSize);
- outlineno++;
-
- for (tl = namedInputArrays; tl; tl = tl->next) {
- Token t = tl->token;
- printf(" DPSWriteTypedObjectArray(%s, %s, (char *)%s, ",
- ctxName,
- CTypeToResultType(t->namedFormal->type),
- t->namedFormal->name);
- if (t->namedFormal->subscript->constant)
- printf("%d);\n", t->namedFormal->subscript->val);
- else
- printf("%s);\n", t->namedFormal->subscript->name);
- outlineno++;
- }
-
- for (tl = namedInputStrings; tl; tl = tl->next) {
- Token t = tl->token;
- if(IsNumStrType(t->namedFormal->type)) {
- printf(" DPSWriteNumString(%s, %s, (char *) %s, ", ctxName,
- CTypeToResultType(t->namedFormal->type), t->namedFormal->name);
- if (t->namedFormal->subscript->constant)
- printf("%d, ", t->namedFormal->subscript->val);
- else
- printf("%s, ", t->namedFormal->subscript->name);
- if (t->namedFormal->scaled) {
- if (t->namedFormal->scale->constant)
- printf("%d);\n", t->namedFormal->scale->val);
- else
- printf("%s);\n", t->namedFormal->scale->name);
- } else printf("0);\n");
- outlineno ++;
- } else {
- printf(" DPSWriteStringChars(%s, (char *)%s, ",
- ctxName, t->namedFormal->name);
- if (!t->namedFormal->subscripted) {
- printf("_dpsP[%d].length);\n", t->tokenIndex);
- if(pad) {
- printf(" DPSWriteStringChars(%s, (char *)pad, ~(_dpsP[%d].length + %d) & %d);\n",
- ctxName,t->tokenIndex,WORD_ALIGN,WORD_ALIGN);
- outlineno ++;
- }
- } else
- if (t->namedFormal->subscript->constant) {
- int val = t->namedFormal->subscript->val;
- printf("%d);\n", val);
- if(pad){
- val = ~(val + WORD_ALIGN) & WORD_ALIGN;
- if(val) {
- printf(" DPSWriteStringChars(%s, (char *)pad, %d);\n",
- ctxName,val);
- outlineno ++;
- }
- }
- } else {
- printf("%s);\n", t->namedFormal->subscript->name);
- if(pad) {
- printf(" DPSWriteStringChars(%s, (char *)pad, ~(%s + %d) & %d);\n",
- ctxName,t->namedFormal->subscript->name,
- WORD_ALIGN,WORD_ALIGN);
- outlineno ++;
- }
- }
- outlineno ++;
- }
- }
-
- if (twoStatics) {
- printf(" DPSWriteStringChars(%s,(char *) &_dpsF1,%d);\n",
- ctxName,stringBytes);
- outlineno++;
- }
-} /* WriteObjSeq */
-
-
-/*************************************************************/
-/* Public procedures, called by the semantic action routines */
-
-void EmitPrototype(Header hdr)
-{
- /* emit procedure prototype to the output .h file, if any */
-
- fprintf(header, "\n");
- fprintf(header, "extern void %s(", hdr->name);
- if (doANSI) EmitANSIPrototypes(header, hdr);
- else if (hdr->inArgs || hdr->outArgs) {
- fprintf(header, " /* ");
- EmitArgPrototypes(header, hdr);
- fprintf(header, "*/ ");
- }
- fprintf(header, ");\n");
-}
-
-void EmitBodyHeader(Header hdr)
-{
- /* emit procedure header */
- register Arg arg;
- register Item item;
-
- nameTokens = NULL;
- nNames = 0;
- ctxName = NULL;
-
- if (hdr->isStatic) printf("static ");
- printf("void %s(", hdr->name);
-
- if (doANSI) {
- EmitANSIPrototypes(stdout,hdr);
- printf(")\n");
- outlineno++;
- }
- else { /* not ANSI */
- for (arg = hdr->inArgs; arg; arg = arg->next) {
- for (item = arg->items; item; item = item->next) {
- if (arg->type == T_CONTEXT) ctxName = item->name;
- printf(item->name);
- if (item->next) printf(", ");
- }
- if (arg->next || hdr->outArgs) printf(", ");
- } /* inArgs */
- for (arg = hdr->outArgs; arg; arg = arg->next) {
- for (item = arg->items; item; item = item->next) {
- printf(item->name);
- if (item->next) printf(", ");
- }
- if (arg->next) printf(", ");
- } /* outArgs */
- printf(")\n"); outlineno++;
- if (hdr->inArgs || hdr->outArgs) {
- EmitArgPrototypes(stdout, hdr);
- printf("\n");
- outlineno++;
- }
- }
-} /* EmitBodyHeader */
-
-void EmitBody(Tokens body, Header hdr)
-{
- Args arg, outArgs = hdr->outArgs;
- Item item;
- long int nObjs;
- unsigned structSize;
- /* total number of objects plus string bodies in objrecs.
- Not including array arg expansions */
- Adr sizeAdr;
-
- if(NumTokens(body) == 0)
- return; /* empty wrap */
-
- if (outArgs) body = AppendResultFlush(body, NumArgs(outArgs));
-
- FlattenSomeArrays(body, false);
-
- if ((large = (((NumTokens(body) > 0xff)) || CheckSize(body))) != 0)
- dpsHeaderSize = DPS_LONG_HEADER_SIZE;
- else
- dpsHeaderSize = DPS_HEADER_SIZE;
-
- /* check for char * input args */
- for (arg = hdr->inArgs; arg && !large; arg = arg->next) {
- for (item = arg->items; item; item = item->next) {
- if ((arg->type == T_CHAR) && item->starred) {
- /* if arg is char * then need to use large format since
- size of arg is unknown */
- large = true;
- dpsHeaderSize = DPS_LONG_HEADER_SIZE;
- }
- }
- }
-
- BuildTypesAndAssignAddresses(body, &sizeAdr, &nObjs, &structSize);
- /* also constructs namedInputArrays, namedInputStrings and literalStrings */
-
- ConstructStatics(body, &sizeAdr, nObjs);
-
- EmitLocals(structSize);
-
- if (outArgs) EmitResultTagTableDecls(outArgs);
-
- if (nameTokens) {
- EmitNameTagAcquisition();
- }
-
- if(reentrant && writable) {
- printf(" _dpsF = _dpsStat; /* assign automatic variable */\n");
- outlineno++;
- }
- if(writable) {
- ScanParamsAndEmitValues(body,hdr->inArgs);
- }
-
- if(doANSI && nameTokens) {
- EmitMappedNames();
- FreeTokenList(nameTokens);
- nameTokens = NULL;
- }
-
- /* Fixup offsets and the total size */
-
- if (writable && (namedInputArrays || namedInputStrings)) {
- FixupOffsets();
- printf("\n _dpsF.nBytes = _dps_offset+%d;\n", dpsHeaderSize);
- outlineno += 2;
- }
-
- if (outArgs) EmitResultTagTableAssignments(outArgs);
-
- WriteObjSeq(structSize);
-
- FreeTokenList(namedInputArrays); namedInputArrays = NULL;
- FreeTokenList(namedInputStrings); namedInputStrings = NULL;
- FreeTokenList(literalStrings); literalStrings = NULL;
-
- if (outArgs)
- printf(" DPSAwaitReturnValues(%s);\n", ctxName);
- else
- printf(" DPSSYNCHOOK(%s)\n", ctxName);
- outlineno++;
-
-#ifdef NeXT
- if (pad) {
- printf(" if (0) *pad = 0; /* quiets compiler warnings */\n"); /* gets rid of "unused variable" warnings */
- outlineno++;
- }
-#endif
-} /* EmitBody */
-
-static void AllocFailure(void)
-{
- ErrIntro(yylineno);
- fprintf(stderr, "pswrap is out of storage; ");
- if (bigFile)
- fprintf(stderr, "try splitting the input file\n");
- else
- fprintf(stderr, "try -b switch\n");
- exit(1);
-}
-
-char *psw_malloc(s) int s; {
- char *temp;
- if ((temp = malloc((unsigned) s)) == NULL)
- AllocFailure();
- return(temp);
-}
-
-char *psw_calloc(n,s) int n,s; {
- char *temp;
- if ((temp = calloc((unsigned) n, (unsigned) s)) == NULL)
- AllocFailure();
- return(temp);
-}
-
-void
-FreeBody(body) Body body; {
- register Token t, nexttoken;
-
- for (t = body; t; t = nexttoken) {
- nexttoken = t->next;
- if (t->adr.var) free(t->adr.var);
- switch (t->type) {
- case T_STRING:
- case T_NAME:
- case T_LITNAME:
- case T_HEXSTRING:
- free (t->val);
- break;
- case T_FLOAT:
- case T_INT:
- case T_BOOLEAN:
- break;
- case T_SUBSCRIPTED:
- free (t->val); free(t->body.var);
- break;
- case T_ARRAY:
- case T_PROC:
- FreeBody((Body) (t->val));
- break;
- default:
- CantHappen();
- }
- free (t);
- }
-}
diff --git a/nx-X11/config/pswrap/psw.h b/nx-X11/config/pswrap/psw.h
deleted file mode 100644
index 612fb5db4..000000000
--- a/nx-X11/config/pswrap/psw.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * psw.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-#ifndef PSW_H
-#define PSW_H
-
-/* C types */
-
-#define T_BOOLEAN 101
-#define T_FLOAT 102
-#define T_DOUBLE 103
-#define T_CHAR 104
-#define T_UCHAR 105
-#define T_INT 106
-#define T_UINT 107
-#define T_LONGINT 108
-#define T_SHORTINT 109
-#define T_ULONGINT 110
-#define T_USHORTINT 111
-#define T_USEROBJECT 112
-#define T_NUMSTR 113
-#define T_FLOATNUMSTR 114
-#define T_LONGNUMSTR 115
-#define T_SHORTNUMSTR 116
-
-
-/* PostScript types */
-
-#define T_STRING 91
-#define T_HEXSTRING 92
-#define T_NAME 93
-#define T_LITNAME 94
-#define T_ARRAY 95
-#define T_PROC 96
-#define T_CONTEXT 97
-#define T_SUBSCRIPTED 98
-
-/* Other PostScript types:
-
- T_FLOAT is used for real
- T_INT is used for integer
- T_BOOLEAN is used for boolean
- T_USEROBJECT is used for userobjects
-
-*/
-
-/* psw.c */
-extern char *psw_malloc(int);
-extern char *psw_calloc(int, int);
-
-/* pswstring.c */
-extern int PSWStringLength(char *);
-extern int PSWHexStringLength(char *);
-extern void PSWOutputStringChars(char *);
-extern void PSWOutputHexStringChars(char *);
-
-#endif /* PSW_H */
diff --git a/nx-X11/config/pswrap/pswdict.c b/nx-X11/config/pswrap/pswdict.c
deleted file mode 100644
index 3c72fbeea..000000000
--- a/nx-X11/config/pswrap/pswdict.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * pswdict.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-/***********/
-/* Imports */
-/***********/
-
-#include <stdlib.h>
-
-#include "pswtypes.h"
-#include "pswdict.h"
-#include "psw.h"
-
-#ifdef XENVIRONMENT
-#include <X11/Xos.h>
-#else
-#include <string.h>
-#endif
-
-/********************/
-/* Types */
-/********************/
-
-typedef struct _t_EntryRec {
- struct _t_EntryRec *next;
- char *name;
- PSWDictValue value;
-} EntryRec, *Entry;
-
- /* The concrete definition for a dictionary */
-typedef struct _t_PSWDictRec {
- int nEntries;
- Entry *entries;
-} PSWDictRec;
-
-PSWDict atoms;
-
-/**************************/
-/* Procedure Declarations */
-/**************************/
-
-/* Creates and returns a new dictionary. nEntries is a hint. */
-PSWDict CreatePSWDict(int nEntries)
-{
- PSWDict d = (PSWDict)psw_calloc(sizeof(PSWDictRec), 1);
- d->nEntries = nEntries;
- d->entries = (Entry *)psw_calloc(sizeof(EntryRec), d->nEntries);
- return d;
-}
-
-/* Destroys a dictionary */
-void DestroyPSWDict(PSWDict dict)
-{
- free(dict->entries);
- free(dict);
-}
-
-static int Hash(char *name, int nEntries)
-{
- register int val = 0;
- while (*name) val += *name++;
- if (val < 0) val = -val;
- return (val % nEntries);
-}
-
-static Entry Probe(PSWDict d, int x, char *name)
-{
- register Entry e;
- for (e = (d->entries)[x]; e; e = e->next) {
- if (strcmp(name, e->name) == 0) break;
- }
- return e;
-}
-
-static Entry PrevProbe(Entry *prev, PSWDict d, int x, char *name)
-{
- register Entry e;
- *prev = NULL;
- for (e = (d->entries)[x]; e; e = e->next) {
- if (strcmp(name, e->name) == 0) break;
- *prev = e;
- }
- return e;
-}
-
-/* -1 => not found */
-PSWDictValue PSWDictLookup(PSWDict dict, char *name)
-{
- Entry e;
- e = Probe(dict, Hash(name, dict->nEntries), name);
- if (e == NULL) return -1;
- return e->value;
-}
-
-/* 0 => normal return (not found)
- -1 => found. If found, value is replaced. */
-PSWDictValue PSWDictEnter(PSWDict dict, char *name, PSWDictValue value)
-{
- Entry e;
- int x = Hash(name, dict->nEntries);
- e = Probe(dict, x, name);
- if (e) {
- e->value = value;
- return -1;
- }
- e = (Entry)psw_calloc(sizeof(EntryRec), 1);
- e->next = (dict->entries)[x]; (dict->entries)[x] = e;
- e->value = value;
- e->name = MakeAtom(name);
- return 0;
-}
-
-/* -1 => not found. If found, value is returned. */
-PSWDictValue PSWDictRemove(PSWDict dict, char *name)
-{
- Entry e, prev;
- PSWDictValue value;
- int x = Hash(name, dict->nEntries);
-
- e = PrevProbe(&prev, dict, x, name);
- if (e == NULL) return -1;
- value = e->value;
- if (prev == NULL) (dict->entries)[x] = e->next; else prev->next = e->next;
- free(e);
- return value;
-}
-
-PSWAtom MakeAtom(char *name)
-{
- Entry e;
- int x = Hash(name, 511);
- char *newname;
-
- if (atoms == NULL) atoms = CreatePSWDict(511);
- e = Probe(atoms, x, name);
- if (e == NULL) {
- e = (Entry)psw_calloc(sizeof(EntryRec), 1);
- e->next = (atoms->entries)[x]; (atoms->entries)[x] = e;
- e->value = 0;
- newname = psw_malloc(strlen(name)+1);
- strcpy(newname, name);
- e->name = newname;
- }
- return e->name;
-}
diff --git a/nx-X11/config/pswrap/pswdict.h b/nx-X11/config/pswrap/pswdict.h
deleted file mode 100644
index dcbfbb13b..000000000
--- a/nx-X11/config/pswrap/pswdict.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * pswdict.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-#ifndef PSWDICT_H
-#define PSWDICT_H
-
-typedef struct _t_PSWDictRec *PSWDict;
-/* Opaque designator for a dictionary */
-
-typedef long int PSWDictValue; /* non-negative */
-typedef char *PSWAtom;
-
-/* PROCEDURES */
-
-/* NOTES
- The name parameters defined below are NULL-terminated C strings.
- None of the name parameters are handed off, i.e. the caller is
- responsible for managing their storage. */
-
-extern PSWDict CreatePSWDict(int /* nEntries */);
-/* nEntries is a hint. Creates and returns a new dictionary */
-
-extern void DestroyPSWDict(PSWDict /* dict */);
-/* Destroys a dictionary */
-
-extern PSWDictValue PSWDictLookup(PSWDict /* dict */, char * /* name */);
-/* -1 => not found. */
-
-extern PSWDictValue PSWDictEnter
- (PSWDict /* dict */, char * /* name */, PSWDictValue /* value */);
-/* 0 => normal return (not found)
- -1 => found. If found, the old value gets replaced with the new one. */
-
-extern PSWDictValue PSWDictRemove(PSWDict /* dict */, char * /* name */);
-/* -1 => not found. If found, value is returned. */
-
-extern PSWAtom MakeAtom(char * /* name */);
-
-extern PSWDict wellKnownPSNames;
-
-#endif /* PSWDICT_H */
diff --git a/nx-X11/config/pswrap/pswfile.c b/nx-X11/config/pswrap/pswfile.c
deleted file mode 100644
index e4f24a641..000000000
--- a/nx-X11/config/pswrap/pswfile.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * pswfile.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/pswfile.c,v 1.5tsi Exp $ */
-
-#include <stdio.h>
-#include "pswversion.h"
-#include "pswpriv.h"
-
-#ifdef __MACH__
-extern char *shlibInclude;
-#endif /* __MACH__ */
-
-static int EmitVersion(FILE *f, char *infname, char *outfname)
-{
- fprintf(f,"/* %s generated from %s\n",outfname,infname);
- fprintf(f," by %s %s %s\n */\n\n",PSW_OS,prog,PSW_VERSION);
- return 4; /* number of output lines */
-}
-
-void InitHFile(void)
-{
- (void) EmitVersion(header, ifile, hfile);
- fprintf(header,"#ifndef %s\n#define %s\n",headid,headid);
-}
-
-void FinishHFile(void)
-{
- fprintf(header,"\n#endif /* %s */\n",headid);
- fclose(header);
-}
-
-void InitOFile(void)
-{
- outlineno += EmitVersion(stdout, ifile, ofile);
-#ifdef __MACH__
- if( shlibInclude ) {
- printf("#ifdef SHLIB\n");
- printf("#include \"%s\"\n", shlibInclude );
- printf("#endif\n");
- outlineno += 3;
- }
-#endif /* __MACH__ */
- printf("#include %s\n", FRIENDSFILE);
- printf("#include <string.h>\n");
- outlineno += 3; /* UPDATE this if you add more prolog */
- if (special_h) {
- printf("#include \"%s\"\n\n", special_h);
- outlineno ++;
- }
- printf("#line 1 \"%s\"\n",ifile);
- outlineno++;
-}
diff --git a/nx-X11/config/pswrap/pswparser.y b/nx-X11/config/pswrap/pswparser.y
deleted file mode 100644
index 795113947..000000000
--- a/nx-X11/config/pswrap/pswparser.y
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * pswparser.y
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/pswparser.y,v 1.4 2000/05/18 23:46:08 dawes Exp $ */
-
-/*
- * Not all yaccs understand this.
- *
-%expect 1
- */
-
-%{
-
-#include "pswpriv.h"
-#include "pswsemantics.h"
-
-%}
-
-/* yylval type (from lexer and on stack) */
-
-%union {
- char *object;
- long intobj;
- Token token;
- Item item;
- Header header;
- int flag;
- Arg arg;
- Subscript subscript;
-}
-
-
-%token <object> DEFINEPS ENDPS STATIC
-%token <object> PSCONTEXT
-%token <object> BOOLEAN FLOAT DOUBLE UNSIGNED SHORT LONG INT CHAR USEROBJECT
-%token <object> NUMSTRING
-%token <object> CNAME
-%token <intobj> CINTEGER
-
-%token <object> PSNAME PSLITNAME PSREAL PSBOOLEAN PSSTRING PSHEXSTRING
-%token <intobj> PSINTEGER
-%token <object> PSSUBNAME PSINDEX
-
-%token <object> '(' ')' '|' ';' ',' '*' '[' ']' '{' '}' ':'
-
-%type <token> Token Tokens Body
-%type <item> Items Item
-%type <header> Header
-%type <flag> Def Type
-%type <arg> InArgs Args ContextArg SubArgs Arg
-%type <subscript> Subscript
-
-%start Module
-
-%%
-
-Module:
- /* empty */
- | Module Definition
- ;
-
-Definition:
- Header Body ENDPS
- { FinalizePSWrapDef($1, $2); yyerrok; }
- | error ENDPS
- { yyerrok; }
- ;
-
-Body:
- /* nothing */
- { $$ = 0; }
- | Tokens
- /* { $$ = $1; }*/
- ;
-
-Tokens:
- Token
- { $$ = AppendPSWToken($1, 0L); }
- | Tokens Token
- { $$ = AppendPSWToken($2, $1); yyerrok; }
- /* | error
- { $$ = 0; } */
- ;
-
-Header:
- Def ')'
- { $$ = PSWHeader($1, 0, 0); yyerrok; }
- | Def InArgs ')'
- { $$ = PSWHeader($1, $2, 0); yyerrok; }
- | Def InArgs '|' Args ')'
- { $$ = PSWHeader($1, $2, $4); yyerrok; }
- | Def '|' Args ')'
- { $$ = PSWHeader($1, 0, $3); yyerrok; }
- ;
-
-Def:
- DEFINEPS CNAME '('
- { PSWName($2); $$ = 0; yyerrok; }
- | DEFINEPS STATIC CNAME '('
- { PSWName($3); $$ = 1; yyerrok; }
- | DEFINEPS error '('
- { PSWName("error"); $$ = 0; yyerrok; }
- ;
-
-Semi:
- /* nothing */
- | ';' { yyerrok; }
- ;
-
-InArgs:
- ContextArg Semi
- /* { $$ = $1; } */
- | Args
- /* { $$ = $1; } */
- | ContextArg ';' Args
- { $$ = ConsPSWArgs($1, $3); }
- ;
-
-ContextArg:
- PSCONTEXT CNAME
- { $$ = PSWArg(T_CONTEXT, PSWItem($2)); }
- ;
-
-Args:
- SubArgs Semi
- /* { $$ = $1; }*/
- ;
-
-SubArgs:
- Arg
- /* { $$ = $1; }*/
- | SubArgs ';' Arg
- { yyerrok; $$ = AppendPSWArgs($3, $1); }
- | SubArgs error
- | SubArgs error Arg
- { yyerrok; $$ = AppendPSWArgs($3, $1); }
- | SubArgs ';' error
- ;
-
-Arg: Type Items
- { $$ = PSWArg($1, $2); yyerrok; }
- ;
-
-Items:
- Item
- /* { $$ = $1; } */
- | Items ',' Item
- { yyerrok; $$ = AppendPSWItems($3, $1); }
- | error { $$ = 0; }
- | Items error
- | Items error Item
- { yyerrok; $$ = AppendPSWItems($3, $1); }
- | Items ',' error
- ;
-
-Item:
- '*' CNAME
- { $$ = PSWStarItem($2); }
- | CNAME '[' Subscript ']'
- { $$ = PSWSubscriptItem($1, $3); }
- | CNAME '[' Subscript ']' ':' CNAME
- { $$ = PSWScaleItem($1, $3, $6, 0); }
- | CNAME '[' Subscript ']' ':' CINTEGER
- { $$ = PSWScaleItem($1, $3, NULL, $6); }
- | CNAME
- { $$ = PSWItem($1); }
- ;
-
-Subscript:
- CNAME
- { $$ = PSWNameSubscript($1); }
- | CINTEGER
- { $$ = PSWIntegerSubscript($1); }
- ;
-
-Type:
- BOOLEAN
- { $$ = T_BOOLEAN; }
- | FLOAT
- { $$ = T_FLOAT; }
- | DOUBLE
- { $$ = T_DOUBLE; }
- | CHAR
- { $$ = T_CHAR; }
- | UNSIGNED CHAR
- { $$ = T_UCHAR; }
- | INT
- { $$ = T_INT; }
- | LONG INT
- { $$ = T_LONGINT; }
- | LONG
- { $$ = T_LONGINT; }
- | SHORT INT
- { $$ = T_SHORTINT; }
- | SHORT
- { $$ = T_SHORTINT; }
- | UNSIGNED
- { $$ = T_UINT; }
- | UNSIGNED LONG
- { $$ = T_ULONGINT; }
- | UNSIGNED INT
- { $$ = T_UINT; }
- | UNSIGNED LONG INT
- { $$ = T_ULONGINT; }
- | UNSIGNED SHORT
- { $$ = T_USHORTINT; }
- | UNSIGNED SHORT INT
- { $$ = T_USHORTINT; }
- | USEROBJECT
- { $$ = T_USEROBJECT; }
- | NUMSTRING
- { $$ = T_NUMSTR; }
- | INT NUMSTRING
- { $$ = T_NUMSTR; }
- | FLOAT NUMSTRING
- { $$ = T_FLOATNUMSTR; }
- | LONG NUMSTRING
- { $$ = T_LONGNUMSTR; }
- | SHORT NUMSTRING
- { $$ = T_SHORTNUMSTR; }
- ;
-
-Token:
- PSINTEGER
- { $$ = PSWToken(T_INT, (char *)$1); }
- | PSREAL
- { $$ = PSWToken(T_FLOAT, $1); }
- | PSBOOLEAN
- { $$ = PSWToken(T_BOOLEAN, $1); }
- | PSSTRING
- { $$ = PSWToken(T_STRING, $1); }
- | PSHEXSTRING
- { $$ = PSWToken(T_HEXSTRING, $1); }
- | PSNAME
- { $$ = PSWToken(T_NAME, $1); }
- | PSLITNAME
- { $$ = PSWToken(T_LITNAME, $1); }
- | PSSUBNAME PSINDEX
- { $$ = PSWToken2(T_SUBSCRIPTED, $1, $2); }
- | '[' Body ']'
- { $$ = PSWToken(T_ARRAY, (char *)$2); }
- | '{' Body '}'
- { $$ = PSWToken(T_PROC, (char *)$2); }
- ;
diff --git a/nx-X11/config/pswrap/pswpriv.h b/nx-X11/config/pswrap/pswpriv.h
deleted file mode 100644
index 18f1cb97b..000000000
--- a/nx-X11/config/pswrap/pswpriv.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * pswpriv.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.6 2000/06/07 21:58:25 tsi Exp $ */
-
-#ifndef PSWPRIV_H
-#define PSWPRIV_H
-
-#include <stdio.h>
-
-#include "pswtypes.h"
-#include "psw.h"
-
-/********************/
-/* Types */
-/********************/
-
-typedef struct _t_ItemRec *Item;
-/* Forward type designator */
-
-typedef struct {
- boolean constant;
- int val; /* valid if constant */
- char *name; /* valid if not constant */
- } SubscriptRec, *Subscript, ScaleRec, *Scale;
-
-typedef int Type;
-
-typedef struct _t_ItemRec { /* see above */
- struct _t_ItemRec *next;
- char *name;
- boolean starred, subscripted, scaled;
- Subscript subscript; /* valid if subscripted */
- Scale scale;
-
- /* the fields below are filled in by PSWHeader */
- boolean isoutput; /* true if this is an output parameter */
- long int tag; /* valid if output is true; the index of
- this output parameter. starting from 0. */
- Type type; /* copied from parent Arg */
- int sourceLine;
- } ItemRec;
-
-typedef Item Items;
-
-typedef struct _t_ArgRec {
- struct _t_ArgRec *next;
- Type type;
- Items items;
- } ArgRec, *Arg;
-
-typedef Arg Args;
-
-typedef struct {
- boolean isStatic;
- char *name;
- Args inArgs, outArgs;
- } HeaderRec, *Header;
-
-typedef struct {
- long cnst;
- char *var;
- } Adr, *PAdr;
-
-typedef struct _t_TokenRec {
- struct _t_TokenRec *next;
- Type type;
- Adr adr; /* of this token in the binary object sequence. */
- char *val; /* loopholed */
- int tokenIndex;
- boolean wellKnownName; /* valid if type is T_NAME or T_LITNAME */
- int sourceLine;
- Item namedFormal;
- /* non-NIL if this token is a reference to a formal.
- (T_STRING, T_HEXSTRING, T_NAME, and T_LITNAME) */
- Adr body;
- /* Meaning depends on the token type, as follows:
- simple => unused
- array or proc => adr of body in binobjseq
- string or hexstring => adr of body in binobjseq
- name or litname => adr of namestring or array in binobjseq (named arg)
- or cnst = the nametag (well-known name)
- or cnst = 0 (name index filled in at runtime)
- subscripted => index for element
- */
-} TokenRec, *Token;
-
-typedef Token Tokens;
-
-typedef Tokens Body;
-
-typedef struct _t_TokenListRec {
- struct _t_TokenListRec *next;
- Token token;
- } TokenListRec, *TokenList;
-
-extern FILE *header;
-extern boolean noUserNames; /* -n flag */
-extern char *currentPSWName;
-extern char *hfile;
-extern char *ifile; /* input file name for error messages */
-extern char *ofile;
-extern char *prog;
-extern char *special_h; /* -f option */
-extern char *string_temp; /* buffer of that size for scanning strings */
-extern char headid[];
-extern int bigFile;
-extern int doANSI; /* -a flag */
-extern int maxstring; /* max PS string length to scan (-s) */
-extern int lexdebug; /* debug flag for lexer */
-extern int errorCount; /* non-fatal errs */
-extern int outlineno; /* line number in output file */
-extern int pad; /* -p flag */
-extern int reentrant;
-extern int reportedPSWName;
-extern int yylineno; /* current line number in pswrap source file */
-
-/* lexer.l */
-extern int yylex(void);
-extern void stringerr(int); /* report string overflow */
-
-/* psw.c */
-extern void EmitPrototype(Header);
-extern void EmitBodyHeader(Header);
-extern void EmitBody(Tokens, Header);
-extern void FreeBody(Body);
-
-/* pswfile.c */
-extern void FinishHFile(void);
-extern void InitHFile(void);
-extern void InitOFile(void);
-
-/* pswparser.y */
-extern int yyparse (void);
-
-/* systemnames.c */
-extern void InitWellKnownPSNames(void);
-
-/* yyerror.c */
-extern void ErrIntro(int);
-extern void yyerror(char *);
-
-#endif /* PSWPRIV_H */
diff --git a/nx-X11/config/pswrap/pswrap.man b/nx-X11/config/pswrap/pswrap.man
deleted file mode 100644
index 17d7f05f7..000000000
--- a/nx-X11/config/pswrap/pswrap.man
+++ /dev/null
@@ -1,141 +0,0 @@
-.\" Id: pswrap.man,v 6.1 1994/05/18 23:21:11 asente Exp $
-.na
-.nh
-.TH PSWRAP 1 "4 Apr 1994" "Adobe Systems"
-.SH NAME
-pswrap \- creates C procedures from segments of PostScript language code
-
-.SH SYNOPSIS
-.B pswrap
-[
-.B \-apr
-] [
-.B \-o
-.I outputCfile
-] [
-.B \-h
-.I outputHfile
-] [
-.B \-s
-.I maxstring
-]
-.I inputfile
-
-.SH DESCRIPTION
-.LP
-.B pswrap
-reads input from
-.I inputfile
-and creates C-callable procedures, known as wraps, that send PostScript
-language code to the PostScript interpreter.
-.I inputfile
-contains segments of PostScript language code wrapped with a C-like
-procedure syntax.
-.LP
-Wraps are the most efficient way for an application to communicate with the
-PostScript interpreter. For complete documentation of
-.B pswrap
-and the language it accepts, see "pswrap Reference Manual"
-in \fIProgramming the Display PostScript System with X.\fR
-.LP
-
-.SH OPTIONS
-.LP
-.TP
-.I inputfile
-A file that contains one or more wrap definitions.
-.B pswrap
-transforms the definitions in
-.I inputfile
-into C procedures. If no input file is specified, the standard
-input (which can be redirected from a file or pipe) is used. The input file
-can include text other than wrap definitions.
-.B pswrap
-converts wrap definitions to C procedures and passes the other text
-through unchanged. Therefore, it is possible to intersperse C-language
-source code with wrap definitions in the input file.
-.RS
-.LP
-.I Note:
-Although C code is allowed in a pswrap input file, it is not allowed
-within a wrap body. In particular, no CPP macros (for example, #define) are
-allowed inside a wrap.
-.RE
-.TP
-.B \-a
-Generates ANSI C procedure prototypes for procedure definitions in
-.I outputCfile
-and, optionally,
-.I outputHfile.
-The
-.B \-a
-option allows compilers that recognize the
-ANSI C standard to do more complete type checking of parameters. The
-.B \-a
-option also causes
-.B pswrap
-to generate const declarations.
-.RS
-.LP
-.I Note:
-ANSI C procedure prototype syntax is not recognized by most non-ANSI C
-compilers, including many compilers based on the Portable C Compiler. Use the
-.B \-a
-option only in conjunction with a compiler that conforms to the ANSI C Standard.
-.RE
-.TP
-.BI \-h " outputHFile"
-Generates a header file that contains extern declarations for non-static
-wraps. This file can be used in #include statements in modules that use
-wraps. If the
-.B \-a
-option is specified, the declarations in the header file
-are ANSI C procedure prototypes. If the
-.B \-h
-option is omitted, a header file is not produced.
-.TP
-.BI \-o " outputCFile"
-Specifies the file to which the generated wraps and passed-through text are
-written. If omitted, the standard output is used. If the
-.B \-a
-option is also specified, the procedure definitions generated by
-.B pswrap
-are in ANSI C procedure prototype syntax.
-.TP
-.B \-p
-Specifies that strings passed by wraps are padded so that each data object
-begins on a long-word (4-byte) boundary. This option allows wraps to run on
-architectures that restrict data alignment to 4-byte boundaries and
-improves performance on some other architectures.
-.TP
-.B \-r
-Generates reentrant code for wraps shared by more than one process (as in
-shared libraries). Reentrant code can be called recursively or by more than
-one thread. The
-.B \-r
-option causes
-.B pswrap
-to generate extra code, so use it only when necessary.
-.TP
-.BI \-s " maxstring"
-Sets the maximum allowable length of a PostScript string object or
-hexadecimal string object in the wrap body input. A syntax error is reported if a
-string is not terminated with ) or > within
-.I maxstring
-characters.
-.I maxstring
-cannot be set lower than 80; the default is 200.
-
-.SH SEE ALSO
-\fIProgramming the Display PostScript System with X\fR
-(Addison-Wesley Publishing Company, Inc., 1993).
-
-.SH AUTHOR
-Adobe Systems Incorporated
-
-.SH NOTES
-PostScript and Display PostScript are trademarks
-of Adobe Systems Incorporated which may be registered
-in certain jurisdictions.
-.PP
-Copyright (c) 1988-1994 Adobe Systems Incorporated. All rights reserved.
diff --git a/nx-X11/config/pswrap/pswsemantics.c b/nx-X11/config/pswrap/pswsemantics.c
deleted file mode 100644
index caaff800e..000000000
--- a/nx-X11/config/pswrap/pswsemantics.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * pswsemantics.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-/***********/
-/* Imports */
-/***********/
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef XENVIRONMENT
-#include <X11/Xos.h>
-#else
-#include <string.h>
-#endif
-
-#include "pswdict.h"
-#include "pswpriv.h"
-#include "pswsemantics.h"
-
-/***********************/
-/* Module-wide globals */
-/***********************/
-
-char *currentPSWName = NULL;
-int reportedPSWName = 0;
-
-static PSWDict currentDict = NULL;
-
-
-/*************************************************/
-/* Procedures called by the parser's annotations */
-/*************************************************/
-
-static boolean IsCharType(Type t)
-{
- return (t == T_CHAR || t == T_UCHAR);
-}
-
-static boolean IsNumStrType(Type t)
-{
- return (t == T_NUMSTR
- || t == T_FLOATNUMSTR
- || t == T_LONGNUMSTR
- || t == T_SHORTNUMSTR);
-}
-
-void PSWName(char *s)
-{
- currentPSWName = psw_malloc(strlen(s)+1);
- strcpy(currentPSWName, s);
- reportedPSWName = 0;
-}
-
- /* Generate the code for this wrap now */
-void FinalizePSWrapDef(Header hdr, Body body)
-{
- if (header && ! hdr->isStatic) EmitPrototype(hdr);
-
- printf("#line %d \"%s\"\n", ++outlineno, ofile);
- EmitBodyHeader(hdr);
-
- printf("{\n"); outlineno++;
- EmitBody(body, hdr);
- printf("}\n"); outlineno++;
- printf("#line %d \"%s\"\n", yylineno, ifile); outlineno++;
-
- /* release storage for this wrap */
- /* Omit if you have lots of memory and want pswrap lean and mean */
- if (bigFile) {
- register Arg arg, nextarg; register Item item, nextitem;
- for(arg = hdr->inArgs; arg; arg = nextarg) {
- nextarg = arg->next;
- for(item = arg->items; item; item = nextitem) {
- nextitem = item->next;
- if (item->subscripted) {
- if (!item->subscript->constant) free(item->subscript->name);
- free(item->subscript);
- if(item->scaled) {
- if (!item->scale->constant) free(item->scale->name);
- free(item->scale);
- }
- }
- free(item->name); free(item);
- }
- free(arg);
- }
- for(arg = hdr->outArgs; arg; arg = nextarg) {
- nextarg = arg->next;
- for(item = arg->items; item; item = nextitem) {
- nextitem = item->next;
- if (item->subscripted) {
- if (!item->subscript->constant) free(item->subscript->name);
- free(item->subscript);
- }
- free(item->name); free(item);
- }
- free(arg);
- }
- free(hdr->name); free(hdr);
- FreeBody(body);
- }
-
- DestroyPSWDict(currentDict);
- currentDict = NULL;
- currentPSWName = NULL;
- reportedPSWName = 0;
-}
-
- /* Complete construction of the Header tree and make some semantic checks */
-Header PSWHeader(boolean isStatic, Args inArgs, Args outArgs)
-{
- char *name = currentPSWName;
- register Arg arg, prevArg;
- register Item item, prevItem;
- int nextTag = 0;
-
- Header hdr = (Header)psw_calloc(sizeof(HeaderRec), 1);
- hdr->isStatic = isStatic;
- hdr->name = name;
-
- currentDict = CreatePSWDict(511);
-
- prevArg = NULL;
- for (arg = inArgs; arg; arg = arg->next) { /* foreach input arg */
- prevItem = NULL;
- for (item = arg->items; item; item = item->next) {
- if (IsCharType(arg->type)
- && !(item->starred || item->subscripted)) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,
- "char input parameter %s must be starred or subscripted\n",
- item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free(item); XXX? */
- continue;
- }
- if(item->scaled && !IsNumStrType(arg->type)) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"only numstring parameters may be scaled\n");
- }
- if (IsNumStrType(arg->type)
- && (item->starred || !item->subscripted)) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,
- "numstring parameter %s may only be subscripted\n",
- item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free(item); XXX? */
- continue;
- }
- if (arg->type != T_CONTEXT) {
- if (PSWDictLookup(currentDict, item->name) != -1) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"parameter %s reused\n", item->name);
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free this ? */
- continue;
- }
- PSWDictEnter(currentDict, item->name, (PSWDictValue) item);
- item->isoutput = false;
- item->type = arg->type;
- prevItem = item;
- }
- }
- if (arg->items == NULL) {
- if (prevArg) { prevArg->next = arg->next;}
- else if (arg == inArgs) {inArgs = arg->next;}
- continue;
- }
- prevArg = arg;
- }
-
- prevArg = NULL;
- for (arg = outArgs; arg; arg = arg->next) { /* foreach output arg */
- prevItem = NULL;
- for (item = arg->items; item; item = item->next) {
- if (arg->type == T_USEROBJECT) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"output parameter %s can not be of type userobject\n",
- item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free(item); XXX */
- continue;
- }
- if (arg->type == T_NUMSTR || arg->type == T_FLOATNUMSTR
- || arg->type == T_LONGNUMSTR || arg->type == T_SHORTNUMSTR) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"output parameter %s can not be of type numstring\n",
- item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free(item); XXX */
- continue;
- }
- if (!(item->starred || item->subscripted)) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"output parameter %s must be starred or subscripted\n",
- item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free(item); XXX */
- continue;
- }
- if (PSWDictLookup(currentDict, item->name) != -1) {
- ErrIntro(item->sourceLine);
- fprintf(stderr,"parameter %s reused\n", item->name);
- /* remove item from list */
- if (prevItem) {prevItem->next = item->next;}
- else if (item == arg->items) {arg->items = item->next;};
- /* free the storage? XXX */
- continue;
- }
- PSWDictEnter(currentDict, item->name, (PSWDictValue) item);
- item->isoutput = true;
- item->type = arg->type;
- item->tag = nextTag++;
- prevItem = item;
- } /* inside for loop */
- if (arg->items == NULL) {
- if (prevArg) {
- prevArg->next = arg->next;
- } else if (arg == outArgs) {
- outArgs = arg->next;
- }
- continue;
- }
- prevArg = arg;
- } /* outside for loop */
-
- /* now go looking for subscripts that name an input arg */
- for (arg = inArgs; arg; arg = arg->next) { /* foreach input arg */
- for (item = arg->items; item; item = item->next) {
- if (item->subscripted && !item->subscript->constant) {
- PSWDictValue v = PSWDictLookup(currentDict, item->subscript->name);
- if (v != -1) {
- Item subItem = (Item)v;
- if (subItem->isoutput) {
- ErrIntro(subItem->sourceLine);
- fprintf(stderr,"output parameter %s used as a subscript\n",
- subItem->name);
- continue;
- }
- if (subItem->type != T_INT) {
- ErrIntro(subItem->sourceLine);
- fprintf(stderr,
- "input parameter %s used as a subscript is not an int\n",
- subItem->name);
- continue;
- }
- }
- }
- }
- }
-
- for (arg = outArgs; arg; arg = arg->next) { /* foreach output arg */
- for (item = arg->items; item; item = item->next) {
- if (item->subscripted && !item->subscript->constant) {
- PSWDictValue v = PSWDictLookup(currentDict, item->subscript->name);
- if (v != -1) {
- Item subItem = (Item)v;
- if (subItem->isoutput) {
- ErrIntro(subItem->sourceLine);
- fprintf(stderr,"output parameter %s used as a subscript\n",
- subItem->name);
- continue;
- }
- if (subItem->type != T_INT) {
- ErrIntro(subItem->sourceLine);
- fprintf(stderr,
- "input parameter %s used as a subscript is not an int\n",
- subItem->name);
- continue;
- }
- }
- }
- }
- }
-
- hdr->inArgs = inArgs;
- hdr->outArgs = outArgs;
-
- return hdr;
-}
-
-Token PSWToken(Type type, char *val)
-{
- register Token token = (Token)psw_calloc(sizeof(TokenRec), 1);
-
- token->next = NULL;
- token->type = type;
- token->val = val;
- token->sourceLine = yylineno;
-
- switch (type) {
- case T_STRING:
- case T_NAME:
- case T_LITNAME: {
- Item dictVal = (Item) PSWDictLookup(currentDict, (char *)val);
- if ((PSWDictValue) dictVal != -1) {
- if ((type != T_NAME) && (dictVal->isoutput)) {
- ErrIntro(yylineno);
- fprintf(stderr,"output parameter %s used as %s\n",
- dictVal->name,
- (type == T_STRING) ? "string": "literal name");
- } else
- if ((type != T_NAME) && !IsCharType(dictVal->type)) {
- ErrIntro(yylineno);
- fprintf(stderr,"non-char input parameter %s used as %s\n",
- dictVal->name,
- (type == T_STRING) ? "string": "literal name");
- } else
- token->namedFormal = dictVal; /* ok, so assign a value */
- }
- break;
- }
- default:
- break;
- }
-
- return token;
-}
-
-Token PSWToken2(Type type, char *val, char *ind)
-{
- register Token token = (Token)psw_calloc(sizeof(TokenRec), 1);
- Item dictVal = (Item) PSWDictLookup(currentDict, val);
- Item dvi;
-
- token->next = NULL;
- token->type = type;
- token->val = val;
- token->sourceLine = yylineno;
-
- /* Assert(type == T_SUBSCRIPTED); */
- if (((PSWDictValue) dictVal == -1) || (dictVal->isoutput)) {
- ErrIntro(yylineno);
- fprintf(stderr,"%s not an input parameter\n", val);
- }
- else if (!dictVal->subscripted) {
- ErrIntro(yylineno);
- fprintf(stderr,"%s not an array\n", val);
- }
- else if (dictVal->type >= T_NUMSTR) {
- ErrIntro(yylineno);
- fprintf(stderr,"cannot subscript numstring %s\n", val);
- }
- else if (IsCharType(dictVal->type)) {
- ErrIntro(yylineno);
- fprintf(stderr,"%s not a scalar type\n", val);
- }
- else {
- dvi = (Item) PSWDictLookup(currentDict, (char *)ind);
- if (((PSWDictValue) dvi != -1)
- && ((dvi->isoutput) || IsCharType(dvi->type))) {
- ErrIntro(yylineno);
- fprintf(stderr,"%s wrong type\n",(char *) ind);
- }
- else {
- token->body.var = (char *) ind;
- token->namedFormal = dictVal; /* ok, so assign a value */
- return token;
- }
- }
-
- /* ERRORS fall through */
- free(token);
- return (PSWToken(T_NAME,val));
-}
-
-Arg PSWArg(Type type, Items items)
-{
- register Arg arg = (Arg)psw_calloc(sizeof(ArgRec), 1);
- arg->next = NULL;
- arg->type = type;
- arg->items = items;
- return arg;
-}
-
-Item PSWItem(char *name)
-{
- register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
- item->next = NULL;
- item->name = name;
- item->sourceLine = yylineno;
- return item;
-}
-
-Item PSWStarItem(char *name)
-{
- register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
- item->next = NULL;
- item->name = name;
- item->starred = true;
- item->sourceLine = yylineno;
- return item;
-}
-
-Item PSWSubscriptItem(char *name, Subscript subscript)
-{
- register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
- item->next = NULL;
- item->name = name;
- item->subscript = subscript;
- item->subscripted = true;
- item->sourceLine = yylineno;
- return item;
-}
-
-Item PSWScaleItem(char *name, Subscript subscript, char *nameval, int val)
-{
- Item item;
- Scale scale = (Scale)psw_calloc(sizeof(ScaleRec), 1);
- item = PSWSubscriptItem(name, subscript);
- item->scaled = true;
- if(nameval)
- scale->name = nameval;
- else {
- scale->constant = true;
- scale->val = val;
- }
- item->scale = scale;
- return(item);
-}
-
-Subscript PSWNameSubscript(char *name)
-{
- Subscript subscript = (Subscript)psw_calloc(sizeof(SubscriptRec), 1);
- subscript->name = name;
- return subscript;
-}
-
-Subscript PSWIntegerSubscript(int val)
-{
- Subscript subscript = (Subscript)psw_calloc(sizeof(SubscriptRec), 1);
- subscript->constant = true;
- subscript->val = val;
- return subscript;
-}
-
-Args ConsPSWArgs(Arg arg, Args args)
-{
- arg->next = args;
- return arg;
-}
-
-Tokens AppendPSWToken(Token token, Tokens tokens)
-{
- register Token t;
- static Token firstToken, lastToken; /* cache ptr to last */
-
- if ((token->type == T_NAME) && (token->namedFormal)) {
- if( token->namedFormal->isoutput) {
- Token oldtoken;
- char *pos = "printobject";
- char *ss = psw_malloc(strlen(pos) + 1);
- strcpy(ss, pos);
- free(token->val);
- oldtoken = token;
- token = PSWToken(T_INT, (char *) token->namedFormal->tag);
- free((char *)oldtoken);
- token->next = PSWToken(T_NAME, ss);
- } else
- if (token->namedFormal->type == T_USEROBJECT) {
- char *pos = "execuserobject";
- char *ss = psw_malloc(strlen(pos) + 1);
- strcpy(ss, pos);
- token->next = PSWToken(T_NAME, ss);
- }
- }
-
- if (tokens == NULL) {
- firstToken = lastToken = token;
- return token;
- }
-
- if (tokens != firstToken)
- firstToken = lastToken = tokens;
- for (t = lastToken; t->next; t = t->next);
- lastToken = t->next = token;
-
- return tokens;
-}
-
-Args AppendPSWArgs(Arg arg, Args args)
-{
- register Arg a;
- arg->next = NULL;
- if (args == NULL) return arg;
-
- for (a = args; a->next; a = a->next);
-
- a->next = arg;
- return args;
-}
-
-Items AppendPSWItems(Item item, Items items)
-{
- register Item t;
- item->next = NULL;
- if (items == NULL) return item;
-
- for (t = items; t->next; t = t->next);
-
- t->next = item;
- return items;
-}
diff --git a/nx-X11/config/pswrap/pswsemantics.h b/nx-X11/config/pswrap/pswsemantics.h
deleted file mode 100644
index b2e0a1a41..000000000
--- a/nx-X11/config/pswrap/pswsemantics.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * pswsemantics.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-#ifndef PSWSEMANTICS_H
-#define PSWSEMANTICS_H
-
-#include "pswpriv.h"
-
-/* PROCEDURES */
-
-extern Arg PSWArg(Type, Items);
-extern Args AppendPSWArgs(Arg, Args);
-extern Args ConsPSWArgs(Arg, Args);
-extern Header PSWHeader(boolean, Args, Args);
-extern Item PSWItem(char *);
-extern Item PSWScaleItem(char *, Subscript, char *, int);
-extern Item PSWStarItem(char *);
-extern Item PSWSubscriptItem(char *, Subscript);
-extern Items AppendPSWItems(Item, Items);
-extern Subscript PSWIntegerSubscript(int);
-extern Subscript PSWNameSubscript(char *);
-extern Token PSWToken(Type, char *);
-extern Token PSWToken2(Type, char *, char *);
-extern Tokens AppendPSWToken(Token, Tokens);
-extern void FinalizePSWrapDef(Header, Body);
-extern void PSWName(char *);
-
-#endif /* PSWSEMANTICS_H */
diff --git a/nx-X11/config/pswrap/pswstring.c b/nx-X11/config/pswrap/pswstring.c
deleted file mode 100644
index 3a4d5084a..000000000
--- a/nx-X11/config/pswrap/pswstring.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * pswstring.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86$ */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#include "pswpriv.h"
-#include "psw.h"
-
-#define outfil stdout
-#define MAX_PER_LINE 16
-
-int PSWStringLength(char *s)
-{
- register char *c = s;
- register int len = 0;
-
- while (*c != '\0') { /* skip \\ and \ooo */
- if (*c++ == '\\') {
- if (*c++ != '\\') c += 2;
- }
- len++;
- }
- return (len);
-}
-
-void PSWOutputStringChars(char *s)
-{
- register char *c = s;
- register char b;
- register int perline = 0;
-
- while (*c != '\0') {
- putc('\'',outfil);
- switch (b = *c++) {
- case '\\':
- putc('\\',outfil);
- fputc(b = *c++,outfil);
- if (b != '\\') {putc(*c++,outfil);putc(*c++,outfil);}
- break;
- case '\'':
- fprintf(outfil,"\\'");
- break;
- case '\"':
- fprintf(outfil,"\\\"");
- break;
- case '\b':
- fprintf(outfil,"\\b");
- break;
- case '\f':
- fprintf(outfil,"\\f");
- break;
-/* avoid funny interpretations of \n, \r by MPW */
- case '\012':
- fprintf(outfil,"\\012"); perline++;
- break;
- case '\015':
- fprintf(outfil,"\\015"); perline++;
- break;
- case '\t':
- fprintf(outfil,"\\t");
- break;
- default:
- putc(b,outfil); perline--;
- break;
- }
- putc('\'',outfil);
- if (*c != '\0') {
- if (++perline >= MAX_PER_LINE) {
- fprintf(outfil,",\n ");
- outlineno++;
- }
- else {putc(',',outfil);}
- perline %= MAX_PER_LINE;
- }
- }
-}
-
-
-int PSWHexStringLength(char *s)
-{
- return ((int) (strlen(s)+1)/2);
-}
-
-void PSWOutputHexStringChars(register char *s)
-{
- register int perline = 0;
- char tmp[3];
-
- tmp[2] ='\0';
- while ((tmp[0] = *s++)!= '\0') {
- tmp[1] = *s ? *s++ : '\0';
- fprintf(outfil,"0x%s",tmp);
- if (*s != '\0') {
- if (++perline >= MAX_PER_LINE) {
- fprintf(outfil,",\n ");
- outlineno++;
- }
- else {putc(',',outfil);}
- perline %= MAX_PER_LINE;
- }
- } /* while */
-}
diff --git a/nx-X11/config/pswrap/pswtypes.h b/nx-X11/config/pswrap/pswtypes.h
deleted file mode 100644
index cfa64f083..000000000
--- a/nx-X11/config/pswrap/pswtypes.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * pswtypes.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86$ */
-
-#ifndef PSWTYPES_H
-#define PSWTYPES_H
-
-#include <stddef.h>
-
-#define false 0
-#define true 1
-typedef short boolean;
-
-#endif /* PSWTYPES_H */
diff --git a/nx-X11/config/pswrap/pswversion.h b/nx-X11/config/pswrap/pswversion.h
deleted file mode 100644
index c28c3f174..000000000
--- a/nx-X11/config/pswrap/pswversion.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * pswversion.h
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-/* $XFree86$ */
-
-#define PSW_VERSION "V1.009 X11"
-
-#define PSW_OS "unix"
diff --git a/nx-X11/config/pswrap/sysname_gen.c b/nx-X11/config/pswrap/sysname_gen.c
deleted file mode 100644
index 10624aafc..000000000
--- a/nx-X11/config/pswrap/sysname_gen.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * sysnames_gen.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
- wellKnownPSNames = CreatePSWDict(431);
-
- PSWDictEnter(wellKnownPSNames,"abs", 0);
- PSWDictEnter(wellKnownPSNames,"add", 1);
- PSWDictEnter(wellKnownPSNames,"aload", 2);
- PSWDictEnter(wellKnownPSNames,"anchorsearch", 3);
- PSWDictEnter(wellKnownPSNames,"and", 4);
- PSWDictEnter(wellKnownPSNames,"arc", 5);
- PSWDictEnter(wellKnownPSNames,"arcn", 6);
- PSWDictEnter(wellKnownPSNames,"arct", 7);
- PSWDictEnter(wellKnownPSNames,"arcto", 8);
- PSWDictEnter(wellKnownPSNames,"array", 9);
- PSWDictEnter(wellKnownPSNames,"ashow", 10);
- PSWDictEnter(wellKnownPSNames,"astore", 11);
- PSWDictEnter(wellKnownPSNames,"awidthshow", 12);
- PSWDictEnter(wellKnownPSNames,"begin", 13);
- PSWDictEnter(wellKnownPSNames,"bind", 14);
- PSWDictEnter(wellKnownPSNames,"bitshift", 15);
- PSWDictEnter(wellKnownPSNames,"ceiling", 16);
- PSWDictEnter(wellKnownPSNames,"charpath", 17);
- PSWDictEnter(wellKnownPSNames,"clear", 18);
- PSWDictEnter(wellKnownPSNames,"cleartomark", 19);
- PSWDictEnter(wellKnownPSNames,"clip", 20);
- PSWDictEnter(wellKnownPSNames,"clippath", 21);
- PSWDictEnter(wellKnownPSNames,"closepath", 22);
- PSWDictEnter(wellKnownPSNames,"concat", 23);
- PSWDictEnter(wellKnownPSNames,"concatmatrix", 24);
- PSWDictEnter(wellKnownPSNames,"copy", 25);
- PSWDictEnter(wellKnownPSNames,"count", 26);
- PSWDictEnter(wellKnownPSNames,"counttomark", 27);
- PSWDictEnter(wellKnownPSNames,"currentcmykcolor", 28);
- PSWDictEnter(wellKnownPSNames,"currentdash", 29);
- PSWDictEnter(wellKnownPSNames,"currentdict", 30);
- PSWDictEnter(wellKnownPSNames,"currentfile", 31);
- PSWDictEnter(wellKnownPSNames,"currentfont", 32);
- PSWDictEnter(wellKnownPSNames,"currentgray", 33);
- PSWDictEnter(wellKnownPSNames,"currentgstate", 34);
- PSWDictEnter(wellKnownPSNames,"currenthsbcolor", 35);
- PSWDictEnter(wellKnownPSNames,"currentlinecap", 36);
- PSWDictEnter(wellKnownPSNames,"currentlinejoin", 37);
- PSWDictEnter(wellKnownPSNames,"currentlinewidth", 38);
- PSWDictEnter(wellKnownPSNames,"currentmatrix", 39);
- PSWDictEnter(wellKnownPSNames,"currentpoint", 40);
- PSWDictEnter(wellKnownPSNames,"currentrgbcolor", 41);
- PSWDictEnter(wellKnownPSNames,"currentshared", 42);
- PSWDictEnter(wellKnownPSNames,"curveto", 43);
- PSWDictEnter(wellKnownPSNames,"cvi", 44);
- PSWDictEnter(wellKnownPSNames,"cvlit", 45);
- PSWDictEnter(wellKnownPSNames,"cvn", 46);
- PSWDictEnter(wellKnownPSNames,"cvr", 47);
- PSWDictEnter(wellKnownPSNames,"cvrs", 48);
- PSWDictEnter(wellKnownPSNames,"cvs", 49);
- PSWDictEnter(wellKnownPSNames,"cvx", 50);
- PSWDictEnter(wellKnownPSNames,"def", 51);
- PSWDictEnter(wellKnownPSNames,"defineusername", 52);
- PSWDictEnter(wellKnownPSNames,"dict", 53);
- PSWDictEnter(wellKnownPSNames,"div", 54);
- PSWDictEnter(wellKnownPSNames,"dtransform", 55);
- PSWDictEnter(wellKnownPSNames,"dup", 56);
- PSWDictEnter(wellKnownPSNames,"end", 57);
- PSWDictEnter(wellKnownPSNames,"eoclip", 58);
- PSWDictEnter(wellKnownPSNames,"eofill", 59);
- PSWDictEnter(wellKnownPSNames,"eoviewclip", 60);
- PSWDictEnter(wellKnownPSNames,"eq", 61);
- PSWDictEnter(wellKnownPSNames,"exch", 62);
- PSWDictEnter(wellKnownPSNames,"exec", 63);
- PSWDictEnter(wellKnownPSNames,"exit", 64);
- PSWDictEnter(wellKnownPSNames,"file", 65);
- PSWDictEnter(wellKnownPSNames,"fill", 66);
- PSWDictEnter(wellKnownPSNames,"findfont", 67);
- PSWDictEnter(wellKnownPSNames,"flattenpath", 68);
- PSWDictEnter(wellKnownPSNames,"floor", 69);
- PSWDictEnter(wellKnownPSNames,"flush", 70);
- PSWDictEnter(wellKnownPSNames,"flushfile", 71);
- PSWDictEnter(wellKnownPSNames,"for", 72);
- PSWDictEnter(wellKnownPSNames,"forall", 73);
- PSWDictEnter(wellKnownPSNames,"ge", 74);
- PSWDictEnter(wellKnownPSNames,"get", 75);
- PSWDictEnter(wellKnownPSNames,"getinterval", 76);
- PSWDictEnter(wellKnownPSNames,"grestore", 77);
- PSWDictEnter(wellKnownPSNames,"gsave", 78);
- PSWDictEnter(wellKnownPSNames,"gstate", 79);
- PSWDictEnter(wellKnownPSNames,"gt", 80);
- PSWDictEnter(wellKnownPSNames,"identmatrix", 81);
- PSWDictEnter(wellKnownPSNames,"idiv", 82);
- PSWDictEnter(wellKnownPSNames,"idtransform", 83);
- PSWDictEnter(wellKnownPSNames,"if", 84);
- PSWDictEnter(wellKnownPSNames,"ifelse", 85);
- PSWDictEnter(wellKnownPSNames,"image", 86);
- PSWDictEnter(wellKnownPSNames,"imagemask", 87);
- PSWDictEnter(wellKnownPSNames,"index", 88);
- PSWDictEnter(wellKnownPSNames,"ineofill", 89);
- PSWDictEnter(wellKnownPSNames,"infill", 90);
- PSWDictEnter(wellKnownPSNames,"initviewclip", 91);
- PSWDictEnter(wellKnownPSNames,"inueofill", 92);
- PSWDictEnter(wellKnownPSNames,"inufill", 93);
- PSWDictEnter(wellKnownPSNames,"invertmatrix", 94);
- PSWDictEnter(wellKnownPSNames,"itransform", 95);
- PSWDictEnter(wellKnownPSNames,"known", 96);
- PSWDictEnter(wellKnownPSNames,"le", 97);
- PSWDictEnter(wellKnownPSNames,"length", 98);
- PSWDictEnter(wellKnownPSNames,"lineto", 99);
- PSWDictEnter(wellKnownPSNames,"load", 100);
- PSWDictEnter(wellKnownPSNames,"loop", 101);
- PSWDictEnter(wellKnownPSNames,"lt", 102);
- PSWDictEnter(wellKnownPSNames,"makefont", 103);
- PSWDictEnter(wellKnownPSNames,"matrix", 104);
- PSWDictEnter(wellKnownPSNames,"maxlength", 105);
- PSWDictEnter(wellKnownPSNames,"mod", 106);
- PSWDictEnter(wellKnownPSNames,"moveto", 107);
- PSWDictEnter(wellKnownPSNames,"mul", 108);
- PSWDictEnter(wellKnownPSNames,"ne", 109);
- PSWDictEnter(wellKnownPSNames,"neg", 110);
- PSWDictEnter(wellKnownPSNames,"newpath", 111);
- PSWDictEnter(wellKnownPSNames,"not", 112);
- PSWDictEnter(wellKnownPSNames,"null", 113);
- PSWDictEnter(wellKnownPSNames,"or", 114);
- PSWDictEnter(wellKnownPSNames,"pathbbox", 115);
- PSWDictEnter(wellKnownPSNames,"pathforall", 116);
- PSWDictEnter(wellKnownPSNames,"pop", 117);
- PSWDictEnter(wellKnownPSNames,"print", 118);
- PSWDictEnter(wellKnownPSNames,"printobject", 119);
- PSWDictEnter(wellKnownPSNames,"put", 120);
- PSWDictEnter(wellKnownPSNames,"putinterval", 121);
- PSWDictEnter(wellKnownPSNames,"rcurveto", 122);
- PSWDictEnter(wellKnownPSNames,"read", 123);
- PSWDictEnter(wellKnownPSNames,"readhexstring", 124);
- PSWDictEnter(wellKnownPSNames,"readline", 125);
- PSWDictEnter(wellKnownPSNames,"readstring", 126);
- PSWDictEnter(wellKnownPSNames,"rectclip", 127);
- PSWDictEnter(wellKnownPSNames,"rectfill", 128);
- PSWDictEnter(wellKnownPSNames,"rectstroke", 129);
- PSWDictEnter(wellKnownPSNames,"rectviewclip", 130);
- PSWDictEnter(wellKnownPSNames,"repeat", 131);
- PSWDictEnter(wellKnownPSNames,"restore", 132);
- PSWDictEnter(wellKnownPSNames,"rlineto", 133);
- PSWDictEnter(wellKnownPSNames,"rmoveto", 134);
- PSWDictEnter(wellKnownPSNames,"roll", 135);
- PSWDictEnter(wellKnownPSNames,"rotate", 136);
- PSWDictEnter(wellKnownPSNames,"round", 137);
- PSWDictEnter(wellKnownPSNames,"save", 138);
- PSWDictEnter(wellKnownPSNames,"scale", 139);
- PSWDictEnter(wellKnownPSNames,"scalefont", 140);
- PSWDictEnter(wellKnownPSNames,"search", 141);
- PSWDictEnter(wellKnownPSNames,"selectfont", 142);
- PSWDictEnter(wellKnownPSNames,"setbbox", 143);
- PSWDictEnter(wellKnownPSNames,"setcachedevice", 144);
- PSWDictEnter(wellKnownPSNames,"setcachedevice2", 145);
- PSWDictEnter(wellKnownPSNames,"setcharwidth", 146);
- PSWDictEnter(wellKnownPSNames,"setcmykcolor", 147);
- PSWDictEnter(wellKnownPSNames,"setdash", 148);
- PSWDictEnter(wellKnownPSNames,"setfont", 149);
- PSWDictEnter(wellKnownPSNames,"setgray", 150);
- PSWDictEnter(wellKnownPSNames,"setgstate", 151);
- PSWDictEnter(wellKnownPSNames,"sethsbcolor", 152);
- PSWDictEnter(wellKnownPSNames,"setlinecap", 153);
- PSWDictEnter(wellKnownPSNames,"setlinejoin", 154);
- PSWDictEnter(wellKnownPSNames,"setlinewidth", 155);
- PSWDictEnter(wellKnownPSNames,"setmatrix", 156);
- PSWDictEnter(wellKnownPSNames,"setrgbcolor", 157);
- PSWDictEnter(wellKnownPSNames,"setshared", 158);
- PSWDictEnter(wellKnownPSNames,"shareddict", 159);
- PSWDictEnter(wellKnownPSNames,"show", 160);
- PSWDictEnter(wellKnownPSNames,"showpage", 161);
- PSWDictEnter(wellKnownPSNames,"stop", 162);
- PSWDictEnter(wellKnownPSNames,"stopped", 163);
- PSWDictEnter(wellKnownPSNames,"store", 164);
- PSWDictEnter(wellKnownPSNames,"string", 165);
- PSWDictEnter(wellKnownPSNames,"stringwidth", 166);
- PSWDictEnter(wellKnownPSNames,"stroke", 167);
- PSWDictEnter(wellKnownPSNames,"strokepath", 168);
- PSWDictEnter(wellKnownPSNames,"sub", 169);
- PSWDictEnter(wellKnownPSNames,"systemdict", 170);
- PSWDictEnter(wellKnownPSNames,"token", 171);
- PSWDictEnter(wellKnownPSNames,"transform", 172);
- PSWDictEnter(wellKnownPSNames,"translate", 173);
- PSWDictEnter(wellKnownPSNames,"truncate", 174);
- PSWDictEnter(wellKnownPSNames,"type", 175);
- PSWDictEnter(wellKnownPSNames,"uappend", 176);
- PSWDictEnter(wellKnownPSNames,"ucache", 177);
- PSWDictEnter(wellKnownPSNames,"ueofill", 178);
- PSWDictEnter(wellKnownPSNames,"ufill", 179);
- PSWDictEnter(wellKnownPSNames,"undef", 180);
- PSWDictEnter(wellKnownPSNames,"upath", 181);
- PSWDictEnter(wellKnownPSNames,"userdict", 182);
- PSWDictEnter(wellKnownPSNames,"ustroke", 183);
- PSWDictEnter(wellKnownPSNames,"viewclip", 184);
- PSWDictEnter(wellKnownPSNames,"viewclippath", 185);
- PSWDictEnter(wellKnownPSNames,"where", 186);
- PSWDictEnter(wellKnownPSNames,"widthshow", 187);
- PSWDictEnter(wellKnownPSNames,"write", 188);
- PSWDictEnter(wellKnownPSNames,"writehexstring", 189);
- PSWDictEnter(wellKnownPSNames,"writeobject", 190);
- PSWDictEnter(wellKnownPSNames,"writestring", 191);
- PSWDictEnter(wellKnownPSNames,"wtranslation", 192);
- PSWDictEnter(wellKnownPSNames,"xor", 193);
- PSWDictEnter(wellKnownPSNames,"xshow", 194);
- PSWDictEnter(wellKnownPSNames,"xyshow", 195);
- PSWDictEnter(wellKnownPSNames,"yshow", 196);
- PSWDictEnter(wellKnownPSNames,"FontDirectory", 197);
- PSWDictEnter(wellKnownPSNames,"SharedFontDirectory", 198);
- PSWDictEnter(wellKnownPSNames,"Courier", 199);
- PSWDictEnter(wellKnownPSNames,"Courier-Bold", 200);
- PSWDictEnter(wellKnownPSNames,"Courier-BoldOblique", 201);
- PSWDictEnter(wellKnownPSNames,"Courier-Oblique", 202);
- PSWDictEnter(wellKnownPSNames,"Helvetica", 203);
- PSWDictEnter(wellKnownPSNames,"Helvetica-Bold", 204);
- PSWDictEnter(wellKnownPSNames,"Helvetica-BoldOblique", 205);
- PSWDictEnter(wellKnownPSNames,"Helvetica-Oblique", 206);
- PSWDictEnter(wellKnownPSNames,"Symbol", 207);
- PSWDictEnter(wellKnownPSNames,"Times-Bold", 208);
- PSWDictEnter(wellKnownPSNames,"Times-BoldItalic", 209);
- PSWDictEnter(wellKnownPSNames,"Times-Italic", 210);
- PSWDictEnter(wellKnownPSNames,"Times-Roman", 211);
- PSWDictEnter(wellKnownPSNames,"execuserobject", 212);
- PSWDictEnter(wellKnownPSNames,"=", 256);
- PSWDictEnter(wellKnownPSNames,"==", 257);
- PSWDictEnter(wellKnownPSNames,"ISOLatin1Encoding", 258);
- PSWDictEnter(wellKnownPSNames,"StandardEncoding", 259);
- PSWDictEnter(wellKnownPSNames,"[", 260);
- PSWDictEnter(wellKnownPSNames,"]", 261);
- PSWDictEnter(wellKnownPSNames,"atan", 262);
- PSWDictEnter(wellKnownPSNames,"banddevice", 263);
- PSWDictEnter(wellKnownPSNames,"bytesavailable", 264);
- PSWDictEnter(wellKnownPSNames,"cachestatus", 265);
- PSWDictEnter(wellKnownPSNames,"closefile", 266);
- PSWDictEnter(wellKnownPSNames,"colorimage", 267);
- PSWDictEnter(wellKnownPSNames,"condition", 268);
- PSWDictEnter(wellKnownPSNames,"copypage", 269);
- PSWDictEnter(wellKnownPSNames,"cos", 270);
- PSWDictEnter(wellKnownPSNames,"countdictstack", 271);
- PSWDictEnter(wellKnownPSNames,"countexecstack", 272);
- PSWDictEnter(wellKnownPSNames,"cshow", 273);
- PSWDictEnter(wellKnownPSNames,"currentblackgeneration", 274);
- PSWDictEnter(wellKnownPSNames,"currentcacheparams", 275);
- PSWDictEnter(wellKnownPSNames,"currentcolorscreen", 276);
- PSWDictEnter(wellKnownPSNames,"currentcolortransfer", 277);
- PSWDictEnter(wellKnownPSNames,"currentcontext", 278);
- PSWDictEnter(wellKnownPSNames,"currentflat", 279);
- PSWDictEnter(wellKnownPSNames,"currenthalftone", 280);
- PSWDictEnter(wellKnownPSNames,"currenthalftonephase", 281);
- PSWDictEnter(wellKnownPSNames,"currentmiterlimit", 282);
- PSWDictEnter(wellKnownPSNames,"currentobjectformat", 283);
- PSWDictEnter(wellKnownPSNames,"currentpacking", 284);
- PSWDictEnter(wellKnownPSNames,"currentscreen", 285);
- PSWDictEnter(wellKnownPSNames,"currentstrokeadjust", 286);
- PSWDictEnter(wellKnownPSNames,"currenttransfer", 287);
- PSWDictEnter(wellKnownPSNames,"currentundercolorremoval", 288);
- PSWDictEnter(wellKnownPSNames,"defaultmatrix", 289);
- PSWDictEnter(wellKnownPSNames,"definefont", 290);
- PSWDictEnter(wellKnownPSNames,"deletefile", 291);
- PSWDictEnter(wellKnownPSNames,"detach", 292);
- PSWDictEnter(wellKnownPSNames,"deviceinfo", 293);
- PSWDictEnter(wellKnownPSNames,"dictstack", 294);
- PSWDictEnter(wellKnownPSNames,"echo", 295);
- PSWDictEnter(wellKnownPSNames,"erasepage", 296);
- PSWDictEnter(wellKnownPSNames,"errordict", 297);
- PSWDictEnter(wellKnownPSNames,"execstack", 298);
- PSWDictEnter(wellKnownPSNames,"executeonly", 299);
- PSWDictEnter(wellKnownPSNames,"exp", 300);
- PSWDictEnter(wellKnownPSNames,"false", 301);
- PSWDictEnter(wellKnownPSNames,"filenameforall", 302);
- PSWDictEnter(wellKnownPSNames,"fileposition", 303);
- PSWDictEnter(wellKnownPSNames,"fork", 304);
- PSWDictEnter(wellKnownPSNames,"framedevice", 305);
- PSWDictEnter(wellKnownPSNames,"grestoreall", 306);
- PSWDictEnter(wellKnownPSNames,"handleerror", 307);
- PSWDictEnter(wellKnownPSNames,"initclip", 308);
- PSWDictEnter(wellKnownPSNames,"initgraphics", 309);
- PSWDictEnter(wellKnownPSNames,"initmatrix", 310);
- PSWDictEnter(wellKnownPSNames,"instroke", 311);
- PSWDictEnter(wellKnownPSNames,"inustroke", 312);
- PSWDictEnter(wellKnownPSNames,"join", 313);
- PSWDictEnter(wellKnownPSNames,"kshow", 314);
- PSWDictEnter(wellKnownPSNames,"ln", 315);
- PSWDictEnter(wellKnownPSNames,"lock", 316);
- PSWDictEnter(wellKnownPSNames,"log", 317);
- PSWDictEnter(wellKnownPSNames,"mark", 318);
- PSWDictEnter(wellKnownPSNames,"monitor", 319);
- PSWDictEnter(wellKnownPSNames,"noaccess", 320);
- PSWDictEnter(wellKnownPSNames,"notify", 321);
- PSWDictEnter(wellKnownPSNames,"nulldevice", 322);
- PSWDictEnter(wellKnownPSNames,"packedarray", 323);
- PSWDictEnter(wellKnownPSNames,"quit", 324);
- PSWDictEnter(wellKnownPSNames,"rand", 325);
- PSWDictEnter(wellKnownPSNames,"rcheck", 326);
- PSWDictEnter(wellKnownPSNames,"readonly", 327);
- PSWDictEnter(wellKnownPSNames,"realtime", 328);
- PSWDictEnter(wellKnownPSNames,"renamefile", 329);
- PSWDictEnter(wellKnownPSNames,"renderbands", 330);
- PSWDictEnter(wellKnownPSNames,"resetfile", 331);
- PSWDictEnter(wellKnownPSNames,"reversepath", 332);
- PSWDictEnter(wellKnownPSNames,"rootfont", 333);
- PSWDictEnter(wellKnownPSNames,"rrand", 334);
- PSWDictEnter(wellKnownPSNames,"run", 335);
- PSWDictEnter(wellKnownPSNames,"scheck", 336);
- PSWDictEnter(wellKnownPSNames,"setblackgeneration", 337);
- PSWDictEnter(wellKnownPSNames,"setcachelimit", 338);
- PSWDictEnter(wellKnownPSNames,"setcacheparams", 339);
- PSWDictEnter(wellKnownPSNames,"setcolorscreen", 340);
- PSWDictEnter(wellKnownPSNames,"setcolortransfer", 341);
- PSWDictEnter(wellKnownPSNames,"setfileposition", 342);
- PSWDictEnter(wellKnownPSNames,"setflat", 343);
- PSWDictEnter(wellKnownPSNames,"sethalftone", 344);
- PSWDictEnter(wellKnownPSNames,"sethalftonephase", 345);
- PSWDictEnter(wellKnownPSNames,"setmiterlimit", 346);
- PSWDictEnter(wellKnownPSNames,"setobjectformat", 347);
- PSWDictEnter(wellKnownPSNames,"setpacking", 348);
- PSWDictEnter(wellKnownPSNames,"setscreen", 349);
- PSWDictEnter(wellKnownPSNames,"setstrokeadjust", 350);
- PSWDictEnter(wellKnownPSNames,"settransfer", 351);
- PSWDictEnter(wellKnownPSNames,"setucacheparams", 352);
- PSWDictEnter(wellKnownPSNames,"setundercolorremoval", 353);
- PSWDictEnter(wellKnownPSNames,"sin", 354);
- PSWDictEnter(wellKnownPSNames,"sqrt", 355);
- PSWDictEnter(wellKnownPSNames,"srand", 356);
- PSWDictEnter(wellKnownPSNames,"stack", 357);
- PSWDictEnter(wellKnownPSNames,"status", 358);
- PSWDictEnter(wellKnownPSNames,"statusdict", 359);
- PSWDictEnter(wellKnownPSNames,"true", 360);
- PSWDictEnter(wellKnownPSNames,"ucachestatus", 361);
- PSWDictEnter(wellKnownPSNames,"undefinefont", 362);
- PSWDictEnter(wellKnownPSNames,"usertime", 363);
- PSWDictEnter(wellKnownPSNames,"ustrokepath", 364);
- PSWDictEnter(wellKnownPSNames,"version", 365);
- PSWDictEnter(wellKnownPSNames,"vmreclaim", 366);
- PSWDictEnter(wellKnownPSNames,"vmstatus", 367);
- PSWDictEnter(wellKnownPSNames,"wait", 368);
- PSWDictEnter(wellKnownPSNames,"wcheck", 369);
- PSWDictEnter(wellKnownPSNames,"xcheck", 370);
- PSWDictEnter(wellKnownPSNames,"yield", 371);
- PSWDictEnter(wellKnownPSNames,"defineuserobject", 372);
- PSWDictEnter(wellKnownPSNames,"undefineuserobject", 373);
- PSWDictEnter(wellKnownPSNames,"UserObjects", 374);
- PSWDictEnter(wellKnownPSNames,"cleardictstack", 375);
- PSWDictEnter(wellKnownPSNames,"A", 376);
- PSWDictEnter(wellKnownPSNames,"B", 377);
- PSWDictEnter(wellKnownPSNames,"C", 378);
- PSWDictEnter(wellKnownPSNames,"D", 379);
- PSWDictEnter(wellKnownPSNames,"E", 380);
- PSWDictEnter(wellKnownPSNames,"F", 381);
- PSWDictEnter(wellKnownPSNames,"G", 382);
- PSWDictEnter(wellKnownPSNames,"H", 383);
- PSWDictEnter(wellKnownPSNames,"I", 384);
- PSWDictEnter(wellKnownPSNames,"J", 385);
- PSWDictEnter(wellKnownPSNames,"K", 386);
- PSWDictEnter(wellKnownPSNames,"L", 387);
- PSWDictEnter(wellKnownPSNames,"M", 388);
- PSWDictEnter(wellKnownPSNames,"N", 389);
- PSWDictEnter(wellKnownPSNames,"O", 390);
- PSWDictEnter(wellKnownPSNames,"P", 391);
- PSWDictEnter(wellKnownPSNames,"Q", 392);
- PSWDictEnter(wellKnownPSNames,"R", 393);
- PSWDictEnter(wellKnownPSNames,"S", 394);
- PSWDictEnter(wellKnownPSNames,"T", 395);
- PSWDictEnter(wellKnownPSNames,"U", 396);
- PSWDictEnter(wellKnownPSNames,"V", 397);
- PSWDictEnter(wellKnownPSNames,"W", 398);
- PSWDictEnter(wellKnownPSNames,"X", 399);
- PSWDictEnter(wellKnownPSNames,"Y", 400);
- PSWDictEnter(wellKnownPSNames,"Z", 401);
- PSWDictEnter(wellKnownPSNames,"a", 402);
- PSWDictEnter(wellKnownPSNames,"b", 403);
- PSWDictEnter(wellKnownPSNames,"c", 404);
- PSWDictEnter(wellKnownPSNames,"d", 405);
- PSWDictEnter(wellKnownPSNames,"e", 406);
- PSWDictEnter(wellKnownPSNames,"f", 407);
- PSWDictEnter(wellKnownPSNames,"g", 408);
- PSWDictEnter(wellKnownPSNames,"h", 409);
- PSWDictEnter(wellKnownPSNames,"i", 410);
- PSWDictEnter(wellKnownPSNames,"j", 411);
- PSWDictEnter(wellKnownPSNames,"k", 412);
- PSWDictEnter(wellKnownPSNames,"l", 413);
- PSWDictEnter(wellKnownPSNames,"m", 414);
- PSWDictEnter(wellKnownPSNames,"n", 415);
- PSWDictEnter(wellKnownPSNames,"o", 416);
- PSWDictEnter(wellKnownPSNames,"p", 417);
- PSWDictEnter(wellKnownPSNames,"q", 418);
- PSWDictEnter(wellKnownPSNames,"r", 419);
- PSWDictEnter(wellKnownPSNames,"s", 420);
- PSWDictEnter(wellKnownPSNames,"t", 421);
- PSWDictEnter(wellKnownPSNames,"u", 422);
- PSWDictEnter(wellKnownPSNames,"v", 423);
- PSWDictEnter(wellKnownPSNames,"w", 424);
- PSWDictEnter(wellKnownPSNames,"x", 425);
- PSWDictEnter(wellKnownPSNames,"y", 426);
- PSWDictEnter(wellKnownPSNames,"z", 427);
- PSWDictEnter(wellKnownPSNames,"setvmthreshold", 428);
- PSWDictEnter(wellKnownPSNames,"<<", 429);
- PSWDictEnter(wellKnownPSNames,">>", 430);
-
diff --git a/nx-X11/config/pswrap/systemnames.c b/nx-X11/config/pswrap/systemnames.c
deleted file mode 100644
index af1dbb83a..000000000
--- a/nx-X11/config/pswrap/systemnames.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * systemnames.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-#include "pswpriv.h"
-#include "pswdict.h"
-
-PSWDict wellKnownPSNames;
-
-void InitWellKnownPSNames(void)
-{
-#include "sysname_gen.c"
-}
diff --git a/nx-X11/config/pswrap/yyerror.c b/nx-X11/config/pswrap/yyerror.c
deleted file mode 100644
index 56044b4b4..000000000
--- a/nx-X11/config/pswrap/yyerror.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * yyerror.c
- *
- * (c) Copyright 1988-1994 Adobe Systems Incorporated.
- * All rights reserved.
- *
- * Permission to use, copy, modify, distribute, and sublicense this software
- * and its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notices appear in all copies and that
- * both those copyright notices and this permission notice appear in
- * supporting documentation and that the name of Adobe Systems Incorporated
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. No trademark license
- * to use the Adobe trademarks is hereby granted. If the Adobe trademark
- * "Display PostScript"(tm) is used to describe this software, its
- * functionality or for any other purpose, such use shall be limited to a
- * statement that this software works in conjunction with the Display
- * PostScript system. Proper trademark attribution to reflect Adobe's
- * ownership of the trademark shall be given whenever any such reference to
- * the Display PostScript system is made.
- *
- * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
- * ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
- * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON- INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE
- * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT
- * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- *
- * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
- * Incorporated which may be registered in certain jurisdictions
- *
- * Author: Adobe Systems Incorporated
- */
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include "pswpriv.h"
-
-/* ErrIntro prints a standard intro for error messages;
- * change it if your system uses something else. We have many options:
- *
- * to match Macintosh: #define FMT "File \"%s\"; Line %d # "
- * to match BSD cc: #define FMT "\"%s\", line %d: "
- * to match gcc: #define FMT "%s:%d: "
- * to match Mips cc: #define FMT "pswrap: Error: %s, line %d: "
- */
-
-
-#define INTRO "# In function %s -\n"
-
-#ifdef macintosh
-#define FMT "File \"%s\"; Line %d # "
-#else /* macintosh */
-#define FMT "\"%s\", line %d: "
-#endif /* macintosh */
-
-void ErrIntro(int line)
-{
- if (! reportedPSWName && currentPSWName) {
- reportedPSWName = 1;
- fprintf(stderr,INTRO,currentPSWName);
- }
- fprintf(stderr,FMT,ifile,line);
- errorCount++;
-}
-
-
-void yyerror(char *errmsg)
-{
- ErrIntro(yylineno);
- fprintf(stderr,"%s near text \"%s\"\n",errmsg,yytext);
-}