Index: head/cad/spice/Makefile =================================================================== --- head/cad/spice/Makefile (revision 526856) +++ head/cad/spice/Makefile (revision 526857) @@ -1,126 +1,122 @@ # Created by: Julian Jenkins # $FreeBSD$ 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 EXTRACT_DEPENDS= ${LOCALBASE}/bin/unzip:archivers/unzip BROKEN_aarch64= Fails to link: missing sbrk WRKSRC= ${WRKDIR}/${PORTNAME}3f5 MAKEFILE= ${FILESDIR}/Makefile CONFIGURE_ENV= CONFIGFILE="${CONFIGFILE}" \ LOCALBASE="${LOCALBASE}" MAKE_JOBS_UNSAFE=yes PORTDOCS= spice3f3.ps.gz PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \ diodisto.cir ltra_1.cir ltra_2.cir ltra_3.cir \ mixdisto.cir mos6inv.cir mosamp2.cir mosmem.cir process.mod \ process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \ rtlinv.cir schmitt.cir simplepz.cir 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 DEV_BSIM3_LICENSE_FILE= ${WRKSRC}/src/lib/dev/bsim3/B3TERMS_OF_USE DEV_BSIM4_DESC= BSIM4v4 MOS Transistor Model Support DEV_BSIM4_LICENSE= BSIML DEV_BSIM4_LICENSE_FILE= ${WRKSRC}/src/lib/dev/bsim4/B4TERMS_OF_USE.txt DEV_HISIM2_DESC= HiSIM2 IGFET Model Support DEV_HISIM2_LICENSE= HISIML .include # Configuration parameters. CC_OPT= ${CFLAGS} CONFIGFILE= ${WRKSRC}/conf/FreeBSD DEVICES= LICENSE_FILE_MIT= ${WRKSRC}/COPYRIGHT LICENSE_NAME_BSIML= BSIM license LICENSE_PERMS_BSIML= dist-mirror pkg-mirror auto-accept LICENSE_NAME_HISIML= HiSIM license LICENSE_PERMS_HISIML= dist-mirror pkg-mirror auto-accept LICENSE_FILE_HISIML= ${FILESDIR}/hisim2-license.txt .for D in ${OPTIONS_DEFINE:MDEV_*:S/DEV_//} . if !empty(PORT_OPTIONS:MDEV_$D) LICENSE_COMB= multi DEVICES+= ${D:tl} . if !empty(DEV_${D}_LICENSE) LICENSE+= ${DEV_${D}_LICENSE} . if !empty(DEV_${D}_LICENSE_FILE) LICENSE_FILE_${DEV_${D}_LICENSE}= ${DEV_${D}_LICENSE_FILE} . endif . endif . endif .endfor LICENSE:= ${LICENSE:O:u} post-extract: @${DO_NADA} post-extract-DEV_BSIM3-on: @${MKDIR} ${WRKSRC}/src/lib/dev/bsim3 ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \ -C ${WRKSRC}/src/lib/dev/bsim3 post-extract-DEV_BSIM4-on: @${MKDIR} ${WRKSRC}/src/lib/dev/bsim4 ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \ -d ${WRKSRC}/src/lib/dev/bsim4 post-extract-DEV_HISIM2-on: ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/HiSIM_2.8.0_Release_20140605.zip \ -d ${WRKDIR} ${MV} ${WRKDIR}/HiSIM_2.8.0_Release_20140605/HiSIM_2.8.0_C-Code/hisim2 \ ${WRKSRC}/src/lib/dev ${CONFIGFILE}:: @${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure .for V in CC MAKE CC_OPT @${ECHO_CMD} "${V}=${$V}" >> ${WRKSRC}/conf/FreeBSD .endfor .for V in DEVICES @${ECHO_CMD} "${V}+=${$V}" >> ${WRKSRC}/conf/FreeBSD .endfor do-configure: ${CONFIGFILE} @${DO_NADA} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps | ${GZIP_CMD} > \ ${STAGEDIR}${DOCSDIR}/${PORTDOCS} post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/cad/spice/files/patch-src_bin_procmod.c =================================================================== --- head/cad/spice/files/patch-src_bin_procmod.c (revision 526856) +++ head/cad/spice/files/patch-src_bin_procmod.c (nonexistent) @@ -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; Property changes on: head/cad/spice/files/patch-src_bin_procmod.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/spice/files/patch-src_bin_help.c =================================================================== --- head/cad/spice/files/patch-src_bin_help.c (revision 526856) +++ head/cad/spice/files/patch-src_bin_help.c (revision 526857) @@ -1,11 +1,11 @@ ---- 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 */ -void +int main(ac, av) int ac; char **av; Index: head/cad/spice/files/patch-src_bin_main.c =================================================================== --- head/cad/spice/files/patch-src_bin_main.c (revision 526856) +++ head/cad/spice/files/patch-src_bin_main.c (revision 526857) @@ -1,11 +1,11 @@ ---- 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 }; -void +int main(ac, av) char **av; { Index: head/cad/spice/files/patch-src_bin_proc2mod.c =================================================================== --- head/cad/spice/files/patch-src_bin_proc2mod.c (nonexistent) +++ head/cad/spice/files/patch-src_bin_proc2mod.c (revision 526857) @@ -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; Property changes on: head/cad/spice/files/patch-src_bin_proc2mod.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/spice/files/patch-src_lib_cp_complete.c =================================================================== --- head/cad/spice/files/patch-src_lib_cp_complete.c (revision 526856) +++ head/cad/spice/files/patch-src_lib_cp_complete.c (revision 526857) @@ -1,20 +1,20 @@ ---- 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) { - (void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf); + tcgetattr(fileno(cp_in), &OS_Buf); sbuf = OS_Buf; sbuf.c_cc[VEOF] = 0; sbuf.c_cc[VEOL] = ESCAPE; sbuf.c_cc[VEOL2] = CNTRL_D; - (void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf); + tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf); } else { - (void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf); + tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf); } # endif Index: head/cad/spice/files/patch-src_lib_cp_lexical.c =================================================================== --- head/cad/spice/files/patch-src_lib_cp_lexical.c (revision 526856) +++ head/cad/spice/files/patch-src_lib_cp_lexical.c (revision 526857) @@ -1,11 +1,11 @@ ---- 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': - if (i > 0) { + if (paren < 1 && i > 0) { newword; } break; Index: head/cad/spice/files/patch-src_lib_cp_unixcom.c =================================================================== --- head/cad/spice/files/patch-src_lib_cp_unixcom.c (revision 526856) +++ head/cad/spice/files/patch-src_lib_cp_unixcom.c (revision 526857) @@ -1,10 +1,10 @@ ---- 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. */ +#include #include "spice.h" #include "cpdefs.h" Index: head/cad/spice/files/patch-src_lib_dev_bjt_makedefs =================================================================== --- head/cad/spice/files/patch-src_lib_dev_bjt_makedefs (revision 526856) +++ head/cad/spice/files/patch-src_lib_dev_bjt_makedefs (revision 526857) @@ -1,11 +1,11 @@ ---- 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 +REAL_CC_OPT = + MODULE = bjt LIBRARY = dev MODULE_TARGET = $(OBJLIB_DIR)/$(MODULE) Index: head/cad/spice/files/patch-src_lib_fte_dotcards.c =================================================================== --- head/cad/spice/files/patch-src_lib_fte_dotcards.c (revision 526856) +++ head/cad/spice/files/patch-src_lib_fte_dotcards.c (revision 526857) @@ -1,31 +1,31 @@ ---- 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; + char *e; + e = string + strlen(string); if (ciprefix("v(", string) && index(string, ',')) { for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; + while (s + 1 < e && isspace(*(s + 1))) { + *(s + 1) = '\0'; + s++; + } for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; -@@ -589,6 +595,10 @@ +@@ -589,6 +595,10 @@ gettoks(s) if (c) *c = 0; + while (c + 1 < r && isspace(*(c + 1))) { + c++; + *c = '\0'; + } wl = alloc(struct wordlist); Index: head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c =================================================================== --- head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c (revision 526856) +++ head/cad/spice/files/patch-src_lib_mfb_mfbcaps.c (revision 526857) @@ -1,22 +1,22 @@ ---- 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 +#include #include "suffix.h" -@@ -43,9 +44,9 @@ +@@ -43,9 +44,9 @@ static int hopcount; /* detect infinite loops in FILE *POpen(); char *strcpy(); -char *MFBSkip(); +static char *MFBSkip(); char *MFBGetStr(); -char *MFBCapDecod(); +static char *MFBCapDecod(); int MFBGetNum(); int MFBGetFlag(); int MFBGetEnt(); Index: head/cad/spice/files/patch-util_build =================================================================== --- head/cad/spice/files/patch-util_build (revision 526856) +++ head/cad/spice/files/patch-util_build (revision 526857) @@ -1,11 +1,11 @@ ---- 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$$" -trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15 +trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15 echo > "${TMP_TRAILER}" BAD=false DEBUG=