27 files changed, 0 insertions, 984 deletions

diff --git a/cad/chipmunk/files/patch-ab b/cad/chipmunk/files/patch-ab
deleted file mode 100644
index 1d64d80e574c..000000000000
--- a/cad/chipmunk/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- until/V1.2/cnf_stuff.c.orig	Mon Feb  5 21:12:59 1996
-+++ until/V1.2/cnf_stuff.c	Mon Feb  5 21:08:08 1996
-@@ -147,7 +147,7 @@
- Local char *getPlainWord(cnfBuf *cb)
- {
-   /* return the next word */
--  char s[256];
-+  static char s[256];
-   long p;
- 
-   skip_blanks(cb);
diff --git a/cad/chipmunk/files/patch-ac b/cad/chipmunk/files/patch-ac
deleted file mode 100644
index 745bd34a579c..000000000000
--- a/cad/chipmunk/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.orig	Mon Sep 20 06:06:10 1999
-+++ Makefile	Mon Sep 20 06:40:16 1999
-@@ -38,10 +38,12 @@
-  		wolcomp \
-  		until/V1.2 \
-  		view
-+
-+all: makeonly
-  
- makeonly: lib bin
- 	for i in $(PACKAGES) ;\
-- 		do (cd $$i ; echo "Making in $$i..."; make $(MFLAGS)); done
-+ 		do (cd $$i ; echo "Making in $$i..."; $(MAKE) $(MFLAGS)); done
-  
- World: lib bin clean install
- 
-@@ -54,17 +56,17 @@
- clean:
- 	for i in $(PACKAGES) ;\
-  	    do (cd $$i ; echo "Making clean in $$i..."; \
-- 		make  clean); done
-+ 		$(MAKE) clean); done
-  
- install:
- 	for i in $(PACKAGES) ;\
- 	    do (cd $$i ; echo "Making install in $$i..."; \
--		make install); done
-+		$(MAKE) install); done
- 
- create:
- 	for i in $(PACKAGES) ;\
- 	    do (cd $$i ; echo "Making create in $$i..."; \
--		make create); done
-+		$(MAKE) create); done
-  
-  
-  
diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad
deleted file mode 100644
index 2da2708fe5d7..000000000000
--- a/cad/chipmunk/files/patch-ad
+++ /dev/null
@@ -1,92 +0,0 @@
---- 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
- 
--LOGLIBDIR = `$(CD) ../../log/lib; pwd`
--LIBDIR = `$(CD) ../../lib; pwd`
-+LOGLIBDIR = ${PREFIX}/share/chipmunk
-+LIBDIR = ${PREFIX}/share/chipmunk
- 
- LOCINC = ../../psys/include
- 
-@@ -63,9 +63,9 @@
- ## or some other directory, depending on your installation. Use the
- ## first one for OS X.
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
--BINDIR = ../../bin
-+BINDIR = ${PREFIX}/bin
- LIBP2C = ../../psys/src/libp2c.a
- 
- ##
-@@ -81,7 +81,7 @@
- ## depending on your installation. Use the second one for OS X.
- ##
- 
--LIBX11 = -lX11
-+LIBX11 = -lX11 -L${LOCALBASE}/lib
- 
- ##
- ## (2) Library additions
-@@ -91,7 +91,7 @@
- ##
- ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
- 
--OTHERLIBS= -lm 
-+OTHERLIBS= -lm -lcompat
- 
- 
- ##
-@@ -110,7 +110,7 @@
-   
- CHIPMUNKCC = gcc -O3
- 
--CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
- 
- ##
- ## (4) Adding appropriate flags
-@@ -148,7 +148,7 @@
- 
- CHIPMUNKFLAGS = 
- 
--CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
-+CFLAGS +=  -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
- 
- DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
-          loghier.o logsimh.o swap.o
-@@ -179,22 +179,24 @@
- ##  older operating systems -- if problems arise, use a hard link.
- ##
- 
-+all:  makeana main
-+
- install: all
--	cp log $(BINDIR)/diglog
-+	${BSD_INSTALL_PROGRAM} log $(BINDIR)/diglog
- 	-rm -f $(BINDIR)/analog
- 	-(cd $(BINDIR); ln -s diglog analog)
--	cp loged $(BINDIR)/loged
--	cp fixfet7 $(BINDIR)/fixfet7
-+	${BSD_INSTALL_PROGRAM} loged $(BINDIR)/loged
-+	${BSD_INSTALL_SCRIPT} fixfet7 $(BINDIR)/fixfet7
-+	cp -R ../lib/* $(LOGLIBDIR)
-+	chmod -R a=r+X $(LOGLIBDIR)
- 
- clean:
- 	-rm -f *.o ana/*.o ana/logdef.h log loged
- 
--all:  makeana main
--
- main: log loged
- 
- makeana:
--	($(CD) ana; make $(MFLAGS) grab all)
-+	($(CD) ana; $(MAKE) $(MFLAGS) grab all)
- 
- 
- LOGOBJ = log.o $(TOOLOBJ) logstuff.o logdef.o
diff --git a/cad/chipmunk/files/patch-ae b/cad/chipmunk/files/patch-ae
deleted file mode 100644
index 3be9235b6b20..000000000000
--- a/cad/chipmunk/files/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
---- log/src/ana/Makefile.orig	2011-10-21 07:26:01.000000000 +0900
-+++ log/src/ana/Makefile	2011-11-26 22:33:01.000000000 +0900
-@@ -45,7 +45,7 @@
- ## For most versions of UNIX, one of the above directories
- ## will be the correct one to use on the line below:
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- ##
- ##  (1) Choosing your compiler
-@@ -66,7 +66,7 @@
- CHIPMUNKCC = gcc -O3
- 
- 
--CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
- 
- ##
- ## (4) Adding appropriate flags
-@@ -108,7 +108,7 @@
- 
- CHIPMUNKFLAGS = 
- 
--CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
-+CFLAGS +=  -I$(LOCINC) -I$(XINCLUDEDIR)
- 
- ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)
- GATESOBJ = numbers.o mmeter.o iscope.o \
diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af
deleted file mode 100644
index 5bf788d88dbc..000000000000
--- a/cad/chipmunk/files/patch-af
+++ /dev/null
@@ -1,65 +0,0 @@
---- mosis/Makefile.orig	2011-09-08 03:38:27.000000000 +0900
-+++ mosis/Makefile	2012-02-22 16:51:46.000000000 +0900
-@@ -23,6 +23,8 @@
- #
- #
- 
-+BINDIR = ${PREFIX}/bin
-+
- ##
- ##  (1) Choosing your compiler
- ##  ---------------------------
-@@ -47,7 +49,7 @@
- ##
- 
- CHIPMUNKCC = gcc -O3
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## If X isn't in the include path, change XINCLUDEDIR:
-@@ -67,7 +69,7 @@
- ## For most versions of UNIX, one of the above directories
- ## will be the correct one to use on the line below:
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- ## 
- ## If X isn't in the library path, change LIBX11 to reflect this:
-@@ -92,7 +94,7 @@
- ## LIBX11= -lX11 -s
- ##
- 
--LIBX11 = -lX11
-+LIBX11 = -lX11 -L${LOCALBASE}/lib
- 
- ##
- ## (3) Adding appropriate flags
-@@ -133,7 +135,7 @@
- 
- CHIPMUNKFLAGS = 
- 
--CFLAGS = $(CHIPMUNKFLAGS) -O -I../psys/include -I$(XINCLUDEDIR)
-+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
- 
- ##
- ## (4) Library additions
-@@ -141,7 +143,7 @@
- ##
- ## on some systems, -ldl must be added to the following line
- 
--OTHERLIBS= -lm
-+OTHERLIBS= -lm -lcompat
- 
- ##
- ##
-@@ -154,7 +156,7 @@
- 	$(CC) $(CFLAGS) -o mosis mosis.o  $(LDFLAGS)
- 
- install: mosis
--	cp mosis ../bin/mosis
-+	${BSD_INSTALL_PROGRAM} mosis $(BINDIR)
- 
- clean:
- 	rm -f *.o mosis
diff --git a/cad/chipmunk/files/patch-ag b/cad/chipmunk/files/patch-ag
deleted file mode 100644
index 0b1859577e15..000000000000
--- a/cad/chipmunk/files/patch-ag
+++ /dev/null
@@ -1,41 +0,0 @@
---- netcmp/Makefile.orig	2011-10-21 07:35:56.000000000 +0900
-+++ netcmp/Makefile	2012-02-22 16:42:56.000000000 +0900
-@@ -22,7 +22,7 @@
- #
- # netcmp makefile
- 
--BINDIR=	../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -48,7 +48,7 @@
- ## For SGI, cc is recommended
- 
- CHIPMUNKCC = gcc -O3
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -77,15 +77,17 @@
- ## -ansi
- ##
- 
-+OTHERLIBS = -lcompat
-+
- CHIPMUNKFLAGS = 
- 
--CFLAGS = $(CHIPMUNKFLAGS)
-+CFLAGS += -DBSD -DF_OK
- 
- netcmp:     main.o parser.o datastruct.o compare.o
--	$(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o -o netcmp
-+	$(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
- 
- install:    netcmp
--	cp netcmp $(BINDIR)  
-+	${BSD_INSTALL_PROGRAM} netcmp $(BINDIR)  
- 
- clean:
- 	-rm -f *.o netcmp
diff --git a/cad/chipmunk/files/patch-ah b/cad/chipmunk/files/patch-ah
deleted file mode 100644
index 2d3f4a517c5d..000000000000
--- a/cad/chipmunk/files/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
---- psys/src/Makefile.orig	2011-10-21 07:23:19.000000000 +0900
-+++ psys/src/Makefile	2011-11-26 22:40:45.000000000 +0900
-@@ -30,8 +30,8 @@
- ## to be made for different systems. Its a good idea to look over each
- ## block and make necessary changes before doing a "make install"
- 
--LIBDIR = ../../lib
--BINDIR = ../../bin
-+LIBDIR = ${PREFIX}/share/chipmunk
-+BINDIR = ${PREFIX}/bin
- 
- 
- LIB = ../libp2c.a
-@@ -56,7 +56,7 @@
- ## For most versions of UNIX, one of the above directories
- ## will be the correct one to use on the line below:
- 
--XINCLUDEDIR = . 
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- ##
- ##  (1) Choosing your compiler
-@@ -105,7 +105,7 @@
- LIBSTUFF = texstuff.ps untilstuff.ps plot.font
- 
- 
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- 
- ##
-@@ -178,7 +178,7 @@
- 
- CHIPMUNKFLAGS = 
- 
--CFLAGS = $(CHIPMUNKFLAGS) $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
-+CFLAGS += -DBSD -DF_OK $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
- 
- P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
- 
-@@ -201,7 +201,7 @@
- ## to delete
- 
- 
--all: setup libp2c.a
-+all: libp2c.a
- 
- setup:
- 	-if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
diff --git a/cad/chipmunk/files/patch-ai b/cad/chipmunk/files/patch-ai
deleted file mode 100644
index a9b7a8b58a5f..000000000000
--- a/cad/chipmunk/files/patch-ai
+++ /dev/null
@@ -1,56 +0,0 @@
---- psys/src/mylib.c.orig	Wed Jul 21 04:06:25 1999
-+++ psys/src/mylib.c	Mon Sep 20 06:58:55 1999
-@@ -4162,7 +4162,7 @@
- 
-   if (currentmode == m_hitdet) {
-     m_hitcount += hitdet_drawpoly(n, pointlist);
--    cfree(pointlist);
-+    free(pointlist);
-     return;
-   }
- 
-@@ -4174,7 +4174,7 @@
-   Xfprintf(stderr, "XDrawLines()\n");
-   XDrawLines(m_display, m_window, gc[currentcolor], pointlist, n+1, CoordModeOrigin);
- 
--  cfree(pointlist);
-+  free(pointlist);
- 
- #ifdef SAVECURSOR
-   if (cursor_is_on)
-@@ -4335,7 +4335,7 @@
- 	j++;
-       } while (count != 0 && j < last);
-       if (edges[i].curx <= m_clip_x2 && edges[j-1].curx >= m_clip_x1) {
--	cfree(edges);
-+	free(edges);
- 	return 1;     /* Found a visible trapezoid */
-       }
-     }
-@@ -4345,7 +4345,7 @@
-   }
- 
-   /* No trapezoids intersect */
--  cfree(edges);
-+  free(edges);
-   return 0;
- }
- 
-@@ -4370,7 +4370,7 @@
- 
-   if (currentmode == m_hitdet) {
-     m_hitcount += hitdet_fillpoly(n, pointlist);
--    cfree(pointlist);
-+    free(pointlist);
-     return;
-   }
- 
-@@ -4382,7 +4382,7 @@
-   Xfprintf(stderr, "XFillPolygon()\n");
-   XFillPolygon(m_display, m_window, gc[currentcolor], pointlist, n, Complex, CoordModeOrigin);
- 
--  cfree(pointlist);
-+  free(pointlist);
- 
- #ifdef SAVECURSOR
-   if (cursor_is_on)
diff --git a/cad/chipmunk/files/patch-aj b/cad/chipmunk/files/patch-aj
deleted file mode 100644
index 9560ddc1338a..000000000000
--- a/cad/chipmunk/files/patch-aj
+++ /dev/null
@@ -1,69 +0,0 @@
---- until/V1.2/Makefile.orig	Sat May 18 12:02:28 2002
-+++ until/V1.2/Makefile	Sat May 18 12:57:40 2002
-@@ -41,7 +41,7 @@
- ##
- 
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- ##
- ## If X isn't in the library path (the case for many MachTen and Linux 
-@@ -57,7 +57,7 @@
- ##
- 
- 
--LIBX11 = -lX11
-+LIBX11 = -lX11 -L${LOCALBASE}/lib
- 
- 
- LIBP2C = ../../psys/src/libp2c.a
-@@ -68,7 +68,7 @@
- ##
- ## on some systems, -ldl must be added to the following line
- 
--OTHERLIBS= -lm
-+OTHERLIBS= -lm -lcompat
- 
- ##
- ##  (2) Choosing your compiler
-@@ -98,10 +98,10 @@
-   
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
- 
--BINDIR = ../../bin
--LIBDIR = `pwd`/../../lib
-+BINDIR = ${PREFIX}/bin
-+LIBDIR = ${PREFIX}/share/chipmunk
- 
- SYSRC =  $(LIBDIR)/system.untilrc
- SYSPS =  $(LIBDIR)/pensps.map
-@@ -165,7 +165,7 @@
- 
- CHIPMUNKFLAGS =   
- 
--CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) \
-+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) \
- -DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\" \
- -DUNTILHEADER=\"$(SYSHD)\"
- 
-@@ -199,11 +199,11 @@
- ## Until as its moved to bin; non ksh-users may wish to change it back.
- 
- install: until
--	cp until $(BINDIR)/Until
--	cp pensps.map $(LIBDIR)/pensps.map
--	cp system.untilrc $(LIBDIR)/system.untilrc
--	cp until.pro  $(LIBDIR)/until.pro
--	cp until.ps  $(LIBDIR)/until.ps
-+	${BSD_INSTALL_PROGRAM} until $(BINDIR)/Until
-+	${BSD_INSTALL_DATA} pensps.map $(LIBDIR)/pensps.map
-+	${BSD_INSTALL_DATA} system.untilrc $(LIBDIR)/system.untilrc
-+	${BSD_INSTALL_DATA} until.pro  $(LIBDIR)/until.pro
-+	${BSD_INSTALL_DATA} until.ps  $(LIBDIR)/until.ps
- 
- 
- bb_stuff.o : bb_stuff.c bb_stuff.h 
diff --git a/cad/chipmunk/files/patch-ak b/cad/chipmunk/files/patch-ak
deleted file mode 100644
index fe914edc5376..000000000000
--- a/cad/chipmunk/files/patch-ak
+++ /dev/null
@@ -1,24 +0,0 @@
---- util/Makefile.orig	2011-10-21 07:40:05.000000000 +0900
-+++ util/Makefile	2011-11-26 22:45:05.000000000 +0900
-@@ -6,14 +6,19 @@
- 
- PACKAGES = cleancif conscripts boxify spc-tools lgf-tools sctomat 
- 
-+all:
-+	for i in $(PACKAGES) ;\
-+	    do (cd $$i ; echo "Making all in $$i..."; \
-+		$(MAKE) all); done
-+
- install:
- 	for i in $(PACKAGES) ;\
- 	    do (cd $$i ; echo "Making install in $$i..."; \
--		make install); done
-+		$(MAKE) install); done
- clean:
- 	for i in $(PACKAGES) ;\
- 	    do (cd $$i ; echo "Making clean in $$i..."; \
--		make clean); done
-+		$(MAKE) clean); done
- 
- dist:
- 	rm -rf util
diff --git a/cad/chipmunk/files/patch-al b/cad/chipmunk/files/patch-al
deleted file mode 100644
index 917865dd040a..000000000000
--- a/cad/chipmunk/files/patch-al
+++ /dev/null
@@ -1,50 +0,0 @@
---- util/boxify/Makefile.orig	Wed Mar 12 02:47:23 1997
-+++ util/boxify/Makefile	Sat May 18 13:12:54 2002
-@@ -21,7 +21,7 @@
- #
- # boxify makefile
- 
--BINDIR=	../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -48,7 +48,7 @@
- ##
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -92,7 +92,7 @@
- ##   -m68040              : for 68040 and 68060
- ##
- 
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
- TRAPESSRC	= trapes/edges.c trapes/findnext.c trapes/mates.c \
- 		trapes/delete.c trapes/gentrapes.c trapes/trapes.c
-@@ -102,16 +102,16 @@
- 
- INCLUDES	= trapes/poly.h trapes/trapes.h p2c.h boxify.h
- 
--boxify: boxify.o
--	(cd trapes; make)
-+all: boxify.o
-+	(cd trapes; $(MAKE) all)
- 	$(CC) -o boxify boxify.o $(TRAPESOBJ)  -lm
- 
- 
- install: boxify
--	cp boxify $(BINDIR)  
-+	${BSD_INSTALL_PROGRAM} -c -s boxify $(BINDIR)  
- 
- clean:
--	(cd trapes; make clean)
-+	(cd trapes; $(MAKE) clean)
- 	-rm -f *.o boxify
- 
- #tar:	$(INCLUDES) $(TRAPESSRC) boxify.c boxify.1 Makefile
diff --git a/cad/chipmunk/files/patch-am b/cad/chipmunk/files/patch-am
deleted file mode 100644
index cb4ce729613c..000000000000
--- a/cad/chipmunk/files/patch-am
+++ /dev/null
@@ -1,29 +0,0 @@
---- util/boxify/trapes/Makefile.orig	Wed Mar 12 02:47:22 1997
-+++ util/boxify/trapes/Makefile	Tue Sep 21 05:36:58 1999
-@@ -18,7 +18,7 @@
- #
- # cleancif makefile
- 
--BINDIR=	../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -45,7 +45,7 @@
- ##
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -89,7 +89,7 @@
- ##   -m68040              : for 68040 and 68060
- ##
-   
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
- all:   edges.o findnext.o mates.o delete.o gentrapes.o trapes.o
- 
diff --git a/cad/chipmunk/files/patch-an b/cad/chipmunk/files/patch-an
deleted file mode 100644
index 1e17843dfa2e..000000000000
--- a/cad/chipmunk/files/patch-an
+++ /dev/null
@@ -1,37 +0,0 @@
---- util/cleancif/Makefile.orig	Wed Mar 12 02:47:24 1997
-+++ util/cleancif/Makefile	Tue Sep 21 03:35:20 1999
-@@ -18,7 +18,7 @@
- #
- # cleancif makefile
- 
--BINDIR=	../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -45,7 +45,7 @@
- ##
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -89,13 +89,13 @@
- ##   -m68040              : for 68040 and 68060
- ##
- 
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
--cleancif:     cleancif.o
-+all:     cleancif.o
- 	$(CC)  cleancif.o -lm -o cleancif
- 
- install:    cleancif
--	cp cleancif $(BINDIR)  
-+	install -c -s cleancif $(BINDIR)  
- 
- clean:
- 	-rm -f *.o cleancif
diff --git a/cad/chipmunk/files/patch-ao b/cad/chipmunk/files/patch-ao
deleted file mode 100644
index a16dc4936669..000000000000
--- a/cad/chipmunk/files/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/conscripts/Makefile.orig	Wed Mar 12 02:47:25 1997
-+++ util/conscripts/Makefile	Sat May 18 13:13:47 2002
-@@ -18,11 +18,11 @@
- #
- # mconvert makefile
- 
--BINDIR=	../../bin
-+BINDIR=	${PREFIX}/bin
- 
- install:    
--	cp mconvert $(BINDIR)  
--	cp unmconvert $(BINDIR)  
-+	${BSD_INSTALL_SCRIPT} mconvert $(BINDIR)  
-+	${BSD_INSTALL_SCRIPT} unmconvert $(BINDIR)  
- 
- clean:
- 	-rm -f *.o 
diff --git a/cad/chipmunk/files/patch-ap b/cad/chipmunk/files/patch-ap
deleted file mode 100644
index cfed53899c0a..000000000000
--- a/cad/chipmunk/files/patch-ap
+++ /dev/null
@@ -1,37 +0,0 @@
---- util/sctomat/Makefile.orig	Wed Mar 12 02:47:26 1997
-+++ util/sctomat/Makefile	Sat May 18 13:14:35 2002
-@@ -5,7 +5,7 @@
- #
- # sctomat makefile
- 
--BINDIR=	../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -32,7 +32,7 @@
- ##
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -76,13 +76,13 @@
- ##   -m68040              : for 68040 and 68060
- ##
-   
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
--scope_to_mat:     savemat.o scope_to_mat.o
-+all:     savemat.o scope_to_mat.o
- 	$(CC) savemat.o scope_to_mat.o -lm -o scope_to_mat
- 
- install:  scope_to_mat  
--	cp scope_to_mat $(BINDIR)  
-+	${BSD_INSTALL_PROGRAM} scope_to_mat $(BINDIR)  
- 
- clean:
- 	-rm -f *.o scope_to_mat
diff --git a/cad/chipmunk/files/patch-aq b/cad/chipmunk/files/patch-aq
deleted file mode 100644
index f1477dfa5059..000000000000
--- a/cad/chipmunk/files/patch-aq
+++ /dev/null
@@ -1,16 +0,0 @@
---- util/spc-tools/Makefile.orig	Wed Mar 12 02:47:32 1997
-+++ util/spc-tools/Makefile	Tue Sep 21 03:38:10 1999
-@@ -11,11 +11,11 @@
- clean:
- 	for i in $(PACKAGES) ;\
-  	    do (cd $$i ; echo "Making clean in $$i..."; \
-- 		make  clean); done
-+ 		$(MAKE) clean); done
-  
- install:
- 	for i in $(PACKAGES) ;\
- 	    do (cd $$i ; echo "Making install in $$i..."; \
--		make install); done
-+		$(MAKE) install); done
- 
-  
diff --git a/cad/chipmunk/files/patch-ar b/cad/chipmunk/files/patch-ar
deleted file mode 100644
index 447dd15af512..000000000000
--- a/cad/chipmunk/files/patch-ar
+++ /dev/null
@@ -1,36 +0,0 @@
---- util/spc-tools/sf/Makefile.orig	Wed Mar 12 02:47:29 1997
-+++ util/spc-tools/sf/Makefile	Sat May 18 13:15:35 2002
-@@ -18,7 +18,7 @@
- #
- # sf makefile
- 
--BINDIR=	../../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -46,7 +46,7 @@
- 
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -90,13 +90,13 @@
- ##   -m68040              : for 68040 and 68060
- ##
- 
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
- sf:     sf.o hash.o spice.o
- 	$(CC) sf.o hash.o spice.o  -o sf
- 
- install:    sf
--	cp sf $(BINDIR)  
-+	${BSD_INSTALL_PROGRAM} sf $(BINDIR)  
- 
- clean:
- 	-rm -f *.o sf
diff --git a/cad/chipmunk/files/patch-as b/cad/chipmunk/files/patch-as
deleted file mode 100644
index 71d5d6cc4a03..000000000000
--- a/cad/chipmunk/files/patch-as
+++ /dev/null
@@ -1,38 +0,0 @@
---- util/spc-tools/ss/Makefile.orig	Wed Mar 12 02:47:27 1997
-+++ util/spc-tools/ss/Makefile	Sat May 18 13:16:25 2002
-@@ -18,7 +18,7 @@
- #
- # ss makefile
- 
--BINDIR=	../../../bin
-+BINDIR=	${PREFIX}/bin
- 
- ##
- ##  (1) Choosing your compiler
-@@ -46,7 +46,7 @@
- 
- 
- CHIPMUNKCC = gcc
--CC = $(CHIPMUNKCC)
-+CC ?= $(CHIPMUNKCC)
- 
- ##
- ## (2) Adding appropriate flags
-@@ -90,14 +90,14 @@
- ##   -m68040              : for 68040 and 68060
- ##
- 
--CFLAGS = 
-+CFLAGS += -DBSD -DF_OK=0
- 
- ss:     spice.o ss.o
- 	$(CC) ss.o spice.o  -o ss
- 
- install:    ss
--	cp ss $(BINDIR)  
--	cp test/ucbsim $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} ss $(BINDIR)  
-+	${BSD_INSTALL_SCRIPT} test/ucbsim $(BINDIR)
- 
- clean:
- 	-rm -f *.o ss
diff --git a/cad/chipmunk/files/patch-at b/cad/chipmunk/files/patch-at
deleted file mode 100644
index b38def93eed3..000000000000
--- a/cad/chipmunk/files/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
---- util/spc-tools/ss/test/Makefile.orig	Wed Mar 12 02:47:28 1997
-+++ util/spc-tools/ss/test/Makefile	Tue Sep 21 03:40:27 1999
-@@ -1,9 +1,9 @@
- #!/bin/sh
- 
- test:	
--	make magic
--	make log
--	make gemini
-+	$(MAKE) magic
-+	$(MAKE) log
-+	$(MAKE) gemini
- 
- magic:	
- 	ext2sim -R -C inv.ext
diff --git a/cad/chipmunk/files/patch-au b/cad/chipmunk/files/patch-au
deleted file mode 100644
index d4c76f810dd9..000000000000
--- a/cad/chipmunk/files/patch-au
+++ /dev/null
@@ -1,61 +0,0 @@
---- view/Makefile.orig	2011-10-21 07:29:27.000000000 +0900
-+++ view/Makefile	2011-11-26 22:47:47.000000000 +0900
-@@ -45,7 +45,7 @@
- ## For most versions of UNIX, one of the above directories
- ## will be the correct one to use on the line below:
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- 
- ## 
-@@ -71,7 +71,7 @@
- ## LIBX11= -lX11 -s
- ##
- 
--LIBX11 = -lX11
-+LIBX11 = -lX11 -L${LOCALBASE}/lib
- 
- LIBP2C = ../psys/src/libp2c.a
- 
-@@ -83,7 +83,7 @@
- ##
- ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
- 
--OTHERLIBS= -lm  
-+OTHERLIBS= -lm -lcompat
- 
- ##
- ## (2) IEEE library directory
-@@ -128,7 +128,7 @@
- 
- CHIPMUNKCC = gcc -O3
- 
--CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
- 
- ##
- ## (4) Adding appropriate flags
-@@ -173,11 +173,11 @@
- 
- CHIPMUNKFLAGS = 
- 
--CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
-+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
- 
- LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
- MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
--BINDIR= ../bin
-+BINDIR = ${PREFIX}/bin
- 
- OBJS =			\
- 	viewfit.o	\
-@@ -245,7 +245,7 @@
- 	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
- 
- install: view
--	cp view $(BINDIR)/vc
-+	${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
- 
- myinstall: myview
- 	cp view ../bin/myview
diff --git a/cad/chipmunk/files/patch-aw b/cad/chipmunk/files/patch-aw
deleted file mode 100644
index 187ee4209606..000000000000
--- a/cad/chipmunk/files/patch-aw
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
- #include <stdlib.h>
- #include <math.h>
- 
diff --git a/cad/chipmunk/files/patch-ax b/cad/chipmunk/files/patch-ax
deleted file mode 100644
index 612e9996041c..000000000000
--- a/cad/chipmunk/files/patch-ax
+++ /dev/null
@@ -1,19 +0,0 @@
---- view/tek2430/Makefile.orig	Wed Mar 12 02:50:18 1997
-+++ view/tek2430/Makefile	Mon Sep 20 22:08:14 1999
-@@ -23,12 +23,12 @@
- # tek2430 makefile
- 
- 
--CC = gcc
--CFLAGS=  -I../../psys/include -DF_OK=0
-+CC ?= gcc
-+CFLAGS +=  -I../../psys/include -DF_OK=0
- LIBP2C = ../../psys/src/libp2c.a 
- #IEEEDIR = ../../iotech/sun4c/4.1c/ieeeio.o
--IEEEDIR = /home/auspex/f/sounds/lazzaro/chipmunk/new/sun4c/4.1.1c/ieeeio.o
--LDFLAGS=$(LIBP2C) $(IEEEDIR) 
-+#IEEEDIR = /home/auspex/f/sounds/lazzaro/chipmunk/new/sun4c/4.1.1c/ieeeio.o
-+LDFLAGS += $(LIBP2C) $(IEEEDIR) 
- 
- OBJS =			\
- 	tek2430.o	\
diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay
deleted file mode 100644
index 895747049150..000000000000
--- a/cad/chipmunk/files/patch-ay
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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 = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- ##
- ## If X isn't in the library path (the case for many MachTen and Linux 
-@@ -55,7 +55,7 @@
- ## depending on your installation. Use the second one for OS X.
- ##
- 
--LIBX11 = -lX11
-+LIBX11 = -lX11 -L${LOCALBASE}/lib
- 
- 
- 
-@@ -67,7 +67,7 @@
- ##
- ## on some systems, -ldl must be added to the following line
- 
--OTHERLIBS= -lm
-+OTHERLIBS= -lm -lcompat
- 
- 
- ##
-@@ -97,11 +97,11 @@
- ##
- 
- CHIPMUNKCC = gcc -O3
--CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
- 
--LIBDIR = `pwd`/
-+LIBDIR = ${PREFIX}/share/chipmunk
- WOLPL = $(LIBDIR)
--BINDIR = ../bin
-+BINDIR = ${PREFIX}/bin
- 
- 
- ##
-@@ -158,7 +158,7 @@
- 
- CHIPMUNKFLAGS =
- 
--CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
-+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
- 
- LDFLAGS= $(LIBP2C)  $(LIBX11) $(OTHERLIBS)
- 
-@@ -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
deleted file mode 100644
index 9e62e2354a44..000000000000
--- a/cad/chipmunk/files/patch-az
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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) 
- 
- LOCINC = ../psys/include
- 
-@@ -71,7 +71,7 @@
- ## first one for OS X.
- ##
- 
--XINCLUDEDIR = .
-+XINCLUDEDIR = ${LOCALBASE}/include
- 
- 
- ##
-@@ -128,7 +128,7 @@
-   
- 
- 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-ba b/cad/chipmunk/files/patch-ba
deleted file mode 100644
index a1ba19323f17..000000000000
--- a/cad/chipmunk/files/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
---- psys/include/p2c/p2c.h.orig	Tue Jan  7 15:14:37 2003
-+++ psys/include/p2c/p2c.h	Tue Jan  7 15:16:04 2003
-@@ -85,10 +85,6 @@
- #include <unistd.h>
- #endif
- 
--#if (!defined(BSD) && !defined(__sgi) && !defined(__alpha__)) 
--# define log1p(X) log(1+(X))
--#endif
--
- #if defined(rs6000) || defined(ultrix)
- extern char *strdup();
- extern char *strpbrk();
diff --git a/cad/chipmunk/files/patch-bb b/cad/chipmunk/files/patch-bb
deleted file mode 100644
index 64ac91f150cf..000000000000
--- a/cad/chipmunk/files/patch-bb
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
diff --git a/cad/chipmunk/files/patch-netcmp-main.c b/cad/chipmunk/files/patch-netcmp-main.c
deleted file mode 100644
index cb7c66aa3875..000000000000
--- a/cad/chipmunk/files/patch-netcmp-main.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- netcmp/main.c
-+++ netcmp/main.c
-@@ -122,16 +122,6 @@
- 
-   outfyle = NULL;
-   while (outfyle == NULL) {
--      char username[100];
--      char *tmp;
--
--#if defined(freebsd)
--      getpwuid(getuid(), username);
--#else
--      getpw(getuid(), username);
--#endif
--      tmp = strchr(username,':');
--      if (tmp != NULL) *tmp = '\0';
-       printf("  Enter output file name [info]: ");
-       fgets(command, 81, stdin);
-       TEMP = strchr(command, '\n');