<pre style='margin:0'>
Mark Anderson (markemer) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd31f2cae539d3b9edd892e5b13afecc16c9232a">https://github.com/macports/macports-ports/commit/bd31f2cae539d3b9edd892e5b13afecc16c9232a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bd31f2cae53 ngspice: update to version 43 (#25041)
</span>bd31f2cae53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd31f2cae539d3b9edd892e5b13afecc16c9232a
</span>Author: Brian Degnan <degnan.68k@gmail.com>
AuthorDate: Fri Aug 30 18:54:57 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> ngspice: update to version 43 (#25041)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56552
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70175
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70435
</span>---
science/ngspice/Portfile | 90 ++++++++++------------
.../files/patch-ngspice-older-MACH-defines.diff | 17 ----
2 files changed, 42 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ngspice/Portfile b/science/ngspice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c971acc584..a676ce15869 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ngspice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ngspice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,14 @@
</span> PortSystem 1.0
name ngspice
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 43
</span> revision 0
license BSD
categories science cad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:degnan.68k @bpdegnan} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mark @markemer} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Circuit simulator based on Spice 3f5, XSpice and others
long_description \
Ngspice is a mixed-level/mixed-signal circuit simulator. Its \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,38 +21,35 @@ long_description \
</span> homepage http://ngspice.sourceforge.net/
master_sites sourceforge:project/ngspice/ng-spice-rework/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 094d76e789b65d10e7d80f2f2f90397ed0ec13c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4f818287efba245341046635b757ae81f879549b326a4316b5f6e697aa517f8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8450071
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 577a26e18e70fdf1fceb87ae3c6a783c3cf00d8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 14dd6a6f08531f2051c13ae63790a45708bd43f3e77886a6a84898c297b13699 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10279606
</span>
set docdir ${prefix}/share/doc/${name}
if {${name} eq ${subport}} {
# freetype2 headers are not found by default
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we could fix the header path in configure.ac, but then need autorecconf, etc
</span> configure.cppflags-prepend -I${prefix}/include/freetype2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TASK_BASIC_INFO_COUNT and friends were renamed in 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span> port:xorg-libX11 \
port:xorg-libXaw \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext
</span>
configure.args --enable-cider \
--enable-xspice \
--enable-pss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-editline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-relpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CFLAGS and LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args VERBOSE=1
</span> post-destroot {
xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,21 +74,8 @@ if {${name} eq ${subport}} {
</span> depends_run-append port:ngspice-lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant openmp description {Add OpenMP support variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ngspice does not specify what openmp version they require
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version 2.5 is the least strict, and works
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.openmp_version 2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/64511
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not too much sure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append "-mcmodel=large"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append "-mcmodel=large"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append "-mcmodel=large"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default_variants +manual +lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
# running the tests from MacPorts errors early, probably due to a permissions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,22 +90,21 @@ if {${name} eq ${subport}} {
</span>
subport ngspice-docs {
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span> description PDF manual for ngspice
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname ${name}-${version}-manual.pdf
extract.suffix
extract.only
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8c15aab0859fbf6540e3e2aa06f486e46ed13397 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f9f308ddcd11ea9708cdcf74894c28befc4d1dd8f00edbcb76a5706daf36cdbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2397103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 af261765d31bb74434eb66f1e13b67c116223b04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae1d8db376df224e0d82e46d34a9d7ada068a69d685144f43b5efe5a2d06f0e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2559027
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -d ${destroot}${docdir}
xinstall -m 644 ${distpath}/${distname} ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,22 +116,30 @@ subport ngspice-lib {
</span> long_description {*}${description}
# freetype2 headers are not found by default
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we could fix the header path in configure.ac, but then need autorecconf, etc
</span> configure.cppflags-prepend -I${prefix}/include/freetype2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TASK_BASIC_INFO_COUNT and friends were renamed in 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libedit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gawk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span>
configure.args --enable-cider \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xspice \
</span> --enable-pss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-editline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-relpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline=${prefix} \
</span> --with-ngshared
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CFLAGS and LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -m64 -O2 -Wall -I${prefix}/include/freetype2 -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -m64 -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the correct prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure yes
</span> destroot {
xinstall -d ${destroot}${prefix}/lib
xinstall -m 755 -W ${worksrcpath}/src/.libs \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ngspice/files/patch-ngspice-older-MACH-defines.diff b/science/ngspice/files/patch-ngspice-older-MACH-defines.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bdb61ba283d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ngspice/files/patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/frontend/get_resident_set_size.c.orig 2020-12-22 17:35:59.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/frontend/get_resident_set_size.c 2020-12-22 17:39:53.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,6 +110,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (unsigned long long) info.WorkingSetSize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define mach_task_basic_info_data_t task_basic_info_data_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define MACH_TASK_BASIC_INFO TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define mach_task_basic_info task_basic_info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* OSX ------------------------------------------------------ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mach_task_basic_info info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
</span></pre><pre style='margin:0'>
</pre>