<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b0f84713f0253919d945bbeb649e9d8f1fc6aae5">https://github.com/macports/macports-ports/commit/b0f84713f0253919d945bbeb649e9d8f1fc6aae5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b0f84713f0253919d945bbeb649e9d8f1fc6aae5
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jun 17 22:49:21 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> htcondor: migrate to boost PG
</span>---
science/htcondor/Portfile | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/Portfile b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02f4668c691..d9d0317fb8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup github 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup boost 1.0
</span> PortGroup active_variants 1.1
github.setup htcondor htcondor 8_8_1 V
version [strsed ${github.version} g/_/\./]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> maintainers {aronnax @lpsinger}
categories science parallel net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +39,10 @@ variant personal \
</span> startupitem.stop "${prefix}/sbin/condor_off -all -master"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 35 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 35 36 37 38 39}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {!([variant_isset python35] || [variant_isset python36])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { !([variant_isset python27] || [variant_isset python35] || [variant_isset python36] || [variant_isset python37] || [variant_isset python38] || [variant_isset python39]) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python39
</span> }
set pythons_ports {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +50,12 @@ foreach s ${pythons_suffixes} {
</span> lappend pythons_ports python${s}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.out_of_source yes
configure.args-append -DWITH_PYTHON_BINDINGS:BOOL="0" -DWITH_KRB5:BOOL="0"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set sel_py ""
</span> foreach s ${pythons_suffixes} {
set p python${s}
set v [string index ${s} 0].[string range ${s} 1 end]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +70,8 @@ foreach s ${pythons_suffixes} {
</span> variant ${p} description "Enable Python interface for Python ${v}" conflicts {*}${c} "
depends_lib-append port:${p}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants boost ${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPython_ADDITIONAL_VERSIONS:STRING=\"${v}\" -DPYTHON_EXECUTABLE:FILEPATH=\"${f}/bin/python${v}\" -DBoost_PYTHON_LIBRARY:FILEPATH=\"${prefix}/lib/libboost_python${m}-mt.dylib\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants [boost::depends_portname] ${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPython_ADDITIONAL_VERSIONS:STRING=\"${v}\" -DPYTHON_EXECUTABLE:FILEPATH=\"${f}/bin/python${v}\" -DBoost_PYTHON_LIBRARY:FILEPATH=\"[boost::lib_dir]/libboost_python${m}-mt.dylib\"
</span> configure.args-replace -DWITH_PYTHON_BINDINGS:BOOL=\"0\" -DWITH_PYTHON_BINDINGS:BOOL=\"1\"
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +79,9 @@ foreach s ${pythons_suffixes} {
</span> reinplace \"s|@c_pythonarchlib@|Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}/site-packages|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
}
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ${p}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sel_py ${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant kerberos description {enable Kerberos5 support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +97,7 @@ checksums rmd160 53f076464a125c3574b25a3df1cb36d1bdd9bc34 \
</span> depends_build-append port:fig2dev \
port:latex2html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:expat \
</span> path:lib/libssl.dylib:openssl \
port:pcre
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +176,15 @@ post-destroot {
</span> xinstall -d ${destroot}${prefix}/var/log
xinstall -d -o condor -g condor ${destroot}${prefix}/var/log/condor
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix linkage. Appears to be a bug in the configuration as it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Should use the configured install area for boost.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sel_py_nodot [string map {. {}} ${sel_py}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set oLib ${prefix}/lib/libboost_python${sel_py_nodot}-mt.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set nLib [boost::lib_dir]/libboost_python${sel_py_nodot}-mt.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib [ exec find ${destroot}${prefix}/ -name "*.dylib" -or -name "*.so" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${oLib} ${nLib} ${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# The second of the three version numbers is even for a stable release.
</pre><pre style='margin:0'>
</pre>