<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/702e3ea267eaa78dd03b07444b7a9323acb97e24">https://github.com/macports/macports-ports/commit/702e3ea267eaa78dd03b07444b7a9323acb97e24</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 702e3ea267eaa78dd03b07444b7a9323acb97e24
</span>Author: emaros <ed.maros@ligo.org>
AuthorDate: Sun Aug 15 13:09:51 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> nds2-client-swig: update to 0.16.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use latest cmake PG
</span><span style='display:block; white-space:pre;color:#404040;'> - add py39 subport
</span>---
science/nds2-client-swig/Portfile | 68 +++++++++++++++++++++++----------------
1 file changed, 40 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client-swig/Portfile b/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2096250eeab..b6095bd74a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name nds2-client-swig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.16.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.16.10
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories science
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,29 +17,26 @@ long_description \
</span> Client tool for accessing streamed LIGO data using the Network \
Data Server version 2.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://wiki.ligo.org/DASWG/NDSClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.ligo.org/Computing/NDSClient
</span> master_sites https://software.igwn.org/lscsoft/source/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-java-rpath.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python-module.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f761fb66deab7b3e5d09df4f51500ff39e1c6f83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 08b666adaa0697baaa6f76bf96757fa580fbd02186826b37792691776b84c5c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 195774
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b4ba2c3e17387f13ccffcd496468b8cb1668946c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ebc7f66d7c41f154f4a1ab3b2f4c574256c851d54f4e83031a68665c687b813e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 164730
</span>
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nds2-client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nds2-client \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig3
</span>
regsub -all -- "-swig$" ${name} {} basename
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args -DPYTHON=false \
-DPYTHON_EXECUTABLE=false \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSWIG_EXECUTABLE:FILEPATH=${prefix}/bin/swig3 \
</span> -DENABLE_SWIG_JAVA=no \
-DENABLE_SWIG_MATLAB=no \
-DENABLE_SWIG_OCTAVE=no \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,28 +50,31 @@ test.run yes
</span> test.cmd ${prefix}/bin/ctest
test.target -R '.*'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {nds2-client-swig-(\d+(?:\.\d+)*).tar.gz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {nds2-client-swig-(\d+(?:\.\d+)*).tar.bz2}
</span>
#========================================================================
# Create subports for Java
#========================================================================
subport ${basename}-java {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append java
description Java bindings for ${description}
long_description ${long_description} This package provides Java \
bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Need GNU Classpath to get jni.h header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-java port:gnu-classpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 1.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set fallback to an LTS Java version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.fallback openjdk8
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append bin:java:kaffe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig3-java
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.javac /usr/bin/javac -source 1.6 -target 1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.javac /usr/bin/javac -source 1.7 -target 1.7
</span> configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
destroot.target install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,18 +88,27 @@ subport ${basename}-java {
</span> #========================================================================
subport ${basename}-matlab {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append matlab
description MATLAB bindings for ${description}
long_description ${long_description} This package provides MATLAB \
bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Need GNU Classpath to get jni.h header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-java port:gnu-classpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 1.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set fallback to an LTS Java version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.fallback openjdk8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig3-java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.javac /usr/bin/javac -source 1.7 -target 1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:${basename}-java
destroot.target install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
</span> configure.args-replace -DENABLE_SWIG_MATLAB=no -DENABLE_SWIG_MATLAB=yes
destroot.args-append -C ${worksrcpath}/../build/matlab
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,13 +121,13 @@ subport ${basename}-matlab {
</span> #========================================================================
subport ${basename}-octave {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> categories-append octave
description Octave bindings for ${description}
long_description ${long_description} This package provides Octave \
bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig3-octave
</span> depends_lib-append path:bin/octave:octave
destroot.target install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +146,7 @@ subport ${basename}-octave {
</span> #========================================================================
# Create subports for each supported Python version
#========================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {27 35 36 37 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {27 35 36 37 38 39} {
</span> set python.version ${v}
set python.branch [string index ${python.version} 0].[string range ${python.version} 1 end]
set python.bin ${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,12 +155,14 @@ foreach v {27 35 36 37 38} {
</span> set python.pkgname ""
subport py${v}-${basename} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> categories-append python
description Python ${python.version} bindings for ${description}
long_description ${long_description} This package provides Python \
${python.version} bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig3-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:python${python.version}
depends_lib-append port:py${python.version}-numpy
</pre><pre style='margin:0'>
</pre>