From 8d5fd7f3c790dc78d66c9290594e9f9640ba3564 Mon Sep 17 00:00:00 2001
From: bentley <bentley@openbsd.org>
Date: Wed, 12 Mar 2014 06:18:34 +0000
Subject: [PATCH] Update to ngspice-26.

---
 cad/ngspice/Makefile                                |  5 ++---
 cad/ngspice/distinfo                                |  4 ++--
 cad/ngspice/patches/patch-configure                 | 12 ++++++++++++
 cad/ngspice/patches/patch-src_maths_misc_randnumb_c | 11 -----------
 cad/ngspice/patches/patch-tests_bin_check_sh        | 12 ------------
 cad/ngspice/pkg/PLIST                               |  3 ++-
 6 files changed, 18 insertions(+), 29 deletions(-)
 create mode 100644 cad/ngspice/patches/patch-configure
 delete mode 100644 cad/ngspice/patches/patch-src_maths_misc_randnumb_c
 delete mode 100644 cad/ngspice/patches/patch-tests_bin_check_sh

diff --git a/cad/ngspice/Makefile b/cad/ngspice/Makefile
index 9205416076d..e984d3f2a2e 100644
--- a/cad/ngspice/Makefile
+++ b/cad/ngspice/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/21 08:45:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2014/03/12 06:18:34 bentley Exp $
 
 COMMENT =		circuit simulator, based on Berkeley SPICE
 
-DISTNAME =		ngspice-25
-REVISION =		0
+DISTNAME =		ngspice-26
 
 CATEGORIES =		cad
 
diff --git a/cad/ngspice/distinfo b/cad/ngspice/distinfo
index 7edcfbcb47e..7f12a6034fb 100644
--- a/cad/ngspice/distinfo
+++ b/cad/ngspice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ngspice-25.tar.gz) = 0AC7uXjbhG/233zjJ9gZSr4Eb91ck+fLojxIQTfvFA4=
-SIZE (ngspice-25.tar.gz) = 6729137
+SHA256 (ngspice-26.tar.gz) = UeIwyLcggC2TdHvFgMCinR+1MPPdBvITtqcAyppNAQg=
+SIZE (ngspice-26.tar.gz) = 6925987
diff --git a/cad/ngspice/patches/patch-configure b/cad/ngspice/patches/patch-configure
new file mode 100644
index 00000000000..d7d4c6de7c6
--- /dev/null
+++ b/cad/ngspice/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2014/03/12 06:18:34 bentley Exp $
+--- configure.orig	Tue Mar 11 05:03:46 2014
++++ configure	Tue Mar 11 05:03:48 2014
+@@ -5199,7 +5199,7 @@ else
+ $as_echo "#define NGDEBUG 1" >>confdefs.h
+ 
+     if test "x$GCC" = xyes; then
+-        CFLAGS="-g -O1 -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wold-style-definition -Wredundant-decls -Wconversion $ext_CFLAGS"
++        CFLAGS="-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wold-style-definition -Wconversion $ext_CFLAGS"
+     else
+         CFLAGS="-g $ext_CFLAGS"
+     fi
diff --git a/cad/ngspice/patches/patch-src_maths_misc_randnumb_c b/cad/ngspice/patches/patch-src_maths_misc_randnumb_c
deleted file mode 100644
index 22ac8802610..00000000000
--- a/cad/ngspice/patches/patch-src_maths_misc_randnumb_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_maths_misc_randnumb_c,v 1.1 2013/12/06 02:26:02 bentley Exp $
---- src/maths/misc/randnumb.c.orig	Thu Dec  5 18:13:53 2013
-+++ src/maths/misc/randnumb.c	Thu Dec  5 18:13:54 2013
-@@ -47,7 +47,6 @@ Copyright 2008 Holger Vogt
- #else
- #include <unistd.h>
- #endif
--#include <sys/timeb.h>
- #include <stdarg.h>			// var. argumente
- 
- /* Tausworthe state variables for double variates*/
diff --git a/cad/ngspice/patches/patch-tests_bin_check_sh b/cad/ngspice/patches/patch-tests_bin_check_sh
deleted file mode 100644
index 35030b4e5ee..00000000000
--- a/cad/ngspice/patches/patch-tests_bin_check_sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
diff --git a/cad/ngspice/pkg/PLIST b/cad/ngspice/pkg/PLIST
index 993e7d1ec08..6471571b76c 100644
--- a/cad/ngspice/pkg/PLIST
+++ b/cad/ngspice/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/01/10 12:19:50 bentley Exp $
+@comment $OpenBSD: PLIST,v 1.3 2014/03/12 06:18:34 bentley Exp $
 @bin bin/ngmakeidx
 @bin bin/ngmultidec
 @bin bin/ngnutmeg
@@ -115,6 +115,7 @@ 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/sharedspice.h
 share/ngspice/include/ngspice/sim.h
 share/ngspice/include/ngspice/smpdefs.h
 share/ngspice/include/ngspice/sperror.h