diff options
Diffstat (limited to 'cad/chipmunk/files')
| -rw-r--r-- | cad/chipmunk/files/patch-ad | 16 | ||||
| -rw-r--r-- | cad/chipmunk/files/patch-af | 33 | ||||
| -rw-r--r-- | cad/chipmunk/files/patch-aw | 13 | ||||
| -rw-r--r-- | cad/chipmunk/files/patch-ay | 20 | ||||
| -rw-r--r-- | cad/chipmunk/files/patch-az | 23 | ||||
| -rw-r--r-- | cad/chipmunk/files/patch-bb | 21 |
6 files changed, 81 insertions, 45 deletions
diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad index 51352529e4a0..e8172429f0a3 100644 --- a/cad/chipmunk/files/patch-ad +++ b/cad/chipmunk/files/patch-ad @@ -1,5 +1,5 @@ ---- log/src/Makefile.orig Tue May 14 03:08:21 2002 -+++ log/src/Makefile Sat May 18 15:49:22 2002 +--- log/src/Makefile.orig Wed Nov 5 04:53:39 2003 ++++ log/src/Makefile Tue Dec 9 17:42:37 2003 @@ -45,8 +45,8 @@ CD = cd @@ -12,8 +12,8 @@ LOCINC = ../../psys/include @@ -63,9 +63,9 @@ - ## or some other directory, depending on your installation. - ## + ## or some other directory, depending on your installation. Use the + ## first one for OS X. -XINCLUDEDIR = . +XINCLUDEDIR = ${X11BASE}/include @@ -24,7 +24,7 @@ ## @@ -81,7 +81,7 @@ - ## depending on your installation. + ## depending on your installation. Use the second one for OS X. ## -LIBX11 = -lX11 @@ -50,7 +50,7 @@ ## ## (4) Adding appropriate flags -@@ -147,7 +147,7 @@ +@@ -148,7 +148,7 @@ CHIPMUNKFLAGS = @@ -59,7 +59,7 @@ DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \ loghier.o logsimh.o swap.o -@@ -178,22 +178,24 @@ +@@ -179,22 +179,24 @@ ## older operating systems -- if problems arise, use a hard link. ## @@ -78,7 +78,7 @@ + chmod -R a=r+X $(LOGLIBDIR) clean: - -rm -f *.o ana/*.o log loged + -rm -f *.o ana/*.o ana/logdef.h log loged -all: makeana main - diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af index a0c60ea25b80..42cb5657c720 100644 --- a/cad/chipmunk/files/patch-af +++ b/cad/chipmunk/files/patch-af @@ -1,5 +1,5 @@ ---- mosis/Makefile.orig Tue Aug 7 09:25:31 2001 -+++ mosis/Makefile Sat May 18 15:59:51 2002 +--- mosis/Makefile.orig Tue Nov 4 22:19:13 2003 ++++ mosis/Makefile Tue Dec 9 17:44:45 2003 @@ -23,6 +23,8 @@ # # @@ -9,21 +9,34 @@ ## ## (1) Choosing your compiler ## --------------------------- -@@ -48,10 +50,10 @@ +@@ -47,7 +49,7 @@ ## -CC = gcc +CC ?= gcc --LIBX11 = -lX11 + ## + ## (2) If X isn't in the include path (the case for many MachTen and Linux +@@ -62,7 +64,7 @@ + ## or some other directory, depending on your installation. Use the + ## first one for OS X. + -XINCLUDEDIR = . -+LIBX11 = -lX11 -L${X11BASE}/lib +XINCLUDEDIR = ${X11BASE}/include ## - ## (2) Adding appropriate flags -@@ -88,7 +90,7 @@ + ## If X isn't in the library path (the case for many MachTen and Linux +@@ -77,7 +79,7 @@ + ## depending on your installation. Use the second one for OS X. + ## + +-LIBX11 = -lX11 ++LIBX11 = -lX11 -L${X11BASE}/lib + + ## + ## (3) Adding appropriate flags +@@ -115,7 +117,7 @@ CHIPMUNKFLAGS = @@ -31,8 +44,8 @@ +CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR) ## - ## (3) Library additions -@@ -96,7 +98,7 @@ + ## (4) Library additions +@@ -123,7 +125,7 @@ ## ## on some systems, -ldl must be added to the following line @@ -41,7 +54,7 @@ ## ## -@@ -109,7 +111,7 @@ +@@ -136,7 +138,7 @@ $(CC) -o mosis mosis.o $(LDFLAGS) install: mosis diff --git a/cad/chipmunk/files/patch-aw b/cad/chipmunk/files/patch-aw index 73997f218d69..187ee4209606 100644 --- a/cad/chipmunk/files/patch-aw +++ b/cad/chipmunk/files/patch-aw @@ -1,15 +1,10 @@ ---- view/viewfit.c.orig Wed Mar 12 02:50:07 1997 -+++ view/viewfit.c Mon Sep 20 21:50:59 1999 -@@ -58,7 +58,12 @@ +--- view/viewfit.c.orig Wed Nov 5 20:37:49 2003 ++++ view/viewfit.c Tue Dec 9 17:46:46 2003 +@@ -58,6 +58,7 @@ #include <stdio.h> +#include <sys/param.h> -+#ifndef __STDC__ - #include <malloc.h> -+#else -+#include <stdlib.h> -+#endif + #include <stdlib.h> #include <math.h> - #include "global.h" diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay index f31e04bc55c3..23aed95d9a78 100644 --- a/cad/chipmunk/files/patch-ay +++ b/cad/chipmunk/files/patch-ay @@ -1,7 +1,7 @@ ---- wol/Makefile.orig Sat May 18 12:02:28 2002 -+++ wol/Makefile Sat May 18 13:01:59 2002 -@@ -39,7 +39,7 @@ - ## or some other directory, depending on your installation. +--- wol/Makefile.orig Wed Nov 5 20:24:18 2003 ++++ wol/Makefile Tue Dec 9 17:49:36 2003 +@@ -40,7 +40,7 @@ + ## first one for OS X. ## -XINCLUDEDIR = . @@ -9,8 +9,8 @@ ## ## If X isn't in the library path (the case for many MachTen and Linux -@@ -54,7 +54,7 @@ - ## depending on your installation. +@@ -55,7 +55,7 @@ + ## depending on your installation. Use the second one for OS X. ## -LIBX11 = -lX11 @@ -18,7 +18,7 @@ -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ ## ## on some systems, -ldl must be added to the following line @@ -42,7 +42,7 @@ ## -@@ -157,7 +157,7 @@ +@@ -158,7 +158,7 @@ CHIPMUNKFLAGS = @@ -51,12 +51,14 @@ LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) -@@ -200,7 +200,7 @@ +@@ -201,8 +201,8 @@ install: wol - cp wol $(BINDIR) +- cp fixcify $(BINDIR) + ${BSD_INSTALL_PROGRAM} wol $(BINDIR) ++ ${BSD_INSTALL_SCRIPT} fixcify $(BINDIR) clean: -rm -f *.o wol diff --git a/cad/chipmunk/files/patch-az b/cad/chipmunk/files/patch-az index 592f12190d60..2bd2b0fbdb7a 100644 --- a/cad/chipmunk/files/patch-az +++ b/cad/chipmunk/files/patch-az @@ -1,24 +1,29 @@ ---- wolcomp/Makefile.orig Sat May 18 12:02:28 2002 -+++ wolcomp/Makefile Sat May 18 13:03:14 2002 -@@ -52,10 +52,10 @@ +--- wolcomp/Makefile.orig Wed Nov 5 20:31:07 2003 ++++ wolcomp/Makefile Tue Dec 9 17:51:24 2003 +@@ -52,7 +52,7 @@ CHIPMUNKCC = gcc -O3 -CC = $(CHIPMUNKCC) -+CC ?= $(CHIPMUNKCC) ++CC ? = $(CHIPMUNKCC) LOCINC = ../psys/include + +@@ -71,7 +71,7 @@ + ## first one for OS X. + ## + -XINCLUDEDIR = . +XINCLUDEDIR = ${X11BASE}/include + ## - ## (2) Adding appropriate flags -@@ -109,7 +109,7 @@ +@@ -128,7 +128,7 @@ - CHIPMUNKFLAGS = --CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) + CHIPMUNKFLAGS = +-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -D_POSIX_SOURCE ++CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -D_POSIX_SOURCE install : $(OBJS) -rm -f wolcomp.a diff --git a/cad/chipmunk/files/patch-bb b/cad/chipmunk/files/patch-bb new file mode 100644 index 000000000000..64ac91f150cf --- /dev/null +++ b/cad/chipmunk/files/patch-bb @@ -0,0 +1,21 @@ +--- util/lgf-tools/Makefile.orig Tue Dec 9 18:20:07 2003 ++++ util/lgf-tools/Makefile Tue Dec 9 18:27:39 2003 +@@ -1,6 +1,6 @@ + ## Makefile for lgf-tools + +-BINDIR= ../../bin ++BINDIR= ${PREFIX}/bin + + SCRIPTS = logar lgfextract lgftodef lgftontk makeinstcopy + +@@ -9,7 +9,9 @@ + + install: + chmod +x $(SCRIPTS) +- cp -a $(SCRIPTS) $(BINDIR) ++ for i in $(SCRIPTS) ; do \ ++ ${BSD_INSTALL_SCRIPT} $$i $(BINDIR) ; \ ++ done + + clean: + rm -f *.bak *.old |