remove simian and simian-docs. The distfile is no longer available and we

are not allowed to mirror it.  Addresses pkg/45650

18 files changed, 1 insertions, 491 deletions

diff --git a/cad/Makefile b/cad/Makefile
index 68ce2d2dbd2..5567f2696b6 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2012/02/27 14:45:33 reinoud Exp $
+# $NetBSD: Makefile,v 1.76 2012/09/05 13:10:36 dmcmahill Exp $
 #
 
 COMMENT=	CAD tools
@@ -53,8 +53,6 @@ SUBDIR+=	qcad-manual-en
 SUBDIR+=	qcad-manual-hu
 SUBDIR+=	qcad-partlibrary
 SUBDIR+=	sci-wcalc
-SUBDIR+=	simian
-SUBDIR+=	simian-docs
 SUBDIR+=	spice
 SUBDIR+=	spiceprm
 SUBDIR+=	stdio-wcalc
diff --git a/cad/simian-docs/DESCR b/cad/simian-docs/DESCR
deleted file mode 100644
index 1724930a9e7..00000000000
--- a/cad/simian-docs/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-User's guide for SIMIAN (Surface Impedance Method for Interconnect
-Analysis).  The guide is in PDF format.
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
deleted file mode 100644
index 5090a4c1f40..00000000000
--- a/cad/simian-docs/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2012/05/19 15:03:01 marino Exp $
-#
-
-DISTNAME=	simian_man_12_98
-PKGNAME=	simian-docs-2.1
-CATEGORIES=	cad
-MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_mnl_ps_pdf/
-EXTRACT_SUFX=	.pdf
-
-MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
-COMMENT=	PDF manual for SIMIAN
-LICENSE=		simian-license
-
-RESTRICTED=		Personal use only
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-# http://leaf.dragonflybsd.org/mailarchive/users/2012-05/msg00066.html
-NOT_FOR_PLATFORM+=	DragonFly-*-*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-WRKSRC=		${WRKDIR}
-EXTRACT_ONLY=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simian
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES:Q} \
-		${DESTDIR}${PREFIX}/share/doc/simian
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/cad/simian-docs/PLIST b/cad/simian-docs/PLIST
deleted file mode 100644
index d99abeb9307..00000000000
--- a/cad/simian-docs/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:35:56 joerg Exp $
-share/doc/simian/simian_man_12_98.pdf
diff --git a/cad/simian-docs/distinfo b/cad/simian-docs/distinfo
deleted file mode 100644
index 4483411aa17..00000000000
--- a/cad/simian-docs/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 14:59:25 agc Exp $
-
-SHA1 (simian_man_12_98.pdf) = 81c3e983c347dd47c622788c01667dfa6fdf7eda
-RMD160 (simian_man_12_98.pdf) = 76964e3974e9991d850b91bbbbb23d248e1ac627
-Size (simian_man_12_98.pdf) = 129861 bytes
diff --git a/cad/simian/DESCR b/cad/simian/DESCR
deleted file mode 100644
index c0bc18aa3ef..00000000000
--- a/cad/simian/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Surface Impedance Method for Interconnect Analysis.
-
-SIMIAN is a two dimensional frequency dependent series
-impedance extraction tool for inerconnects and transmission
-lines using conductors of rectangular or circular cross section.
-
-The use of the surface ribbon method (SRM) greatly enhances
-the speed of computation relative to the volume filament
-method (VFM).
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
deleted file mode 100644
index 2ba41927aaf..00000000000
--- a/cad/simian/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2012/05/19 15:02:13 marino Exp $
-#
-
-DISTNAME=	simian_12_98
-PKGNAME=	simian-2.1
-CATEGORIES=	cad
-MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/CODE_RQST/
-
-MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
-COMMENT=	2-dimensional interconnect and transmission line simulator
-LICENSE=		simian-license
-
-RESTRICTED=		Redistribution for personal use only.
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-# http://leaf.dragonflybsd.org/mailarchive/users/2012-05/msg00066.html
-NOT_FOR_PLATFORM+=	DragonFly-*-*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_LANGUAGES=		c++
-GCC_REQD+=		3.0
-
-WRKSRC=		${WRKDIR}/Simian
-BUILD_DIRS=	src
-
-BUILD_TARGET=	simian
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/simian ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/simian
-	${INSTALL_DATA} ${WRKSRC}/examples/* \
-		${DESTDIR}${PREFIX}/share/examples/simian
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/cad/simian/PLIST b/cad/simian/PLIST
deleted file mode 100644
index c5df564c814..00000000000
--- a/cad/simian/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:35:56 joerg Exp $
-bin/simian
-share/examples/simian/ex1
-share/examples/simian/ex10
-share/examples/simian/ex11
-share/examples/simian/ex12
-share/examples/simian/ex2
-share/examples/simian/ex3
-share/examples/simian/ex4
-share/examples/simian/ex5
-share/examples/simian/ex6
-share/examples/simian/ex7
-share/examples/simian/ex8
-share/examples/simian/ex9
diff --git a/cad/simian/distinfo b/cad/simian/distinfo
deleted file mode 100644
index 7d73b9fb117..00000000000
--- a/cad/simian/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/01/22 17:41:17 dmcmahill Exp $
-
-SHA1 (simian_12_98.tar.gz) = c7d57087a397970b05195f497c98a058cea1a93a
-RMD160 (simian_12_98.tar.gz) = 3eecb229dd1fb3c761ee30c9d053673a45782170
-Size (simian_12_98.tar.gz) = 18474 bytes
-SHA1 (patch-aa) = 25b5b63e26478b31956f902eaffd4976d09e1448
-SHA1 (patch-ab) = 46c10535420ac625b7548e3b663ef9174d9c34b2
-SHA1 (patch-ac) = 8f9785a688235689060ec504bc7f24a1f73b117f
-SHA1 (patch-ad) = e94d69600ef57e16a4d552e2c7e5d152f710c122
-SHA1 (patch-ae) = fe34cacf05054a3e8465815aab67eda2e07d9432
-SHA1 (patch-af) = 75830be229798faa340f4db9f3fdc2effe30420b
-SHA1 (patch-ag) = eb94c6b84b55a4a5441953a6031354732f0a5b6c
-SHA1 (patch-ah) = 853f89961f53b3bd1605d6e9ec15790ef09ca3a6
-SHA1 (patch-ai) = 46046596daeb7f3fd6cb2e8dc9435626e049d430
diff --git a/cad/simian/patches/patch-aa b/cad/simian/patches/patch-aa
deleted file mode 100644
index 01aafa8d2d0..00000000000
--- a/cad/simian/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/11/03 19:56:36 rillig Exp $
-
---- src/Makefile.orig	Mon Dec  7 03:28:52 1998
-+++ src/Makefile		Fri Apr 27 17:09:20 2001
-@@ -1,6 +1,4 @@
- 
--SHELL = /bin/csh
--CCC = c++
--CCFLAGS = -g  
-+CXXFLAGS+= -Wformat
- LDFLAGS = -lm 
- RM = /bin/rm
-@@ -14,5 +12,5 @@
- 
- simian : $(OBJEC)
--	$(CCC) $(CCFLAGS) $(TARGET_ARCH) $(OBJEC) -o simian $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(TARGET_ARCH) $(OBJEC) -o simian $(LDFLAGS)
- 
- main.o : main.cc weeks.h  
-@@ -48,11 +46,11 @@
- 
- $(INCLU)/linear.o : $(INCLU)/linear.cc
--	g++ -c $(CFLAGS) $(INCLU)/linear.cc -o $(INCLU)/linear.o
-+	$(CXX) -c $(CXXFLAGS) $(INCLU)/linear.cc -o $(INCLU)/linear.o
- 
- $(INCLU)/bessel.o : $(INCLU)/bessel.cc
--	g++ -c $(CFLAGS) $(INCLU)/bessel.cc -o $(INCLU)/bessel.o
-+	$(CXX) -c $(CXXFLAGS) $(INCLU)/bessel.cc -o $(INCLU)/bessel.o
- 
- clean:
--	$(RM) -f *.o
-+	$(RM) -f *.o simian
- 	cd ../include; $(RM) -f *.o
- 
diff --git a/cad/simian/patches/patch-ab b/cad/simian/patches/patch-ab
deleted file mode 100644
index 6d58aa782a3..00000000000
--- a/cad/simian/patches/patch-ab
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/11/03 19:56:36 rillig Exp $
-
---- src/main.cc.orig	1998-12-10 10:56:19.000000000 +0000
-+++ src/main.cc
-@@ -1,6 +1,7 @@
- /* Main program, prints out all the results */
- /* written and modified by Emre Tuncer and Sangwoo Kim */
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <stdlib.h>
- #include <math.h>
- #include <stdio.h>
-@@ -42,7 +43,7 @@ main(int argc,char** argv)
-   printf("\n");
-   start=time(NULL);
-   if (argc!=3) {
--    cerr << "Usage: " << argv[0] << 
-+    std::cerr << "Usage: " << argv[0] << 
-       " <input file> <w/r>\n";
-     exit(1);
-   }
-@@ -73,7 +74,7 @@ main(int argc,char** argv)
-   Nf=nf[Nc+1];
-   LastFil(fils);         //remove last empty entry. 
- //  Corr(fils); /* x1 < x2 */
--  printf("Total %ld ribbons, %ld conductor\n",Nf,Nc);
-+  printf("Total %d ribbons, %d conductor\n",Nf,Nc);
-   L=allocator(Nf);
- 
-   if (argv[2][0]=='w') {
-@@ -84,7 +85,7 @@ main(int argc,char** argv)
-       for (j=i;j<Nf;j++) {
- 	L[j][i]=L[i][j]=Lp(iF,jF); 
- 	jF=jF->next;
--        fprintf(fo,"%ld %ld %le\n",i,j,L[i][j]*sis->unit);
-+        fprintf(fo,"%d %d %e\n",i,j,L[i][j]*sis->unit);
-       }
-       iF=iF->next;
-     }
-@@ -96,7 +97,7 @@ main(int argc,char** argv)
-     fi=fopen("induc","r");
-     for (i=0;i<Nf;i++) {
-       for (j=i;j<Nf;j++) {
--        fscanf(fi,"%ld  %ld  %le\n",&k,&k,&L[i][j]); 
-+        fscanf(fi,"%d  %d  %le\n",&k,&k,&L[i][j]); 
-         L[i][j]/=sis->unit;
-         L[j][i]=L[i][j];
-       }
-@@ -114,7 +115,7 @@ main(int argc,char** argv)
-       stop= time(NULL);
-       printf("\n");
-       printf("***********  \n");
--      printf("Total Elapsed time=%ld Seconds\n",(stop-start)); 
-+      printf("Total Elapsed time=%ld Seconds\n",(long int) (stop-start)); 
-       exit(1);
-     }
-     Z=matrix(Nf,Nf);
-@@ -143,11 +144,11 @@ main(int argc,char** argv)
-     if ((sis->loop != 0) || (Nc==1)){
-       z=matrix(Nc,Nc);
-       z=inverse(ymtrx,Nc);
--      fprintf(fzs,"\nImpedance %ld x %ld matrix (R,L) at f=%10.4le Hz\n",
-+      fprintf(fzs,"\nImpedance %d x %d matrix (R,L) at f=%10.4e Hz\n",
- 	Nc,Nc,w/2/M_PI);
-       for (i=0;i<Nc;i++) {
-         for (j=0;j<Nc;j++) {
--          fprintf(fzs,"(%11.4le,%11.4le)  ",RE(z[i][j])*sis->unit,IM(z[i][j])
-+          fprintf(fzs,"(%11.4e,%11.4e)  ",RE(z[i][j])*sis->unit,IM(z[i][j])
- 	/w*sis->unit);
-         } 
-         fprintf(fzs,"\n");
-@@ -181,12 +182,12 @@ main(int argc,char** argv)
- 
-       Din=matrix(numsgn+1,numsgn+1);
-       Din=Zequ(cons,numsgn,Nc);
--      fprintf(fzs,"\nImpedance %ld x %ld matrix (R,L) at f=%10.4le Hz\n",
-+      fprintf(fzs,"\nImpedance %d x %d matrix (R,L) at f=%10.4e Hz\n",
- 	numsgn,numsgn,w/2/M_PI);
- 
-       for (i=0;i<numsgn;i++) {
-         for (j=0;j<numsgn;j++) {
--          fprintf(fzs,"(%11.4le,%11.4le)  ",RE(Din[i][j])*sis->unit,IM(Din[i][j])
-+          fprintf(fzs,"(%11.4e,%11.4e)  ",RE(Din[i][j])*sis->unit,IM(Din[i][j])
-  	       /w*sis->unit);
-         }
-         fprintf(fzs,"\n");
-@@ -199,7 +200,7 @@ main(int argc,char** argv)
-   stop= time(NULL);
-   printf("\n");
-   printf("***********  \n");
--  printf("Total Elapsed time=%ld Seconds\n",(stop-start));  
-+  printf("Total Elapsed time=%ld Seconds\n",(long int) (stop-start));  
-   exit(0);
- }
- 
diff --git a/cad/simian/patches/patch-ac b/cad/simian/patches/patch-ac
deleted file mode 100644
index bd3ac39039c..00000000000
--- a/cad/simian/patches/patch-ac
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/01/22 17:41:17 dmcmahill Exp $
-
-sunpro compilers do not like non-constant array sizes in declarations.
-
---- src/plane.cc.orig	1998-12-07 03:28:51.000000000 -0500
-+++ src/plane.cc
-@@ -1,6 +1,7 @@
- /* Ribbon segmentation on ground plane */
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "weeks.h"
- #include "plane.h"
- #include "../include/linear.h"
-@@ -100,8 +101,11 @@ void filplane(Conductor *c)
-   y1=new double[sis->pc+1];
-   y2=new double[sis->pc+1]; 
-   int j,i,k;
--  struct line line[sis->lc+1];
--  struct Plane Plane[sis->pc+2];
-+  struct line *line;
-+  struct Plane *Plane;
-+  line = new struct line[sis->lc+1];
-+  Plane = new struct Plane[sis->pc+2];
-+
-   for (i=0;i<=sis->lc;i++) line[i].h1=line[i].h2=0.;
-   i=1; j=1;
-   double *sort;
-@@ -213,8 +217,18 @@ void filplane(Conductor *c)
-     for (j=1;j<=l[i];j++) LX[i][j]=b[j];
-   }
- 
--  struct space su[sis->pc+1][sis->lc+2];
--  struct space sl[sis->pc+1][sis->lc+2];
-+  struct space **su;
-+  struct space **sl;
-+  su = new  struct space *[sis->pc+1];
-+  sl = new  struct space *[sis->pc+1];
-+
-+  if (su != NULL && sl != NULL) {
-+    for (int i = 0; i < sis->pc+1; i++) {
-+      su[i] = new struct space[sis->lc+2];
-+      sl[i] = new struct space[sis->lc+2];
-+    }
-+  } 
-+
-   for (i=1;i<=sis->pc;i++) {
-     for (j=1;j<=u[i]/2;j++) su[i][j].hl=su[i][j].hr=0.;
-     for (j=1;j<=l[i]/2;j++) sl[i][j].hl=sl[i][j].hr=0.;
-@@ -334,11 +348,11 @@ void filplane(Conductor *c)
-   for (i=1;i<=sis->pc;i++) {
-     for (j=1;j<=l[i];j++) {
-       if (l[i]!=2) 
--	if (LX[i][j]!=LX[i][j+1])  fprintf(fo,"below %ld %le\n",i,LX[i][j]);
-+	if (LX[i][j]!=LX[i][j+1])  fprintf(fo,"below %d %e\n",i,LX[i][j]);
-     } 
-     for (j=1;j<=u[i];j++) {
-      if (u[i]!=2) 
--	if (UX[i][j]!=UX[i][j+1]) fprintf(fo,"above %ld %le\n",i,UX[i][j]);
-+	if (UX[i][j]!=UX[i][j+1]) fprintf(fo,"above %d %e\n",i,UX[i][j]);
-     }
-   }
- 
diff --git a/cad/simian/patches/patch-ad b/cad/simian/patches/patch-ad
deleted file mode 100644
index ed663bab651..00000000000
--- a/cad/simian/patches/patch-ad
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/11/03 19:56:36 rillig Exp $
-
---- src/reader.cc.orig	1998-12-10 09:02:44.000000000 +0000
-+++ src/reader.cc
-@@ -1,6 +1,9 @@
- /* Reading Input Geometry */
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <ios>
-+#include <streambuf>
-+#include <sstream>
-+#include <fstream>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-@@ -29,7 +32,7 @@ void Default(Conductor* c)
-     c->xc=0; c->yc=0;
- }
- 
--void ReadRest(Sys *sis,Conductor* conduc,fstream& fl,int& line)
-+void ReadRest(Sys *sis,Conductor* conduc,std::fstream& fl,int& line)
- {
-   char* s1;
-   char *proj;
-@@ -212,19 +215,19 @@ void ReadRest(Sys *sis,Conductor* conduc
-     else if (strcmp(s1,"nx")==0) {
-       fl >> s1;
-       if (strcmp(s1,"=")==0) fl >> conduc->dx;
--      else sscanf(s1,"%c%ld",&dum,&conduc->dx);
-+      else sscanf(s1,"%c%d",&dum,&conduc->dx);
-     }
-     else if (strcmp(s1,"ny=")==0) fl >> conduc->dy;
-     else if (strcmp(s1,"ny")==0) {
-       fl >> s1;
-       if (strcmp(s1,"=")==0) fl >> conduc->dy;
--      else sscanf(s1,"%c%ld",&dum,&conduc->dy);
-+      else sscanf(s1,"%c%d",&dum,&conduc->dy);
-     }
-     else if (strcmp(s1,"nr=")==0) fl >> conduc->nr;
-     else if (strcmp(s1,"nr")==0) {
-       fl >> s1;
-       if (strcmp(s1,"=")==0) fl >> conduc->nr;
--      else sscanf(s1,"%c%ld",&dum,&conduc->nr);
-+      else sscanf(s1,"%c%d",&dum,&conduc->nr);
-     }
-     else  if ((strncmp(s1,"*",1)==0)||(strncmp(s1,".",1)==0)) {
-       fl.getline(proj,80,'\n');
-@@ -265,11 +268,11 @@ void ReadRest(Sys *sis,Conductor* conduc
-       else if (strncmp(s1,"v=",2)==0)
- 	sscanf(s1,"%c%c%le",&dum,&dum,&conduc->v);
-       else if (strncmp(s1,"nx=",3)==0)
--	sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->dx);
-+	sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->dx);
-       else if (strncmp(s1,"ny=",3)==0)
--	sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->dy);
-+	sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->dy);
-       else if (strncmp(s1,"nr=",3)==0)
--	sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->nr);
-+	sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->nr);
-       else if (strncmp(s1,"rx=",3)==0)
- 	sscanf(s1,"%c%c%c%le",&dum,&dum,&dum,&conduc->rx);
-       else if (strncmp(s1,"ry=",3)==0)
-@@ -297,7 +300,7 @@ void reader(Conductor* conduc,Sys* sis,c
-   ss=new char[80];
-   s1=new char[80];
- 
--  fstream fll(fn,ios::in);
-+  std::fstream fll(fn,std::ios::in);
-   if (!fll) {
-     exit(1);
-   }
-@@ -337,7 +340,7 @@ void reader(Conductor* conduc,Sys* sis,c
-   ss=new char[100];
-   int p_c,l_c;
-   p_c=0; l_c=0;
--  fstream fl(fn,ios::in);
-+  std::fstream fl(fn,std::ios::in);
-   line=0;
-   do {
-     fl >> ss;
diff --git a/cad/simian/patches/patch-ae b/cad/simian/patches/patch-ae
deleted file mode 100644
index b36f4a79190..00000000000
--- a/cad/simian/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/11/03 19:56:36 rillig Exp $
-
---- src/Zs.cc.orig	1998-12-07 08:28:51.000000000 +0000
-+++ src/Zs.cc
-@@ -1,6 +1,6 @@
- /* EII for Plane wave model */
- 
--#include <stream.h>
-+#include <sstream>
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
diff --git a/cad/simian/patches/patch-af b/cad/simian/patches/patch-af
deleted file mode 100644
index 8c61266d7d7..00000000000
--- a/cad/simian/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/11/03 19:56:36 rillig Exp $
-
---- src/surfer1.cc.orig	1998-12-10 10:10:46.000000000 +0000
-+++ src/surfer1.cc
-@@ -2,8 +2,8 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include "weeks.h"
- #include "linklist.h"
- #include "nonuni.h"
-@@ -19,7 +19,7 @@ Filament* surfer(Conductor* cc,Filament*
-   double dum;
-   l=0; u=0;
-   if ((cc->lp==0)&&(sis->pc!=0)) {
--    fstream plate("plate",ios::in);
-+    std::fstream plate("plate",std::ios::in);
-     char *ss;
-     ss=new char[100];
-     do {
diff --git a/cad/simian/patches/patch-ag b/cad/simian/patches/patch-ag
deleted file mode 100644
index 28e639cd7e8..00000000000
--- a/cad/simian/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/11/03 19:56:36 rillig Exp $
-
---- src/linklist.cc.orig	1998-12-07 08:28:51.000000000 +0000
-+++ src/linklist.cc
-@@ -1,12 +1,13 @@
-+#include <iostream>
-+#include <sstream>
- #include <stdlib.h>
- #include <stdio.h>
--#include <stream.h>
- #include "weeks.h"
- 
- void newCon(Conductor* conduc)
- {
-   if ((conduc->next=new Conductor)==NULL) {
--    cerr << "Can't allocate!\n";
-+    std::cerr << "Can't allocate!\n";
-     exit(1);
-   }
- }
-@@ -15,7 +16,7 @@ void newCon(Conductor* conduc)
- void newFil(Filament* filam)
- {
-   if ((filam->next=new Filament)==(Filament*)NULL) {
--    cerr << "Can't allocate!\n";
-+    std::cerr << "Can't allocate!\n";
-     exit(1);
-   }
-   filam->next->next = (Filament*) NULL;
diff --git a/cad/simian/patches/patch-ah b/cad/simian/patches/patch-ah
deleted file mode 100644
index 2b2cee38855..00000000000
--- a/cad/simian/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/11/03 19:56:36 rillig Exp $
-
---- include/linear.cc.orig	1998-12-07 08:28:52.000000000 +0000
-+++ include/linear.cc
-@@ -10,7 +10,8 @@
-  ** Modification includes new memory allocation scheme and    **
-  ** LU decomposition                                          ** 
-  ***************************************************************/
--#include <stream.h>
-+#include <iostream>
-+#include <sstream>
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
diff --git a/cad/simian/patches/patch-ai b/cad/simian/patches/patch-ai
deleted file mode 100644
index 1c50db5ce36..00000000000
--- a/cad/simian/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/01/22 17:41:17 dmcmahill Exp $
-
-fix prototype to match what the function actually is.  Without this
-linking fails on sunpro
-
---- src/incident.h.orig	1998-12-07 03:28:51.000000000 -0500
-+++ src/incident.h
-@@ -1,3 +1,3 @@
- complex **Zequ(Conductor *c,int numsgn,int Nc);
--complex **ysort(int Nc,int n,int m);
-+void ysort(int Nc,int n,int m);
-