<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/f52105c01a0a2905b62d04d9fb98b3bb4e418553">https://github.com/macports/macports-ports/commit/f52105c01a0a2905b62d04d9fb98b3bb4e418553</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 f52105c htcondor: update to 8.6.8
</span>f52105c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f52105c01a0a2905b62d04d9fb98b3bb4e418553
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Sat Dec 9 17:05:37 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> htcondor: update to 8.6.8
</span>---
science/htcondor/Portfile | 34 ++++++++---------
science/htcondor/files/condor_config | 36 ++++++++----------
...atch-build-cmake-CondorPackageConfig.cmake.diff | 11 ------
science/htcondor/files/patch-doc_Makefile.diff | 29 --------------
.../files/patch-src-classad-CMakeLists.txt.diff | 20 ++++++++++
...tch-src-condor_scripts-macosx_rewrite_libs.diff | 44 ++++++++++------------
.../patch-src-condor_utils-CMakeLists.txt.diff | 10 +++++
.../patch-src-condor_utils-condor_config.cpp.diff | 19 ++--------
.../patch-src-python-bindings-CMakeLists.txt.diff | 10 ++++-
9 files changed, 94 insertions(+), 119 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 8587e64..cd5f87c 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;'>@@ -4,10 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup htcondor htcondor 8_6_1 V
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup htcondor htcondor 8_6_8 V
</span> version [strsed ${github.version} g/_/\./]
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,8 +48,6 @@ foreach s ${pythons_suffixes} {
</span> lappend pythons_ports python${s}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0e0e0;'>@@ -60,17 +56,17 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set d ${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${frameworks_dir}/Python.framework/Versions/${v}
</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 -DC_PYTHONARCHLIB:PATH=\"${d}/site-packages\" -DPYTHON_LIBRARY:PATH=\"${frameworks_dir}/Python.framework/Versions/${v}/lib/libpython${v}.dylib\"
</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}\" -DC_PYTHONARCHLIB:PATH=\"${f}/lib/python${v}/site-packages\"
</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|@c_pythonarchlib@|${d}/site-packages|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@python@|${f}/bin/python${v}|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span> }
"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,10 +77,11 @@ variant kerberos description {enable Kerberos5 support} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0a53d7cbcf8c23afdf8c70ab1dbff572312c9c56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 083fa7e9a4ea8ece29d72f92c3f4a0f1b37ee0ea13cc0769cfa9090e616bdd6f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 84293176b8a3ffa9a09e1543295e1b1089126a3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b8234ace974952a13c5f133c86fd6eb454924564ceb8665123bb7b5357cc820
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:latex2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:fig2dev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:latex2html
</span>
depends_lib-append port:boost \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,18 +90,19 @@ depends_lib-append port:boost \
</span>
license_noconflict latex2html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: For some reason, Condor uses install_name_tool to have dynamic links
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# point to @executable_path/../lib/condor/libexpat.1.dylib, etc, instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# @executable_path/../lib/libexpat.1.dylib, etc. Why?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-doc_Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-classad-CMakeLists.txt.diff \
</span> patch-src-condor_scripts-macosx_rewrite_libs.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-condor_utils-CMakeLists.txt.diff \
</span> patch-src-condor_utils-condor_config.cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-python-bindings-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-cmake-CondorPackageConfig.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-python-bindings-CMakeLists.txt.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp doc/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp ${worksrcpath}/src/condor_scripts/macosx_rewrite_libs ${worksrcpath}/doc/Makefile
</span> reinplace "s|g\+\+|${configure.cxx}|g" ${worksrcpath}/doc/makeman/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This .sty file seems to be available for latex2html but not pdftex,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and the "make just-man-pages" target seems to expect it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln ${prefix}/share/texmf/tex/latex/html/html.sty ${worksrcpath}/doc/
</span> }
# FIXME: Globus support is disabled because Globus is not available in MacPorts.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/condor_config b/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;color:#808080;'>index f679462..91c4e91 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +49,6 @@
</span> ## What machine is your central manager?
CONDOR_HOST = 127.0.0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## Don't use DNS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-NO_DNS = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ##--------------------------------------------------------------------
## Pathnames:
##--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,7 +427,7 @@ LOCK = $(LOG)
</span> ## DEFAULT_DOMAIN_NAME. Both NO_DNS and DEFAULT_DOMAIN must be set in
## your top-level config file for this mode of operation to work
## properly.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#NO_DNS = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+NO_DNS = True
</span>
## Condor can be told whether or not you want the Condor daemons to
## create a core file if something really bad happens. This just
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1284,7 +1281,7 @@ benchmarks_kflops_job_load = 1.0
</span> #CONSOLE_DEVICES = mouse, console
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## The STARTD_ATTRS (and legacy STARTD_EXPRS) entry allows you to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## The STARTD_ATTRS (formerly STARTD_EXPRS) entry allows you to
</span> ## have the startd advertise arbitrary attributes from the config
## file in its ClassAd. Give the comma-separated list of entries
## from the config file you want in the startd ClassAd.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1331,21 +1328,21 @@ benchmarks_kflops_job_load = 1.0
</span> ## slot2 - favorite_color = "green"; favorite_season = "spring"
## slot3 - favorite_color = "blue"; favorite_season = "summer"
##
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## Finally, the recommended default value for this setting, is to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Finally, there is an automatic mechanism to
</span> ## publish the COLLECTOR_HOST setting as a string. This can be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## useful using the "$$(COLLECTOR_HOST)" syntax in the submit file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## useful using the "$$(COLLECTOR_HOST_STRING)" syntax in the submit file
</span> ## for jobs to know (for example, via their environment) what pool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## they're running in.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-COLLECTOR_HOST_STRING = "$(COLLECTOR_HOST)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-STARTD_ATTRS = COLLECTOR_HOST_STRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## they're running in. You can change the value published in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## COLLECTOR_HOST_STRING attribute by changing this value,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## (this must be a value classad string value, so don't forget the quotes!)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#COLLECTOR_HOST_STRING = "$(COLLECTOR_HOST)"
</span>
## When the startd is claimed by a remote user, it can also advertise
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## arbitrary attributes from the ClassAd of the job its working on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## arbitrary attributes from the ClassAd of the job it is working on.
</span> ## Just list the attribute names you want advertised.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## Note: since this is already a ClassAd, you don't have to do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## anything funny with strings, etc. This feature can be turned off
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## by commenting out this setting (there is no default).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-STARTD_JOB_EXPRS = ImageSize, ExecutableSize, JobUniverse, NiceUser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Note: since this is already a ClassAd, you don't have to do quoting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Note2: the job attributes ImageSize, ExecutableSize, JobUniverse, NiceUser are automatically advertised.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#STARTD_JOB_ATTRS =
</span>
## If you want to "lie" to Condor about how many CPUs your machine
## has, you can use this setting to override Condor's automatic
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1739,13 +1736,13 @@ WINDOWS_SOFTKILL = $(SBIN)/condor_softkill
</span>
## If you want condor_submit to automatically append expressions to
## the job ClassAds it creates, you can uncomment and define the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## SUBMIT_EXPRS setting. It works just like the STARTD_EXPRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## SUBMIT_ATTRS (formerly SUBMIT_EXPRS) setting. It works just like the STARTD_ATTRS
</span> ## described above with respect to ClassAd vs. config file syntax,
## strings, etc. One common use would be to have the full hostname
## of the machine where a job was submitted placed in the job
## ClassAd. You would do this by uncommenting the following lines:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#MACHINE = "$(FULL_HOSTNAME)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#SUBMIT_EXPRS = MACHINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#Machine = "$(FULL_HOSTNAME)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#SUBMIT_ATTRS = Machine
</span>
## Condor keeps a buffer of recently-used data for each file an
## application opens. This macro specifies the default maximum number
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1945,9 +1942,6 @@ CREAM_GAHP = $(SBIN)/cream_gahp
</span> ## about to expire.
#MYPROXY_GET_DELEGATION = /path/to/myproxy-get-delegation
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## The location of the Deltacloud GAHP server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DELTACLOUD_GAHP = $(SBIN)/deltacloud_gahp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ##
## EC2 (REST): Universe = Grid, Grid_Resource = ec2
##
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fbb70ea..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/cmake/CondorPackageConfig.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/cmake/CondorPackageConfig.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,7 +118,7 @@ set( C_LIB32 lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( C_LIBEXEC libexec )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( C_SBIN sbin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set( C_PYTHONARCHLIB lib/python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set( C_PYTHONARCHLIB @c_pythonarchlib@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( C_INCLUDE include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( C_INCLUDE_PUBLIC include)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-doc_Makefile.diff b/science/htcondor/files/patch-doc_Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6b471f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/patch-doc_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/Makefile.orig 2015-12-15 10:20:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/Makefile 2016-01-07 02:54:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex $(LATEXARGS) ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeindex ref
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex $(LATEXARGS) ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/bin/latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ref && perl -pi.bak -e 's,\<HEAD\>,<HEAD>\n<link rel="canonical" href="http://research.cs.wisc.edu/htcondor/manual/current/$$ARGV">\n,' condor_*.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f ref.dvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv ref condor-$(SUBVER)-Manual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex $(LATEXARGS) ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeindex ref
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex $(LATEXARGS) ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/bin/latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons ref.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf $(LOCALDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv ref $(LOCALDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch local.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -170,7 +170,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s symbol-html.tex symbol.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s figuresizing-html.tex figuresizing.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd makeman && make clean makeman
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons just-man-pages.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/bin/latex2html -split 4 -link 2 -show_section_numbers -antialias -tmp /tmp -long_titles 3 -toc_depth 2 -local_icons just-man-pages.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for html in $(MANPAGES); do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thisfile=just-man-pages/$$html; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeman/makeman -v -i $$thisfile -s 1; \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-src-classad-CMakeLists.txt.diff b/science/htcondor/files/patch-src-classad-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c74c183
</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-src-classad-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/classad/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/classad/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,11 +100,17 @@ if (NOT WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable( classad_functional_tester "classad_functional_tester.cpp" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ condor_set_link_libs( classad_functional_tester "${CLASSADS_FOUND};${PCRE_FOUND};${DL_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install (TARGETS classad_functional_tester DESTINATION ${C_BIN} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( DARWIN )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_BIN}/classad_functional_tester)" )
</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;'>+ ##condor_exe( classad_version "classad_version.cpp" ${C_BIN} "${CLASSADS_FOUND};${PCRE_FOUND};${DL_FOUND}" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable( classad_version "classad_version.cpp" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ condor_set_link_libs( classad_version "${CLASSADS_FOUND};${PCRE_FOUND};${DL_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install (TARGETS classad_version DESTINATION ${C_BIN} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( DARWIN )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_BIN}/classad_version)" )
</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;'>+ ###### Install elements with our distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( TARGETS classads DESTINATION ${C_LIB_PUBLIC} )
</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 16e92b8..8c564d0 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,23 +1,19 @@
</span> --- src/condor_scripts/macosx_rewrite_libs
+++ src/condor_scripts/macosx_rewrite_libs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,43 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Given a list of files, rewrite the non-system shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# dependencies of executables and libraries to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# @executable_path/../lib/condor/... or @executable_path/../lib/...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Other types of files are ignored.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "$1" = "" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Usage:" `basename $0` "<executable/library> ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for filename in "$@" ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- type=`file -h $filename`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if echo $type | grep -q -e 'dynamically linked shared library' -e 'executable' ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,36 +9,17 @@ if [ "$1" = "" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Usage:" `basename $0` "<executable/library> ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++resolver="@prefix@/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for filename in "$@" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type=`file -h $filename`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if echo $type | grep -q -e 'dynamically linked shared library' -e 'executable' ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basefile=`basename $filename`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v "$basefile "`
</span> - external_resolver="@executable_path/../lib/condor"
- internal_resolver="@executable_path/../lib"
- if echo $type | grep -q -e 'dynamically linked shared library' ; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -id $basefile $filename
</span> - if echo $filename | grep -q -e 'libcondor_utils' -e 'libpyclassad' -e 'libclassad' -e 'libchirp_client' -e 'libcondorapi' ; then
- external_resolver="@loader_path/condor"
- internal_resolver="@loader_path"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +26,17 @@
</span> - external_resolver="@loader_path/../condor"
- internal_resolver="@loader_path/.."
- fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- basefile=`basename $filename`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v "$basefile "`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for lib in $libraries ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo $lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- baselib=`basename $lib`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v '^@prefix@/Library/' | grep -v "$basefile "`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for lib in $libraries ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baselib=`basename $lib`
</span> - if echo $baselib | grep -q -e 'classad' -e 'condor' ; then
- install_name_tool -change "$lib" "$internal_resolver/$baselib" $filename
- else
- install_name_tool -change "$lib" "$external_resolver/$baselib" $filename
- fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_name_tool -change "$lib" "$resolver/$baselib" $filename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-src-condor_utils-CMakeLists.txt.diff b/science/htcondor/files/patch-src-condor_utils-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6ad0971
</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-src-condor_utils-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/condor_utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/condor_utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,6 +184,7 @@ if (WANT_FULL_DEPLOYMENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LINUX OR DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install ( TARGETS condorapi_shared DESTINATION ${C_LIB} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_LIB}/libcondorapi.dylib)" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WANT_FULL_DEPLOYMENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DENABLE_STATE_DUMP)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff b/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f5314c..74b1e32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,6 @@
</span> --- src/condor_utils/condor_config.cpp
+++ src/condor_utils/condor_config.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doesn't exist, we look in the following locations:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1) ~/.condor/ # if not started as root
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 2) /etc/condor/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 2) @prefix@/etc/condor/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3) /usr/local/etc/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4) ~condor/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -916,7 +916,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -982,7 +982,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</span> fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
myDistro->GetUc() );
# if defined UNIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +9,7 @@
</span> myDistro->Get(), myDistro->Get(), myDistro->Get() );
# elif defined WIN32
fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -926,7 +926,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -992,7 +992,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</span> fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
"source,\n", myDistro->GetUc() );
# if defined UNIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +18,11 @@
</span> myDistro->Get(), myDistro->Get(), myDistro->Get() );
# elif defined WIN32
fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1477,8 +1477,8 @@ find_file(const char *env_name, const char *file_name, int config_options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 1) $HOME/.condor/condor_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1606,7 +1606,7 @@ find_file(const char *env_name, const char *file_name, int config_options)
</span> // $HOME/.condor/condor_config was added for BOSCO and never used, We are removing it in 8.3.1, but may put it back if users complain.
//find_user_file(locations[0], file_name, false);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- // 2) /etc/condor/condor_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 2) /etc/condor/condor_config
</span> - locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // 2) @prefix@/etc/condor/condor_config
</span> + locations[1].formatstr( "@prefix@/etc/%s/%s", myDistro->Get(), file_name );
// 3) /usr/local/etc/condor_config (FreeBSD)
locations[2].formatstr( "/usr/local/etc/%s", file_name );
<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 5b94c58..aa1d670 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,6 +1,6 @@
</span> --- src/python-bindings/CMakeLists.txt
+++ src/python-bindings/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,9 +101,9 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,9 +109,9 @@ else()
</span> set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,3 +12,11 @@
</span> endif()
include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,6 +174,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( DARWIN )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties( pyclassad PROPERTIES INSTALL_NAME_DIR ${CMAKE_CURRENT_BINARY_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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)" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_LIBEXEC}/libclassad_python_user.so)" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_PYTHONARCHLIB}/classad.so)" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_PYTHONARCHLIB}/htcondor.so)" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>