Date: Sat, 22 Feb 2020 20:44:35 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526857 - in head/cad/spice: . files Message-ID: <202002222044.01MKiZEu036842@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Feb 22 20:44:35 2020 New Revision: 526857 URL: https://svnweb.freebsd.org/changeset/ports/526857 Log: Unbreak the build: - Update MASTER_SITES. - Add missing dependency. - Regenerate patches. Added: head/cad/spice/files/patch-src_bin_proc2mod.c (contents, props changed) Deleted: head/cad/spice/files/patch-src_bin_procmod.c Modified: head/cad/spice/Makefile head/cad/spice/files/patch-src_bin_help.c head/cad/spice/files/patch-src_bin_main.c head/cad/spice/files/patch-src_lib_cp_complete.c head/cad/spice/files/patch-src_lib_cp_lexical.c head/cad/spice/files/patch-src_lib_cp_unixcom.c head/cad/spice/files/patch-src_lib_dev_bjt_makedefs head/cad/spice/files/patch-src_lib_fte_dotcards.c head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c head/cad/spice/files/patch-util_build Modified: head/cad/spice/Makefile ============================================================================== --- head/cad/spice/Makefile Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/Makefile Sat Feb 22 20:44:35 2020 (r526857) @@ -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 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 Modified: head/cad/spice/files/patch-src_bin_help.c ============================================================================== --- head/cad/spice/files/patch-src_bin_help.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_bin_help.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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 */ Modified: head/cad/spice/files/patch-src_bin_main.c ============================================================================== --- head/cad/spice/files/patch-src_bin_main.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_bin_main.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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 }; Added: head/cad/spice/files/patch-src_bin_proc2mod.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/spice/files/patch-src_bin_proc2mod.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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; Modified: head/cad/spice/files/patch-src_lib_cp_complete.c ============================================================================== --- head/cad/spice/files/patch-src_lib_cp_complete.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_cp_complete.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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) { Modified: head/cad/spice/files/patch-src_lib_cp_lexical.c ============================================================================== --- head/cad/spice/files/patch-src_lib_cp_lexical.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_cp_lexical.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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': Modified: head/cad/spice/files/patch-src_lib_cp_unixcom.c ============================================================================== --- head/cad/spice/files/patch-src_lib_cp_unixcom.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_cp_unixcom.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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. */ Modified: head/cad/spice/files/patch-src_lib_dev_bjt_makedefs ============================================================================== --- head/cad/spice/files/patch-src_lib_dev_bjt_makedefs Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_dev_bjt_makedefs Sat Feb 22 20:44:35 2020 (r526857) @@ -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 Modified: head/cad/spice/files/patch-src_lib_fte_dotcards.c ============================================================================== --- head/cad/spice/files/patch-src_lib_fte_dotcards.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_fte_dotcards.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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; Modified: head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c ============================================================================== --- head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c Sat Feb 22 20:44:35 2020 (r526857) @@ -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(); Modified: head/cad/spice/files/patch-util_build ============================================================================== --- head/cad/spice/files/patch-util_build Sat Feb 22 20:01:41 2020 (r526856) +++ head/cad/spice/files/patch-util_build Sat Feb 22 20:44:35 2020 (r526857) @@ -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$$"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002222044.01MKiZEu036842>