Make it compile/work on NetBSD/pmax.

2 files changed, 62 insertions, 89 deletions

diff --git a/cad/spice/patches/patch-aa b/cad/spice/patches/patch-aa
index e97e93e4de3..4522ed2a31b 100644
--- a/cad/spice/patches/patch-aa
+++ b/cad/spice/patches/patch-aa
@@ -1,93 +1,5 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:28 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/01/15 20:13:24 frueauf Exp $
 
-*** conf/defaults.orig	Thu Jul 29 16:33:56 1993
---- conf/defaults	Sat Jun  6 23:40:14 1998
-***************
-*** 65,71 ****
-  #	the following definition:
-  #		SYS_DIR		= $(DIST_DIR)
-  
-! SYS_DIR		= $(TOP1)/$(SYSTEM)
-  
-  #	OBJ_TOP is the directory in which intermidiate files reside
-  #	These are ".o" files, synthesized ".c" files, ".a" files,
---- 65,71 ----
-  #	the following definition:
-  #		SYS_DIR		= $(DIST_DIR)
-  
-! SYS_DIR		= $(TOP0)/$(SYSTEM)
-  
-  #	OBJ_TOP is the directory in which intermidiate files reside
-  #	These are ".o" files, synthesized ".c" files, ".a" files,
-***************
-*** 105,116 ****
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed on the "build" command line.
-  
-! SPICE_DIR	= $(TOP1)/$(SYSTEM)
-! SPICE_LIB_DIR	= $(SPICE_DIR)/lib
-  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
-  
-  S_SPICE_DIR	= $(SPICE_DIR)
-! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
-  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
---- 105,116 ----
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed on the "build" command line.
-  
-! SPICE_DIR	= ${PREFIX}
-! SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
-  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
-  
-  S_SPICE_DIR	= $(SPICE_DIR)
-! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
-  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
-***************
-*** 129,139 ****
-  #	an extra definition to work around the same strange bug.  See either
-  #	file "conf/vax" or "conf/gcc".
-  
-! CC		= cc
-  
-  #	CC_OPT: Default compile options (optimization/debug level, other)
-  
-! CC_OPT		= -O
-  
-  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
-  #	which typically causes problems for most compilers (bsim1 and bsim2).
---- 129,139 ----
-  #	an extra definition to work around the same strange bug.  See either
-  #	file "conf/vax" or "conf/gcc".
-  
-! CC		= gcc
-  
-  #	CC_OPT: Default compile options (optimization/debug level, other)
-  
-! CC_OPT		= -O2 -pipe
-  
-  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
-  #	which typically causes problems for most compilers (bsim1 and bsim2).
-***************
-*** 203,209 ****
-  #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
-  #	a convenience that is used in the following definitions.
-  
-! X_DIR		= /usr
-  
-  #	INCX lists the X include directories.  This may be different between
-  #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
---- 203,209 ----
-  #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
-  #	a convenience that is used in the following definitions.
-  
-! X_DIR		= ${X11BASE}
-  
-  #	INCX lists the X include directories.  This may be different between
-  #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
 *** util/build.orig	Sun Mar 31 10:56:09 1996
 --- util/build	Sun Mar 31 10:57:21 1996
 ***************
diff --git a/cad/spice/patches/patch-ad b/cad/spice/patches/patch-ad
new file mode 100644
index 00000000000..9abd51c1f29
--- /dev/null
+++ b/cad/spice/patches/patch-ad
@@ -0,0 +1,61 @@
+$NetBSD: patch-ad,v 1.1 1999/01/15 20:13:25 frueauf Exp $
+
+--- conf/defaults.orig	Thu Jul 29 23:33:56 1993
++++ conf/defaults	Fri Jan 15 19:10:03 1999
+@@ -65,7 +65,7 @@
+ #	the following definition:
+ #		SYS_DIR		= $(DIST_DIR)
+ 
+-SYS_DIR		= $(TOP1)/$(SYSTEM)
++SYS_DIR		= $(TOP0)/$(SYSTEM)
+ 
+ #	OBJ_TOP is the directory in which intermidiate files reside
+ #	These are ".o" files, synthesized ".c" files, ".a" files,
+@@ -105,12 +105,12 @@
+ #	identified as and SYSTEM is the name of the per-system definitions
+ #	file listed on the "build" command line.
+ 
+-SPICE_DIR	= $(TOP1)/$(SYSTEM)
+-SPICE_LIB_DIR	= $(SPICE_DIR)/lib
++SPICE_DIR	= ${PREFIX}
++SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
+ SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
+ 
+ S_SPICE_DIR	= $(SPICE_DIR)
+-S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
++S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
+ S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
+ 
+ #	INSTALL_DIRS lists the directories that need to be created before
+@@ -129,11 +129,11 @@
+ #	an extra definition to work around the same strange bug.  See either
+ #	file "conf/vax" or "conf/gcc".
+ 
+-CC		= cc
++CC		= gcc
+ 
+ #	CC_OPT: Default compile options (optimization/debug level, other)
+ 
+-CC_OPT		= -O
++CC_OPT		= -O2 -pipe
+ 
+ #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
+ #	which typically causes problems for most compilers (bsim1 and bsim2).
+@@ -203,7 +203,7 @@
+ #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
+ #	a convenience that is used in the following definitions.
+ 
+-X_DIR		= /usr
++X_DIR		= ${X11BASE}
+ 
+ #	INCX lists the X include directories.  This may be different between
+ #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
+@@ -218,7 +218,7 @@
+ #	which is not available with all versions of X11.  If you do not have
+ #	it, then you do not need it (delete the following reference to it).
+ 
+-LIBX		= -L$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lX11
++LIBX		= -L$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11
+ 
+ 
+