- updated to 6.08

Changed files:
    electric-datadir.patch -> 1.2
    electric-makefile.patch -> 1.2
    electric-tcl.patch -> 1.2

diff --git a/electric-datadir.patch b/electric-datadir.patch
index fd5f79e4ad1e4973c5d114f3004a3018ad2aa344..1d00ddff65ea4569d746b541a9cc3a819aa5b90d 100644 (file)
--- a/electric-datadir.patch
+++ b/electric-datadir.patch
@@ -1,12 +1,12 @@
 diff -durN electric-6.01.orig/src/include/config.h electric-6.01/src/include/config.h
 --- electric-6.01.orig/src/include/config.h    Sat Jul 15 17:29:26 2000
 +++ electric-6.01/src/include/config.h Thu Oct 12 18:36:34 2000
-@@ -93,7 +93,7 @@
- #  define DIRSEP           '/'                                                /* directory separator */
- #  define NONFILECH        '?'                                                /* character that cannot be in file name */
- #  define CADRCFILENAME    ".cadrc"                                   /* CAD startup file */
--#  define LIBDIR           "lib/"                                     /* location of library files */
-+#  define LIBDIR           "/usr/X11R6/share/electric/"                       /* location of library files */
- #  define ESIMLOC          "/usr/local/bin/esim"
- #  define RSIMLOC          "/usr/local/bin/rsim"
- #  define PRESIMLOC        "/usr/local/bin/presim"
+@@ -157,7 +157,7 @@
+ #    define SFLATDRCLOC      x_("/usr/local/bin/findshort")
+ #    define u_int64_t uint64_t
+ #  else
+-#    define LIBDIR           x_("/usr/share/electric/lib/")   /* location of library files */
++#    define LIBDIR           x_("/usr/share/electric/")       /* location of library files */
+ #    define DOCDIR           x_("/usr/share/electric/doc/html/")      /* location of HTML files */
+ #    define ESIMLOC          x_("/usr/bin/esim")
+ #    define RSIMLOC          x_("/usr/bin/rsim")

diff --git a/electric-makefile.patch b/electric-makefile.patch
index c114d261887f9842adfadc465d43fc37b9b9fbb8..695029b242a6dc73b829db561d59059e505a04c7 100644 (file)
--- a/electric-makefile.patch
+++ b/electric-makefile.patch
@@ -1,24 +1,25 @@
---- Makefile.in.orig   Sat Jun 15 01:01:30 2002
-+++ Makefile.in        Sun Aug 11 18:42:23 2002
-@@ -14,7 +14,7 @@
- GRAPH_LIBS = $(XTLIBS)
+diff -urN Makefile.in.orig Makefile.in
+--- Makefile.in.orig   2003-05-22 20:35:22.000000000 +0200
++++ Makefile.in        2003-11-03 10:00:11.000000000 +0100
+@@ -24,7 +24,7 @@
+ GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
  GRAPH_OBJS = $(GRAPH_OBJS_XT)
  GRAPH_SRC = $(GRAPH_SRC_XT)
 -CCOMPILER = @PTHREAD_CC@
 +CCOMPILER = gcc
  
- ##### For Motif/Lesstif widgets, uncomment these two lines
- TIFFLAGS = -DUSETIF
-@@ -701,10 +701,10 @@
+ ##### For the general-purpose X facility, uncomment this line
+ XPOWER = -DANYDEPTH
+@@ -795,10 +795,10 @@
  HDS = src/include
- CFLAGS = $(OPTIMIZE) $(GRAPH_FLAGS) $(ARCHFLAGS) -I$(HDS) \
-     $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(IRSIMCFLAGS) \
--    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) @PTHREAD_CFLAGS@
-+    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS)
- XCFLAGS = $(CFLAGS) $(TIFFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS)
- LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) \
--    $(GRAPH_LIBS) -lX11 -lm @X_EXTRA_LIBS@ $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_LIBS@
-+    $(GRAPH_LIBS) -lX11 -lm @X_EXTRA_LIBS@ $(LANGTCLLIBS) $(LANGJAVALIBS) -lpthread
+ CFLAGS = $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \
+     $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(SIMIRSIM_CFLAGS) \
+-    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@
++    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS)
+ XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS)
+ LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \
+-    $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++    $(LANGTCLLIBS) $(LANGJAVALIBS) -lpthread
  FIND = find
  INSTALL = install
  prefix = @prefix@

diff --git a/electric-tcl.patch b/electric-tcl.patch
index f7c53c05d7c45ce4476af3ad78d37a137b7f0a07..8c1b781d46d346b92e041bdf3098c327cacbc0f3 100644 (file)
--- a/electric-tcl.patch
+++ b/electric-tcl.patch
@@ -1,31 +1,13 @@
-diff -durN electric-6.01.orig/Makefile.in electric-6.01/Makefile.in
---- electric-6.01.orig/Makefile.in     Sat Jul 15 17:29:24 2000
-+++ electric-6.01/Makefile.in  Sun Oct 22 10:14:52 2000
-@@ -31,7 +31,8 @@
- ############################################### TCL INTERPRETER ###############
- ##### If building with a TCL interpreter, uncomment the next two lines
- # LANGTCL_OBJS= $(TCL_OBJS)
--# LANGTCLCFLAGS =  -DFORCETCL=1 -Isrc/tcl/generic
-+LANGTCLLIBS = -ltcl
+--- electric-6.08.orig/Makefile.in     2003-05-22 20:35:22.000000000 +0200
++++ electric-6.08/Makefile.in  2003-11-03 10:45:47.000000000 +0100
+@@ -61,8 +61,8 @@
+ 
+ ########################################################### TCL INTERPRETER
+ ##### If building with a TCL interpreter, uncomment these two lines
+-# LANGTCLCFLAGS =  -DFORCETCL=1
+-# LANGTCLLIBS = -ltcl
 +LANGTCLCFLAGS =  -DFORCETCL=1
- ###############################################################################
- 
- 
-@@ -53,7 +54,7 @@
- # LANGJAVA_MACHINE = i386
- # LANGJAVA_OS = linux
- # LANGJAVA_THREADLIB = -lhpi
--###############################################################################
-+###############################################################################NG
++LANGTCLLIBS = -ltcl
+ ###########################################################
  
  
- ############################################### MISCELLANEOUS EXTRAS ##########
-@@ -390,7 +391,7 @@
- EXTRA_CFLAGS = $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(CADENCECFLAGS)
- CFLAGS = $(EXTRA_CFLAGS) $(DEBUG) -I$(HDS)
- XCFLAGS = @X_CFLAGS@ $(CFLAGS) $(TIFFLAGS) $(XPOWER)
--EXTRA_LIBS = $(LANGJAVALIBS)
-+EXTRA_LIBS = $(LANGJAVALIBS) $(LANGTCLLIBS)
- LIBS = @X_PRE_LIBS@ @X_LIBS@ $(XTLIBS) -lX11 -lm @X_EXTRA_LIBS@ $(EXTRA_LIBS)
- INSTALL = cp -r
- INSTALL_PROGRAM = $(INSTALL)