<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6883f8674bafaadcbd8e0fa1dffaa385652da16d">https://github.com/macports/macports-ports/commit/6883f8674bafaadcbd8e0fa1dffaa385652da16d</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 6883f86  htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports
</span>6883f86 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6883f8674bafaadcbd8e0fa1dffaa385652da16d
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Sun Apr 8 21:51:19 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports
</span>---
 science/htcondor/Portfile                          | 23 +++++++++++++---------
 ...atch-build-cmake-CondorPackageConfig.cmake.diff | 11 +++++++++++
 ...tch-src-condor_scripts-macosx_rewrite_libs.diff | 10 +++++-----
 .../patch-src-python-bindings-CMakeLists.txt.diff  | 10 +++++-----
 4 files changed, 35 insertions(+), 19 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 a16591d..7d810f7 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;'>@@ -5,9 +5,8 @@ PortGroup               github 1.0
</span> PortGroup               cmake 1.0
 PortGroup               active_variants 1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            htcondor htcondor 8_6_8 V
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            htcondor htcondor 8_7_7 V
</span> version                 [strsed ${github.version} g/_/\./]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                1
</span> maintainers             {aronnax @lpsinger}
 
 categories              science parallel net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +37,9 @@ variant personal \
</span>     startupitem.stop    "${prefix}/sbin/condor_off -all -master"
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 34}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 34 35 36}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!([variant_isset python34] || [variant_isset python35] || [variant_isset python36])} {
</span>     default_variants +python27
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,16 +57,21 @@ foreach s ${pythons_suffixes} {
</span>     set i [lsearch -exact ${pythons_ports} ${p}]
     set c [lreplace ${pythons_ports} ${i} ${i}]
     set f ${frameworks_dir}/Python.framework/Versions/${v}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${s} == 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set m ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set m 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     variant ${p} description "Enable Python interface for Python ${v}" conflicts {*}${c} "
 
         depends_lib-append      port:${p}
         require_active_variants boost ${p}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DPython_ADDITIONAL_VERSIONS:STRING=\"${v}\" -DPYTHON_EXECUTABLE:FILEPATH=\"${f}/bin/python${v}\" -DC_PYTHONARCHLIB:PATH=\"${f}/lib/python${v}/site-packages\"
</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=\"${prefix}/lib/libboost_python${m}-mt.dylib\"
</span>         configure.args-replace  -DWITH_PYTHON_BINDINGS:BOOL=\"0\" -DWITH_PYTHON_BINDINGS:BOOL=\"1\"
 
         post-patch {
             reinplace \"s|@prefix@|${prefix}|g\" ${worksrcpath}/src/condor_utils/condor_config.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace \"s|@python@|${f}/bin/python${v}|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace \"s|@c_pythonarchlib@|Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}/site-packages|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span>         }
     "
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +82,8 @@ variant kerberos description {enable Kerberos5 support} {
</span> }
 
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  84293176b8a3ffa9a09e1543295e1b1089126a3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  3b8234ace974952a13c5f133c86fd6eb454924564ceb8665123bb7b5357cc820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  8b29509fb553454f5d67f67cb59db1d80d50f43c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  65cb1b12f8cb972a3d245f6cea7ec0509cd86d07368dc3dc0dcd7679238cb3b4
</span> 
 depends_build-append    port:fig2dev \
                         port:latex2html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +95,8 @@ depends_lib-append      port:boost \
</span> 
 license_noconflict      latex2html
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-src-classad-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-build-cmake-CondorPackageConfig.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-src-classad-CMakeLists.txt.diff \
</span>                         patch-src-condor_scripts-macosx_rewrite_libs.diff \
                         patch-src-condor_utils-CMakeLists.txt.diff \
                         patch-src-condor_utils-condor_config.cpp.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff b/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f89e8ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.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;'>+--- build/cmake/CondorPackageConfig.cmake.orig     2018-04-08 15:08:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/cmake/CondorPackageConfig.cmake  2018-04-08 15:08:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( C_LIBEXEC            libexec )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( C_SBIN                       sbin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set( C_PYTHONARCHLIB lib/python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set( C_PYTHONARCHLIB @c_pythonarchlib@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( C_INCLUDE            include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( C_INCLUDE_PUBLIC             include)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff b/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c564d0..7d82584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/condor_scripts/macosx_rewrite_libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/condor_scripts/macosx_rewrite_libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,36 +9,17 @@ if [ "$1" = "" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/condor_scripts/macosx_rewrite_libs.orig    2018-04-08 14:38:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/condor_scripts/macosx_rewrite_libs 2018-04-08 14:39:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,35 +9,16 @@
</span>    echo "Usage:" `basename $0` "<executable/library> ..."
    exit 1
  fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,10 @@
</span> -      external_resolver="@loader_path/../condor"
 -      internal_resolver="@loader_path/.."
 -    fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-    
</span> +    libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v '^@prefix@/Library/' | grep -v "$basefile "`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span>      for lib in $libraries ; do
<span style='display:block; white-space:pre;background:#ffe0e0;'>-       echo $lib
</span>        baselib=`basename $lib`
 -      if echo $baselib | grep -q -e 'classad' -e 'condor' ; then
 -        install_name_tool -change "$lib" "$internal_resolver/$baselib" $filename
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff b/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aa1d670..c9f4b2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/python-bindings/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/python-bindings/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,9 +109,9 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/python-bindings/CMakeLists.txt.orig        2018-04-08 14:41:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/python-bindings/CMakeLists.txt     2018-04-08 14:43:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,9 +130,9 @@
</span>      set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if ("${PYTHON_VERSION_MAJOR}" MATCHES "3")
</span> -      set ( PYTHON_BOOST_LIB boost_python3 )
 +      set ( PYTHON_BOOST_LIB boost_python3-mt )
      else()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span>      endif()
  
      include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,6 +174,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,6 +195,7 @@
</span>      if ( DARWIN )
        set_target_properties( pyclassad PROPERTIES INSTALL_NAME_DIR ${CMAKE_CURRENT_BINARY_DIR} )
          install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_LIB}/lib${PYCLASSAD_LIB_NAME}.dylib)" )
</pre><pre style='margin:0'>

</pre>