Remove support for Ultrix. (#28)

Ultrix hasn't seen an update since 1995 and the DEC3100 hardware that this was originally written for was released in 1989. It isn't likely that anyone has Ultrix running on hardware where they would also want to run this.
2026-03-05 10:44:07 +00:00 · 2020-12-13 09:15:22 +07:00
parent 348a3a2b30
commit 1c28005420
8 changed files with 10 additions and 218 deletions
--- a/bin/makedecright
+++ b/bin/makedecright
@@ -1,120 +0,0 @@
-# makeright
-#  @(#) makeright Version 1.12 (7/18/90). 
-##***********************************************************************/
-##									*/
-##	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
-##									*/
-##	This file is work-product resulting from the Xerox/Venue	*/
-##	Agreement dated 18-August-1989 for support of Medley.		*/
-##									*/
-##***********************************************************************/
-#
-# Feb. 6 1990 osamu: Add display option
-#		     release option does not support yet.
-# Apr.23 1990 osamu: add release option.
-#
-# Jul 18 1990 JDS:  Add 'init' option for making init-loading emulators
-#
-# usage:  makeright [display-option] [other-option]
-# 
-# example: makeright single	;  make lde for mmaped displayFB
-#	   makeright multi	;  make lde for cg3,cg6
-#	   makeright x		;  make lde for X-windows
-#	   makeright color	;  make lde with color support in it.
-#	   makeright multi release ; make release version of lde for cg3,cg6
-#	   makeright init	;  make lde for loading INIT.DLINIT b/w only
-#
-# makeright multi requires directory "maiko/${osversion}.${architecture}-multi"
-# (ex. maiko/sunos4.sparc-multi)
-# object files are stored there.
-#
-# makeright init  requires directory "maiko/init.${architecture}
-#
-# Note: X11R4 environment link shared libraries. 
-#	lde need X library. If lde links shared libraries, 
-#	X shared libraries are needed at run time.
-#
-# Hide X shared libraries from link libraries search path.
-setenv	LD_LIBRARY_PATH	/usr/local/lib 
-set	RELDIR = ../RELEASE/
-
-if($1 == "") then
-	set display=single
-else
-	if($1 == "release") then
- 		switch($2)
-		case single:
-			set display = single
-			breaksw
-		case multi:
-			set display = multi
-			breaksw
-		case x:
-			set display = x
-			breaksw
-		default:
-			makeright single release
-			makeright multi release
-			makeright x	release
-			exit
-			breaksw
-		endsw
-	else
-		set display=$1
-	endif
-endif
-
-if( $#argv > 0 ) then
-	shift
-endif 
-
-set architecture = dec3100
-set osversion = ultrix
-switch($display)
-	case init:
-		set display = single
-		set releasename = init.${architecture}
-		set ldename = ldeinit
-		breaksw
-	case single:	
-		set releasename = ${osversion}.${architecture}
-		set ldename = ldesingle
-		breaksw
-	case multi:	
-		set releasename = ${osversion}.${architecture}-${display}
-		set ldename = ldemulti
-		breaksw
-	case x:
-		set releasename = ${osversion}.${architecture}-${display}
-		set ldename = ldex
-		breaksw
-	default:	
-		echo "display-option: $display is not supported."
-		exit
-		breaksw
-endsw
-set releaseflg = 0
-if( "$1" == "release" ) then
-	set releaseflg = 1
-	if($display != single) then
-		if( !(-e usermakefile-${releasename})) then
-			ln usermakefile-${osversion}.${architecture} usermakefile-${releasename}
-		endif
-	endif
-else
-	set releaseflg = 0
-endif
-set installdir = ${RELDIR}install.${osversion}.${architecture}/
-
-#if($display == single ) then
-#	set releasename = ${osversion}.${architecture}
-#else
-#	set releasename = ${osversion}.${architecture}-${display}
-#endif
-echo start making lde for ${releasename}.
-# then finally do the make, including the right stuff
-# With makefile-tail merged, this should only take ONE make command....
-make RELEASENAME=${releasename} INSDIR=${installdir} LDENAME=${ldename} \
-			OSARCHNAME=${osversion}.${architecture} \
-			-f makefile-header -f makefile-${releasename} \
-			-f makefile-tail $*
--- a/bin/makefile-osf1.dec-x
+++ b/bin/makefile-osf1.dec-x
@@ -1,4 +1,4 @@
-# Options for Ultrix, DECStation 3100, and X-Window
+# Options for OSF1, DECStation 3100, and X-Window


 CC = cc
--- a/bin/makefile-riscos.mips-x
+++ b/bin/makefile-riscos.mips-x
@@ -1,4 +1,4 @@
-# Options for Ultrix, RISCStation, and X-Window
+# Options for RISCOS, and X-Window


 # CC = gcc
--- a/bin/makefile-ultrix.dec3100-x
+++ b/bin/makefile-ultrix.dec3100-x
@@ -1,67 +0,0 @@
-# Options for Ultrix, DECStation 3100, and X-Window
-
-
-CC = cc
-
-XFILES = $(OBJECTDIR)XClose.o \
-	$(OBJECTDIR)Cursor.o \
-	$(OBJECTDIR)XWindow.o \
-	$(OBJECTDIR)DoRing.o \
-	$(OBJECTDIR)DoScroll.o \
-	$(OBJECTDIR)XEvent.o \
-	$(OBJECTDIR)XGravity.o \
-	$(OBJECTDIR)XInit.o \
-	$(OBJECTDIR)Xevinit.o \
-	$(OBJECTDIR)Xkbdmus.o \
-	$(OBJECTDIR)Xlspwin.o \
-        $(OBJECTDIR)Xbbt.o \
-	$(OBJECTDIR)Xkbd.o \
-	$(OBJECTDIR)Xmkicon.o \
-	$(OBJECTDIR)Xopendsp.o \
-	$(OBJECTDIR)Xrdopt.o \
-	$(OBJECTDIR)Xreconf.o \
-	$(OBJECTDIR)XScroll.o \
-	$(OBJECTDIR)Xscrolb.o \
-	$(OBJECTDIR)XCursor.o \
-	$(OBJECTDIR)XMouse.o \
-	$(OBJECTDIR)Xsubwin.o \
-	$(OBJECTDIR)Xcolor.o \
-	$(OBJECTDIR)Xwinman.o  
-
-BYTESWAPFILES = $(OBJECTDIR)byteswap.o
-
-XVERSION = XV11R4
-XFLAGS = -DXWINDOW -D$(XVERSION)
-
-# This is to make the %$#@! Apollo cc happy
-OEXT = .o
-# OPTFLAGS is normally -O2.
-OPTFLAGS = -O2 -Olimit 999
-DISPOPTFLAGS = -O2 -Olimit 999
-FPFLAGS =
-DFLAGS = -DFSERROR -DNEW_STORAGE -DAIX -DOLD_CURSOR -DNOPIXRECT -DBYTESWAP \
-DFORKCOMM -DLOGINT -DSYS5 -DDEC3100 -DNOFORN -DNOETHER -DBIGATOMS $(XFLAGS)  
-LDFLAGS = -lX11 -lc -lm
-LDELDFLAGS = -lX11 -lc -lm
-# -Dsparc?
-INLINE = 
-
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
-
-# Special rules to create xc.c on Sun4
-
-#run cpp to expand macros
-$(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
-	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
-	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
-	 $(INCDIR)arith.h $(INCDIR)stream.h \
-	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
-	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
-	 $(INCDIR)inln68k.h
-	$(CC) -c   $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o  $(OBJECTDIR)xc.o
-
-
--- a/inc/medleyfp.h
+++ b/inc/medleyfp.h
@@ -20,10 +20,6 @@
 #include <i32.h>
 #endif /* DOS */

-#ifdef ULTRIX
-#include <ieeefp.h>
-#endif /* ULTRIX */
-
 #ifdef RISCOS
 /*#include <ieeefp.h> */
 /*#define isnan isnand */
--- a/inc/os.h
+++ b/inc/os.h
@@ -113,12 +113,6 @@
 #define bcopy(a,b,n)	memcpy(b,a,n)
 #endif

-#ifdef ULTRIX
-#ifndef USE_PFILT
-#define USE_PFILT	1
-#endif
-#endif
-
 #ifdef DECOSF
 #ifndef USE_PFILT
 #define USE_PFILT	1
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -115,9 +115,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #include "commondefs.h"
 #include "ufsdefs.h"

-#if defined(ULTRIX) || defined(MACOSX) || defined(FREEBSD)
-#include <sys/mount.h>
-#elif OSF1
+#if defined(OSF1) || defined(MACOSX) || defined(FREEBSD)
 #include <sys/mount.h>
 #else
 #ifdef AIX
@@ -132,7 +130,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #define d_fileno d_ino
 #endif /* AIX */

-#endif /* ULTRIX */
+#endif /* OSF1 | MACOSX | FREEBSD */

 #ifdef GCC386
 #include "inlnPS2.h"
@@ -2355,9 +2353,7 @@ LispPTR COM_getfreeblock(register LispPTR *args)
  char lfname[MAXPATHLEN + 5], dir[MAXPATHLEN], host[MAXNAMLEN];
  char name[MAXNAMLEN + 1], file[MAXPATHLEN], ver[VERSIONLEN];
  char drive[2];
-#ifdef ULTRIX
-  struct fs_data sfsbuf;
-#elif defined(OS5)
+#if defined(OS5)
  struct statvfs sfsbuf;
 #else
 #ifndef AIXPS2
@@ -2366,7 +2362,7 @@ LispPTR COM_getfreeblock(register LispPTR *args)
 #endif /* DOS */
 #endif /* AIXPS2 */

-#endif /* ULTRIX */
+#endif /* OS5 */
 #ifdef DOS
  struct diskfree_t sfsbuf;
 #endif /* DOS */
@@ -2435,10 +2431,7 @@ LispPTR COM_getfreeblock(register LispPTR *args)
    *buf = sfsbuf.avail_clusters * sfsbuf.sectors_per_cluster * sfsbuf.bytes_per_sector;
  }
 #else
-#ifdef ULTRIX
-  TIMEOUT(rval = getmnt(0, &sfsbuf, 0, STAT_ONE, dir));
-  if (rval <= 0) {
-#elif OSF1
+#if OSF1
  TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs)));
  if (rval <= 0) {
 #elif defined(ISC)
@@ -2468,13 +2461,11 @@ LispPTR COM_getfreeblock(register LispPTR *args)
 #endif /* AIXPS2 */

  if (rval != 0) {
-#endif /* ULTRIX */
+#endif /* OSF1 */
    *Lisp_errno = errno;
    return (NIL);
  }
-#ifdef ULTRIX
-  *buf = sfsbuf.fd_req.bfree;
-#elif defined(RS6000)
+#if defined(RS6000)
  *buf = (sfsbuf.f_bavail) * 4; /* AIX 3.1 returns no. of 4K blocks */
 #elif defined(ISC)
  *buf = (sfsbuf.f_bfree) / 2; /* ISC claims 1K blocks, but it's really 512b */
@@ -2484,7 +2475,7 @@ LispPTR COM_getfreeblock(register LispPTR *args)
  *buf = sfsbuf.f_bavail;
 #else
  *buf = 200000; /* FAKE - pretend we have 200,000 blocks free! */
-#endif /* ULTRIX */
+#endif /* RS6000 */
 #endif /* DOS */
  return (ATOM_T);
 }
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -42,7 +42,6 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig
 #include <sys/select.h>

 #ifndef HPUX
-#ifndef ULTRIX
 #ifndef LINUX
 #ifndef MACOSX
 #ifndef FREEBSD
@@ -50,7 +49,6 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig
 #endif /* FREEBSD */
 #endif /* MACOSX */
 #endif /* LINUX */
-#endif /* ULTRIX */
 #endif /* HPUX */

 #ifdef ISC