rsk@juniper.circ.upenn.edu (Rich Kulawiec) (01/31/91)
I've been bringing up X11R4 on a DS5000 under Ultrix 4.1. Here are the
changes I've made so far, which seem to be adequate to get it to build.
Big Caveat: I have everything under /X, because I'm trying to keep from
clobbering DEC's X stuff. Thus, /X/src/R4 is the top of my source tree,
/X/src/R4/mit is where the MIT stuff lives, /X/usr/{bin,lib,include}
is where the installed stuff goes, etc. I'll try to point out all spots
below where this comes into play.
But first, the question: has anyone gotten this to work? I've gotten
everything built and installed, but trying to run xinit (per section 2.9
of the X11R4 release notes) results in numerous "unaligned data access"
errors. I've since recompiled everything with the C compiler optimizer
disabled, but that has not fixed the problem. Does anybody have a clue
about this particular problem?
Thanks,
---Rsk
==========
./lib/Xt/IntrinsicI.h.ORIG -- One of the places where /X came into play
==========
155c155
< #define XFILESEARCHPATHDEFAULT "/X/usr/lib/X11/%L/%T/%N%S:/X/usr/lib/X11/%l/%T/%N%S:/X/usr/lib/X11/%T/%N%S"
---
> #define XFILESEARCHPATHDEFAULT "/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
168c168
< #define ERRORDB "/X/usr/lib/X11/XtErrorDB"
---
> #define ERRORDB "/usr/lib/X11/XtErrorDB"
==========
./lib/Xmu/Imakefile.ORIG -- deleted these lines to get it to imake
==========
119,120d118
< DEFINES = -DBITMAPDIR=\"$(INCDIR)/bitmaps\"
<
==========
./server/ddx/dec/cfbpmax/cfbpmax_io.c.ORIG -- DEC moved some headers
==========
34,35c34,35
< #include <io/tc/pmioctl.h>
< #include <io/tc//dc7085reg.h>
---
> #include <machine/pmioctl.h>
> #include <machine/dc7085cons.h>
==========
./server/ddx/dec/cfbpmax/cfbpmaxcolor.c.ORIG -- DEC moved some headers
==========
49,50c49,50
< #include <io/tc/pmioctl.h>
< #include <io/tc/dc7085reg.h>
---
> #include <machine/pmioctl.h>
> #include <machine/dc7085cons.h>
==========
./server/ddx/dec/mfbpmax/mfbpmax_io.c.ORIG -- DEC moved some headers
==========
34,35c34,35
< #include <io/tc/pmioctl.h>
< #include <io/tc/dc7085reg.h>
---
> #include <machine/pmioctl.h>
> #include <machine/dc7085cons.h>
==========
./server/ddx/dec/mfbpmax/init.c.ORIG -- DEC moved some headers
==========
30c30
< #include <io/tc/pmreg.h>
---
> #include <machine/pmreg.h>
==========
./clients/xterm/main.c.ORIG -- more DEC-related changes
==========
820c820
< stderr->_file = i;
---
> fileno(stderr) = i;
823c823
< stderr->_file = i;
---
> fileno(stderr) = i;
==========
./clients/xterm/misc.c.ORIG -- more DEC-related changes
==========
428,429c428,429
< dup2(stderr->_file), 1);
< dup2(stderr->_file), 2);
---
> dup2(fileno(stderr), 1);
> dup2(fileno(stderr), 2);
433,434c433,434
< close(stderr->_file);
< stderr->_file = 2;
---
> close(fileno(stderr));
> fileno(stderr) = 2;
==========
./clients/xterm/resize.c.ORIG -- more DEC-related changes
==========
253c253
< if ((name_of_tty = ttyname(stderr->_file)) == NULL)
---
> if ((name_of_tty = ttyname(fileno(stderr))) == NULL)
==========
./clients/twm/parse.c.ORIG -- More /X-related changes
==========
55c55
< #define SYSTEM_INIT_FILE "/X/usr/lib/X11/twm/system.twmrc"
---
> #define SYSTEM_INIT_FILE "/usr/lib/X11/twm/system.twmrc"
==========
./config/ultrix.cf.ORIG -- just updating a couple of fields
==========
5,6c5,6
< #define OSName Ultrix-32 4.1
< #define OSMajorVersion 4
---
> #define OSName Ultrix-32 3.1
> #define OSMajorVersion 3
==========
./config/site.def.ORIG -- the place where the toplevel directory was set.
==========
147,149d146
<
< #define DestDir /X
<