<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5a81c639902185d2d9fa601fa97f06c98d77c8e9">https://github.com/macports/macports-ports/commit/5a81c639902185d2d9fa601fa97f06c98d77c8e9</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 5a81c63 nds2-client Update to 0.16.2
</span>5a81c63 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5a81c639902185d2d9fa601fa97f06c98d77c8e9
</span>Author: Edward Maros <ed.maros@ligo.org>
AuthorDate: Wed Nov 28 13:56:38 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> nds2-client Update to 0.16.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> nds2-client-swig 0.16.3 new Portfile
</span>---
science/{nds2-client => nds2-client-swig}/Portfile | 87 ++++----
.../nds2-client-swig/files/patch-java-rpath.diff | 225 +++++++++++++++++++++
.../files/patch-python-module.diff | 107 ++++++++++
science/nds2-client/Portfile | 149 +-------------
4 files changed, 382 insertions(+), 186 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client/Portfile b/science/nds2-client-swig/Portfile
</span>similarity index 71%
copy from science/nds2-client/Portfile
copy to science/nds2-client-swig/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index eeb777d..61f6551 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nds2-client/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name nds2-client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.15.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name nds2-client-swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.16.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,18 +20,21 @@ long_description \
</span> homepage https://wiki.ligo.org/DASWG/NDSClient
master_sites http://software.ligo.org/lscsoft/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 46a1c7d6cfe9c3e1c6a7e04c5421efe026edee00 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39e9f04b6cb454fe6de992b10e323299bc291ad7685662a9693d1a977368c667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-java-rpath.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python-module.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f761fb66deab7b3e5d09df4f51500ff39e1c6f83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 08b666adaa0697baaa6f76bf96757fa580fbd02186826b37792691776b84c5c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 195774
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nds2-client
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset sasl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gssapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+regsub -all -- "-swig$" ${name} {} basename
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,26 +43,12 @@ configure.args -DPYTHON=false \
</span> -DENABLE_SWIG_JAVA=no \
-DENABLE_SWIG_MATLAB=no \
-DENABLE_SWIG_OCTAVE=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SWIG_PYTHON=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_SASL=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_GSSAPI=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SWIG_PYTHON2=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SWIG_PYTHON3=no \
</span> -DCMAKE_INSTALL_SYSCONFDIR=${prefix}/etc \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_EXPORT_COMPILE_COMMANDS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sasl description "Use cyrus-sasl2 for authentication" conflicts gssapi {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DWITH_SASL=no -DWITH_SASL=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:cyrus-sasl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gssapi description "Use kerberos5 gssapi for authentication" conflicts sasl {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DWITH_GSSAPI=no -DWITH_GSSAPI=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:kerberos5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.cmd ${prefix}/bin/ctest
test.target -R '.*'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,13 +57,13 @@ use_parallel_build yes
</span>
livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {nds2-client-(\d+(?:\.\d+)*).tar.gz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {nds2-client-swig-(\d+(?:\.\d+)*).tar.gz}
</span>
#========================================================================
# Create subports for Java
#========================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-java {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${basename}-java {
</span> categories-append java
description Java bindings for ${description}
long_description ${long_description} This package provides Java \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,13 +73,12 @@ subport ${name}-java {
</span> depends_build-append port:swig-java port:gnu-classpath
depends_lib-append bin:java:kaffe
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.javac /usr/bin/javac -source 1.5 -target 1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.javac /usr/bin/javac -source 1.6 -target 1.6
</span> configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
destroot.target install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append -C ${worksrcpath}/../build/java
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +87,7 @@ subport ${name}-java {
</span> # Create subports for MATLAB
#========================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-matlab {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${basename}-matlab {
</span> categories-append matlab
description MATLAB bindings for ${description}
long_description ${long_description} This package provides MATLAB \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,14 +95,14 @@ subport ${name}-matlab {
</span>
# Need GNU Classpath to get jni.h header
depends_build-append port:swig-java port:gnu-classpath
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${basename}-java
</span>
destroot.target install
configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
configure.args-replace -DENABLE_SWIG_MATLAB=no -DENABLE_SWIG_MATLAB=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/matlab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append -C ${worksrcpath}/../build/matlab
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +111,7 @@ subport ${name}-matlab {
</span> # Create subports for Octave
#========================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-octave {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${basename}-octave {
</span> categories-append octave
description Octave bindings for ${description}
long_description ${long_description} This package provides Octave \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +119,6 @@ subport ${name}-octave {
</span>
depends_build-append port:swig-octave
depends_lib-append path:bin/octave:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span>
destroot.target install
destroot.args-append pkgoctexecdir="${prefix}/share/octave/site/m"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +128,7 @@ subport ${name}-octave {
</span>
configure.args-replace -DENABLE_SWIG_OCTAVE=no -DENABLE_SWIG_OCTAVE=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append -C ${worksrcpath}/../build/octave
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +136,7 @@ subport ${name}-octave {
</span> #========================================================================
# Create subports for each supported Python version
#========================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {27 34 35 36 37} {
</span> set python.version ${v}
set python.branch [string range ${python.version} 0 end-1].[string index ${python.version} end]
set python.bin ${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,30 +144,33 @@ foreach v {27} {
</span> set python.site_packages "${python.prefix}/lib/python${python.branch}/site-packages"
set python.pkgname ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- subport py${v}-${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${v}-${basename} {
</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.
depends_build-append port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span> depends_lib-append port:python${python.version}
depends_lib-append port:py${python.version}-numpy
configure.python ${python.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DPYTHON=false -DPYTHON=${python.prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DPYTHON_EXECUTABLE=false -DPYTHON_EXECUTABLE=${python.prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_PYTHON=no -DENABLE_SWIG_PYTHON=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_MODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXTMODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPYTHON=false -DPYTHON=${python.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPYTHON_EXECUTABLE=false -DPYTHON_EXECUTABLE=${python.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -glob -- ${v} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "2*" { configure.args-replace -DENABLE_SWIG_PYTHON2=no "-DENABLE_SWIG_PYTHON2=yes -DPYTHON2_VERSION=${python.branch}" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "3*" -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default { configure.args-replace -DENABLE_SWIG_PYTHON3=no "-DENABLE_SWIG_PYTHON3=yes -DPYTHON3_VERSION=${python.branch}" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON${python.version}_MODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON${python.version}_EXTMODULE_INSTALL_DIR="${python.site_packages}" \
</span> -DSWIG_CPPFLAGS="-I${python.prefix}/include"
destroot.target install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append -C ${worksrcpath}/../build/python
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "py27-${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "py27-${basename}"} {
</span> foreach script [glob -tails -nocomplain -directory ${destroot}${python.prefix}/bin *] {
file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${python.version}/bin/${script}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client-swig/files/patch-java-rpath.diff b/science/nds2-client-swig/files/patch-java-rpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c91d61f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client-swig/files/patch-java-rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,225 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- java/module/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ java/module/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,9 +94,9 @@ if ( ENABLE_SWIG_JAVA )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach(_NDS_FILE ${built_java_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/connection_iterator.java ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/connection_iterator.java ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_SWIG_FLAGS -O -package nds2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_SWIG_OUTDIR nds2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,35 +120,31 @@ if ( ENABLE_SWIG_JAVA )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${SWIG_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGS -java -c++ ${CMAKE_SWIG_FLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I${PROJECT_BINARY_DIR}/common/module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I${PROJECT_SOURCE_DIR}/common/module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -o ${WRAPPER_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INTERFACE_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I${PROJECT_BINARY_DIR}/common/module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I${PROJECT_SOURCE_DIR}/common/module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -o ${WRAPPER_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INTERFACE_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # swig_link_libraries(nds2JNI -static-libstdc++ ${JNI_LIBRARIES} $<TARGET_OBJECTS:ndswrapcxx_obj> ndsclient)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library( nds2JNI SHARED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_FILE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( nds2JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -static-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CONLIBNDSCXX_OBJECTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JNI_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nds::daqc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( nds2JNI nds::cxx Ws2_32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_requires_cpp11(nds2JNI PUBLIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swig_add_library(nds2JNI_rpath LANGUAGE java SOURCES ${INTERFACE_FILE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swig_link_libraries(nds2JNI_rpath ${JNI_LIBRARIES} nds::cxx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #................................................................
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,59 +157,51 @@ if ( ENABLE_SWIG_JAVA )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Un*x / OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #................................................................
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(nds2JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_OUTPUT_DIRECTORY nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PREFIX lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUFFIX .jnilib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PREFIX lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SUFFIX .jnilib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(nds2JNI_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUILD_WITH_INSTALL_RPATH TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBRARY_OUTPUT_DIRECTORY rpath/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_NAME nds2JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PREFIX lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUFFIX .jnilib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(nds2JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BUILD_WITH_INSTALL_RPATH TRUE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build the JAR library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message("################################ built_java_sources = ${built_java_sources}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_jar(nds2 ${built_java_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(nds2 nds2JNI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_jar(nds2_rpath ${built_java_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_dependencies(nds2_rpath nds2JNI_rpath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build java documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- create_javadoc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILES ${pathed_built_java_sources}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALLPATH ${CMAKE_INSTALL_DATADIR}/nds2-client/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WINDOWTITLE "NDS2 Client Interface"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOCTITLE "<h1>NDS2 Client Interface</h1>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AUTHOR TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- USE TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VERSION TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_dependencies( nds2_javadoc nds2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ create_javadoc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILES ${pathed_built_java_sources}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALLPATH ${CMAKE_INSTALL_DATADIR}/nds2-client/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WINDOWTITLE "NDS2 Client Interface"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DOCTITLE "<h1>NDS2 Client Interface</h1>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AUTHOR TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ USE TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERSION TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_dependencies( nds2_javadoc nds2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create JAR of documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_target(nds2_javadoc_jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${CMAKE_COMMAND} -E echo ${JAVA_ARCHIVE} -cvf ${CMAKE_CURRENT_BINARY_DIR}/nds2_javadoc.jar "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_CURRENT_BINARY_DIR}/nds2_javadoc.jar "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/javadoc/nds2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS nds2_javadoc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_custom_target(nds2_javadoc_jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${CMAKE_COMMAND} -E echo ${JAVA_ARCHIVE} -cvf ${CMAKE_CURRENT_BINARY_DIR}/nds2_javadoc.jar "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_CURRENT_BINARY_DIR}/nds2_javadoc.jar "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/javadoc/nds2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEPENDS nds2_javadoc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add the JNI library to the jar archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,27 +209,16 @@ if ( ENABLE_SWIG_JAVA )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(nds2JNIinclusion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $<TARGET_FILE_DIR:nds2JNI>/$<TARGET_FILE_NAME:nds2JNI> "${CMAKE_CURRENT_BINARY_DIR}/nds2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${JAVA_ARCHIVE} uvf ${CMAKE_CURRENT_BINARY_DIR}/nds2.jar "nds2/$<TARGET_FILE_NAME:nds2JNI>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS nds2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_target(nds2JNIinclusion_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/rpath/nds2/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${CMAKE_COMMAND} -E copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $<TARGET_FILE_DIR:nds2JNI_rpath>/$<TARGET_FILE_NAME:nds2JNI_rpath> "${CMAKE_CURRENT_BINARY_DIR}/rpath/nds2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${JAVA_ARCHIVE} uvf ${CMAKE_CURRENT_BINARY_DIR}/nds2_rpath.jar -C "${CMAKE_CURRENT_BINARY_DIR}/rpath" "nds2/$<TARGET_FILE_NAME:nds2JNI_rpath>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS nds2_rpath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( FILENAME_NDS2_JAR "${CMAKE_CURRENT_BINARY_DIR}/nds2_rpath.jar" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( FILENAME_NDS2_JAR "${CMAKE_CURRENT_BINARY_DIR}/nds2.jar" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif ( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<TARGET_FILE_DIR:nds2JNI>/$<TARGET_FILE_NAME:nds2JNI> "${CMAKE_CURRENT_BINARY_DIR}/nds2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${JAVA_ARCHIVE} uvf ${CMAKE_CURRENT_BINARY_DIR}/nds2.jar "nds2/$<TARGET_FILE_NAME:nds2JNI>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEPENDS nds2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( FILENAME_NDS2_JAR "${CMAKE_CURRENT_BINARY_DIR}/nds2.jar" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #====================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Report the configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #====================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/nds2-client-java.cfg.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/nds2-client-java.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @ONLY )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @ONLY )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #====================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Distribution rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #====================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,32 +233,32 @@ if ( ENABLE_SWIG_JAVA )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES "${FILENAME_NDS2_JAR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RENAME "nds2.jar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/nds2-client/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT JAVA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/nds2-client/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT JAVA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES ${CMAKE_CURRENT_BINARY_DIR}/nds2_javadoc.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/nds2-client/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT JAVA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(_NDS_FILE ${built_java_classes})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/nds2.dir/nds2/${_NDS_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/nds2-client/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/nds2-client/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach(_NDS_FILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS nds2JNI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libnds2JNI.jnilib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libnds2JNI.jnilib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/java/nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT JAVA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_nds_java_library_dir( "Release" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_nds_java_library_dir( "Debug" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client-swig/files/patch-python-module.diff b/science/nds2-client-swig/files/patch-python-module.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..94f11b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client-swig/files/patch-python-module.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,107 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/test/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,14 +356,3 @@ if( PYTHON_EXECUTABLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_test( test_cpp11_traits_cxx )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( PYTHON_EXECUTABLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#========================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Installation of files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#========================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( NOT PYTHON_MODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #set( PYTHON_MODULE_INSTALL_DIR ${SHARE_INSTALL_DIR}/nds2-client/python CACHE PATH "Installation directory for Python modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( PYTHON_MODULE_INSTALL_DIR ${pythondir_full} CACHE PATH "Installation directory for Python modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif( NOT PYTHON_MODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( NOT PYTHON_EXTMODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #set( PYTHON_EXTMODULE_INSTALL_DIR ${LIBEXEC_INSTALL_DIR}/nds2-client/python CACHE PATH "Installation directory for Python extension modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( PYTHON_EXTMODULE_INSTALL_DIR ${pyexecdir_full} CACHE PATH "Installation directory for Python extension modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif( NOT PYTHON_EXTMODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/cmake/Modules/Autotools/Archive/cx_python.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/cmake/Modules/Autotools/Archive/cx_python.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,16 +117,16 @@ function( cx_python )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( pyexecdir_full ${pyexecdir_full} PARENT_SCOPE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( NOT PYTHON_MODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( PYTHON_MODULE_INSTALL_DIR ${pythondir_full}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( NOT PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_MODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_MODULE_INSTALL_DIR ${pythondir_full}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE PATH "Installation directory for Python modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cm_msg_debug_variable(PYTHON_MODULE_INSTALL_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif( NOT PYTHON_MODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( NOT PYTHON_EXTMODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( PYTHON_EXTMODULE_INSTALL_DIR ${pyexecdir_full}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( NOT PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_EXTMODULE_INSTALL_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_EXTMODULE_INSTALL_DIR ${pyexecdir_full}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE PATH "Installation directory for Python extension modules" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cm_msg_debug_variable(PYTHON_EXTMODULE_INSTALL_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif( NOT PYTHON_EXTMODULE_INSTALL_DIR )
</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;'>+ cm_msg_debug_variable( PYTHON_EXECUTABLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cm_msg_debug_variable( PYTHON_LIBRARIES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/cmake/Portfile.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/cmake/Portfile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,8 +157,8 @@ foreach v {27 34 35 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "3*" -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default { configure.args-replace -DENABLE_SWIG_PYTHON3=no "-DENABLE_SWIG_PYTHON3=yes -DPYTHON3_VERSION=${python.branch}" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure.args-append -DPYTHON_MODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -DPYTHON_EXTMODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure.args-append -DPYTHON${python.version}_MODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DPYTHON${python.version}_EXTMODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSWIG_CPPFLAGS="-I${python.prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- python/module/nds2-client-python.cfg.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ python/module/nds2-client-python.cfg.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-py@NDS_PYTHON_VERSION_MAJOR@@NDS_PYTHON_VERSION_MINOR@dir:Python sources:@pythondir_full@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-py@NDS_PYTHON_VERSION_MAJOR@@NDS_PYTHON_VERSION_MINOR@execdir:Python executable libraries:@pyexecdir_full@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++py@NDS_PYTHON_VERSION_MAJOR@@NDS_PYTHON_VERSION_MINOR@dir:Python sources:@PYTHON_MODULE_INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++py@NDS_PYTHON_VERSION_MAJOR@@NDS_PYTHON_VERSION_MINOR@execdir:Python executable libraries:@PYTHON_EXTMODULE_INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- python/python2/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ python/python2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,14 +41,17 @@ if ( NOT DEFINED ENABLE_SWIG_PYTHON2 OR ENABLE_SWIG_PYTHON2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTERFACE_FILE "${PROJECT_SOURCE_DIR}/python/module/nds_python.i")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( NDS_PYTHON_VERSION_MAJOR ${PYTHON2_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( NDS_PYTHON_VERSION_MINOR ${PYTHON2_VERSION_MINOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_MODULE_INSTALL_DIR ${PYTHON${PYTHON2_VERSION_MAJOR}${PYTHON2_VERSION_MINOR}_MODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_EXTMODULE_INSTALL_DIR ${PYTHON${PYTHON2_VERSION_MAJOR}${PYTHON2_VERSION_MINOR}_EXTMODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cx_swig_python_module(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX PYTHON2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INTERFACE_FILE ${INTERFACE_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MODULE nds2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK_LIBRARIES nds::cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( NDS_PYTHON_VERSION_MAJOR ${PYTHON2_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( NDS_PYTHON_VERSION_MINOR ${PYTHON2_VERSION_MINOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #======================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configuration file rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- python/python3/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ python/python3/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,11 @@ if ( NOT DEFINED ENABLE_SWIG_PYTHON3 OR ENABLE_SWIG_PYTHON3 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTERFACE_FILE "${PROJECT_SOURCE_DIR}/python/module/nds_python.i")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( NDS_PYTHON_VERSION_MAJOR ${PYTHON3_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( NDS_PYTHON_VERSION_MINOR ${PYTHON3_VERSION_MINOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_MODULE_INSTALL_DIR ${PYTHON${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}_MODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_EXTMODULE_INSTALL_DIR ${PYTHON${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}_EXTMODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cx_swig_python_module(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX PYTHON3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INTERFACE_FILE ${INTERFACE_FILE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +55,8 @@ if ( NOT DEFINED ENABLE_SWIG_PYTHON3 OR ENABLE_SWIG_PYTHON3 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( NDS_PYTHON_VERSION_MAJOR ${PYTHON3_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( NDS_PYTHON_VERSION_MINOR ${PYTHON3_VERSION_MINOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_MODULE_INSTALL_DIR ${PYTHON${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}_MODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PYTHON_EXTMODULE_INSTALL_DIR ${PYTHON${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}_EXTMODULE_INSTALL_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #======================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configuration file rules
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client/Portfile b/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eeb777d..6ee8696 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name nds2-client
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.15.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.16.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,27 +19,22 @@ long_description \
</span> homepage https://wiki.ligo.org/DASWG/NDSClient
master_sites http://software.ligo.org/lscsoft/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 46a1c7d6cfe9c3e1c6a7e04c5421efe026edee00 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39e9f04b6cb454fe6de992b10e323299bc291ad7685662a9693d1a977368c667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9653ad19cc2af2d194c8331e5cac99c6beb95119 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 485ce5cc1650f384897e5ddcd259ad2f4f6b63e309372990b997d86b54cf529e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 535845
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><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;'>+depends_build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:graphviz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset sasl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gssapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +gssapi
</span>
cmake.out_of_source yes
configure.args -DPYTHON=false \
-DPYTHON_EXECUTABLE=false \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SWIG_JAVA=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SWIG_MATLAB=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SWIG_OCTAVE=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SWIG_PYTHON=no \
</span> -DWITH_SASL=no \
-DWITH_GSSAPI=no \
-DCMAKE_INSTALL_SYSCONFDIR=${prefix}/etc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,125 +63,3 @@ use_parallel_build yes
</span> livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex {nds2-client-(\d+(?:\.\d+)*).tar.gz}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create subports for Java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-java {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-append java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Java bindings for ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} This package provides Java \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>-
</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:#ffe0e0;'>- depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.javac /usr/bin/javac -source 1.5 -target 1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create subports for MATLAB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-matlab {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-append matlab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description MATLAB bindings for ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} This package provides MATLAB \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>- depends_lib-append port:${name}-java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_JAVA=no -DENABLE_SWIG_JAVA=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_MATLAB=no -DENABLE_SWIG_MATLAB=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/matlab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create subports for Octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-octave {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-append octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Octave bindings for ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} This package provides Octave \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/octave:octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append pkgoctexecdir="${prefix}/share/octave/site/m"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # At least as of Octave 3.2.4, the Octave C++ API does not work with clang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compiler.blacklist-append *clang*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_OCTAVE=no -DENABLE_SWIG_OCTAVE=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create subports for each supported Python version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version ${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch [string range ${python.version} 0 end-1].[string index ${python.version} end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.bin ${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.site_packages "${python.prefix}/lib/python${python.branch}/site-packages"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.pkgname ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport py${v}-${name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-append python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Python ${python.version} bindings for ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} This package provides Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${python.version} bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python${python.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${python.bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DPYTHON=false -DPYTHON=${python.prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DPYTHON_EXECUTABLE=false -DPYTHON_EXECUTABLE=${python.prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_SWIG_PYTHON=no -DENABLE_SWIG_PYTHON=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_MODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXTMODULE_INSTALL_DIR="${python.site_packages}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSWIG_CPPFLAGS="-I${python.prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append -C ${worksrcpath}/../build/swig/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "py27-${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach script [glob -tails -nocomplain -directory ${destroot}${python.prefix}/bin *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${python.version}/bin/${script}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>