* Strongly buildlinkify to handle readline wierdness.

* Don't declare a bunch of extern functions that are already declared by
  system headers on NetBSD.
  XXX This change may be incorrect for non-current systems.

2 files changed, 63 insertions, 42 deletions

diff --git a/cad/spice/patches/patch-ac b/cad/spice/patches/patch-ac
index 0c68b1a2e17..b89f65d722a 100644
--- a/cad/spice/patches/patch-ac
+++ b/cad/spice/patches/patch-ac
@@ -1,33 +1,44 @@
-$NetBSD: patch-ac,v 1.3 1999/10/01 17:05:15 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2002/02/27 17:14:28 jlam Exp $
 
-*** 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;
-+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
-  extern char *sys_errlist[];
-+ #endif
-  extern char *getenv();
-  extern char *getwd();
-  extern int rand();
-***************
-*** 111,122 ****
---- 111,124 ----
-  #    endif /* clearerr */
-  #  endif /* HAS_CLEARERR */
-  
-+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
-  #  ifndef bzero
-  extern int bzero();
-  #  endif
-  #  ifndef bcopy
-  extern void bcopy();
-  #  endif
-+ #endif /* defined(__FreeBSD__) || defined(__NetBSD__) */
-  
-  #  ifndef index
-  #    ifdef HAS_INDEX
+--- src/include/misc.h.orig	Sun Apr 25 17:37:48 1993
++++ src/include/misc.h
+@@ -86,7 +86,9 @@
+ extern char *realloc();
+ extern char *getenv();
+ extern int errno;
++#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ extern char *sys_errlist[];
++#endif
+ extern char *getenv();
+ extern char *getwd();
+ extern int rand();
+@@ -109,12 +111,14 @@
+ #    endif /* clearerr */
+ #  endif /* HAS_CLEARERR */
+ 
++#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ #  ifndef bzero
+ extern int bzero();
+ #  endif
+ #  ifndef bcopy
+ extern void bcopy();
+ #  endif
++#endif /* defined(__FreeBSD__) || defined(__NetBSD__) */
+ 
+ #  ifndef index
+ #    ifdef HAS_INDEX
+@@ -144,12 +148,14 @@
+ extern void perror();
+ #endif
+ 
++#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ #ifdef HAS_TIME_
+ #  ifdef HAS_BSDTIME
+ extern char *timezone();
+ #  endif
+ extern char *asctime();
+ extern struct tm *localtime();
++#endif
+ #endif
+ 
+ #ifndef HAS_MEMAVL
diff --git a/cad/spice/patches/patch-ag b/cad/spice/patches/patch-ag
index 025de107519..21b452c9208 100644
--- a/cad/spice/patches/patch-ag
+++ b/cad/spice/patches/patch-ag
@@ -1,20 +1,23 @@
-$NetBSD: patch-ag,v 1.1 1999/10/01 17:05:15 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2002/02/27 17:14:28 jlam Exp $
 
 --- conf/defaults.orig	Thu Jul 29 17:33:56 1993
-+++ conf/defaults	Wed Sep 29 21:30:44 1999
-@@ -66,5 +66,5 @@
++++ conf/defaults
+@@ -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
-@@ -106,10 +106,10 @@
+ #	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_DIR	= @PREFIX@
 +SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
  
@@ -23,7 +26,9 @@ $NetBSD: patch-ag,v 1.1 1999/10/01 17:05:15 dmcmahill Exp $
 +S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  
-@@ -130,9 +130,9 @@
+ #	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
@@ -35,17 +40,22 @@ $NetBSD: patch-ag,v 1.1 1999/10/01 17:05:15 dmcmahill Exp $
 +CC_OPT		= -O2 -pipe
  
  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
-@@ -204,5 +204,5 @@
+ #	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}
++X_DIR		= @BUILDLINK_X11_DIR@
  
  #	INCX lists the X include directories.  This may be different between
-@@ -219,5 +219,5 @@
+ #	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 -Wl,-R$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11
++LIBX		= -L$(X_DIR)/lib -Wl,-R@X11BASE@/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11
+