diff options
-rw-r--r-- | cad/spice/Makefile | 18 | ||||
-rw-r--r-- | cad/spice/files/patch-src_bin_help.c | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_bin_main.c | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_bin_proc2mod.c | 11 | ||||
-rw-r--r-- | cad/spice/files/patch-src_bin_procmod.c | 11 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_cp_complete.c | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_cp_lexical.c | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_cp_unixcom.c | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_dev_bjt_makedefs | 6 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_fte_dotcards.c | 8 | ||||
-rw-r--r-- | cad/spice/files/patch-src_lib_mfb_mfbcaps.c | 8 | ||||
-rw-r--r-- | cad/spice/files/patch-util_build | 6 |
12 files changed, 47 insertions, 51 deletions
diff --git a/cad/spice/Makefile b/cad/spice/Makefile index f2d9e5a6c6b0..7408e3b8b2cd 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -3,26 +3,22 @@ PORTNAME= spice PORTVERSION= 3f5.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= cad -MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:srcs \ - http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM3/ftpv330/src/:bsim3 \ - http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM4/BSIM480/:bsim4 \ +MASTER_SITES= https://ptolemy.berkeley.edu/projects/embedded/pubs/downloads/spice/:srcs \ http://home.hiroshima-u.ac.jp/usdl/HiSIM2/:hisim2 \ - LOCAL/hrs/${PORTNAME}:docs + LOCAL/hrs/${PORTNAME} DISTFILES= spice3f5${EXTRACT_SUFX}:srcs \ - BSIM3v330.tar.Z:bsim3 \ - BSIM480_Code.zip:bsim4 \ + BSIM3v330.tar.Z \ + BSIM480_Code.zip \ HiSIM_2.8.0_Release_20140605.zip:hisim2 \ - cp.ps:docs toc.ps:docs doc.ps:docs + cp.ps toc.ps doc.ps DIST_SUBDIR= spice EXTRACT_ONLY= spice3f5${EXTRACT_SUFX} MAINTAINER= hrs@FreeBSD.org COMMENT= General-purpose circuit simulation program -BROKEN= unfetchable - LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT @@ -47,7 +43,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2 OPTIONS_DEFAULT=X11 X11_USES= xorg -X11_USE= XORG=x11,xaw,xext,xmu,xt +X11_USE= XORG=x11,xaw,xext,xmu,xorgproto,xt X11_CONFIGURE_ENV= WITH_X11=yes DEV_BSIM3_DESC= BSIM3v3 MOS Transistor Model Support DEV_BSIM3_LICENSE= BSIML diff --git a/cad/spice/files/patch-src_bin_help.c b/cad/spice/files/patch-src_bin_help.c index 19921819a7db..9b2f82702a9a 100644 --- a/cad/spice/files/patch-src_bin_help.c +++ b/cad/spice/files/patch-src_bin_help.c @@ -1,6 +1,6 @@ ---- src/bin/help.c.orig 2011-06-24 19:12:52.000000000 +0000 -+++ src/bin/help.c 2011-06-24 19:13:19.000000000 +0000 -@@ -46,7 +46,7 @@ +--- src/bin/help.c.orig 1993-04-22 00:35:08 UTC ++++ src/bin/help.c +@@ -46,7 +46,7 @@ bool cp_interactive = false; char *hlp_filelist[] = { "spice", 0 }; /* ARGSUSED */ diff --git a/cad/spice/files/patch-src_bin_main.c b/cad/spice/files/patch-src_bin_main.c index a978271cb889..e1cd7b04af94 100644 --- a/cad/spice/files/patch-src_bin_main.c +++ b/cad/spice/files/patch-src_bin_main.c @@ -1,6 +1,6 @@ ---- src/bin/main.c.orig 2011-06-24 16:53:54.000000000 +0000 -+++ src/bin/main.c 2011-06-24 16:54:24.000000000 +0000 -@@ -183,7 +183,7 @@ +--- src/bin/main.c.orig 1993-07-29 05:48:32 UTC ++++ src/bin/main.c +@@ -183,7 +183,7 @@ if_tranparams(ckt, start, stop, step) struct circ *ckt char *hlp_filelist[] = { "spice", 0 }; diff --git a/cad/spice/files/patch-src_bin_proc2mod.c b/cad/spice/files/patch-src_bin_proc2mod.c new file mode 100644 index 000000000000..cfb443229409 --- /dev/null +++ b/cad/spice/files/patch-src_bin_proc2mod.c @@ -0,0 +1,11 @@ +--- src/bin/proc2mod.c.orig 1992-09-17 12:33:34 UTC ++++ src/bin/proc2mod.c +@@ -51,7 +51,7 @@ FILE *p = NULL; + char *dataline; + + +-void ++int + main() { + char *typeline; + char *prname; diff --git a/cad/spice/files/patch-src_bin_procmod.c b/cad/spice/files/patch-src_bin_procmod.c deleted file mode 100644 index 3ee73f74743e..000000000000 --- a/cad/spice/files/patch-src_bin_procmod.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/bin/proc2mod.c.orig 2011-06-24 16:07:41.000000000 +0000 -+++ src/bin/proc2mod.c 2011-06-24 16:08:43.000000000 +0000 -@@ -51,7 +51,7 @@ - char *dataline; - - --void -+int - main() { - char *typeline; - char *prname; diff --git a/cad/spice/files/patch-src_lib_cp_complete.c b/cad/spice/files/patch-src_lib_cp_complete.c index d5bed9295ba7..a22c5cec1426 100644 --- a/cad/spice/files/patch-src_lib_cp_complete.c +++ b/cad/spice/files/patch-src_lib_cp_complete.c @@ -1,6 +1,6 @@ ---- src/lib/cp/complete.c Wed Jun 19 05:55:38 1991 -+++ src/lib/cp/complete.c Sat Mar 17 11:51:56 2007 -@@ -445,14 +445,14 @@ +--- src/lib/cp/complete.c.orig 1991-06-19 03:55:38 UTC ++++ src/lib/cp/complete.c +@@ -445,14 +445,14 @@ cp_ccon(on) ison = on; if (ison == true) { diff --git a/cad/spice/files/patch-src_lib_cp_lexical.c b/cad/spice/files/patch-src_lib_cp_lexical.c index 371656745430..607ec05ed073 100644 --- a/cad/spice/files/patch-src_lib_cp_lexical.c +++ b/cad/spice/files/patch-src_lib_cp_lexical.c @@ -1,6 +1,6 @@ ---- src/lib/cp/lexical.c.orig 2013-05-01 05:15:32.000000000 +0900 -+++ src/lib/cp/lexical.c 2013-05-01 05:16:36.000000000 +0900 -@@ -145,7 +145,7 @@ +--- src/lib/cp/lexical.c.orig 1993-04-06 00:48:45 UTC ++++ src/lib/cp/lexical.c +@@ -145,7 +145,7 @@ gotchar: switch (c) { case ' ': case '\t': diff --git a/cad/spice/files/patch-src_lib_cp_unixcom.c b/cad/spice/files/patch-src_lib_cp_unixcom.c index 10df4369dfbd..9996146d952b 100644 --- a/cad/spice/files/patch-src_lib_cp_unixcom.c +++ b/cad/spice/files/patch-src_lib_cp_unixcom.c @@ -1,6 +1,6 @@ ---- src/lib/cp/unixcom.c.orig 2011-06-24 16:24:35.000000000 +0000 -+++ src/lib/cp/unixcom.c 2011-06-24 16:30:47.000000000 +0000 -@@ -6,6 +6,7 @@ +--- src/lib/cp/unixcom.c.orig 1993-04-14 01:15:50 UTC ++++ src/lib/cp/unixcom.c +@@ -6,6 +6,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD /* * Routines to do execution of unix commands. */ diff --git a/cad/spice/files/patch-src_lib_dev_bjt_makedefs b/cad/spice/files/patch-src_lib_dev_bjt_makedefs index 4d4ca73e777a..45d44a8e5794 100644 --- a/cad/spice/files/patch-src_lib_dev_bjt_makedefs +++ b/cad/spice/files/patch-src_lib_dev_bjt_makedefs @@ -1,6 +1,6 @@ ---- src/lib/dev/bjt/makedefs~ Fri May 31 23:16:08 1991 -+++ src/lib/dev/bjt/makedefs Mon Dec 8 14:16:57 2003 -@@ -14,6 +14,8 @@ +--- src/lib/dev/bjt/makedefs.orig 1991-05-31 21:16:08 UTC ++++ src/lib/dev/bjt/makedefs +@@ -14,6 +14,8 @@ COBJS = bjt.o bjtacld.o bjtask.o bjtconv.o bjtdel.o b bjtsacl.o bjtsetup.o bjtsload.o bjtsprt.o bjtsset.o \ bjtsupd.o bjttemp.o bjttrunc.o diff --git a/cad/spice/files/patch-src_lib_fte_dotcards.c b/cad/spice/files/patch-src_lib_fte_dotcards.c index 47103c282e89..7b91daf00cda 100644 --- a/cad/spice/files/patch-src_lib_fte_dotcards.c +++ b/cad/spice/files/patch-src_lib_fte_dotcards.c @@ -1,6 +1,6 @@ ---- src/lib/fte/dotcards.c.orig 1993-07-30 13:44:28.000000000 +0900 -+++ src/lib/fte/dotcards.c 2013-05-01 05:07:55.000000000 +0900 -@@ -405,11 +405,17 @@ +--- src/lib/fte/dotcards.c.orig 1993-07-30 04:44:28 UTC ++++ src/lib/fte/dotcards.c +@@ -405,11 +405,17 @@ fixem(string) char *string; { char buf[BSIZE_SP], *s, *t, *ss = string; @@ -18,7 +18,7 @@ for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; -@@ -589,6 +595,10 @@ +@@ -589,6 +595,10 @@ gettoks(s) if (c) *c = 0; diff --git a/cad/spice/files/patch-src_lib_mfb_mfbcaps.c b/cad/spice/files/patch-src_lib_mfb_mfbcaps.c index 3b7f20da26ae..82c22437ab5c 100644 --- a/cad/spice/files/patch-src_lib_mfb_mfbcaps.c +++ b/cad/spice/files/patch-src_lib_mfb_mfbcaps.c @@ -1,6 +1,6 @@ ---- src/lib/mfb/mfbcaps.c.orig 1991-04-01 22:32:50.000000000 +0000 -+++ src/lib/mfb/mfbcaps.c 2011-06-24 19:53:27.000000000 +0000 -@@ -26,6 +26,7 @@ +--- src/lib/mfb/mfbcaps.c.orig 1991-04-01 22:32:50 UTC ++++ src/lib/mfb/mfbcaps.c +@@ -26,6 +26,7 @@ Author: -C- 1982 Giles Billingsley #include "spice.h" #include "mfb.h" #include <ctype.h> @@ -8,7 +8,7 @@ #include "suffix.h" -@@ -43,9 +44,9 @@ +@@ -43,9 +44,9 @@ static int hopcount; /* detect infinite loops in FILE *POpen(); char *strcpy(); diff --git a/cad/spice/files/patch-util_build b/cad/spice/files/patch-util_build index de7b2dd1c6e3..6f9657906f79 100644 --- a/cad/spice/files/patch-util_build +++ b/cad/spice/files/patch-util_build @@ -1,6 +1,6 @@ ---- util/build.orig Thu Jul 29 03:46:39 1993 -+++ util/build Thu Jul 17 00:47:50 2003 -@@ -96,7 +96,7 @@ +--- util/build.orig 1993-07-29 08:46:39 UTC ++++ util/build +@@ -96,7 +96,7 @@ DIR4=`basename ${TOP3}` TMP_LEADER="${TMP_DIR}/buildl$$" TMP_TRAILER="${TMP_DIR}/buildt$$" |