*** xc/config/cf/os2.cf:1.1	1996/10/26 20:05:31
--- xc/config/cf/os2.cf	1996/10/26 20:06:14
***************
*** 58,64 ****
  #define NroffCmd	groff -Tascii
  #define	EqnCmd 		eqn -Tascii
  #define TroffCmd        groff -Tps
-           COL = /usr/bin/col
           NEQN = NeqnCmd
          NROFF = NroffCmd
  
--- 58,63 ----
*** xc/config/cf/os2.rules:1.1	1996/10/26 19:35:28
--- xc/config/cf/os2.rules	1996/10/26 20:03:02
***************
*** 17,22 ****
--- 17,23 ----
  #define ImakeSubCmdHelper \imake -I$(IRULESRC) $(IMAKE_DEFINES)
  #define Fontc \bdftopcf
  #define MkFontDir \mkfontdir
+ #define XkbComp \xkbcomp
  #else
  #define ImakeHelper imakesvc
  #define IMmode u
***************
*** 24,35 ****
--- 25,38 ----
  #define ImakeSubCmdHelper $(IMAKE_CMD)
  #define Fontc bdftopcf
  #define MkFontDir mkfontdir
+ #define XkbComp xkbcomp
  #endif
  
  #define echo ImakeHelper 8 
  #define RunProgram(progvar,options) $(subst /,\,$(progvar)) options
  #define RemoveFile(file) $(RM) file
  #define RemoveFiles(files) $(RM) files
+ #define NeedLdLibraryPathForXkbComp NO
  
  #define LibObjCompile(dir,options) RemoveFiles($@ dir\$@)		@@\
  	$(CC) $(CCOPTIONS) $(ALLDEFINES) options -c  $*.c		@@\
***************
*** 498,501 ****
--- 501,514 ----
  
  #ifndef StaticLibrary
  #define StaticLibrary(libpath,libname) Concat4(libpath,/,libname,_s.a)
+ #endif
+ 
+ #ifndef MakeXkbDir
+ #define MakeXkbDir(basedir,subdir)					@@\
+ all::	Concat(subdir,.dir)						@@\
+ 									@@\
+ Concat(subdir,.dir):							@@\
+ 	$(XKBCOMPCMD) -lfhlpR -o Concat(subdir,.dir) *			@@\
+ 									@@\
+ InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir)
  #endif
*** xc/config/cf/Project.tmpl:1.1	1996/10/26 19:49:04
--- xc/config/cf/Project.tmpl	1996/10/26 20:07:12
***************
*** 618,623 ****
--- 618,627 ----
  #endif
  #endif
  
+ #ifndef XkbComp
+ #define XkbComp xkbcomp
+ #endif
+ 
  XCOMM -----------------------------------------------------------------------
  XCOMM X Window System make variables; these need to be coordinated with rules
  
***************
*** 1216,1229 ****
  #define	XkbClientLibs /**/
  #endif
  #endif
! #ifdef UseInstalled
!      XKBCOMPCMD = xkbcomp			/* assume BINDIR in path */
  #else
       XKBCOMPSRC = $(PROGRAMSRC)/xkbcomp
  #if HasSharedLibraries
  XKBCOMPENVSETUP = LdLibraryPath=$(BUILDLIBDIR):$(LdLibraryPath)
  #endif
!      XKBCOMPCMD = $(XKBCOMPENVSETUP) $(XKBCOMPSRC)/xkbcomp
  #endif
  #else /* !BuildXKBlib */
  #ifndef XkbClientDepLibs
--- 1220,1233 ----
  #define	XkbClientLibs /**/
  #endif
  #endif
! #if defined(UseInstalled) || defined(OS2Architecture)
!      XKBCOMPCMD = XkbComp			/* assume BINDIR in path */
  #else
       XKBCOMPSRC = $(PROGRAMSRC)/xkbcomp
  #if HasSharedLibraries
  XKBCOMPENVSETUP = LdLibraryPath=$(BUILDLIBDIR):$(LdLibraryPath)
  #endif
!      XKBCOMPCMD = $(XKBCOMPENVSETUP) $(XKBCOMPSRC)/XkbComp
  #endif
  #else /* !BuildXKBlib */
  #ifndef XkbClientDepLibs
*** xc/config/util/buildos2.cmd:1.1	1996/10/25 02:12:02
--- xc/config/util/buildos2.cmd	1996/10/25 06:44:06
***************
*** 12,18 ****
  'copy config\util\mkdirhier.cmd \ > nul 2>&1'
  'copy config\imake\imakesvc.cmd \ > nul 2>&1'
  
! IF \(exists('Makefile.os2')) THEN 'COPY Makefile Makefile.os2 >nul 2>&1'
  
  CALL VALUE 'GCCOPT','-pipe',env
  CALL VALUE 'EMXLOAD',5,env
--- 12,18 ----
  'copy config\util\mkdirhier.cmd \ > nul 2>&1'
  'copy config\imake\imakesvc.cmd \ > nul 2>&1'
  
! CALL create_makefile
  
  CALL VALUE 'GCCOPT','-pipe',env
  CALL VALUE 'EMXLOAD',5,env
***************
*** 20,37 ****
  'emxload x11make.exe gcc.exe rm.exe mv.exe'
  
  'x11make MAKE=x11make SHELL= MFLAGS="MAKE=x11make CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " World.OS2 2>&1 | tee buildxc.log'
- /* cleanup the mess */
- /* del \indir.cmd 
-  * del \mkdirhier.cmd
-  * del \imakesvc.cmd
-  * del \imake.exe
-  * del \makedepend.exe
-  */
  
  EXIT
  
  /* returns 1, if file exists */
  exists:
! 'DIR "'arg(1)'" >nul 2>&1'
! IF rc = 0 THEN return 1
! RETURN 0
--- 20,106 ----
  'emxload x11make.exe gcc.exe rm.exe mv.exe'
  
  'x11make MAKE=x11make SHELL= MFLAGS="MAKE=x11make CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " World.OS2 2>&1 | tee buildxc.log'
  
  EXIT
  
  /* returns 1, if file exists */
  exists:
! 	IF STREAM(arg(1), 'C', 'QUERY EXISTS') = '' THEN
! 		RETURN 0
! 	ELSE
! 		RETURN 1
! 
! create_makefile:
! IF exists(Makefile) THEN del Makefile
! CALL LINEOUT 'Makefile','RELEASE = "Release 6.1beta"',1
! CALL LINEOUT 'Makefile','SHELL = /bin/sh'
! CALL LINEOUT 'Makefile','RM = rm -f'
! CALL LINEOUT 'Makefile','MV = mv'
! CALL LINEOUT 'Makefile','WORLDOPTS = -k'
! CALL LINEOUT 'Makefile','TOP = .'
! CALL LINEOUT 'Makefile','CURRENT_DIR = .'
! CALL LINEOUT 'Makefile','CONFIGSRC = $(TOP)/config'
! CALL LINEOUT 'Makefile','IMAKESRC = $(CONFIGSRC)/imake'
! CALL LINEOUT 'Makefile','DEPENDSRC = $(CONFIGSRC)/makedepend'
! CALL LINEOUT 'Makefile','DEPENDTOP = ../..'
! CALL LINEOUT 'Makefile','IMAKETOP = ../..'
! CALL LINEOUT 'Makefile','IRULESRC = $(CONFIGSRC)/cf'
! CALL LINEOUT 'Makefile','IMAKE = $(IMAKESRC)/imake'
! CALL LINEOUT 'Makefile','IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)'
! CALL LINEOUT 'Makefile','MAKE_OPTS = '
! CALL LINEOUT 'Makefile','MAKE_CMD = $(MAKE) $(MAKE_OPTS)'
! CALL LINEOUT 'Makefile','FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"'
! CALL LINEOUT 'Makefile',' '
! CALL LINEOUT 'Makefile','World.OS2:'
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile','	@echo Building $(RELEASE) of the X Window System on OS/2.'
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile','	\indir $(IMAKESRC) $(MAKE) SHELL= -f Makefile.ini clean.os2'
! CALL LINEOUT 'Makefile','	\indir $(IMAKESRC) $(MAKE) SHELL= CC=gcc -f Makefile.ini imake.os2'
! CALL LINEOUT 'Makefile','	-if exist Makefile.bak del Makefile.bak'
! CALL LINEOUT 'Makefile','	-if exist Makefile ren Makefile Makefile.bak'
! CALL LINEOUT 'Makefile','	$(subst /,\,$(IMAKE)) -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) VerifyOS'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) Makefiles'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) clean'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) includes'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) depend'
! CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS)  '
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile','	@echo Full build of $(RELEASE) of the X Window System complete.'
! CALL LINEOUT 'Makefile','	@echo :'
! CALL LINEOUT 'Makefile',' '
! CALL LINEOUT 'Makefile','# dont allow any default rules in this Makefile'
! CALL LINEOUT 'Makefile','.SUFFIXES:'
! CALL LINEOUT 'Makefile','# quiet "make" programs that display a message if suffix list empty'
! CALL LINEOUT 'Makefile','.SUFFIXES: .Dummy'
! CALL LINEOUT 'Makefile',' '
! CALL LINEOUT 'Makefile','# a copy of every rule that might be invoked at top level'
! CALL LINEOUT 'Makefile',' '
! CALL LINEOUT 'Makefile','clean:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','dangerous_strip_clean:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','depend:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','Everything:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','includes:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','install.man:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','install:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','Makefiles:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','man_keywords:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','tags:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile','VerifyOS:'
! CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
! CALL LINEOUT 'Makefile',' '
! CALL STREAM 'Makefile','c','close'
! RETURN
*** xc/programs/xhost/xhost.c:1.1	1996/10/25 02:22:13
--- xc/programs/xhost/xhost.c	1996/10/25 02:22:38
***************
*** 85,91 ****
  #include <arpa/inet.h>
  	bogus definition of inet_makeaddr() in BSD 4.2 and Ultrix
  #else
! #if !defined(hpux) && !defined(NCR)
  extern unsigned long inet_makeaddr();
  #endif
  #endif
--- 85,91 ----
  #include <arpa/inet.h>
  	bogus definition of inet_makeaddr() in BSD 4.2 and Ultrix
  #else
! #if !defined(hpux) && !defined(NCR) && !defined(__EMX__)
  extern unsigned long inet_makeaddr();
  #endif
  #endif
*** xc/programs/xinit/xinitrc.cmd:1.1	1996/11/03 13:01:27
--- xc/programs/xinit/xinitrc.cmd	1996/11/03 13:02:02
***************
*** 36,47 ****
   * 'xsetroot -bitmap 'xbitmapdir'\xfree1'
   * 'xsetroot -bitmap 'xbitmapdir'\xfree2'
   */
! 'start/min/k "X Clock" xclock -update 1 -geometry 100x100-1+1'
! 'start/min/k "Login Xterm" xterm -sb -geometry 80x25+0+0 -name login'
  IF manpath \= '' THEN
! 	'start/min/k "X Manual" xman -geometry 100x100-105+1'
! /* 'start/min/k "Xterm 1" xterm -sb -geometry 80x50+494+51' */
! /* 'start/min/k "Xterm 2" xterm -sb -geometry 80x20+494-0' */
  'twm'
  
  EXIT
--- 36,57 ----
   * 'xsetroot -bitmap 'xbitmapdir'\xfree1'
   * 'xsetroot -bitmap 'xbitmapdir'\xfree2'
   */
! 
! /****** WARNING! *********
!  * Below some programs are started minimized, some are started detached.
!  * In general, those that spawn other shells are minimized, others may be
!  * detached. You might be tempted to run the xterm's as well as detached.
!  * This works, but leaves you with an independent xterm/cmd pair, when the 
!  * server shuts down, which you can only see in watchcat, not the process list.
!  * If you start and stop x11 multiple times, this will let you run out of
!  * PTYs, and will lead to a large number of background sessions.
!  */
! 'detach xclock -update 1 -geometry 100x100-1+1'
! 'start/min/n "Login Xterm" xterm -sb -geometry 80x25+0+0 -name login'
  IF manpath \= '' THEN
! 	'detach "X Manual" xman -geometry 100x100-105+1'
! /* 'startx/min/n "Xterm 1" xterm -sb -geometry 80x50+494+51' */
! /* 'startx/min/n "Xterm 2" xterm -sb -geometry 80x20+494-0' */
  'twm'
  
  EXIT
*** xc/programs/xkbcomp/Imakefile:1.1	1996/10/26 19:41:25
--- xc/programs/xkbcomp/Imakefile	1996/10/26 19:43:02
***************
*** 36,38 ****
--- 36,42 ----
  
  ComplexProgramTarget(xkbcomp)
  
+ #ifdef OS2Architecture
+ all::
+ 	$(CP) ProgramTargetName(xkbcomp) /
+ #endif
*** xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:1.1	1996/11/03 00:40:12
--- xc/programs/Xserver/hw/xfree86/doc/OS2.Notes	1996/11/03 00:55:52
***************
*** 1,15 ****
    Notes on Rebuilding XFree86/OS2 from Scratch
    Holger Veit
!   Last modified 22 Feb 1996
  
    1.  Preface
! 
!   X11 and XFree86 were initially developed on Unix-based systems.
!   Usually Unix systems provide a rich number of tools and utilities to
    get certain things done. Under OS/2, these tools are not installed,
    but ports are available which are sometimes functionally equivalent to
!   Unix utilities with the same name, but also differ sometimes in a
!   subtle way.  This guide will give you hints if you intend to rebuild
    the system from scratch under OS/2.
  
    Please also read README.OS2 for end-user information, and set at least
--- 1,15 ----
    Notes on Rebuilding XFree86/OS2 from Scratch
    Holger Veit
!   Last modified 2 Nov 1996
  
    1.  Preface
!   
!   X11 and XFree86 were initially developed on Unix-based systems. 
!   Usually Unix systems provide a rich number of tools and utilities to 
    get certain things done. Under OS/2, these tools are not installed,
    but ports are available which are sometimes functionally equivalent to
!   Unix utilities with the same name, but also differ sometimes in a 
!   subtle way. This guide will give you hints if you intend to rebuild 
    the system from scratch under OS/2.
  
    Please also read README.OS2 for end-user information, and set at least
***************
*** 20,115 ****
    I have tried to reduce the number of external tools, but when looking
    back it seems I were not very successful. At least I managed to get
    everything working with the native CMD.EXE shell only. However, there
!   is still plenty of software required.  Most of this software is
    available from hobbes.nmsu.edu or ftp.leo.org via anonymous FTP. The
    following shopping list shows what you will need:
  
  
!      o  gcc     EMX/gcc emx 0.9B fix 1 or later
! 
!      o  gzip    GNU zip/unzip
! 
!      o  tar     GNU tar
  
!      o  patch   Larry Wall's patch utility (attention: incompatible tool
          with same name in OS/2)
  
!      o  install BSD/GNU install
  
!      o  rm,mv,cp        GNU file utilities
  
!      o  tee,..  GNU shell utilities
  
!      o  groff   GNU nroff/troff
  
!      o  sed     GNU sed stream editor
  
!      o  grep    GNU grep
  
!      o  gawk    GNU awk
  
!      o  make    GNU make 3.71/3.72
  
!      o  flex    GNU flex
  
!      o  bison   GNU bison
  
!      o  find    GNU find    (attention: incompatible tool with the same
          name in OS/2)
  
    If there is no version number given, any new version will do.
!   Particularly critical is only EMX/gcc and GNU make. Note that the
!   second GCC implementation which might still be available from some
    archives is NOT compatible.
! 
!   Furthermore, you need the X11R6.1 and XFree86 sources.  At this
! 
    moment, I cannot say anything about the file names to obtain, because
    things are currently in the flow. The X Consortium is about to publish
!   an update to X11R6, named X11R6.1 (cynics call this "X11'95" :-) ); I
!   don't know whether a patch or an entirely new version will be issued.
!   The public XFree86 sources will likely be called XFree86-3.2.tar.gz;
!   for sources for the alpha version XFree86/OS2 3.1.2D you must become a
    member of XFree86.
! 
    3.  Compiling and Installing
! 
    You need about 300MB of free HPFS space for the whole system. This
!   does not include space for the postscript and troff documentation
!   files. I have never installed them. Nor did I install the test
!   subtree.
  
  
!      1. Install all the above utilities. Refer to the corresponding
!         documentation.  Verify that everything works well, particularly
          EMX.
  
       2. It is a good idea to use the same or a similar structure I have.
          I have made a directory \x11 on the partition for compiling and
          have put everything below this tree. I found that a clean tree
          occupies less than the half space of the disk, this gives me the
!         opportunity to rename this tree to \x11old and copy a new
!         version to the same disk to produce diffs. Last time the
!         complete tree was arranged under the root directory xc, this
          would become \x11\xc then.
  
       3. To unpack the files you would usually execute the command
  
          gzip -dc file.tar.gz | tar xvf -
  
! 
!      in the \x11 directory. At the end you will usually see the irritat-
!      ing, but non-fatal message "gzip: stdout Broken pipe". Ignore it.
  
       4. After that, is is likely necessary to apply some patches, either
          from the XConsortium or from the XFree86 project. Before you do
          this, enter
  
!               chmod -R a+rw \ex11\exc
! 
  
! 
!      to make certain files in the tree writable.
  
       5. There should be a file added-XXX accompanying the patch file
          which lists the files that are newly created. The patch program
--- 20,114 ----
    I have tried to reduce the number of external tools, but when looking
    back it seems I were not very successful. At least I managed to get
    everything working with the native CMD.EXE shell only. However, there
!   is still plenty of software required. Most of this software is
    available from hobbes.nmsu.edu or ftp.leo.org via anonymous FTP. The
    following shopping list shows what you will need:
+   
  
+      o  gcc	EMX/gcc emx 0.9C or later
  
!      o  gzip	GNU zip/unzip
  
!      o  tar	GNU tar
!   
!      o  patch	Larry Wall's patch utility (attention: incompatible tool 
          with same name in OS/2)
  
!      o  install	BSD/GNU install
  
!      o  rm,mv,cp	GNU file utilities
  
!      o  tee,..	GNU shell utilities
  
!      o  groff	GNU nroff/troff
  
!      o  sed	GNU sed stream editor
  
!      o  grep	GNU grep
  
!      o  gawk	GNU awk
  
!      o  make	GNU make 3.71/3.72
  
!      o  flex	GNU flex
  
!      o  bison	GNU bison
  
!      o  find	GNU find    (attention: incompatible tool with the same 
          name in OS/2)
  
+      o  tcl/tk    This is needed for the XF86Setup utility; a suitable 
+         binary set is available from the ported software WWW page
+   
    If there is no version number given, any new version will do.
!   Particularly critical is only EMX/gcc and GNU make. Note that the 
!   second GCC implementation which might still be available from some 
    archives is NOT compatible.
!   
!   Furthermore, you need the X11R6.1 and XFree86 sources. At this 
    moment, I cannot say anything about the file names to obtain, because
    things are currently in the flow. The X Consortium is about to publish
!   an update to X11R6, named X11R6.1 (cynics call this "X11'95" :-) ); I 
!   don't know whether a patch or an entirely new version will be issued. 
!   The public XFree86 sources will likely be called XFree86-3.2.tar.gz; for
!   sources for an alpha or beta version of XFree86/OS2 you must become a 
    member of XFree86.
!   
    3.  Compiling and Installing
!   
    You need about 300MB of free HPFS space for the whole system. This
!   does not include space for the postscript and troff documentation 
!   files. I have never installed them. Nor did I install the test subtree.
  
  
!      1. Install all the above utilities. Refer to the corresponding 
!         documentation. Verify that everything works well, particularly
          EMX.
  
       2. It is a good idea to use the same or a similar structure I have.
          I have made a directory \x11 on the partition for compiling and
          have put everything below this tree. I found that a clean tree
          occupies less than the half space of the disk, this gives me the
!         opportunity to rename this tree to \x11old and copy a new 
!         version to the same disk to produce diffs. Last time the 
!         complete tree was arranged under the root directory xc, this 
          would become \x11\xc then.
  
       3. To unpack the files you would usually execute the command
  
          gzip -dc file.tar.gz | tar xvf -
  
!         in the \x11 directory. At the end you will usually see the
!         irritating, but non-fatal message "gzip: stdout Broken pipe". 
!         Ignore it.
  
       4. After that, is is likely necessary to apply some patches, either
          from the XConsortium or from the XFree86 project. Before you do
          this, enter
  
!               chmod -R a+rw \x11\xc
  
!         to make certain files in the tree writable.
  
       5. There should be a file added-XXX accompanying the patch file
          which lists the files that are newly created. The patch program
***************
*** 120,266 ****
          xc\config\util\added added-XXX
  
  
!      If there is no added-XXX file available, you can make one with the
!      following instructions:
! 
!            grep "\*\*\* xc/" patchfile >added-file
! 
! 
! 
!      Edit added-file with a text editor and remove the ***  at the
!      beginning and the time stamp at the end (search for a TAB and erase
! 
!      to the end of the line). You get a list of file paths, one in a
!      line, which is the input to the added utility.
! 
!      6. After that you can apply the patches in the right order. Usually
!         this is done by a command
! 
!               patch -p -E <patchfile 2>&1 | tee patchlog
! 
  
  
-      from the \x11 directory. Be aware to use the right patch - OS/2 has
-      a utility with the same name and different functionality.  Don't
-      use the recommended -s option, this makes patch quiet, and you
-      won't see problems in the patchlog file. Use
  
!            find \x11 -name *.rej -print
!            find \x11 -name *# -print
  
  
  
!      to find any rejects and unapplied patches (attention: yet another
!      OS/2 program with wrong functionality). Normally there shouldn't be
!      any problems of this kind, else you have made a mistake. finally
!      remove the original files with
  
!            find \x11 -name *.orig -print -exec rm {} ;
  
  
  
  
!      7. Go to the xc/config/cf directory and edit the xf86site.def file
!         to match your requirements (you probably don't want to compile
!         all X servers). Certain changes must be set to the following
!         values:
  
!         o  Disable if not already done any PC98 server; PC98 (Japanese
!            XFree86) does not work yet. Porters from Japan are welcome!
  
!         o  #define WacomSupport            NO #define ElographicsSupport
!            NO Both options are not yet supported.
  
!         o  #define ForceNormalLib NO There is no support for static
!            libraries yet; why would you need them anyway.
  
!      8. Go to the directory xc\util\compress and make compress.exe
!         there. Install the program produced there in your path. I
!         stumbled more than once on half-ported compress programs on OS/2
!         ftp servers that are defective w.r.t.  reading and writing
!         stdin/stdout. In some stage (font compression) otherwise you
!         will get a core dump of mkfontdir, because all compressed fonts
!         are corrupt.
  
       9. Set the environment variable X11ROOT to something different than
          it is; otherwise the installation process will overwrite your
          original XFree86/OS2 installation. If you have not set this
!         variable, go back to the prefix section of this document: you
!         have forgotten something.
  
       10.
          Copy the file xc/config/util/buildos2.cmd into the xc directory.
! 
!      11.
!         Execute this buildos2.cmd command in the xc directory; it will
          produce a logfile buildxc.log in this directory.
  
- 
       12.
!         Go have a bucket of coffee. The compile will need between 2 and
!         20 hours.
  
       13.
!         When finished, view the logfile for errors, and fix the problems
!         if there are some. I have managed to compile the whole system
          flawlessly, so there is at least one configuration that works.
  
       14.
          Finally, from the xc dir, execute
  
!               xmake install
!               xmake install.man
! 
! 
! 
! 
    Well, you see, this was quite easy :-)
! 
! 
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml,v 3.1 1996/02/24 10:19:19 dawes Exp $
! 
! 
! 
! 
! 
    $XConsortium$
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- $XFree86: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v 3.3 1996/02/24 10:48:46 dawes Exp $
--- 119,220 ----
          xc\config\util\added added-XXX
  
  
!         If there is no added-XXX file available, you can make one with
!         the following instructions:
  
+         grep "\*\*\* xc/" patchfile >added-file
  
  
!         Edit added-file with a text editor and remove the ***  at the 
!         beginning and the time stamp at the end (search for a TAB and
!         erase to the end of the line). You get a list of file paths, 
!         one in a line, which is the input to the added utility.
  
+      6. After that you can apply the patches in the right order. Usually this
+         is done by a command
  
+         patch -p -E <patchfile 2>&1 | tee patchlog
  
!         from the \x11 directory. Be aware to use the right patch - OS/2 has 
!         a utility with the same name and different functionality. Don't 
!         use the recommended -s option, this makes patch quiet, and you 
!         won't see problems in the patchlog file. Use
  
!         find \x11 -name *.rej -print 
!         find \x11 -name *# -print
  
+         to find any rejects and unapplied patches (attention: yet another 
+         OS/2 program with wrong functionality). Normally there shouldn't
+         be any problems of this kind, else you have made a mistake. Finally
+         remove the original files with
  
+         find \x11 -name *.orig -print -exec rm {} ;
  
+      7. Go to the xc/config/cf directory and edit the xf86site.def
+         file to match your requirements (you probably don't want to compile
+         all X servers). Certain changes must be set to the following values:
  
!            o  Disable if not already done any PC98 server; PC98 (Japanese 
!               XFree86) does not work yet. Porters from Japan are welcome!
  
!            o  #define WacomSupport            NO
!               #define ElographicsSupport      NO
!               Both options are not yet supported.
  
!            o  Tcl* and Tk* don't need to be set explicitly. Reasonable 
!               defaults are in the other config files, provided you have
!               a complete XFree86/OS2 binary tree with the tcl/tk runtime 
!               support installed.
  
!            o  #define BuildDynamicLoading   NO
!               This does not work.
  
!      8. Go to the directory xc\util\compress and make compress.exe there. 
!         Install the program produced there in your path. I stumbled more 
!         than once on half-ported compress programs on OS/2 ftp servers
!         that are defective w.r.t. reading and writing stdin/stdout. In
!         some stage (font compression) otherwise you will get a core dump
!         of mkfontdir, because all compressed fonts are corrupt.
  
       9. Set the environment variable X11ROOT to something different than
          it is; otherwise the installation process will overwrite your
          original XFree86/OS2 installation. If you have not set this
!         variable, go back to the prefix section of this document: you have 
!         forgotten something.
  
       10.
          Copy the file xc/config/util/buildos2.cmd into the xc directory.
!   
!      11. 
!         Execute this buildos2.cmd command in the xc directory; it will 
          produce a logfile buildxc.log in this directory.
  
       12.
!         Go have a bucket of coffee, or better, buy new coffee - in Columbia!
!         The compile will need between 2 and 20 hours.
  
       13.
!         When finished, view the logfile for errors, and fix the problems if
!         there are some. I have managed to compile the whole system
          flawlessly, so there is at least one configuration that works.
  
       14.
          Finally, from the xc dir, execute
  
!         xmake install
!         xmake install.man
!   
    Well, you see, this was quite easy :-)
!   
!   
!   
!   
!   $XFree86$
!   
!   
!   
!   
!   
    $XConsortium$
+   
  
*** xc/programs/Xserver/hw/xfree86/doc/README.OS2:1.1	1996/11/03 00:41:08
--- xc/programs/Xserver/hw/xfree86/doc/README.OS2	1996/11/03 01:28:04
***************
*** 1,794 ****
!   README for XFree86 3.1.2D on OS/2
    Holger Veit
!   Last modified on: 20 Feb 1996
! 
!   1.  Introductory Note about the ALPHA release 3.1.2D
! 
    Before looking into this file, please check for any LATEST.OS2 files
!   that may come with the binary distribution. Some statements made here
!   refer to the official public version of XFree86/OS2, and may not be
!   fully functional in the alpha release.
! 
!   This version of the code is called XFree86/OS2 3.1.2D. The letter
!   ``D'', according to the naming rules of XFree86, usually denotes a
!   (public) beta version of the code. Since this is the first public
!   version of XFree86/OS2 at all, this code is considered having ALPHA
!   quality only.
! 
!   The purpose of this release is to test it widely without restrictions
!   in a large number of configurations and find bugs that are still
!   existing in the distribution. It is also intended as a developer's
!   platform to port and write applications based on the X11 programming
!   interfaces provided here. This release is complete (with one
!   exception) regarding the X11R6.1 ``core'' distribution. The
!   ``contrib'' distribution containing some of the more interesting tools
!   for the end user, will be issued together with a later release (no
!   need to start porting it independently).
! 
!   This version is therefore intended for the experienced and knowledged
!   software engineer only, not for a casual end user.
! 
!   This means - and this should be taken serious - that
! 
!      o  there is no explicit or implicit warranty that certain code
!         works correctly or works at all
! 
!      o  this code may damage your hardware; this includes improper
!         configuration or bugs still present in the software
! 
!      o  this code may destroy or damage your data on the storage media,
!         crash or lock up the operating system and even damage data on
!         different disk partitions
! 
!   You are urged to make a backup of your complete system and keep it in
!   a safe place before you attempt to load any of this software on your
!   disk.
! 
!   This even holds if you already have a working copy of XFree86-3.1.2D
!   running on another platform, such as Linux, and found it working
!   without problems. This is XFree86/OS2 which differs in a number of
!   critical aspects from any Unix implementation of XFree86.
! 
!   If you are afraid to try out this code, simply don't use it and wait
!   for a future, hopefully more bug-free version.
! 
    2.  What and Where is XFree86?
! 
!   XFree86 is a port of X11R6 that supports several versions of Intel-
!   based Unix.  It is derived from X386 1.2, which was the X server
    distributed with X11R5.  This release consists of many new features
    and performance improvements as well as many bug fixes.  The release
    is available as source patches against the X Consortium X11R6 code, as
    well as binary distributions for many architectures.
! 
!   XFree86/OS2 is the tentative work title for the implementation of
!   XFree86 on OS/2 based systems.
! 
!   See the Copyright Notice <COPYRIGHT.html>.
! 
!   Binaries for OS/2 2.11 and OS/2 Warp are available from:
!   ftp.XFree86.org:/pub/XFree86/beta/binaries/OS2
!   <ftp://ftp.XFree86.org/pub/XFree86/beta/binaries/OS2>
! 
!   more archives to be added ...
! 
    Other versions:
! 
!   XFree86/OS2 will run on all dialects of Warp, including Warp "red
!   spine box", Warp "blue spine box", Warp Connect and Warp Server (beta
!   1 and 2). Fixpack level 5 is mandatory, a later fixpack level (10 or
!   17) is recommended.  XFree86/OS2 appears to work under OS/2 2.11 with
!   fixpack 100, but this was not checked in all details, so hidden
!   problems may still exist. It is unlikely that it will run stable under
!   OS/2 2.0 and 2.1, and it will definitely not run with any OS/2 1.X.
! 
    It is possible to build XFree86/OS2 from the sources.  Read about this
    in some section below.
  
    3.  Bug Reports for This Document
  
!   Send email to Holger.Veit@gmd.de (Holger Veit) or XFree86@XFree86.org
!   if you have comments or suggestions about this file and we'll revise
!   it.
! 
    4.  Hardware and Software Requirements
  
!   4.1.  Supported, Required, and Recommended Hardware
! 
! 
!      o  At least a 486DX33 with 16MB RAM is required. A Pentium or
!         Pentium Pro and more main memory is recommended. A 386 or a
!         system with 8MB or less memory is an insufficient configuration.
! 
!      o  There are no specific requirements concerning network cards,
!         disk types, or CD ROM equipment; of course the more powerful,
!         the better.
! 
!      o  Depending on the packages installed, a disk space of 20-55MB on
!         a HPFS formatted partition (or a NFS partition natively allowing
!         long filenames) is required. XFree86/OS2 will not run on FAT
!         partitions.
  
!      o  You need a video card that is supported by XFree86. Refer to the
!         general README document for a list of supported cards. Note that
!         the sets of video cards supported by XFree86 on one hand and
!         OS/2 on the other hand overlap, but do not match exactly, i.e.
!         the fact that your card is supported by OS/2 does not mean it
!         works with XFree86 as well, and vice versa. XFree86 does not use
!         the video services of the OS/2 operating system.
! 
!   4.2.  Required Software
! 
! 
!      o  OS/2 2.11 with fixpack 100 and all versions of Warp with at
!         least fixpack level 5 are required.
! 
!      o  In the version 3.1.2D, you need certain networking TCP/IP
!         software.  In a future version, this restriction might be no
!         longer present.
! 
!         1. For OS/2 2.11, IBM TCP/IP 2.0 or later is mandatory.
! 
! 
!         2. Warp comes with the Internet Access Kit (IAK), which is
!            sufficient. Warp Connect and Warp Server come with a full
!            version of TCP/IP (3.0). Use of this software is preferred
!            over IAK then.
! 
!         Other versions of TCP/IP, such as FTP's, DEC's, or Hummingbird's
!         TCP/IP versions, as well as IBM TCP/IP 1.X are not supported.
!         Nor does any networking support from DOS (packet drivers,
!         winsock), Netware, or NetBIOS work, and I won't to provide sup-
!         port for that in the future.
! 
!      o  If you want to write or port applications for XFree86, you are
!         encouraged to do so. You will need a complete installation of
!         EMX/gcc 0.9B fix 1 or later for doing so. Neither the second
!         (obsolete) implementation of gcc, nor any commercial package,
!         including Cset/2, VAC++, Borland C++/OS2, Watcom C++, Metaware
!         C, and others, is suitable for porting, because various parts of
!         the X DLLs rely on certain features only present with EMX.
  
    5.  Installing the System
! 
!   The binary distribution is composed of a number of zip archives which
!   are the executables, servers, fonts, libraries, include files, man
!   pages, and config files.  The full distribution requires about 40-55MB
!   of disk space.
! 
!   All archives of this alpha version are packed with the info-zip
!   utility, which is available under the name UNZ512X2.EXE from many OS/2
!   archives.  Please obtain a native OS/2 version of this unpacker. DOS
!   PKUNZIP does not work, because it cannot unpack long file names and
!   extended attributes.
! 
    At this moment, the distribution covers only the ``core'' distribution
!   which somewhat reduces the usability. Some of the more interesting
!   clients from the ``contrib'' area will be made available in the
!   future.
! 
!   The contents of the packages are:
! 
! 
!      REQUIRED:
! 
!         312Dbase
!            A special device driver and the SuperProbe program
! 
!         312Ddoc
!            READMEs and XFree86 specific man pages.
  
!         312Dbin
!            all of the executable X client applications and shared libs
  
!         312Dfnts
!            the misc and 75dpi fonts
  
!         312Dlib
!            data files needed at runtime
  
!         emxrt
!            Runtime libraries of EMX
  
!         Choose at least one of the following to match your hardware:
  
  
!         312D8514
!            the X server for IBM 8514/A and compatible boards
  
!         312DAGX
!            the X server for AGX boards
  
!         312DI128
!            the X server for #9 Imagination 128 boards
  
!         312DMa32
!            the X server for ATI Mach32 graphics boards
  
!         312DMa64
!            the X server for ATI Mach64 graphics boards
  
!         312DMa8
!            the X server for ATI Mach8 graphics boards
  
!         312DMono
!            the Monochrome X Server
  
!         312DP9K
!            the X server for P9000 based boards
  
!         312DS3
!            the X server for S3 based boards
  
!         312DSvga
!            the 8-bit pseudo-color X server for Super VGA cards
  
!         312Dvg16
!            the 4-bit pseudo-color X server for VGA & SVGA cards.
  
!         312Dw32
!            the X server for et4000w32 based boards
  
!      OPTIONAL:
  
!         312Dman
!            pre-formatted man pages for the X11 interface and clients
  
!         312Df100
!            100dpi fonts
  
!         312Dfscl
!            Speedo and Type1 fonts
  
!         312Dfnon
!            Japanese, Chinese and other fonts
  
!         312Dfcyr
!            Cyrillic fonts
  
!         312Dfsrv
!            the font server with man pages.
  
!         312Dprog
!            the X11 header files and programmer's utilities for compiling
!            other X applications
  
!         312Dpex
!            PEX fonts and libraries required for PEX applications
! 
!         312Dnest
!            the Xnest X server
! 
!   In order to save space on your disk and reduce net bandwidth, choose
!   the software to obtain carefully. Each X server is an archive of about
! 
!   1.4MB and occupies 2.5MB on the disk. You won't normally need more
!   than the single Xserver tailored to your video card.
! 
!   If it is your first time install, get the 312Dbase archive before any
!   of the other packages. This package contains a driver and a test
!   program, which analyzes your video hardware. If this program fails or
!   reports an incompatible hardware, it makes no sense to obtain the
!   other packages in the hope that they would magically work.
  
    6.  Checking Compatibility of Video Hardware
! 
!   In the following, we assume that you want to install XFree86/OS2 on a
!   disk drive with the letter Y: (which you probably don't have). Change
!   the letter in all commands accordingly.
! 
! 
!      1. Obtain the package 312Dbase and install it from the root
!         directory of the Y: drive, by entering the following commands:
! 
! 
!           [C:\] Y:
!           [Y:\] cd \
!           [Y:\] unzip \path_of_package\312Dbase.zip
! 
! 
! 
! 
! 
!      2. Edit your CONFIG.SYS file to contain the following line
!         somewhere:
! 
! 
!           DEVICE=Y:\XFree86\lib\xf86sup.sys
! 
! 
! 
! 
!      Of course replace ``Y:'' with the correct drive letter.
! 
!      3. At this point, you may consider to add the variables required
!         for XFree86/OS2 as well, which will save you from one additional
!         reboot.  Refer to section ``Adding Variables to CONFIG.SYS''
!         below.
! 
!      4. After adding the device driver entry to the CONFIG.SYS file, you
!         must reboot to install the driver. XFree86/OS2 will not work
!         without this driver.
! 
!      5. Start a full screen OS/2 CMD session and enter the following
!         command:
! 
! 
!           [C:\] Y:\XFree86\bin\SuperProbe
! 
! 
! 
! 
! 
!      6. This command will (normally) report important information about
!         your video configuration, i.e. the type of chipset, the
!         available video memory and the RAMDAC circuit available. Please
!         write this down or redirect the output of ``SuperProbe'' into a
!         file by entering:
! 
! 
! 
!      [C:\] Y:\XFree86\bin\SuperProbe >filename
! 
! 
! 
! 
! 
!      7. SuperProbe can identify many more video cards than are supported
!         by XFree86. Therefore lookup the reported type in the
!         compatibility list, and also check the accompanying README.*
!         files for special conditions and requirements. If the card is
!         not mentioned or marked as unsupported, the game is over for you
!         now, unfortunately.
! 
!      8. Otherwise chances are good, that you can run XFree86/OS2. Obtain
!         the rest of the software and proceed with the next section.
! 
    7.  Installing the packages
! 
!   XFree86/OS2 assumes a directory hierarchy starting from
!   drive:\XFree86.  This can be changed, but is strictly discouraged.
! 
! 
!      1. Choose a HPFS partition with sufficient free space.
! 
!      2. For each package to install, go to the root directory of this
!         drive, and type:
! 
! 
!           drive:> cd \
!           drive:> unzip \path_of_packages\312Dxxxx.zip
! 
! 
! 
  
    8.  Adding Variables to CONFIG.SYS
  
!   XFree86/OS2 requires a number of settings in the CONFIG.SYS file to
!   work correctly. Please add the following settings:
! 
! 
!      TERM
!         Set the preferred terminal type for the xterm or editor to be
!         used.  Some programs need this setting. I have my type set to
! 
! 
!           SET TERM=ansi
! 
! 
! 
! 
!      \XFree86\lib\X11\etc\termcap.x11 contains a suitable termcap which
!      can be used in place of termcap files that come with EMX, EMACS, or
!      other ported software.
! 
!      TERMCAP
!         This variable must be set to the location where the termcap file
!         used for the above TERM variable is searched. My setting, for
!         instance, is:
! 
! 
!           SET TERMCAP=D:/EMX/ETC/TERMCAP.X11
! 
! 
! 
! 
! 
!      Note that forward ``/'' is used as a directory separator.
! 
!      ETC
!         Set to an ETC directory. Normally, this is already set to the
!         ETC directory of the TCP/IP code, such as
! 
! 
!           SET ETC=C:\TCPIP\ETC
! 
! 
! 
! 
!      TMP
!         Set to an TMP directory. Normally, this is already set to the
!         TMP directory of the TCP/IP code, such as
! 
! 
!           SET TMP=C:\TCPIP\TMP
! 
! 
! 
! 
!      HOSTNAME
!         Set to the internet hostname. Normally, this is already set by
!         the TCP/IP installation program, such as
! 
! 
!           SET HOSTNAME=myhost
! 
! 
! 
! 
!      With IAK, you would normally run a loopback configuration ``Network
!      configuration'' and would then set this to
! 
! 
!           SET HOSTNAME=localhost
! 
! 
! 
! 
!      USER
! 
!      LOGNAME
!         Set both to a username. Currently, they are there just to make
!         some programs happy; in the future, this variable might be set
!         by a login shell of a multiuser configuration. My variable, for
!         instance, is set to
! 
! 
!                   SET USER=holger
!                   SET LOGNAME=holger
! 
! 
! 
! 
!      HOME
!         Set this to an existing directory that is supposed to be a home
!         directory of a user. Some utilities place temporary and init
!         files here. This is also future investment for a multiuser
!         configuration, but must still be there. For instance, this
!         variable might be set to
  
  
  
  
!      SET HOME=H:\user\holger
  
  
  
  
!      X11ROOT
!         This is one of the most important settings, it determines the
!         root of the XFree86 directory tree. Normally, you will set this
!         to the drive letter of the partition where the \XFree86 tree
!         resides, such as in
  
  
!           SET X11ROOT=Y:
  
  
  
  
!      You may try to move the tree to another subdirectory, e.g. to
!      K:\OS2\X11\XFree86... and would then have to change this to
  
  
!           SET X11ROOT=K:/OS2/X11
  
  
  
!      , but this is discouraged, since some utilities might not accept
!      this.  Note the forward ``/'' as a directory separator here.
  
!      DISPLAY
!         This variable may be set to the display to be used for
!         displaying clients. Normally you will set this variable to the
!         same value as the HOSTNAME variable and simply add a :0.0 after
!         it, such as
  
  
!           SET DISPLAY=myhost:0.0
  
  
  
  
!      Read the X11 man page on the exact meaning of these postfixes and
!      other options.
  
!      XSERVER
!         Set this to the executable name of the X server to be used. This
!         must be a complete path. My setting is as follows:
  
  
!           SET XSERVER=D:/XFree86/bin/XF86_Mach64.exe
  
  
  
! 
!      PATH
!         Add the binary directory for the X11 utilities to your search
!         PATH.  This is normally the directory (adjust the letter)
! 
! 
!           Y:\XFree86\bin
! 
! 
! 
! 
!      It is possible to move the binaries to another directory in the
!      search path; for maintenance reasons and clarity of the structure,
! 
!      this is not recommended, though.
! 
!      LIBPATH
!         Add the DLL directory for the X11 utilities to the LIBPATH.
!         This is normally the directory (adjust the letter)
! 
! 
!           Y:\XFree86\lib
! 
! 
! 
! 
!      It is possible to move the DLLs to another directory in the library
!      path; for maintenance reasons and clarity of the structure, this is
!      not recommended, though. Note that Y:\XFree86\lib has several other
!      subdirectories; these may not be moved elsewhere, rather they must
!      stay there, because most utilities form a path to these directories
!      by using %X11ROOT%\XFree86\lib as a base.
  
    9.  Remarks on the Network Configuration
! 
!   It is beyond the scope of this document to even give an introduction
!   about the correct installation of the TCP/IP networking system. You
!   must do this yourself or seek assistance elsewhere. It is only
!   possible to say here that a PC working well in a TCP/IP based LAN
!   network will also work with XFree86/OS2 (when all other prerequisites
!   are matched as well).
! 
!   With IAK, there is a special configuration necessary, unless you want
!   to use XFree86/OS2 only during a hot link to your Internet provider,
!   the so called ``localhost'' or ``loopback'' configuration. This is a
!   local network interface which ``loops'' back to the same host. The
    following settings are necessary for this:
  
  
!      1. Create a file \tcpip\etc\hosts with the following content:
! 
  
!           127.0.0.1  localhost
  
! 
! 
! 
!      2. Add the following line to your \tcpip\bin\tcpstart.cmd:
! 
! 
!           ifconfig lo 127.0.0.1 up
! 
! 
! 
! 
!      3. Uncomment the inetd process in the same file.
! 
!      4. Set the HOSTNAME environment variable to localhost as described
          in the last section.
  
!      5. Add the following line to CONFIG.SYS:
! 
! 
!           SET USE_HOSTS_FIRST=1
! 
! 
! 
! 
  
  
!      6. After rebooting, verify that the following command works:
  
! 
!           [C:\] ping localhost
! 
! 
! 
! 
!   If you have problems to get this or other basic networking things
!   running, seek assistance elsewhere.
  
    10.  Configuring X for Your Hardware
! 
!   After you have added the required settings and setup a working
!   network, run the xf86config program to create a standard configuration
!   file in Y:\XFree86\lib\X11\XConfig from a windowed or full screen OS/2
    text session:
  
  
!        [C:\] xf86config
! 
! 
! 
! 
!   This program will ask a number of questions. You will need the
!   information obtained from the SuperProbe program here. The program
!   should be self explanatory; if you have problems to understand
!   something though, seek assistance in the newsgroups.
! 
!   Alternatively, but not recommended for the non-expert, you can edit
!   the XConfig file manually with a text editor. A sample file is in
!   Y:\XFree86\lib\X11\XConfig.eg, which can be used as a starting point.
  
    For details about the XF86Config file format, refer to the
    XF86Config(4/5) manual page.
! 
!   If you know the configuration process from Linux or other XFree86
!   platform, you will encounter a few differences:
! 
!      o  There is no configuration for the mouse type or device. The
!         mouse device name is fixed to OSMOUSE, and this cannot be
!         changed.  If you have a three-button-mouse, install the correct
!         OS/2 driver for it, such as
! 
! 
!           DEVICE=D:\OS2\BOOT\PCLOGIC.SYS SERIAL=COM1
!           DEVICE=D:\OS2\BOOT\MOUSE.SYS TYPE=PCLOGIC$
! 
! 
! 
! 
!      for a MouseSystems compatible mouse, for instance.
! 
!      o  Currently, the X server does not read the native OS/2 keyboard
!         map, so you need a xmodmap file for a non-us keyboard.
!         Fortunately, it is the same you use for Linux. The server is
!         compiled with the XKEYBOARD option, so this might be an
!         alternative. At the time of this documentation, unfortunately,
!         some subtle bug in the OS/2 implementation is still waiting for
!         a fix, so this might not yet work. Read the LATEST.OS2 file with
!         the binary distribution.
! 
!      o  There is no support for the Wacom and Elographics input devices
!         yet.
! 
! 
!   Other than that, an existing XF86Config file for the same XFree86
!   version from Linux or another platform may be used without changes.
! 
    Once you've set up a XF86Config file, you can fine tune the video
!   modes with the xvidtune utility.
  
    11.  Running X
! 
!   16mb of memory is a recommended minimum for running the network
!   software, X and the presentation manager in parallel.  The server,
!   window manager and an xterm take about 4-6 Mb of memory themselves.  X
!   will start up on a system with 8MB or less, but the performance will
!   severely suffer from heavy disk swapping. Your mileage may vary,
!   though, so some people might consider this still tolerable.
! 
!   The easiest way for new users to start X windows is to type:
! 
! 
!        [C:\] startx
! 
! 
! 
! 
!   To get out of X windows, type: ``exit'' in the console xterm.  You can
!   customize your X by creating .xinitrc, .xserverrc, and .twmrc files in
!   the directory that the HOME environment variable points to. These
!   files are described in the xinit and startx man pages.
  
    12.  Rebuilding the XFree86 Distribution
  
-   Do you really want to rebuild XFree86/OS2 from source? If so, here are
-   a few hints:
- 
-      1. You need about 250-300 MB of free HPFS space.
- 
-      2. You must have the complete EMX environment installed.
- 
-      3. You need most of the GNU utilities that are available from the
-         unix directory of hobbes.nmsu.edu.
- 
-      4. You need a GNU make 3.71 or 3.72, others often have obscure
-         bugs.  You cannot use dmake, nmake, wmake, or other toy software
-         as a replacement.
- 
-      5. Install the X11R6.1 ``core'' distribution on some disk under a
-         directory like \X11, i.e.  \X11\xc\....
- 
-      6. Copy the cmd file buildos2.cmd from the directory
-         \X11\xc\config\util to the top directory \X11\xc.
- 
-      7. Execute this script; this should recompile everything, thereby
-         producing a logfile \X11\xc\buildxc.log.  The process requires
-         between 2 and 20 hours depending on your hardware.
- 
-   Good luck!
  
    13.  Building New X Clients
! 
!   The easiest way to build a new client (X application) is to use xmkmf
!   if an Imakefile is included in the sources.  Type ``xmkmf -a'' to
!   create the Makefiles, check the configuration if necessary and type
!   ``xmake''. ``xmake'' is a wrapper for the GNU make program which
!   defeats the improper SHELL setting typically found in a Makefile
!   generated from an Imakefile.
! 
  
    14.  Acknowledgements
! 
    Many thanks to:
  
!      o  Sebastien Marineau for his great work on getting the server code
          debugged
  
!      o  Eberhard Mattes for the wonderful base platform EMX which this
          port heavily relies on
  
!      o  ME - no, no, forget this: I won't praise myself :-)
! 
! 
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2.sgml,v 3.4 1996/03/10 12:05:04 dawes Exp $
! 
! 
! 
! 
  
    $XConsortium$
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.OS2,v 3.7 1996/03/17 13:02:35 dawes Exp $
--- 1,620 ----
!   README for XFree86 3.2 on OS/2
    Holger Veit
!   Last modified on: 21 Oct 1996
!   
!   1.  Introductory Note about the release 3.2
!   
    Before looking into this file, please check for any LATEST.OS2 files
!   that may come with the binary distribution.
!   
!   This version of the code is called XFree86/OS2 3.2. This means it is
!   a public release for which also the source code is provided. In
!   contrast, a version with a letter, such as in ``3.1.2D'', for instance, is a beta
!   version which has certain restrictions.
!   
!   Previous beta versions have been tested in a large number of configurations
!   and have been found to be working, with some bugs left, rather flawlessly.
!   This code is released for public use by an end user, not only for developers, 
!   although this does not necessarily mean that it is easy to use or user 
!   friendly, or using a popular term, ``plug & play''. Emphasis is on
!   functionality, not simple installation.
!   
!   This release is complete (with one exception) regarding
!   the X11R6.1 ``core'' distribution. The ``contrib'' distribution containing
!   some of the more interesting tools for the end user, will be issued together
!   with a later release (no need to start porting it independently).
!   
!   In the past beta testing, it has been found that the software itself is
!   rather stable and does not damage hardware - provided the user does not
!   try to push the builtin limits and change certain configuration parameters
!   which could operate the video hardware out of specs.
!   
!   However,
!     o    there is no explicit or implicit warranty that certain code works
!          correctly or works at all
!     o    although no damage reports are known, it does not mean that it is
!          impossible to damage hardware with this code; some deeply hidden
!          bugs may still be present in the software.
!   
!   It is recommended that you backup essential data of your system before
!   installing this software, but this should be your general precautions 
!   before ANY installation. No reports exist that a crashing X server itself
!   actively destroys or modifies data, but it is possible in rare cases
!   that the system is left in an unusable state (video display mode garbled
!   or system unresponsive, not reacting to mouse or keyboard actions).
!   If you then hard reset or switch off the system, file caches of the operating
!   system might not be written correctly back to disk, thus causing data loss.
!   
    2.  What and Where is XFree86?
!   
!   
!   XFree86 is a port of X11R6 that supports several versions of
!   Intel-based Unix.  It is derived from X386 1.2, which was the X server
    distributed with X11R5.  This release consists of many new features
    and performance improvements as well as many bug fixes.  The release
    is available as source patches against the X Consortium X11R6 code, as
    well as binary distributions for many architectures.
!   XFree86/OS2 is the name of the implementation of XFree86
!   on OS/2 based systems.
!   
!   See the Copyright Notice <COPYRIGHT.HTML>
!   
!   The sources for XFree86/OS2 are available by anonymous ftp from:
!   
!   ftp.XFree86.org:/pub/XFree86 <ftp://ftp.XFree86.org/pub/XFree86>
!   
!   Binaries for OS/2 Warp and Merlin are available from:
!   ftp.XFree86.org:/pub/XFree86/binaries/OS2
!   <ftp://ftp.XFree86.org/pub/XFree86/binaries/OS2>
!   
!   The WWW page
!   borneo.gmd.de:/~veit/os2/xf86os2.html
!   <http://borneo.gmd.de/~veit/os2/xf86os2.html>
!   usually show more references to FTP or WWW sites to retrieve
!   sources or binaries.
!   
!   
    Other versions:
!   
!   XFree86/OS2 will run on all dialects of Warp, including Warp "red spine box",
!   Warp "blue spine box", Warp Connect, Warp Server, and Merlin. 
!   For Warp fixpack level 17 is mandatory, a later fixpack level (e.g. FP22) 
!   is recommended. In some future, a more recent fixpack might be necessary.
!   Please check a LATEST.OS2 file.
!   
!   OS/2 2.11 is no longer supported beginning with this release, due to lack
!   of a working test environment. Consequently, OS/2 SMP is not supported either,
!   because this is currently based on OS/2 2.11.
!   OS/2 versions 1.X are definitely not supported and will never be.
!   
    It is possible to build XFree86/OS2 from the sources.  Read about this
    in some section below.
+   
  
    3.  Bug Reports for This Document
+   
+   Send email to Holger.Veit@gmd.de (Holger Veit) or
+   XFree86@XFree86.org if you have comments or suggestions about
+   this file and we'll revise it.
  
!   
    4.  Hardware and Software Requirements
  
!   4.1  Supported, Required, and Recommended Hardware
  
!      o   At least a 486DX33 with 16MB RAM is required. A Pentium or Pentium Pro
!          and more main memory is recommended. A 386 or a system with 8MB or less
!          memory is an insufficient configuration.
! 
!      o   There are no specific requirements concerning network cards, disk types,
!          or CD ROM equipment; of course the more powerful, the better.
! 
!      o   Depending on the packages installed, a disk space of 20-55MB on a
!          HPFS formatted partition (or a NFS partition natively allowing long 
!          filenames) is required. XFree86/OS2 will not run on FAT partitions.
! 
!      o   You need a video card that is supported by XFree86. Refer to the general
!          README document for a list of supported cards. Note that the sets
!          of video cards supported by XFree86 on one hand and OS/2 on the other 
!          hand overlap, but do not match exactly, i.e. the fact that your card
!          is supported by OS/2 does not mean it works with XFree86 as well, and
!          vice versa. XFree86 does not use the video services of the OS/2
!          operating system.
!   
!   4.2  Required Software
!   
!   
!      o   Any version of Warp with at least fixpack 17, or Merlin is required
! 
!      o   XFree86/OS2-3.2 may use a local named-pipe connection or a TCP/IP 
!          based network connection.
! 
!            1.   Warp comes with the Internet Access Kit (IAK), which is
!                 sufficient. Warp Connect and Warp Server come with a full
!                 version of TCP/IP (3.0). Use of this software is preferred over
!                 IAK then.
! 
!            2.   Merlin comes with TCP/IP 4.0 which should also work.
! 
!            3.   The old IBM TCP/IP 2.0, that comes with the IBM PMX product
!                 may be used with Warp as well.
! 
!          Other versions of TCP/IP, such as FTP's, DEC's, or Hummingbird's 
!          TCP/IP versions, as well as IBM TCP/IP 1.X are not supported. Nor does
!          any networking support from DOS (packet drivers, winsock), Netware,
!          or NetBIOS work, and I won't to provide support for that in the future.
! 
!      o   If you want to write or port applications for XFree86, you are
!          encouraged to do so. You will need a complete installation of
!          EMX/gcc 0.9C or later for doing so. Neither the second (obsolete)
!          implementation of gcc, nor any commercial package, including
!          Cset/2, VAC++, Borland C++/OS2, Watcom C++, Metaware C, and others,
!          is suitable for porting, because various parts of the X DLLs rely
!          on certain features only present with EMX.
  
+   
    5.  Installing the System
!   
!   The binary distribution is composed of a number of zip archives
!   which are the executables, servers, fonts, libraries, include files,
!   man pages, and config files.  The full distribution requires about 
!   40-55MB of disk space.  
!   
!   All archives of this alpha version are packed with the info-zip utility, 
!   which is available under the name UNZ512X2.EXE from many OS/2 archives.
!   Please obtain a native OS/2 version of this unpacker. DOS PKUNZIP does
!   not work, because it cannot unpack long file names and extended attributes.
!   
    At this moment, the distribution covers only the ``core'' distribution
!   which somewhat reduces the usability. Refer to WWW sites and archives listed 
!   in the XFree86/OS2 FAQ and elsewhere to obtain prebuilt X clients which
!   were ported to XFree86.
!   
!       The contents of the packages are:
!   
!   REQUIRED:
  
!       XF32base	A special device driver and the SuperProbe program
  
!       XF32doc	READMEs and XFree86 specific man pages.
  
!       XF32bin	all of the executable X client applications and shared libs
  
!       XF32fnts	the misc and 75dpi fonts
  
!       emxrt	Runtime libraries of EMX
  
+       Choose at least one of the following to match your hardware:
+   
+       XF328514	the X server for IBM 8514/A and compatible boards
  
!       XF32AGX	the X server for AGX boards
  
!       XF32I128	the X server for #9 Imagination 128 boards
  
!       XF32Ma32	the X server for ATI Mach32 graphics boards
  
!       XF32Ma64	the X server for ATI Mach64 graphics boards
  
!       XF32Ma8	the X server for ATI Mach8 graphics boards
  
!       XF32Mono	the Monochrome X Server
  
!       XF32P9K	the X server for P9000 based boards
  
!       XF32S3 	the X server for S3 based boards (excluding S3 ViRGE)
  
!       XF32S3V 	the X server for S3 ViRGE based boards
  
!       XF32Svga	the 8-bit pseudo-color X server for Super VGA cards
  
!       XF32vg16	the 4-bit pseudo-color X server for VGA &amp; SVGA cards.
  
!       XF32w32	the X server for et4000w32 based boards
!   
!   OPTIONAL:
!   
!       XF32man 	pre-formatted man pages for the X11 interface and clients
  
!       XF32f100	100dpi fonts
  
!       XF32fscl	Speedo and Type1 fonts
  
!       XF32fnon 	Japanese, Chinese and other fonts
  
!       XF32fcyr	Cyrillic fonts
  
!       XF32fsrv	the font server with man pages.
  
!       XF32prog	the X11 header files and programmer's utilities
! 		for compiling other X applications
  
!       XF32pex	PEX fonts and libraries required for PEX applications
  
!       XF32nest	the experimental Xnest X server
  
!       XF32vfb	the experimental VFB X server
!   
!   In order to save space on your disk and reduce net bandwidth, choose the
!   software to obtain carefully. Each X server is an archive of about 1.2MB
!   and occupies 3.0MB on the disk. You won't normally need more than the
!   single Xserver tailored to your video card.
!   
!   If it is your first time install, get the XF32base archive before any
!   of the other packages. This package contains a driver and a test program,
!   which analyzes your video hardware. If this program fails or reports an
!   incompatible hardware, it makes no sense to obtain the other packages in
!   the hope that they would magically work.
!   
  
    6.  Checking Compatibility of Video Hardware
!   
!   
!   In the following, we assume that you want to install XFree86/OS2 on a disk
!   drive with the letter Y: (which you probably don't have). Change the letter
!   in all commands accordingly.
!   
!     1.   Obtain the package XF32base and install it from the root directory
!          of the Y: drive, by entering the following commands:
!   
! 	 [C:\] Y:
! 	 [Y:\] cd \
! 	 [Y:\] unzip \path_of_package\XF32base.zip
!   
!   
!     2.   Edit your CONFIG.SYS file to contain the following line somewhere:
!   
! 	 DEVICE=Y:\XFree86\lib\xf86sup.sys
!   
!          Of course replace ``Y:'' with the correct drive letter.
!   
!     3.   At this point, you may consider to add the variables required for
!          XFree86/OS2 as well, which will save you from one additional reboot.
!          Refer to section "Adding Variables to CONFIG.SYS" below.
!   
!     4.   After adding the device driver entry to the CONFIG.SYS file, you must
!          reboot to install the driver. XFree86/OS2 will not work without this
!          driver.
!   
!     5.   Start a full screen OS/2 CMD session and enter the following
!          command:
!   
! 	 [C:\] Y:\XFree86\bin\SuperProbe
!   
!     6.   This command will (normally) report important information about your
!          video configuration, i.e. the type of chipset, the available video
!          memory and the RAMDAC circuit available. Please write this down or
!          redirect the output of ``SuperProbe'' into a file by entering:
!   
! 	 [C:\] Y:\XFree86\bin\SuperProbe >filename
!    
!     7.   SuperProbe can identify many more video cards than are supported by
!          XFree86. In some cases, Superprobe unfortunately detects a wrong
!          card, often it claims to have seen a MCGA card which is some sort of
!          a fallback. Generally, if it is approximately right, there are only
!          few reasons for doubts; if it is totally off (e.g. saying it has
!          seen a ET4000, and you have a Cirrus card), you should report a
!          misdetection as a bug to the given address. In all cases, please
!          take the few minutes and check the accompanying README.* files to
!          check for special precautions, options, or features of the card.
!   
!     8.   If the README files tell you that your hardware is supported, please
!          obtain the rest of the software.
!   
!   
    7.  Installing the packages
!   
!   XFree86/OS2 assumes a directory hierarchy starting from drive:\XFree86.
!   This can be changed, but is strictly discouraged.
!   
!     1.   Choose a HPFS partition with sufficient free space.
! 
!     2.   For each package to install, go to the root directory of this
!          drive, and type:
!   
! 	 drive:> cd \
! 	 drive:> unzip \path_of_packages\XF32xxxx.zip
!   
  
    8.  Adding Variables to CONFIG.SYS
+   
+   
+   XFree86/OS2 requires a number of settings in the CONFIG.SYS file to work
+   correctly. Please add the following settings:
+   
+   TERM
+   	Set the preferred terminal type for the xterm or editor to be used.
+   	Some programs need this setting. I have my type set to
  
! 	SET TERM=ansi
  
+   	\XFree86\lib\X11\etc\termcap.x11 contains a suitable termcap which
+   	can be used in place of termcap files that come with EMX, EMACS, or
+   	other ported software.
  
+   TERMCAP
+   	This variable must be set to the location where the termcap file
+   	used for the above TERM variable is searched. My setting, for
+   	instance, is:
  
+ 	SET TERMCAP=D:/EMX/ETC/TERMCAP.X11
  
!   	Note that forward ``/'' is used as a directory separator.
  
+   ETC
+   	Set to an ETC directory. Normally, this is already set to the ETC
+ 	directory of the TCP/IP code, such as
  
+ 	SET ETC=C:\TCPIP\ETC
  
+   TMP
+   	Set to an TMP directory. Normally, this is already set to the TMP
+ 	directory of the TCP/IP code, such as
  
! 	SET TMP=C:\TCPIP\TMP
  
+   HOSTNAME
+   	Set to the internet hostname. Normally, this is already set by the
+   	TCP/IP installation program, such as
  
! 	SET HOSTNAME=myhost
  
+   	With IAK, you would normally run a loopback configuration 
+   	and would then set this to
  
+ 	SET HOSTNAME=localhost
  
+   USER
+   LOGNAME
+   	Set both to a username. Currently, they are there just to make some
+   	programs happy; in the future, this variable might be set by a
+   	login shell of a multiuser configuration. My variable, for instance,
+   	is set to
+   
+ 	SET USER=holger
+ 	SET LOGNAME=holger
+   
+   HOME
+   	Set this to an existing directory that is supposed to be a home directory
+   	of a user. Some utilities place temporary and init files here. This
+   	is also future investment for a multiuser configuration, but must still
+   	be there. For instance, this variable might be set to
  
! 	SET HOME=H:\user\holger
  
+   X11ROOT
+   	This is one of the most important settings, it determines the root
+   	of the XFree86 directory tree. Normally, you will set this to the
+   	drive letter of the partition where the \XFree86 tree resides,
+   	such as in
  
! 	SET X11ROOT=Y:
  
+   	You may try to move the tree to another subdirectory, e.g. to
+   	K:\OS2\X11\XFree86... and would then have
+   	to change this to
  
+ 	SET X11ROOT=K:/OS2/X11
  
!   	but this is discouraged, since some utilities might not accept this.
!   	Note the forward ``/'' as a directory separator here.
  
!   DISPLAY
!   	This variable may be set to the display to be used for displaying
!   	clients. Normally you will set this variable to the same value as
!   	the HOSTNAME variable and simply add a :0.0 after it, such as
  
+ 	SET DISPLAY=myhost:0.0
  
!   	Read the X11 man page on the exact meaning of these postfixes and
!   	other options.
  
+   XSERVER
+   	Set this to the executable name of the X server to be used. This
+   	must be a complete path. My setting is as follows:
  
+ 	SET XSERVER=D:/XFree86/bin/XF86_Mach64.exe
  
+   PATH
+   	Add the binary directory for the X11 utilities to your search PATH.
+   	This is normally the directory (adjust the letter)
  
! 	Y:\XFree86\bin
  
!   	It is possible to move the binaries to another directory in the
!   	search path; for maintenance reasons and clarity of the structure, this
!   	is not recommended, though.
  
+   LIBPATH
+   	Add the DLL directory for the X11 utilities to the LIBPATH.
+   	This is normally the directory (adjust the letter)
  
! 	Y:\XFree86\lib
  
+   	It is possible to move the DLLs to another directory in the
+   	library path; for maintenance reasons and clarity of the structure, 
+   	this is not recommended, though. Note that
  
+   	Y:\XFree86\lib
  
!   	has several other subdirectories; these may not be moved elsewhere,
!   	rather they must stay there, because most utilities form a path to
!   	these directories by using %X11ROOT%\XFree86\lib
!   	as a base.
!   
!   The recent version of XFree86/OS2 has a REXX script named checkinstall.cmd
!   which you can (and should) use to check whether you have entered most things
!   correctly. This is not bullet-proof, but prevents the most obvious 
!   setup problems.
!   
  
    9.  Remarks on the Network Configuration
!   
!   
!   It is beyond the scope of this document to even give an introduction about
!   the correct installation of the TCP/IP networking system. You must do this
!   yourself or seek assistance elsewhere. It is only possible to say here that
!   a PC working well in a TCP/IP based LAN network will also work with 
!   XFree86/OS2 (when all other prerequisites are matched as well). 
!   
!   With IAK, there is a special configuration necessary, unless you want 
!   to use XFree86/OS2 only during a hot link to your Internet provider, 
!   the so called ``localhost'' or ``loopback'' configuration. This is
!   a local network interface which ``loops'' back to the same host. The 
    following settings are necessary for this:
+   
+     1.  Create a file \tcpip\etc\hosts with the
+   	following content:
  
+ 	127.0.0.1  localhost
  
!     2.  Add the following line to your
!   	\tcpip\bin\tcpstart.cmd:
  
! 	ifconfig lo 127.0.0.1 up
  
!     3.  Set the HOSTNAME environment variable to localhost as described
          in the last section.
  
!     4.  Add the following line to CONFIG.SYS:
  
+ 	SET USE_HOSTS_FIRST=1
  
!     5.  After rebooting, verify that the following command works:
  
! 	[C:\] ping localhost
!   
!   The checkinstall.cmd script coming with XFree86/OS2 gives some advice
!   here as well.
!   
!   If you have problems to get this or other basic networking things running,
!   seek assistance elsewhere.
!   
  
    10.  Configuring X for Your Hardware
!     
!   After you have added the required settings and setup a working network,
!   run the xf86config program to create a standard configuration file
!   in Y:\XFree86\lib\X11\XConfig from a windowed or full screen OS/2 
    text session:
  
+   [C:\] xf86config
+   
+   The xf86config program will ask a number of questions. You will need 
+   the information obtained from the SuperProbe program here. The program
+   should be self explanatory; if you have problems to understand something
+   though, seek assistance in the newsgroups.
+   
+   Alternatively, but not recommended for the non-expert, you can edit the 
+   XConfig file manually with a text editor. A sample file is in
  
!   Y:\XFree86\lib\X11\XConfig.eg
  
+   which can be used as a starting point.
+   
    For details about the XF86Config file format, refer to the
    XF86Config(4/5) manual page.
!   
!   By the time this README file is written, a more sophisticated and user
!   friendly setup program named XF86Setup, which is the now preferred
!   configuration software for XFree86, was not yet functioning, but
!   this might change in the final version. Please check the LATEST.OS2 file.
!   
!   If you know the configuration process from Linux or other XFree86 platform, 
!   you will encounter a few differences:
! 
!     o    The configuration file is named XF86Config in Unix environments.
! 
!     o   There is no configuration for the mouse type or device. The mouse
! 	device name is fixed to OSMOUSE, and this cannot be changed.
! 	If you have a three-button-mouse, install the correct OS/2 driver 
! 	for it, such as
!   
! 	DEVICE=D:\OS2\BOOT\PCLOGIC.SYS SERIAL=COM1
! 	DEVICE=D:\OS2\BOOT\MOUSE.SYS TYPE=PCLOGIC$
!   
! 	for a MouseSystems compatible mouse, for instance.
! 
!     o   The X server supports the XKEYBOARD extension, so it can take
! 	advantage from a number of precompiled national keyboard layouts.
! 	Enable the XKB option and choose an appropriate keyboard in the 
! 	xf86config dialog. For special purposes, you can also configure
! 	the XKB files in Y:\XFree86\lib\X11\xkb, or use an xmodmap file.
! 
!     o   There is no support for the Wacom and Elographics input devices yet.
!   
!   In most cases, an existing XF86Config file for the same XFree86 version
!   from Linux or another platform may be used without changes. There is one 
!   prominent exception: some S3 805 based VLB cards put their video memory
!   in odd locations. The X server can search for this memory by experimentally
!   mapping and unmapping possible memory regions. In XFree86/OS2, the OS may
!   run out of memory tiles during this process. If this happens, you must
!   find out the location of the memory yourself and add it as an option
!   
!   	MemBase 0x12345678
!   
!   to the XConfig file.
!   
    Once you've set up a XF86Config file, you can fine tune the video
!   modes with the xvidtune utility. 
!   
  
    11.  Running X
!  
!   16mb of memory is a recommended minimum for running the network software,
!   X and the presentation manager in parallel.  The server, window manager and 
!   an xterm take about 4-6 Mb of memory themselves.  X will start up on a
!   system with 8MB or less, but the performance will severely suffer from
!   heavy disk swapping. Your mileage may vary, though, so some people might
!   consider this still tolerable.
!   
!   The easiest way for new users to start X windows is to type: 
! 
!   [C:\] startx.
!   
!   To get out of X windows, select the ``exit'' function of the window manager.
!   You can customize your X by creating .xinitrc, .xserverrc,
!   and .twmrc files in the directory that the HOME environment variable
!   points to. These files are described in the xinit and startx man pages.
!   
  
    12.  Rebuilding the XFree86 Distribution
+     
+   Do you really want to rebuild XFree86/OS2 from source? Read the file OS2.Notes
+   on details to recompile XFree86/OS2 from scratch.
  
  
    13.  Building New X Clients
!     
!   The easiest way to build a new client (X application) is to use
!   xmkmf if an Imakefile is included in the sources.  Type
!   ``xmkmf -a'' to create the Makefiles, check the configuration if
!   necessary and type ``xmake''. ``xmake'' is a wrapper for the
!   GNU make program which defeats the improper SHELL setting typically found
!   in a Makefile generated from an Imakefile. Also see the XFree86/OS2 FAQ 
!   for more hints about porting X clients.
!   
  
    14.  Acknowledgements
!   
    Many thanks to:
  
!     o   Sebastien Marineau for his great work on getting the server code
          debugged
  
!     o   Eberhard Mattes for the wonderful base platform EMX which this
          port heavily relies on
  
!     o   ME - no, no, forget this: I won't praise myself :-)
!   
  
+   
+   $XFree86$
+   
+   
+   
+   
+   
    $XConsortium$
!   
!   
*** xc/programs/Xserver/hw/xfree86/doc/sgml/OS2.sgml:1.1	1996/11/03 00:15:56
--- xc/programs/Xserver/hw/xfree86/doc/sgml/OS2.sgml	1996/11/03 00:18:54
***************
*** 1,58 ****
  <!doctype linuxdoc system>
  
  <article>
! <title>README for XFree86 3.1.2D on OS/2
  <author>Holger Veit
! <Date>Last modified on: 20 Feb 1996
  
  <toc>
  
! <sect>Introductory Note about the ALPHA release 3.1.2D
  <p>
  Before looking into this file, please check for any LATEST.OS2 files
! that may come with the binary distribution. Some statements made here
! refer to the official public version of XFree86/OS2, and may not be
! fully functional in the alpha release.
! 
! This version of the code is called XFree86/OS2 3.1.2D. The letter ``D'',
! according to the naming rules of XFree86, usually denotes a (public)
! beta version of the code. Since this is the first public version of
! XFree86/OS2 at all, this code is considered having ALPHA quality only.
! 
! The purpose of this release is to test it widely without restrictions
! in a large number of configurations and find bugs that are still existing
! in the distribution. It is also intended as a developer's platform to
! port and write applications based on the X11 programming interfaces
! provided here. This release is complete (with one exception) regarding
  the X11R6.1 ``core'' distribution. The ``contrib'' distribution containing
  some of the more interesting tools for the end user, will be issued together
  with a later release (no need to start porting it independently).
  
! This version is therefore intended for the experienced and knowledged
! software engineer only, not for a casual end user.
  
! This means - and this should be taken serious - that
  <itemize>
  <item> there is no explicit or implicit warranty that certain code works
         correctly or works at all
! <item> this code may damage your hardware; this includes improper
!        configuration or bugs still present in the software
! <item> this code may destroy or damage your data on the storage media, crash 
!        or lock up the operating system and even damage data on different 
!        disk partitions
  </itemize>
  
! You are urged to make a backup of your complete system and keep it in a safe
! place before you attempt to load any of this software on your disk.
! 
! This even holds if you already have a working copy of XFree86-3.1.2D
! running on another platform, such as Linux, and found it working without
! problems. This is XFree86/OS2 which differs in a number of critical aspects
! from any Unix implementation of XFree86.
! 
! If you are afraid to try out this code, simply don't use it and wait for
! a future, hopefully more bug-free version.
! 
  
  <sect>What and Where is XFree86?
  
--- 1,56 ----
  <!doctype linuxdoc system>
  
  <article>
! <title>README for XFree86 3.2 on OS/2
  <author>Holger Veit
! <Date>Last modified on: 21 Oct 1996
  
  <toc>
  
! <sect>Introductory Note about the release 3.2
  <p>
  Before looking into this file, please check for any LATEST.OS2 files
! that may come with the binary distribution.
! 
! This version of the code is called XFree86/OS2 3.2. This means it is
! a public release for which also the source code is provided. In
! contrast, a version with a letter, such as in ``3.1.2D'', for instance, is a beta
! version which has certain restrictions.
! 
! Previous beta versions have been tested in a large number of configurations
! and have been found to be working, with some bugs left, rather flawlessly.
! This code is released for public use by an end user, not only for developers, 
! although this does not necessarily mean that it is easy to use or user 
! friendly, or using a popular term, ``plug & play''. Emphasis is on
! functionality, not simple installation.
! 
! This release is complete (with one exception) regarding
  the X11R6.1 ``core'' distribution. The ``contrib'' distribution containing
  some of the more interesting tools for the end user, will be issued together
  with a later release (no need to start porting it independently).
  
! In the past beta testing, it has been found that the software itself is
! rather stable and does not damage hardware - provided the user does not
! try to push the builtin limits and change certain configuration parameters
! which could operate the video hardware out of specs.
  
! However,
  <itemize>
  <item> there is no explicit or implicit warranty that certain code works
         correctly or works at all
! <item> although no damage reports are known, it does not mean that it is
!        impossible to damage hardware with this code; some deeply hidden
!        bugs may still be present in the software.
  </itemize>
  
! It is recommended that you backup essential data of your system before
! installing this software, but this should be your general precautions 
! before ANY installation. No reports exist that a crashing X server itself
! actively destroys or modifies data, but it is possible in rare cases
! that the system is left in an unusable state (video display mode garbled
! or system unresponsive, not reacting to mouse or keyboard actions).
! If you then hard reset or switch off the system, file caches of the operating
! system might not be written correctly back to disk, thus causing data loss.
  
  <sect>What and Where is XFree86?
  
***************
*** 63,69 ****
  and performance improvements as well as many bug fixes.  The release
  is available as source patches against the X Consortium X11R6 code, as
  well as binary distributions for many architectures.
! <p>XFree86/OS2 is the tentative work title for the implementation of XFree86
  on OS/2 based systems.
  
  See the <url url="COPYRIGHT.html" name="Copyright Notice">.
--- 61,67 ----
  and performance improvements as well as many bug fixes.  The release
  is available as source patches against the X Consortium X11R6 code, as
  well as binary distributions for many architectures.
! <p>XFree86/OS2 is the name of the implementation of XFree86
  on OS/2 based systems.
  
  See the <url url="COPYRIGHT.html" name="Copyright Notice">.
***************
*** 71,96 ****
  <!--
  The sources for XFree86/OS2 are available by anonymous ftp from:
  
! <url name="ftp.XFree86.org:/pub/XFree86/current"
! url="ftp://ftp.XFree86.org/pub/XFree86/current">
  -->
  
! Binaries for OS/2 2.11 and OS/2 Warp are available from:
! <url name="ftp.XFree86.org:/pub/XFree86/beta/binaries/OS2"
! url="ftp://ftp.XFree86.org/pub/XFree86/beta/binaries/OS2">
  <p>
- more archives to be added ...
- 
  
  Other versions:
  
  XFree86/OS2 will run on all dialects of Warp, including Warp "red spine box",
! Warp "blue spine box", Warp Connect and Warp Server (beta 1 and 2). Fixpack
! level 5 is mandatory, a later fixpack level (10 or 17) is recommended.
! XFree86/OS2 appears to work under OS/2 2.11 with fixpack 100, but this was
! not checked in all details, so hidden problems may still exist. It is 
! unlikely that it will run stable under OS/2 2.0 and 2.1, and it will definitely
! not run with any OS/2 1.X.
  
  It is possible to build XFree86/OS2 from the sources.  Read about this
  in some section below.
--- 69,101 ----
  <!--
  The sources for XFree86/OS2 are available by anonymous ftp from:
  
! <url name="ftp.XFree86.org:/pub/XFree86"
! url="ftp://ftp.XFree86.org/pub/XFree86">
  -->
  
! Binaries for OS/2 Warp and Merlin are available from:
! <url name="ftp.XFree86.org:/pub/XFree86/binaries/OS2"
! url="ftp://ftp.XFree86.org/pub/XFree86/binaries/OS2">
! <p>
! The WWW page
! <url name="borneo.gmd.de:/~veit/os2/xf86os2.html"
! url="http://borneo.gmd.de/~veit/os2/xf86os2.html"> will
! usually show more references to FTP or WWW sites to retrieve
! sources or binaries.
  <p>
  
  Other versions:
  
  XFree86/OS2 will run on all dialects of Warp, including Warp "red spine box",
! Warp "blue spine box", Warp Connect, Warp Server, and Merlin. 
! For Warp fixpack level 17 is mandatory, a later fixpack level (e.g. FP22) 
! is recommended. In some future, a more recent fixpack might be necessary.
! Please check a LATEST.OS2 file.
! 
! OS/2 2.11 is no longer supported beginning with this release, due to lack
! of a working test environment. Consequently, OS/2 SMP is not supported either,
! because this is currently based on OS/2 2.11.
! OS/2 versions 1.X are definitely not supported and will never be.
  
  It is possible to build XFree86/OS2 from the sources.  Read about this
  in some section below.
***************
*** 130,145 ****
  
  <p>
  <itemize>
! <item> OS/2 2.11 with fixpack 100 and all versions of Warp with at least
!        fixpack level 5 are required.
! <item> In the version 3.1.2D, you need certain networking TCP/IP software. 
!        In a future version, this restriction might be no longer present.
         <enum>
-        <item> For OS/2 2.11, IBM TCP/IP 2.0 or later is mandatory.
         <item> Warp comes with the Internet Access Kit (IAK), which is
                sufficient. Warp Connect and Warp Server come with a full
                version of TCP/IP (3.0). Use of this software is preferred over
                IAK then.
         </enum>
         Other versions of TCP/IP, such as FTP's, DEC's, or Hummingbird's 
         TCP/IP versions, as well as IBM TCP/IP 1.X are not supported. Nor does
--- 135,151 ----
  
  <p>
  <itemize>
! <item> Any version of Warp with at least fixpack 17, or Merlin is required
! <item> XFree86/OS2-3.2 may use a local named-pipe connection or a TCP/IP 
!        based network connection.
         <enum>
         <item> Warp comes with the Internet Access Kit (IAK), which is
                sufficient. Warp Connect and Warp Server come with a full
                version of TCP/IP (3.0). Use of this software is preferred over
                IAK then.
+        <item> Merlin comes with TCP/IP 4.0 which should also work.
+        <item> The old IBM TCP/IP 2.0, that comes with the IBM PMX product
+               may be used with Warp as well.
         </enum>
         Other versions of TCP/IP, such as FTP's, DEC's, or Hummingbird's 
         TCP/IP versions, as well as IBM TCP/IP 1.X are not supported. Nor does
***************
*** 147,153 ****
         or NetBIOS work, and I won't to provide support for that in the future.
  <item> If you want to write or port applications for XFree86, you are
         encouraged to do so. You will need a complete installation of
!        EMX/gcc 0.9B fix 1 or later for doing so. Neither the second (obsolete)
         implementation of gcc, nor any commercial package, including
         Cset/2, VAC++, Borland C++/OS2, Watcom C++, Metaware C, and others,
         is suitable for porting, because various parts of the X DLLs rely
--- 153,159 ----
         or NetBIOS work, and I won't to provide support for that in the future.
  <item> If you want to write or port applications for XFree86, you are
         encouraged to do so. You will need a complete installation of
!        EMX/gcc 0.9C or later for doing so. Neither the second (obsolete)
         implementation of gcc, nor any commercial package, including
         Cset/2, VAC++, Borland C++/OS2, Watcom C++, Metaware C, and others,
         is suitable for porting, because various parts of the X DLLs rely
***************
*** 168,228 ****
  not work, because it cannot unpack long file names and extended attributes.
  
  At this moment, the distribution covers only the ``core'' distribution
! which somewhat reduces the usability. Some of the more interesting clients 
! from the ``contrib'' area will be made available in the future.
  
      The contents of the packages are:
  
  <descrip>
  <tag/REQUIRED:/
      <descrip>
!     <tag/312Dbase/	A special device driver and the SuperProbe program
!     <tag/312Ddoc/	READMEs and XFree86 specific man pages.
!     <tag/312Dbin/	all of the executable X client applications and shared libs
!     <tag/312Dfnts/	the misc and 75dpi fonts
!     <tag/312Dlib/	data files needed at runtime
      <tag/emxrt/         Runtime libraries of EMX
      </descrip>
  
      Choose at least one of the following to match your hardware:
  
      <descrip>
!     <tag/312D8514/	the X server for IBM 8514/A and compatible boards
!     <tag/312DAGX/	the X server for AGX boards
!     <tag/312DI128/	the X server for &num;9 Imagination 128 boards
!     <tag/312DMa32/	the X server for ATI Mach32 graphics boards
!     <tag/312DMa64/	the X server for ATI Mach64 graphics boards
!     <tag/312DMa8/	the X server for ATI Mach8 graphics boards
!     <tag/312DMono/	the Monochrome X Server
!     <tag/312DP9K/	the X server for P9000 based boards
!     <tag/312DS3/ 	the X server for S3 based boards
!     <tag/312DSvga/	the 8-bit pseudo-color X server for Super VGA cards
!     <tag/312Dvg16/	the 4-bit pseudo-color X server for VGA &amp; SVGA cards.
!     <tag/312Dw32/	the X server for et4000w32 based boards
      </descrip>
  
  <tag/OPTIONAL:/
  
      <descrip>
!     <tag/312Dman/ 	pre-formatted man pages for the X11 interface and clients
!     <tag/312Df100/	100dpi fonts
!     <tag/312Dfscl/	Speedo and Type1 fonts
!     <tag/312Dfnon/ 	Japanese, Chinese and other fonts
!     <tag/312Dfcyr/	Cyrillic fonts
!     <tag/312Dfsrv/	the font server with man pages.
!     <tag/312Dprog/	the X11 header files and programmer's utilities
  			for compiling other X applications
!     <tag/312Dpex/	PEX fonts and libraries required for PEX applications
!     <tag/312Dnest/	the Xnest X server
      </descrip>
  </descrip>
  
  In order to save space on your disk and reduce net bandwidth, choose the
! software to obtain carefully. Each X server is an archive of about 1.4MB
! and occupies 2.5MB on the disk. You won't normally need more than the
  single Xserver tailored to your video card.
  
! If it is your first time install, get the <tt/312Dbase/ archive before any
  of the other packages. This package contains a driver and a test program,
  which analyzes your video hardware. If this program fails or reports an
  incompatible hardware, it makes no sense to obtain the other packages in
--- 174,236 ----
  not work, because it cannot unpack long file names and extended attributes.
  
  At this moment, the distribution covers only the ``core'' distribution
! which somewhat reduces the usability. Refer to WWW sites and archives listed 
! in the XFree86/OS2 FAQ and elsewhere to obtain prebuilt X clients which
! were ported to XFree86.
  
      The contents of the packages are:
  
  <descrip>
  <tag/REQUIRED:/
      <descrip>
!     <tag/XF32base/	A special device driver and the SuperProbe program
!     <tag/XF32doc/	READMEs and XFree86 specific man pages.
!     <tag/XF32bin/	all of the executable X client applications and shared libs
!     <tag/XF32fnts/	the misc and 75dpi fonts
      <tag/emxrt/         Runtime libraries of EMX
      </descrip>
  
      Choose at least one of the following to match your hardware:
  
      <descrip>
!     <tag/XF328514/	the X server for IBM 8514/A and compatible boards
!     <tag/XF32AGX/	the X server for AGX boards
!     <tag/XF32I128/	the X server for &num;9 Imagination 128 boards
!     <tag/XF32Ma32/	the X server for ATI Mach32 graphics boards
!     <tag/XF32Ma64/	the X server for ATI Mach64 graphics boards
!     <tag/XF32Ma8/	the X server for ATI Mach8 graphics boards
!     <tag/XF32Mono/	the Monochrome X Server
!     <tag/XF32P9K/	the X server for P9000 based boards
!     <tag/XF32S3/ 	the X server for S3 based boards (excluding S3 ViRGE)
!     <tag/XF32S3V/ 	the X server for S3 ViRGE based boards
!     <tag/XF32Svga/	the 8-bit pseudo-color X server for Super VGA cards
!     <tag/XF32vg16/	the 4-bit pseudo-color X server for VGA &amp; SVGA cards.
!     <tag/XF32w32/	the X server for et4000w32 based boards
      </descrip>
  
  <tag/OPTIONAL:/
  
      <descrip>
!     <tag/XF32man/ 	pre-formatted man pages for the X11 interface and clients
!     <tag/XF32f100/	100dpi fonts
!     <tag/XF32fscl/	Speedo and Type1 fonts
!     <tag/XF32fnon/ 	Japanese, Chinese and other fonts
!     <tag/XF32fcyr/	Cyrillic fonts
!     <tag/XF32fsrv/	the font server with man pages.
!     <tag/XF32prog/	the X11 header files and programmer's utilities
  			for compiling other X applications
!     <tag/XF32pex/	PEX fonts and libraries required for PEX applications
!     <tag/XF32nest/	the experimental Xnest X server
!     <tag/XF32vfb/	the experimental VFB X server
      </descrip>
  </descrip>
  
  In order to save space on your disk and reduce net bandwidth, choose the
! software to obtain carefully. Each X server is an archive of about 1.2MB
! and occupies 3.0MB on the disk. You won't normally need more than the
  single Xserver tailored to your video card.
  
! If it is your first time install, get the <tt/XF32base/ archive before any
  of the other packages. This package contains a driver and a test program,
  which analyzes your video hardware. If this program fails or reports an
  incompatible hardware, it makes no sense to obtain the other packages in
***************
*** 236,247 ****
  in all commands accordingly.
  
  <enum>
! <item> Obtain the package <tt/312Dbase/ and install it from the root directory
         of the Y: drive, by entering the following commands:
  <tscreen><verb>
  [C:\] Y:
  [Y:\] cd \
! [Y:\] unzip \path_of_package\312Dbase.zip
  </verb></tscreen>
  
  <item> Edit your CONFIG.SYS file to contain the following line somewhere:
--- 244,255 ----
  in all commands accordingly.
  
  <enum>
! <item> Obtain the package <tt/XF32base/ and install it from the root directory
         of the Y: drive, by entering the following commands:
  <tscreen><verb>
  [C:\] Y:
  [Y:\] cd \
! [Y:\] unzip \path_of_package\XF32base.zip
  </verb></tscreen>
  
  <item> Edit your CONFIG.SYS file to contain the following line somewhere:
***************
*** 274,286 ****
  </verb></tscreen>
  
  <item> SuperProbe can identify many more video cards than are supported by
!        XFree86. Therefore lookup the reported type in the compatibility list,
!        and also check the accompanying README.* files for special conditions
!        and requirements. If the card is not mentioned or marked as unsupported,
!        the game is over for you now, unfortunately.
  
- <item> Otherwise chances are good, that you can run XFree86/OS2. Obtain the
-        rest of the software and proceed with the next section.
  </enum>
  
  <sect> Installing the packages
--- 282,299 ----
  </verb></tscreen>
  
  <item> SuperProbe can identify many more video cards than are supported by
!        XFree86. In some cases, Superprobe unfortunately detects a wrong
!        card, often it claims to have seen a MCGA card which is some sort of
!        a fallback. Generally, if it is approximately right, there are only
!        few reasons for doubts; if it is totally off (e.g. saying it has
!        seen a ET4000, and you have a Cirrus card), you should report a
!        misdetection as a bug to the given address. In all cases, please
!        take the few minutes and check the accompanying README.* files to
!        check for special precautions, options, or features of the card.
! 
! <item> If the README files tell you that your hardware is supported, please
!        obtain the rest of the software.
  
  </enum>
  
  <sect> Installing the packages
***************
*** 295,301 ****
         drive, and type:
  <tscreen><verb>
  drive:> cd \
! drive:> unzip \path_of_packages\312Dxxxx.zip
  </verb></tscreen>
  </enum>
  
--- 308,314 ----
         drive, and type:
  <tscreen><verb>
  drive:> cd \
! drive:> unzip \path_of_packages\XF32xxxx.zip
  </verb></tscreen>
  </enum>
  
***************
*** 323,333 ****
  <tag/ETC/
  	Set to an ETC directory. Normally, this is already set to the ETC
          directory of the TCP/IP code, such as
! <tscreen><verb>SET ETC=C:\TCPIP\ETC</verb></tscreen>
  <tag/TMP/
  	Set to an TMP directory. Normally, this is already set to the TMP
          directory of the TCP/IP code, such as
! <tscreen><verb>SET TMP=C:\TCPIP\TMP</verb></tscreen>
  <tag/HOSTNAME/
  	Set to the internet hostname. Normally, this is already set by the
  	TCP/IP installation program, such as
--- 336,346 ----
  <tag/ETC/
  	Set to an ETC directory. Normally, this is already set to the ETC
          directory of the TCP/IP code, such as
! <tscreen><verb>SET ETC=C:&bsol;TCPIP&bsol;ETC</verb></tscreen>
  <tag/TMP/
  	Set to an TMP directory. Normally, this is already set to the TMP
          directory of the TCP/IP code, such as
! <tscreen><verb>SET TMP=C:&bsol;TCPIP&bsol;TMP</verb></tscreen>
  <tag/HOSTNAME/
  	Set to the internet hostname. Normally, this is already set by the
  	TCP/IP installation program, such as
***************
*** 352,358 ****
  	of a user. Some utilities place temporary and init files here. This
  	is also future investment for a multiuser configuration, but must still
  	be there. For instance, this variable might be set to
! <tscreen><verb>SET HOME=H:\user\holger</verb></tscreen>
  <tag/X11ROOT/
  	This is one of the most important settings, it determines the root
  	of the XFree86 directory tree. Normally, you will set this to the
--- 365,371 ----
  	of a user. Some utilities place temporary and init files here. This
  	is also future investment for a multiuser configuration, but must still
  	be there. For instance, this variable might be set to
! <tscreen><verb>SET HOME=H:&bsol;user&bsol;holger</verb></tscreen>
  <tag/X11ROOT/
  	This is one of the most important settings, it determines the root
  	of the XFree86 directory tree. Normally, you will set this to the
***************
*** 379,392 ****
  <tag/PATH/
  	Add the binary directory for the X11 utilities to your search PATH.
  	This is normally the directory (adjust the letter)
! <tscreen><verb>Y:\XFree86\bin</verb></tscreen>
  	It is possible to move the binaries to another directory in the
  	search path; for maintenance reasons and clarity of the structure, this
  	is not recommended, though.
  <tag/LIBPATH/
  	Add the DLL directory for the X11 utilities to the LIBPATH.
  	This is normally the directory (adjust the letter)
! <tscreen><verb>Y:\XFree86\lib</verb></tscreen>
  	It is possible to move the DLLs to another directory in the
  	library path; for maintenance reasons and clarity of the structure, 
  	this is not recommended, though. Note that
--- 392,405 ----
  <tag/PATH/
  	Add the binary directory for the X11 utilities to your search PATH.
  	This is normally the directory (adjust the letter)
! <tscreen><verb>Y:&bsol;XFree86&bsol;bin</verb></tscreen>
  	It is possible to move the binaries to another directory in the
  	search path; for maintenance reasons and clarity of the structure, this
  	is not recommended, though.
  <tag/LIBPATH/
  	Add the DLL directory for the X11 utilities to the LIBPATH.
  	This is normally the directory (adjust the letter)
! <tscreen><verb>Y:&bsol;XFree86&bsol;lib</verb></tscreen>
  	It is possible to move the DLLs to another directory in the
  	library path; for maintenance reasons and clarity of the structure, 
  	this is not recommended, though. Note that
***************
*** 397,402 ****
--- 410,420 ----
  	as a base.
  </descrip>
  
+ The recent version of XFree86/OS2 has a REXX script named <tt/checkinstall.cmd/
+ which you can (and should) use to check whether you have entered most things
+ correctly. This is not bullet-proof, but prevents the most obvious 
+ setup problems.
+ 
  <sect> Remarks on the Network Configuration
  
  <p>
***************
*** 425,433 ****
  <item> Add the following line to CONFIG.SYS:
  <tscreen><verb>SET USE_HOSTS_FIRST=1</verb></tscreen>
  <item> After rebooting, verify that the following command works:
! <tscreen><verb>[C:\] ping localhost</verb></tscreen>
  </enum>
  
  If you have problems to get this or other basic networking things running,
  seek assistance elsewhere.
  
--- 443,454 ----
  <item> Add the following line to CONFIG.SYS:
  <tscreen><verb>SET USE_HOSTS_FIRST=1</verb></tscreen>
  <item> After rebooting, verify that the following command works:
! <tscreen><verb>[C:&bsol;] ping localhost</verb></tscreen>
  </enum>
  
+ The <tt/checkinstall.cmd/ script coming with XFree86/OS2 gives some advice
+ here as well.
+ 
  If you have problems to get this or other basic networking things running,
  seek assistance elsewhere.
  
***************
*** 438,448 ****
  run the <tt/xf86config/ program to create a standard configuration file
  in <tt>Y:&bsol;XFree86&bsol;lib&bsol;X11&bsol;XConfig</tt> from a windowed
  or full screen OS/2 text session:
! <tscreen><verb>[C:\] xf86config</verb></tscreen>
  
! This program will ask a number of questions. You will need the information
! obtained from the SuperProbe program here. The program should be 
! self explanatory; if you have problems to understand something though, seek
  assistance in the newsgroups.
  
  Alternatively, but not recommended for the non-expert, you can edit the 
--- 459,469 ----
  run the <tt/xf86config/ program to create a standard configuration file
  in <tt>Y:&bsol;XFree86&bsol;lib&bsol;X11&bsol;XConfig</tt> from a windowed
  or full screen OS/2 text session:
! <tscreen><verb>[C:&bsol;] xf86config</verb></tscreen>
  
! The <tt/xf86config/ program will ask a number of questions. You will need 
! the information obtained from the SuperProbe program here. The program should 
! be self explanatory; if you have problems to understand something though, seek
  assistance in the newsgroups.
  
  Alternatively, but not recommended for the non-expert, you can edit the 
***************
*** 453,468 ****
  For details about the <tt/XF86Config/ file format, refer to the
  <em>XF86Config(4/5)</em> manual page.
  
  If you know the configuration process from Linux or other XFree86 platform, 
  you will encounter a few differences:
  <itemize>
  <item> There is no configuration for the mouse type or device. The mouse
         device name is fixed to OSMOUSE, and this cannot be changed.
         If you have a three-button-mouse, install the correct OS/2 driver 
         for it, such as
  <tscreen><verb>
! DEVICE=D:\OS2\BOOT\PCLOGIC.SYS SERIAL=COM1
! DEVICE=D:\OS2\BOOT\MOUSE.SYS TYPE=PCLOGIC$
  </verb></tscreen>
         for a MouseSystems compatible mouse, for instance.
  <item> Currently, the X server does not read the native OS/2 keyboard map,
--- 474,495 ----
  For details about the <tt/XF86Config/ file format, refer to the
  <em>XF86Config(4/5)</em> manual page.
  
+ By the time this README file is written, a more sophisticated and user
+ friendly setup program named <tt/XF86Setup/, which is the now preferred
+ configuration software for XFree86, was not yet functioning, but
+ this might change in the final version. Please check the LATEST.OS2 file.
+ 
  If you know the configuration process from Linux or other XFree86 platform, 
  you will encounter a few differences:
  <itemize>
+ <item>The configuration file is named <tt/XF86Config/ in Unix environments.
  <item> There is no configuration for the mouse type or device. The mouse
         device name is fixed to OSMOUSE, and this cannot be changed.
         If you have a three-button-mouse, install the correct OS/2 driver 
         for it, such as
  <tscreen><verb>
! DEVICE=D:&bsol;OS2&bsol;BOOT&bsol;PCLOGIC.SYS SERIAL=COM1
! DEVICE=D:&bsol;OS2&bsol;BOOT&bsol;MOUSE.SYS TYPE=PCLOGIC$
  </verb></tscreen>
         for a MouseSystems compatible mouse, for instance.
  <item> Currently, the X server does not read the native OS/2 keyboard map,
***************
*** 475,482 ****
  <item> There is no support for the Wacom and Elographics input devices yet.
  </itemize>
  
! Other than that, an existing <tt/XF86Config/ file for the same XFree86 version
! from Linux or another platform may be used without changes.
  
  Once you've set up a XF86Config file, you can fine tune the video
  modes with the <tt>xvidtune</tt> utility. 
--- 502,518 ----
  <item> There is no support for the Wacom and Elographics input devices yet.
  </itemize>
  
! In most cases, an existing <tt/XF86Config/ file for the same XFree86 version
! from Linux or another platform may be used without changes. There is one 
! prominent exception: some S3 805 based VLB cards put their video memory
! in odd locations. The X server can search for this memory by experimentally
! mapping and unmapping possible memory regions. In XFree86/OS2, the OS may
! run out of memory tiles during this process. If this happens, you must
! find out the location of the memory yourself and add it as an option
! <tscreen><verb>
! 	MemBase 0x12345678
! </verb></tscreen>
! to the XConfig file.
  
  Once you've set up a XF86Config file, you can fine tune the video
  modes with the <tt>xvidtune</tt> utility. 
***************
*** 492,498 ****
  consider this still tolerable.
  
  The easiest way for new users to start X windows is to type: 
! <tscreen><verb>[C:\] startx</verb></tscreen>.
  
  To get out of X windows, type: ``<tt/exit/'' in the console xterm.
  You can customize your X by creating <tt/.xinitrc/, <tt/.xserverrc/,
--- 528,534 ----
  consider this still tolerable.
  
  The easiest way for new users to start X windows is to type: 
! <tscreen><verb>[C:&bsol;] startx</verb></tscreen>.
  
  To get out of X windows, type: ``<tt/exit/'' in the console xterm.
  You can customize your X by creating <tt/.xinitrc/, <tt/.xserverrc/,
***************
*** 502,528 ****
  <sect> Rebuilding the XFree86 Distribution
  
  <p>
! Do you really want to rebuild XFree86/OS2 from source? If so, here are
! a few hints:
! <enum>
! <item> You need about 250-300 MB of free HPFS space.
! <item> You must have the complete EMX environment installed.
! <item> You need most of the GNU utilities that are available from the
!        unix directory of hobbes.nmsu.edu.
! <item> You need a GNU make 3.71 or 3.72, others often have obscure bugs.
!        You cannot use dmake, nmake, wmake, or other toy software as a
!        replacement.
! <item> Install the X11R6.1 ``core'' distribution on some disk under a
!        directory like <tt>&bsol;X11</tt>, i.e.
!        <tt>&bsol;X11&bsol;xc&bsol;...</tt>.
! <item> Copy the cmd file <tt>buildos2.cmd</tt> from the directory
!        <tt>&bsol;X11&bsol;xc&bsol;config&bsol;util</tt> to the top
!        directory <tt>&bsol;X11&bsol;xc</tt>.
! <item> Execute this script; this should recompile everything, thereby
!        producing a logfile <tt>&bsol;X11&bsol;xc&bsol;buildxc.log</tt>.
!        The process requires between 2 and 20 hours depending on your hardware.
! </enum>
! Good luck!
  
  <sect>Building New X Clients
  
--- 538,545 ----
  <sect> Rebuilding the XFree86 Distribution
  
  <p>
! Do you really want to rebuild XFree86/OS2 from source? Read the file OS2.Notes
! on details to recompile XFree86/OS2 from scratch.
  
  <sect>Building New X Clients
  
***************
*** 532,538 ****
  ``<tt/xmkmf -a/'' to create the Makefiles, check the configuration if
  necessary and type ``<tt/xmake/''. ``<tt/xmake/'' is a wrapper for the
  GNU make program which defeats the improper SHELL setting typically found
! in a Makefile generated from an Imakefile.
  
  <sect> Acknowledgements
  
--- 549,556 ----
  ``<tt/xmkmf -a/'' to create the Makefiles, check the configuration if
  necessary and type ``<tt/xmake/''. ``<tt/xmake/'' is a wrapper for the
  GNU make program which defeats the improper SHELL setting typically found
! in a Makefile generated from an Imakefile. Also see the XFree86/OS2 FAQ 
! for more hints about porting X clients.
  
  <sect> Acknowledgements
  
*** xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml:1.1	1996/11/03 00:16:05
--- xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml	1996/11/03 00:18:54
***************
*** 3,9 ****
  
  <title>Notes on Rebuilding XFree86/OS2 from Scratch
  <author>Holger Veit
! <date>Last modified 22 Feb 1996
  
  <toc>
  
--- 3,9 ----
  
  <title>Notes on Rebuilding XFree86/OS2 from Scratch
  <author>Holger Veit
! <date>Last modified 21 Oct 1996
  
  <toc>
  
***************
*** 31,37 ****
  via anonymous FTP. The following shopping list shows what you will need:
  
  <itemize>
! <item>gcc	EMX/gcc emx 0.9B fix 1 or later
  <item>gzip	GNU zip/unzip
  <item>tar	GNU tar
  <item>patch	Larry Wall's patch utility (attention: incompatible tool with same name in OS/2)
--- 31,37 ----
  via anonymous FTP. The following shopping list shows what you will need:
  
  <itemize>
! <item>gcc	EMX/gcc emx 0.9C or later
  <item>gzip	GNU zip/unzip
  <item>tar	GNU tar
  <item>patch	Larry Wall's patch utility (attention: incompatible tool with same name in OS/2)
***************
*** 46,51 ****
--- 46,53 ----
  <item>flex	GNU flex
  <item>bison	GNU bison
  <item>find	GNU find    (attention: incompatible tool with the same name in OS/2)
+ <item>tcl/tk    This is needed for the XF86Setup utility; a suitable binary
+                 set is available from the ported software WWW page
  </itemize>
  
  If there is no version number given, any new version will do. Particularly
***************
*** 58,64 ****
  an update to X11R6, named X11R6.1 (cynics call this "X11'95" :-) ); I don't 
  know whether a patch or an entirely new version will be issued. The public
  XFree86 sources will likely be called XFree86-3.2.tar.gz; for sources for
! the alpha version XFree86/OS2 3.1.2D you must become a member of XFree86.
  
  <sect>Compiling and Installing
  <p>
--- 60,66 ----
  an update to X11R6, named X11R6.1 (cynics call this "X11'95" :-) ); I don't 
  know whether a patch or an entirely new version will be issued. The public
  XFree86 sources will likely be called XFree86-3.2.tar.gz; for sources for
! an alpha or beta version of XFree86/OS2 you must become a member of XFree86.
  
  <sect>Compiling and Installing
  <p>
***************
*** 92,102 ****
        which lists the files that are newly created. The patch program has
        a problem with creating new directories, so we need to create them
        on advance. For each <tt/added-XXX/ file you find, execute from
!       <tt>&bsol;x11</tt> <verb>xc\config\util\added added-XXX</verb>
        If there is no <tt>added-XXX</tt> file available, you can make one with
        the following instructions:
        <verb>
!       grep "\*\*\* xc/" patchfile >added-file
        </verb>
        Edit <tt/added-file/ with a text editor and remove the <tt/*** / at
        the beginning and the time stamp at the end (search for a TAB and
--- 94,104 ----
        which lists the files that are newly created. The patch program has
        a problem with creating new directories, so we need to create them
        on advance. For each <tt/added-XXX/ file you find, execute from
!       <tt>&bsol;x11</tt> <verb>xc&bsol;config&bsol;util&bsol;added added-XXX</verb>
        If there is no <tt>added-XXX</tt> file available, you can make one with
        the following instructions:
        <verb>
!       grep "&bsol;*&bsol;*&bsol;* xc/" patchfile >added-file
        </verb>
        Edit <tt/added-file/ with a text editor and remove the <tt/*** / at
        the beginning and the time stamp at the end (search for a TAB and
***************
*** 112,126 ****
        Don't use the recommended <tt/-s/ option, this makes <tt/patch/ quiet,
        and you won't see problems in the patchlog file. Use
        <verb>
!       find \x11 -name *.rej -print 
!       find \x11 -name *# -print
        </verb>
        to find any rejects and unapplied patches (attention: yet another OS/2
        program with wrong functionality). Normally there shouldn't
!       be any problems of this kind, else you have made a mistake. finally
        remove the original files with
        <verb>
!       find \x11 -name *.orig -print -exec rm {} ;
        </verb>
  <item>Go to the <tt>xc/config/cf</tt> directory and edit the <tt>xf86site.def</tt>
        file to match your requirements (you probably don't want to compile
--- 114,128 ----
        Don't use the recommended <tt/-s/ option, this makes <tt/patch/ quiet,
        and you won't see problems in the patchlog file. Use
        <verb>
!       find &bsol;x11 -name *.rej -print 
!       find &bsol;x11 -name *# -print
        </verb>
        to find any rejects and unapplied patches (attention: yet another OS/2
        program with wrong functionality). Normally there shouldn't
!       be any problems of this kind, else you have made a mistake. Finally
        remove the original files with
        <verb>
!       find &bsol;x11 -name *.orig -print -exec rm {} ;
        </verb>
  <item>Go to the <tt>xc/config/cf</tt> directory and edit the <tt>xf86site.def</tt>
        file to match your requirements (you probably don't want to compile
***************
*** 131,139 ****
        <item><tt>&num;define WacomSupport            NO
              &num;define ElographicsSupport      NO</tt>
              Both options are not yet supported.
!       <item><tt/&num;define ForceNormalLib NO/
!             There is no support for static libraries yet; why would you need
!             them anyway.
        </itemize>
  <item>Go to the directory <tt>xc&bsol;util&bsol;compress</tt> and 
        <tt>make compress.exe</tt> there. Install the program produced 
--- 133,143 ----
        <item><tt>&num;define WacomSupport            NO
              &num;define ElographicsSupport      NO</tt>
              Both options are not yet supported.
!       <item>Tcl* and Tk* don't need to be set explicitly. Reasonable defaults
!             are in the other config files, provided you have a complete 
!             XFree86/OS2 binary tree with the tcl/tk runtime support installed.
!       <item><tt>&num;define BuildDynamicLoading   NO</tt>
! 	    This does not work.
        </itemize>
  <item>Go to the directory <tt>xc&bsol;util&bsol;compress</tt> and 
        <tt>make compress.exe</tt> there. Install the program produced 
***************
*** 148,158 ****
        go back to the prefix section of this document: you have forgotten
        something.
  <item>Copy the file <tt>xc/config/util/buildos2.cmd</tt> into the <tt/xc/
!       directory.
  <item>Execute this <tt/buildos2.cmd/ command in the <tt/xc/ directory;
        it will produce a logfile <tt>buildxc.log</tt> in this directory.
! <item>Go have a bucket of coffee. The compile will need between 2 and 20
!       hours.
  <item>When finished, view the logfile for errors, and fix the problems if
        there are some. I have managed to compile the whole system
        flawlessly, so there is at least one configuration that works.
--- 152,165 ----
        go back to the prefix section of this document: you have forgotten
        something.
  <item>Copy the file <tt>xc/config/util/buildos2.cmd</tt> into the <tt/xc/
!       directory. If this is a second or later attempt, you might need to
!       copy the saved toplevel Makefile.os2 back to Makefile.
! 
! 
  <item>Execute this <tt/buildos2.cmd/ command in the <tt/xc/ directory;
        it will produce a logfile <tt>buildxc.log</tt> in this directory.
! <item>Go have a bucket of coffee, or better, buy new coffee - in Columbia!
!       The compile will need between 2 and 20 hours.
  <item>When finished, view the logfile for errors, and fix the problems if
        there are some. I have managed to compile the whole system
        flawlessly, so there is at least one configuration that works.
*** xc/programs/Xserver/hw/xfree86/XF86Setup/filelistos2.tcl:1.1	1996/10/25 02:09:14
--- xc/programs/Xserver/hw/xfree86/XF86Setup/filelistos2.tcl	1996/10/25 02:10:18
***************
*** 0 ****
--- 1,100 ----
+ # $XFree86: xc/programs/Xserver/hw/xfree86/XF86Setup/filelist.tcl,v 3.3 1996/08/24 12:50:45 dawes Exp $
+ #
+ # Copyright 1996 by Joseph V. Moss <joe@XFree86.Org>
+ #
+ # See the file "LICENSE" for information regarding redistribution terms,
+ # and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+ 
+ # List of files that are needed by this program or programs spawned by it.
+ # These lists are not meant to be exhaustive, but they should be
+ # complete enough to ensure that all the needed .tgz files have been
+ # installed
+ 
+ array set FilePermsDescriptions {
+ 	Libs	"X11 libraries"
+ 	Cfg	"configuration and application default files"
+ 	Fonts	"standard font files"
+ 	DB	"device, keysym, error, locale, and color databases"
+ 	Bin	"standard X client programs"
+ 	VidTune	"xvidtune configuration files and/or the xvidtune program"
+ 	XKB	"X keyboard extension programs and configuration files"
+ }
+ 
+ array set FilePermsLibs {
+ 	lib/libX11*				644
+ 	lib/libXaw*				644
+ 	lib/libXext*				644
+ 	lib/libXi*				644
+ 	lib/libXmu*				644
+ 	lib/libXtst*				644
+ 	lib/libSM*				644
+ 	lib/libICE*				644
+ }
+ 
+ array set FilePermsCfg {
+ 	lib/X11/xinit/xinitrc.cmd		444
+ 	lib/X11/app-defaults/Bitmap		444
+ 	lib/X11/app-defaults/XLogo		444
+ 	lib/X11/app-defaults/XTerm		444
+ }
+ 
+ array set FilePermsFonts {
+ 	lib/X11/fonts/misc/fonts.dir		444
+ 	lib/X11/fonts/misc/fonts.alias		444
+ 	lib/X11/fonts/misc/6x13.pc*		444
+ 	lib/X11/fonts/75dpi/fonts.dir		444
+ 	lib/X11/fonts/75dpi/symb10.pc*		444
+ }
+ 
+ array set FilePermsDB {
+ 	lib/X11/XErrorDB			444
+ 	lib/X11/XKeysymDB			444
+ 	lib/X11/rgb.txt				444
+ 	lib/X11/Cards				444
+ 	lib/X11/locale/locale.dir		444
+ 	lib/X11/locale/C/XLC_LOCALE		444
+ }
+ 
+ array set FilePermsBin {
+ 	bin/SuperProbe.exe			755
+ 	bin/bitmap.exe				755
+ 	bin/mkfontdir.exe			755
+ 	bin/twm.exe				755
+ 	bin/xdpyinfo.exe			755
+ 	bin/xinit.exe				755
+ 	bin/xset.exe				755
+ 	bin/xterm.exe				755
+ }
+ 
+ array set FilePermsVidTune {
+ 	bin/xvidtune.exe			755
+ 	lib/X11/app-defaults/Xvidtune		444
+ }
+ 
+ array set FilePermsXKB {
+ 	bin/xkbcomp.exe				755
+ 	lib/X11/xkb/xkbcomp.exe			755
+ 	lib/X11/xkb/compat/default		444
+ 	lib/X11/xkb/compiled/README		444
+ 	lib/X11/xkb/geometry/pc			444
+ 	lib/X11/xkb/keycodes/xfree86		444
+ 	lib/X11/xkb/keymap/xfree86		444
+ 	lib/X11/xkb/semantics/default		444
+ 	lib/X11/xkb/symbols/us			444
+ 	lib/X11/xkb/types/default		444
+ 	lib/X11/xkb/rules/xfree86		444
+ 	lib/X11/xkb/rules/xfree86.lst		444
+ }
+ 
+ array set FilePermsReadMe {
+ 	lib/X11/doc/README.Oak			444
+ 	lib/X11/doc/README.ati			444
+ 	lib/X11/doc/README.trident		444
+ 	lib/X11/doc/README.agx			444
+ 	lib/X11/doc/README.Mach64		444
+ 	lib/X11/doc/README.P9000		444
+ 	lib/X11/doc/README.S3			444
+ 	lib/X11/doc/README.W32			444
+ }
+ 
*** xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile:1.1	1996/10/25 02:07:55
--- xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile	1996/10/25 02:10:18
***************
*** 22,31 ****
              OBJS = main.o tclmisc.o tclvidmode.o tclcards.o tclother.o \
  		   tclkbd.o tclxfconf.o xf86Config.o cards.o tclxkbui.o \
  		   tkother.o
         TCL_FILES = phase1.tcl phase2.tcl phase3.tcl phase4.tcl phase5.tcl \
  		   setuplib.tcl srvflags.tcl carddata.tcl \
  		   card.tcl done.tcl filelist.tcl keyboard.tcl \
! 		   mondata.tcl monitor.tcl mouse.tcl LICENSE
      TCLLIB_FILES = tcllib/button.tcl tcllib/combobox.tcl tcllib/misc.tcl \
  		   tcllib/downarrow.xbm tcllib/dialog.tcl tcllib/entry.tcl \
  		   tcllib/focus.tcl tcllib/init.tcl tcllib/listbox.tcl \
--- 22,35 ----
              OBJS = main.o tclmisc.o tclvidmode.o tclcards.o tclother.o \
  		   tclkbd.o tclxfconf.o xf86Config.o cards.o tclxkbui.o \
  		   tkother.o
+ #ifdef OS2Architecture
+     OS2_TCLFILES=  filelistos2.tcl
+ #endif
         TCL_FILES = phase1.tcl phase2.tcl phase3.tcl phase4.tcl phase5.tcl \
  		   setuplib.tcl srvflags.tcl carddata.tcl \
  		   card.tcl done.tcl filelist.tcl keyboard.tcl \
! 		   mondata.tcl monitor.tcl mouse.tcl LICENSE \
! 		   $(OS2_TCLFILES)
      TCLLIB_FILES = tcllib/button.tcl tcllib/combobox.tcl tcllib/misc.tcl \
  		   tcllib/downarrow.xbm tcllib/dialog.tcl tcllib/entry.tcl \
  		   tcllib/focus.tcl tcllib/init.tcl tcllib/listbox.tcl \
***************
*** 74,80 ****
   XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
  		   $(XCONFIG_DEFINES)
!         INCLUDES = -I$(TCLINCDIR) -I../os-support -I../common \
  		   -I$(SERVERSRC)/include -I$(INCLUDESRC) \
  		   -I$(EXTINCSRC) $(USEINSTALLEDINC)
  
--- 78,84 ----
   XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
  		   $(XCONFIG_DEFINES)
!         INCLUDES = -I$(TCLINCDIR) -I$(TKINCDIR) -I../os-support -I../common \
  		   -I$(SERVERSRC)/include -I$(INCLUDESRC) \
  		   -I$(EXTINCSRC) $(USEINSTALLEDINC)
  
*** xc/programs/Xserver/hw/xfree86/XF86Setup/main.c:1.1	1996/10/25 02:08:04
--- xc/programs/Xserver/hw/xfree86/XF86Setup/main.c	1996/10/25 02:10:20
***************
*** 73,78 ****
--- 73,79 ----
  #endif
  
  static char Set_InitVars[] =
+ #ifndef __EMX__
  	"if [info exists env(XWINHOME)] {\n"
  	"    set Xwinhome $env(XWINHOME)\n"
  	"} else {\n"
***************
*** 93,98 ****
--- 94,110 ----
  	"    }\n"
  	"    unset xdirs dir\n"
  	"}\n"
+ #else
+ 	"if [info exists env(X11ROOT)] {\n"
+ 	"    set Xwinhome \"$env(X11ROOT)/XFree86\"\n"
+ 	"}\n"
+ 	"    if ![info exists Xwinhome] {\n"
+ 	"        error \"Couldn't determine where you have XFree86 installed.\\n"
+ 		"If you have XFree86 properly installed, set the "
+ 		"X11ROOT environment\\n variable to point to the "
+ 		"XFree86 root directory.\\n\"\n"
+ 	"    }\n"
+ #endif
  	"if [info exists env(XF86SETUPLIB)] {\n"
  	"    set XF86Setup_library $env(XF86SETUPLIB)\n"
  	"} else {\n"
*** xc/programs/Xserver/hw/xfree86/XF86Setup/phase1.tcl:1.1	1996/10/25 02:08:07
--- xc/programs/Xserver/hw/xfree86/XF86Setup/phase1.tcl	1996/10/26 19:29:30
***************
*** 1,4 ****
! # $XFree86: xc/programs/Xserver/hw/xfree86/XF86Setup/phase1.tcl,v 3.11 1996/09/03 06:48:28 dawes Exp $
  #
  # Copyright 1996 by Joseph V. Moss <joe@XFree86.Org>
  #
--- 1,4 ----
! # $XFree86: xc/programs/Xserver/hw/xfree86/XF86Setup/phase1.tcl,v 3.12 1996/10/26 09:35:24 dawes Exp $
  #
  # Copyright 1996 by Joseph V. Moss <joe@XFree86.Org>
  #
***************
*** 9,14 ****
--- 9,19 ----
  #
  # Phase I - Initial text mode interaction w/user and starting of VGA16 server
  #
+ if {$tcl_platform(platform) == "os2"} {
+ 	set is_os2 1
+ } else {
+ 	set is_os2 0
+ }
  
  set clicks1 [clock clicks]
  
***************
*** 16,22 ****
  source $tcl_library/init.tcl
  # load in our library
  source $XF86Setup_library/setuplib.tcl
! source $XF86Setup_library/filelist.tcl
  source $XF86Setup_library/carddata.tcl
  source $XF86Setup_library/mondata.tcl
  
--- 21,31 ----
  source $tcl_library/init.tcl
  # load in our library
  source $XF86Setup_library/setuplib.tcl
! if { is_os2 } {
! 	source $XF86Setup_library/filelistos2.tcl
! } else {
! 	source $XF86Setup_library/filelist.tcl
! }
  source $XF86Setup_library/carddata.tcl
  source $XF86Setup_library/mondata.tcl
  
***************
*** 155,161 ****
  		    [lsearch -exact $ServerList [set $varname]] < 0} {
  		set filename $Xwinhome/bin/X
  		for {set nlinks 0} \
! 			{[file type $filename]=="link" && $nlinks<20} \
  			{incr nlinks} {
  		    set filename [readlink $filename]
  		}
--- 164,171 ----
  		    [lsearch -exact $ServerList [set $varname]] < 0} {
  		set filename $Xwinhome/bin/X
  		for {set nlinks 0} \
! 			{[file exists $filename] && \
! 			 [file type $filename]=="link" && $nlinks<20} \
  			{incr nlinks} {
  		    set filename [readlink $filename]
  		}
*** xc/programs/Xserver/hw/xfree86/XF86Setup/tclother.c:1.1	1996/10/25 02:08:08
--- xc/programs/Xserver/hw/xfree86/XF86Setup/tclother.c	1996/10/25 02:10:20
***************
*** 357,363 ****
  		Tcl_SetResult(interp, "Usage: link <oldfilename> <newfilename>", TCL_STATIC);
  		return TCL_ERROR;
  	}
! 
  #ifdef S_IFLNK
  	if (symlink(argv[1], argv[2]) == -1)
  #else
--- 357,366 ----
  		Tcl_SetResult(interp, "Usage: link <oldfilename> <newfilename>", TCL_STATIC);
  		return TCL_ERROR;
  	}
! #ifdef __EMX__
! 	Tcl_SetResult(interp, "OS/2 has no links", TCL_STATIC);
! 	return TCL_ERROR;
! #else
  #ifdef S_IFLNK
  	if (symlink(argv[1], argv[2]) == -1)
  #else
***************
*** 367,372 ****
--- 370,376 ----
  	else
  		Tcl_SetResult(interp, "1", TCL_STATIC);
  	return TCL_OK;
+ #endif
  }
  
  /*
*** xc/programs/Xserver/S3V.def:1.1	1996/10/26 18:54:19
--- xc/programs/Xserver/S3V.def	1996/10/26 18:54:32
***************
*** 1,4 ****
  NAME XF86_S3V NOTWINDOWCOMPAT
! DESCRIPTION "X11R6 XFree86 3.1.2 Xserver S3V EMX09B"
  PROTMODE
  EXETYPE OS2
--- 1,4 ----
  NAME XF86_S3V NOTWINDOWCOMPAT
! DESCRIPTION "X11R6 XFree86 3.2 Xserver S3V EMX09C"
  PROTMODE
  EXETYPE OS2
*** xc/programs/Xserver/TGA.def:1.1	1996/10/26 18:54:42
--- xc/programs/Xserver/TGA.def	1996/10/26 18:54:54
***************
*** 1,4 ****
  NAME XF86_TGA NOTWINDOWCOMPAT
! DESCRIPTION "X11R6.1 XFree86 3.2 Xserver TGA EMX09B"
  PROTMODE
  EXETYPE OS2
--- 1,4 ----
  NAME XF86_TGA NOTWINDOWCOMPAT
! DESCRIPTION "X11R6 XFree86 3.2 Xserver TGA EMX09C"
  PROTMODE
  EXETYPE OS2
