From a521884136f7621f31488baa82262bf5816467c1 Mon Sep 17 00:00:00 2001
From: jtb <jtb>
Date: Fri, 19 Jan 2001 23:24:33 +0000
Subject: Updated xcircuit to version 2.2.0. The schematic capture code is now
 considered stable. Xcircuit now has the ability to pass parameters to
 objects. For the moment, this only works with string parameters. Integral
 parameters will be added in upcoming versions.

---
 cad/xcircuit/patches/patch-aa | 27 +++++++++++++++++----------
 cad/xcircuit/patches/patch-ab | 11 +++++------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'cad/xcircuit/patches')

diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index cb79e6e3c50..cea45cf3b81 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/19 23:24:34 jtb Exp $
 
---- Imakefile.orig	Tue Oct  3 11:33:52 2000
-+++ Imakefile	Thu Nov  2 08:22:31 2000
-@@ -29,6 +29,6 @@
+--- Imakefile.orig	Tue Dec 19 18:43:58 2000
++++ Imakefile
+@@ -28,15 +28,15 @@
+ #CCOPTIONS = -O2
  #
  # for debugging purposes uncomment the following line:
 -CDEBUGFLAGS = -g
@@ -11,23 +12,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $
 +STD_INCLUDES = -I. -I${X11BASE}/include -I${LOCALBASE}/include
  
  #------------------------------------------------------------------------
-@@ -37,5 +37,5 @@
+ # Installation directories:
+ # Change the following as desired to suit your environment:
  #------------------------------------------------------------------------
  #
 -PREFIX = /usr/local
 +# PREFIX = /usr/local
- # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b5/psfiles
- XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.1
-@@ -59,5 +59,5 @@
+ # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.2.0/psfiles
+ XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.2
+ XCIRCUIT_BIN_DIR = $(PREFIX)/bin
+@@ -58,7 +58,7 @@
+ # Support for background rendering through ghostscript.  Change this
  # to the path where gs can be found.
  # GS_EXEC= /usr/local/src/gs5.50/obj/gs
 -GS_EXEC= /usr/bin/gs
-+GS_EXEC= ${LOCALBASE}/bin/gs
++GS_EXEC= ${GS_PREFIX}/bin/gs
  
  #------------------------------------------------------------------------
-@@ -186,4 +186,5 @@
+ # Window manager bug workaround---If you don't like xcircuit grabbing kbd
+@@ -186,6 +186,7 @@
+    MakeNsubdirMakefiles()
  #endif
  
 +MakefileSubdirs(Xw)
  MakeMakeSubdirs(Xw,libxcXw.a)
  MakeSubdirs(Xw)
+ DependSubdirs(Xw)
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index ec8265f769b..ab129b4cf53 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2001/01/19 23:24:34 jtb Exp $
 
-use the 'standard' netbsd config rather than overriding CC.
-
---- Xw/Imakefile.orig	Thu Aug  3 16:10:52 2000
-+++ Xw/Imakefile	Thu Nov  2 08:32:51 2000
-@@ -1,4 +1,4 @@
+--- Xw/Imakefile.orig	Thu Aug  3 20:10:52 2000
++++ Xw/Imakefile
+@@ -1,5 +1,5 @@
  # Compile flags
 -CC = cc
 +#CC = cc
  # If you wish to compile with gcc:
  #CC = gcc
+ 
-- 
cgit v1.2.3