1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-04 22:33:27 +00:00
freebsd-ports/cad/spice/files/patch-aa
Thomas Gellekum 32b8c8be6c Use the original version from EECS, not the patched linux stuff.
Closes PR 2254.

Submitted by: Julian Jenkins <kaveman@magna.com.au>
1996-12-23 07:26:19 +00:00

179 lines
5.1 KiB
Plaintext

*** 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 = /usr/X11R6
# 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