[ngspice] Update to rev 33 (#15837)

* [ngspice] Update to rev 33

* Update ports/ngspice/CONTROL

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* x-add-version ngspice

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

5 files changed, 30 insertions, 20 deletions

diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL
index df7fd9b5b..52d04f3aa 100644
--- a/ports/ngspice/CONTROL
+++ b/ports/ngspice/CONTROL
@@ -1,6 +1,5 @@
 Source: ngspice
-Version: 32
-Port-Version: 1
+Version: 33
 Homepage: http://ngspice.sourceforge.net/
 Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE
 Supports: !(linux|osx|arm|uwp)
diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake
index 66675c8c4..538a02f5e 100644
--- a/ports/ngspice/portfile.cmake
+++ b/ports/ngspice/portfile.cmake
@@ -8,9 +8,9 @@ set(VCPKG_CRT_LINKAGE static)
 vcpkg_from_sourceforge(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO ngspice/ng-spice-rework

-    REF 32

-    FILENAME "ngspice-32.tar.gz"

-    SHA512 222eaa0cd6577a6eb8454bb49a7050a162d430c4b07a4fdc6baf350c5b3f5b018bac640fd44f465ec09c8cba6a9729b1cbe8d3d8c097f672acc2c22fabe8f4bc

+    REF 33

+    FILENAME "ngspice-33.tar.gz"

+    SHA512 895e39f7de185df18bf443a9fa5691cdb3bf0a5091d9860d20ccb02254ef396a4cca5a1c8bf4ba19a03783fc89bb86649218cee977b0fe4565d3c84548943c09

     PATCHES

         use-winbison-global.patch

 )

diff --git a/ports/ngspice/use-winbison-global.patch b/ports/ngspice/use-winbison-global.patch
index f28a34ace..c345e9839 100644
--- a/ports/ngspice/use-winbison-global.patch
+++ b/ports/ngspice/use-winbison-global.patch
@@ -1,13 +1,19 @@
-diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj

-index 96786b1..f5d9322 100644

---- a/visualc/sharedspice.vcxproj

-+++ b/visualc/sharedspice.vcxproj

-@@ -879,7 +879,7 @@

-   <ItemGroup>

-     <CustomBuild Include="..\src\frontend\parse-bison.y;..\src\spicelib\parser\inpptree-parser.y">

-       <Message>invoke win_bison.exe for %(Identity)</Message>

--      <Command>..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>

-+      <Command>win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>

-       <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>

-     </CustomBuild>

-     <None Include="..\src\sharedspice.map" />

+diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj
+index 4ff0dfc..57b0c35 100644
+--- a/visualc/sharedspice.vcxproj
++++ b/visualc/sharedspice.vcxproj
+@@ -2223,12 +2223,12 @@
+   <ItemGroup>
+     <CustomBuild Include="..\src\frontend\parse-bison.y">
+       <Message>invoke win_bison.exe for %(Identity)</Message>
+-      <Command>..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
++      <Command>win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
+       <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
+     </CustomBuild>
+     <CustomBuild Include="..\src\spicelib\parser\inpptree-parser.y">
+       <Message>invoke win_bison.exe for %(Identity)</Message>
+-      <Command>..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
++      <Command>win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
+       <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
+     </CustomBuild>
+   </ItemGroup>
diff --git a/versions/baseline.json b/versions/baseline.json
index c394a6042..e574da5a3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4009,8 +4009,8 @@
       "port-version": 0
     },
     "ngspice": {
-      "baseline": "32",
-      "port-version": 1
+      "baseline": "33",
+      "port-version": 0
     },
     "nifticlib": {
       "baseline": "2020-04-30",
diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json
index 5dcf4cb76..b34cb7d92 100644
--- a/versions/n-/ngspice.json
+++ b/versions/n-/ngspice.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "90c388f47ca769fd11449fde9d70402e9865a986",
+      "version-string": "33",
+      "port-version": 0
+    },
+    {
       "git-tree": "b15238b045e17d6543080e78e20071380df008f2",
       "version-string": "32",
       "port-version": 1