From 41893cf148934fd7f4739a8fd80aea3fbfdf1f5b Mon Sep 17 00:00:00 2001 From: bentley Date: Thu, 10 Jan 2013 12:19:50 +0000 Subject: [PATCH] Update to ngpsice-25. Release notes: http://ngspice.git.sourceforge.net/git/gitweb.cgi?p=ngspice/ngspice;a=blob;f=NEWS ok benoit@ --- cad/ngspice/Makefile | 4 +- cad/ngspice/distinfo | 7 +- cad/ngspice/patches/patch-tests_bin_check_sh | 12 +- cad/ngspice/pkg/PLIST | 122 ++++++++++++++++++- 4 files changed, 131 insertions(+), 14 deletions(-) diff --git a/cad/ngspice/Makefile b/cad/ngspice/Makefile index d47f3e952a5..8870c85a3eb 100644 --- a/cad/ngspice/Makefile +++ b/cad/ngspice/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/05/16 08:20:17 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2013/01/10 12:19:50 bentley Exp $ COMMENT = circuit simulator, based on Berkeley SPICE -DISTNAME = ngspice-22 +DISTNAME = ngspice-25 CATEGORIES = cad diff --git a/cad/ngspice/distinfo b/cad/ngspice/distinfo index 553fcce0fc9..7edcfbcb47e 100644 --- a/cad/ngspice/distinfo +++ b/cad/ngspice/distinfo @@ -1,5 +1,2 @@ -MD5 (ngspice-22.tar.gz) = tVzdgKVmkv5s4T96M8ZNCA== -RMD160 (ngspice-22.tar.gz) = ktCAdW7nnuoGQpckZPXMZT34gbU= -SHA1 (ngspice-22.tar.gz) = q7IyYT+0hZ8XvN7+74aecCvT8Nw= -SHA256 (ngspice-22.tar.gz) = +13xB83u+UCgbXG+Dvu0b5awXFS/xiRknHizt/DUQ8E= -SIZE (ngspice-22.tar.gz) = 6022305 +SHA256 (ngspice-25.tar.gz) = 0AC7uXjbhG/233zjJ9gZSr4Eb91ck+fLojxIQTfvFA4= +SIZE (ngspice-25.tar.gz) = 6729137 diff --git a/cad/ngspice/patches/patch-tests_bin_check_sh b/cad/ngspice/patches/patch-tests_bin_check_sh index 47d4635dd20..35030b4e5ee 100644 --- a/cad/ngspice/patches/patch-tests_bin_check_sh +++ b/cad/ngspice/patches/patch-tests_bin_check_sh @@ -1,12 +1,12 @@ -$OpenBSD: patch-tests_bin_check_sh,v 1.1.1.1 2011/05/16 08:20:17 landry Exp $ ---- tests/bin/check.sh.orig Sun May 15 20:45:54 2011 -+++ tests/bin/check.sh Sun May 15 20:46:36 2011 -@@ -33,7 +33,7 @@ case $HOST_TYPE in +$OpenBSD: patch-tests_bin_check_sh,v 1.2 2013/01/10 12:19:50 bentley Exp $ +--- tests/bin/check.sh.orig Wed Jan 2 08:33:37 2013 ++++ tests/bin/check.sh Thu Jan 10 00:26:36 2013 +@@ -47,7 +47,7 @@ case $HOST_TYPE in fi rm -f $testname.test_tmp $testname.out_tmp ;; - SunOS*) + SunOS*|OpenBSD*) $SPICE --batch $testdir/$testname.cir >$testname.test &&\ - sed -e '/^$/d' $testname.test | egrep -v $FILTER > $testname.test_tmp &&\ - sed -e '/^$/d' $testdir/$testname.out | egrep -v $FILTER > $testname.out_tmp + sed -e '/^$/d' $testname.test | egrep -v "$FILTER" > $testname.test_tmp &&\ + sed -e '/^$/d' $testdir/$testname.out | egrep -v "$FILTER" > $testname.out_tmp diff --git a/cad/ngspice/pkg/PLIST b/cad/ngspice/pkg/PLIST index bf4c638ffbf..993e7d1ec08 100644 --- a/cad/ngspice/pkg/PLIST +++ b/cad/ngspice/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/16 08:20:17 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2013/01/10 12:19:50 bentley Exp $ @bin bin/ngmakeidx @bin bin/ngmultidec @bin bin/ngnutmeg @@ -13,6 +13,126 @@ share/ngspice/ share/ngspice/helpdir/ share/ngspice/helpdir/ngspice.idx share/ngspice/helpdir/ngspice.txt +share/ngspice/include/ +share/ngspice/include/ngspice/ +share/ngspice/include/ngspice/1-f-code.h +share/ngspice/include/ngspice/FastNorm3.h +share/ngspice/include/ngspice/acdefs.h +share/ngspice/include/ngspice/bdrydefs.h +share/ngspice/include/ngspice/bool.h +share/ngspice/include/ngspice/carddefs.h +share/ngspice/include/ngspice/ciderinp.h +share/ngspice/include/ngspice/cidersupt.h +share/ngspice/include/ngspice/cktdefs.h +share/ngspice/include/ngspice/cluster.h +share/ngspice/include/ngspice/cm.h +share/ngspice/include/ngspice/cmconstants.h +share/ngspice/include/ngspice/cmproto.h +share/ngspice/include/ngspice/cmtypes.h +share/ngspice/include/ngspice/compatmode.h +share/ngspice/include/ngspice/complex.h +share/ngspice/include/ngspice/config.h +share/ngspice/include/ngspice/const.h +share/ngspice/include/ngspice/contdefs.h +share/ngspice/include/ngspice/cpdefs.h +share/ngspice/include/ngspice/cpextern.h +share/ngspice/include/ngspice/cpstd.h +share/ngspice/include/ngspice/defines.h +share/ngspice/include/ngspice/devdefs.h +share/ngspice/include/ngspice/dgen.h +share/ngspice/include/ngspice/distodef.h +share/ngspice/include/ngspice/dllitf.h +share/ngspice/include/ngspice/domndefs.h +share/ngspice/include/ngspice/dopdefs.h +share/ngspice/include/ngspice/dstring.h +share/ngspice/include/ngspice/dvec.h +share/ngspice/include/ngspice/elctdefs.h +share/ngspice/include/ngspice/enh.h +share/ngspice/include/ngspice/evt.h +share/ngspice/include/ngspice/evtproto.h +share/ngspice/include/ngspice/evtudn.h +share/ngspice/include/ngspice/fftext.h +share/ngspice/include/ngspice/ftedbgra.h +share/ngspice/include/ngspice/ftedebug.h +share/ngspice/include/ngspice/ftedefs.h +share/ngspice/include/ngspice/ftedev.h +share/ngspice/include/ngspice/fteext.h +share/ngspice/include/ngspice/fteinp.h +share/ngspice/include/ngspice/fteinput.h +share/ngspice/include/ngspice/fteoptdefs.h +share/ngspice/include/ngspice/fteparse.h +share/ngspice/include/ngspice/gendefs.h +share/ngspice/include/ngspice/gendev.h +share/ngspice/include/ngspice/graph.h +share/ngspice/include/ngspice/grid.h +share/ngspice/include/ngspice/hash.h +share/ngspice/include/ngspice/hlpdefs.h +share/ngspice/include/ngspice/iferrmsg.h +share/ngspice/include/ngspice/ifsim.h +share/ngspice/include/ngspice/inpdefs.h +share/ngspice/include/ngspice/inpmacs.h +share/ngspice/include/ngspice/inpptree.h +share/ngspice/include/ngspice/ipc.h +share/ngspice/include/ngspice/ipcproto.h +share/ngspice/include/ngspice/ipctiein.h +share/ngspice/include/ngspice/jobdefs.h +share/ngspice/include/ngspice/lsort.h +share/ngspice/include/ngspice/macros.h +share/ngspice/include/ngspice/material.h +share/ngspice/include/ngspice/matldefs.h +share/ngspice/include/ngspice/memory.h +share/ngspice/include/ngspice/meshdefs.h +share/ngspice/include/ngspice/meshext.h +share/ngspice/include/ngspice/methdefs.h +share/ngspice/include/ngspice/mif.h +share/ngspice/include/ngspice/mifcmdat.h +share/ngspice/include/ngspice/mifdefs.h +share/ngspice/include/ngspice/mifparse.h +share/ngspice/include/ngspice/mifproto.h +share/ngspice/include/ngspice/miftypes.h +share/ngspice/include/ngspice/missing_math.h +share/ngspice/include/ngspice/mobdefs.h +share/ngspice/include/ngspice/modldefs.h +share/ngspice/include/ngspice/multi_line.h +share/ngspice/include/ngspice/ngspice.h +share/ngspice/include/ngspice/noisedef.h +share/ngspice/include/ngspice/numcards.h +share/ngspice/include/ngspice/numconst.h +share/ngspice/include/ngspice/numenum.h +share/ngspice/include/ngspice/numgen.h +share/ngspice/include/ngspice/numglobs.h +share/ngspice/include/ngspice/onedev.h +share/ngspice/include/ngspice/onemesh.h +share/ngspice/include/ngspice/opdefs.h +share/ngspice/include/ngspice/optdefs.h +share/ngspice/include/ngspice/optndefs.h +share/ngspice/include/ngspice/outpdefs.h +share/ngspice/include/ngspice/plot.h +share/ngspice/include/ngspice/pnode.h +share/ngspice/include/ngspice/profile.h +share/ngspice/include/ngspice/pssdefs.h +share/ngspice/include/ngspice/pzdefs.h +share/ngspice/include/ngspice/sen2defs.h +share/ngspice/include/ngspice/sensdefs.h +share/ngspice/include/ngspice/sensgen.h +share/ngspice/include/ngspice/sim.h +share/ngspice/include/ngspice/smpdefs.h +share/ngspice/include/ngspice/sperror.h +share/ngspice/include/ngspice/spmatrix.h +share/ngspice/include/ngspice/stringutil.h +share/ngspice/include/ngspice/suffix.h +share/ngspice/include/ngspice/swec.h +share/ngspice/include/ngspice/tclspice.h +share/ngspice/include/ngspice/tfdefs.h +share/ngspice/include/ngspice/trandefs.h +share/ngspice/include/ngspice/trcvdefs.h +share/ngspice/include/ngspice/tskdefs.h +share/ngspice/include/ngspice/twodev.h +share/ngspice/include/ngspice/twomesh.h +share/ngspice/include/ngspice/typedefs.h +share/ngspice/include/ngspice/wallace.h +share/ngspice/include/ngspice/wordlist.h +share/ngspice/include/ngspice/wstdio.h share/ngspice/scripts/ share/ngspice/scripts/setplot share/ngspice/scripts/spectrum