This commit was manufactured by cvs2git to create branch 'unlabeled-1.21.2'.

Sprout from master 2002-08-11 22:04:42 UTC Mariusz Mazur <mmazur@pld-linux.org> '- I've mixed up Portable threads with Posix Threads... fixed :)'
Delete:
    electric-ac_fix.patch
    electric-datadir.patch
    electric-makefile.patch
    electric-tcl.patch

diff --git a/electric-ac_fix.patch b/electric-ac_fix.patch
deleted file mode 100644 (file)
index d785231..0000000
--- a/electric-ac_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in~      Sat Jun 15 01:01:30 2002
-+++ configure.in       Mon Aug 12 00:01:01 2002
-@@ -47,8 +47,21 @@
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(ftime getcwd gethostid getpagesize gettimeofday getwd qsort scandir setlocale strstr strchr valloc vsnprintf)
- 
--PTHREAD_LIBS=-lpthread
--ACX_PTHREAD()
-+dnl Checks for libpthreads
-+AC_ARG_WITH(pthreads, 
-+          AC_HELP_STRING([--with-pthreads],[Use pthreads.]), [ 
-+           if test "$withval" = "yes" ; then
-+                   INCLUDEPTHREAD=1
-+           else
-+                   INCLUDEPTHREAD=0; 
-+           fi ],[INCLUDEPTHREAD=1])
-+
-+if test "$INCLUDEPTHREAD"=1 ; then
-+      AC_CHECK_LIB(pthread,pthread_mutex_init, 
-+                   [LDFLAGS="$LDFLAGS -pthread"],
-+                   [AC_MSG_ERROR(****Library not found: -pthread****)])
-+      AC_DEFINE(HAVE_PTHREAD)
-+fi
- 
- dnl Figure out how to reference 64-bit unsigned integers
- AC_CHECK_TYPE(u_int64_t, long long)

diff --git a/electric-datadir.patch b/electric-datadir.patch
deleted file mode 100644 (file)
index fd5f79e..0000000
--- a/electric-datadir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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"

diff --git a/electric-makefile.patch b/electric-makefile.patch
deleted file mode 100644 (file)
index c114d26..0000000
--- a/electric-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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)
- 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 @@
- 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
- FIND = find
- INSTALL = install
- prefix = @prefix@

diff --git a/electric-tcl.patch b/electric-tcl.patch
deleted file mode 100644 (file)
index f7c53c0..0000000
--- a/electric-tcl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-+LANGTCLCFLAGS =  -DFORCETCL=1
- ###############################################################################
- 
- 
-@@ -53,7 +54,7 @@
- # LANGJAVA_MACHINE = i386
- # LANGJAVA_OS = linux
- # LANGJAVA_THREADLIB = -lhpi
--###############################################################################
-+###############################################################################NG
- 
- 
- ############################################### 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)