<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/f6293ac9d36631ade38760671b95873e92e2c40b">https://github.com/macports/macports-ports/commit/f6293ac9d36631ade38760671b95873e92e2c40b</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 f6293ac9d36 ngspice: fix the port for < 10.8 (#25537)
</span>f6293ac9d36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f6293ac9d36631ade38760671b95873e92e2c40b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 2 19:52:31 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> ngspice: fix the port for < 10.8 (#25537)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: fix compiler choice: it needs C/C++11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: do not hardcode arch flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: restore accidentally dropped patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: fix libKLU bug
</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/70665
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: non-functional: alignment to multiple of 4 spaces
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: fix broken linking, finally
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/70175
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ngspice: remove unneeded build flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ---------
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Mark Anderson <mark@macports.org>
</span>---
science/ngspice/Portfile | 43 +++++++++++++++++++---
science/ngspice/files/patch-fix-linking.diff | 12 ++++++
.../files/patch-ngspice-older-MACH-defines.diff | 17 +++++++++
.../files/patch-use-cxx-to-link-cxx-code.diff | 11 ++++++
4 files changed, 78 insertions(+), 5 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 a676ce15869..4efdb178c3f 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;'>@@ -27,11 +27,22 @@ checksums rmd160 577a26e18e70fdf1fceb87ae3c6a783c3cf00d8e \
</span>
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# checking whether C compiler accepts -std=gnu11... no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# C compiler cannot compile C11 code, etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} eq ${subport}} {
# freetype2 headers are not found by default
configure.cppflags-prepend -I${prefix}/include/freetype2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TASK_BASIC_INFO_COUNT and friends were renamed in 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/70175
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:readline \
port:libtool \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +54,26 @@ if {${name} eq ${subport}} {
</span> --enable-pss \
--enable-relpath \
--disable-openmp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span> --with-readline=${prefix} \
--with-x
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/70665
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/commit/e485b0a0c8125cb9d8bcc6241a9c2016514188c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D__NOEXTENSIONS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not let an arbitrary compiler be set as CC_FOR_BUILD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not link C++ code with gcc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-cxx-to-link-cxx-code.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CC_FOR_BUILD=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set CFLAGS and LDFLAGS
configure.ldflags-append -L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args VERBOSE=1
</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;'>@@ -67,11 +91,11 @@ if {${name} eq ${subport}} {
</span> }
variant manual description {Legacy compatibility variant} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:ngspice-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:ngspice-docs
</span> }
variant lib description {Enable dynamic lib} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:ngspice-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:ngspice-lib
</span> }
default_variants +manual +lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +142,9 @@ subport ngspice-lib {
</span> # freetype2 headers are not found by default
configure.cppflags-prepend -I${prefix}/include/freetype2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TASK_BASIC_INFO_COUNT and friends were renamed in 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:autoconf \
port:automake \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,9 +161,15 @@ subport ngspice-lib {
</span> --with-readline=${prefix} \
--with-ngshared
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/70665
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/commit/e485b0a0c8125cb9d8bcc6241a9c2016514188c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D__NOEXTENSIONS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set CFLAGS and LDFLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -m64 -O2 -Wall -I${prefix}/include/freetype2 -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -m64 -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -Wall -I${prefix}/include/freetype2
</span>
# Use the correct prefix
use_configure yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ngspice/files/patch-fix-linking.diff b/science/ngspice/files/patch-fix-linking.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c6844ad0a8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ngspice/files/patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in 2024-07-13 01:09:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2024-08-31 13:25:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -875,7 +875,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's|@XSPICEINIT[@]|$(XSPICEINIT)|g' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's|@pkglibdir[@]|$(spinitpath)|g'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_CFLAGS = -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacOS linker does not need this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AM_CFLAGS = -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAINTAINERCLEANFILES = Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @SHARED_MODULE_TRUE@lib_LTLIBRARIES = libngspice.la
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bdb61ba283d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ngspice/files/patch-ngspice-older-MACH-defines.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/frontend/get_resident_set_size.c 2020-12-22 17:39:53.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +110,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (unsigned long long) info.WorkingSetSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define mach_task_basic_info_data_t task_basic_info_data_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define MACH_TASK_BASIC_INFO TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define mach_task_basic_info task_basic_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OSX ------------------------------------------------------ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mach_task_basic_info info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ngspice/files/patch-use-cxx-to-link-cxx-code.diff b/science/ngspice/files/patch-use-cxx-to-link-cxx-code.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..20d0db1d97c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ngspice/files/patch-use-cxx-to-link-cxx-code.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in 2024-07-13 01:09:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2024-08-31 14:02:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -482,7 +482,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_CC_0 = @echo " CC " $@;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_CC_1 =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CCLD = $(CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CCLD = $(CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
</span></pre><pre style='margin:0'>
</pre>