summaryrefslogtreecommitdiff
path: root/cad/spice/files/patch-aa
blob: 36d04d4a4708eb122f6d61331cd0025cb36b2dd6 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
*** conf/defaults.orig	Thu Jul 29 23:33:56 1993
--- conf/defaults	Sat Dec 21 14:15:35 1996
***************
*** 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/spice
  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
  
  S_SPICE_DIR	= $(SPICE_DIR)
! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  
  #	INSTALL_DIRS lists the directories that need to be created before
***************
*** 129,135 ****
  #	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)
  
--- 129,135 ----
  #	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)
  
***************
*** 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
***************
*** 282,288 ****
  #	code for either or both MFB (a terminal independent graphics
  #	interface) or X11.
  
! INTERFACE_OPTS	= -DWANT_MFB -DWANT_X11
  
  #	BUGADDR is the e-mail address to send bug reports.  If left blank
  #	the "bug" command in spice will not operate.
--- 282,288 ----
  #	code for either or both MFB (a terminal independent graphics
  #	interface) or X11.
  
! INTERFACE_OPTS	= -DWANT_X11
  
  #	BUGADDR is the e-mail address to send bug reports.  If left blank
  #	the "bug" command in spice will not operate.
***************
*** 292,298 ****
  #	DEFAULT_EDITOR lists where the default editor used by the "edit"
  #	command is located.
  
! DEFAULT_EDITOR	= vi
  
  #	ASCII_RAWFILE indicates that the default format of the spice3 raw data
  #	file should be in human-readable format ( = 1 ) or in the smaller,
--- 292,298 ----
  #	DEFAULT_EDITOR lists where the default editor used by the "edit"
  #	command is located.
  
! DEFAULT_EDITOR	= /usr/bin/vi
  
  #	ASCII_RAWFILE indicates that the default format of the spice3 raw data
  #	file should be in human-readable format ( = 1 ) or in the smaller,
*** util/build.orig	Sun Mar 31 10:56:09 1996
--- util/build	Sun Mar 31 10:57:21 1996
***************
*** 96,102 ****
  
  TMP_LEADER="${TMP_DIR}/buildl$$"
  TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15
  echo > "${TMP_TRAILER}"
  BAD=false
  DEBUG=
--- 96,102 ----
  
  TMP_LEADER="${TMP_DIR}/buildl$$"
  TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15
  echo > "${TMP_TRAILER}"
  BAD=false
  DEBUG=
*** src/lib/fte/resource.c.orig	Sun Mar 31 10:59:57 1996
--- src/lib/fte/resource.c	Sun Mar 31 11:00:57 1996
***************
*** 369,375 ****
--- 369,377 ----
  	long x;
  	SIGNAL_TYPE	(*orig_signal)( );
  
+ #ifndef __FreeBSD__
  	if (getenv("SPICE_NO_DATASEG_CHECK"))
+ #endif
  		return 0;
  
  	low = 0;
*** src/include/misc.h.orig	Thu Dec  1 09:17:02 1994
--- src/include/misc.h	Sun Mar 31 12:32:58 1996
***************
*** 86,92 ****
--- 86,94 ----
  extern char *realloc();
  extern char *getenv();
  extern int errno;
+ #ifndef __FreeBSD__
  extern char *sys_errlist[];
+ #endif
  extern char *getenv();
  extern char *getwd();
  extern int rand();
***************
*** 111,122 ****
--- 111,124 ----
  #    endif /* clearerr */
  #  endif /* HAS_CLEARERR */
  
+ #ifndef __FreeBSD__
  #  ifndef bzero
  extern int bzero();
  #  endif
  #  ifndef bcopy
  extern void bcopy();
  #  endif
+ #endif /* __FreeBSD__ */
  
  #  ifndef index
  #    ifdef HAS_INDEX