[106881] trunk/dports/science/htcondor
aronnax at macports.org
aronnax at macports.org
Sun Jun 9 11:12:57 PDT 2013
Revision: 106881
https://trac.macports.org/changeset/106881
Author: aronnax at macports.org
Date: 2013-06-09 11:12:57 -0700 (Sun, 09 Jun 2013)
Log Message:
-----------
htcondor: update to 8.0.0
Modified Paths:
--------------
trunk/dports/science/htcondor/Portfile
trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff
trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff
Added Paths:
-----------
trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff
trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
Modified: trunk/dports/science/htcondor/Portfile
===================================================================
--- trunk/dports/science/htcondor/Portfile 2013-06-09 17:11:44 UTC (rev 106880)
+++ trunk/dports/science/htcondor/Portfile 2013-06-09 18:12:57 UTC (rev 106881)
@@ -6,7 +6,7 @@
PortGroup cmake 1.0
PortGroup active_variants 1.1
-github.setup htcondor htcondor 7_8_8 V
+github.setup htcondor htcondor 8_0_0 V
version [strsed ${github.version} g/_/\./]
maintainers aronnax
@@ -38,8 +38,8 @@
startupitem.stop "${prefix}/sbin/condor_off -all -master"
}
-checksums rmd160 05bf7ab149aef9590776efe3f48c83a7038f346d \
- sha256 2077dcc0e74d84f45793b50dde84854519931649fad9c6a33550a5fa715a6f21
+checksums rmd160 d7a11387a78b1a25d2ecd04f2d136d74f2f5fb6c \
+ sha256 d07e2ccc24beefc84f5c878b702468e52ca20a26ef326b3eca2a2c531fa95876
depends_build-append port:latex2html
@@ -47,7 +47,8 @@
port:expat \
port:kerberos5 \
port:openssl \
- port:pcre
+ port:pcre \
+ port:python27
license_noconflict latex2html
@@ -55,7 +56,9 @@
# point to @executable_path/../lib/condor/libexpat.1.dylib, etc, instead of
# @executable_path/../lib/libexpat.1.dylib, etc. Why?
patchfiles patch-src-condor_scripts-macosx_rewrite_libs.diff \
- patch-src-condor_utils-condor_config.cpp.diff
+ patch-src-condor_utils-condor_config.cpp.diff \
+ patch-src-python-bindings-CMakeLists.txt.diff \
+ patch-build-cmake-CondorPackageConfig.cmake.diff
post-patch {
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp
@@ -64,12 +67,14 @@
compiler.blacklist clang
# FIXME: Globus support is disabled because Globus is not available in MacPorts.
-configure.args-append -DWITH_GLOBUS:BOOL="0"
+configure.args-append -DWITH_GLOBUS:BOOL="0" -DBUILD_TESTING:BOOL="0" -DC_PYTHONARCHLIB:PATH="${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages"
+# Man pages are not part of the default build target.
post-build {
system -W ${worksrcpath}/doc "make just-man-pages"
}
+# These are empty directories that are needed by the personal Condor pool.
destroot.keepdirs ${destroot}${prefix}/etc/condor/config.d \
${destroot}${prefix}/var/lib/condor/execute \
${destroot}${prefix}/var/lib/condor/spool \
@@ -78,20 +83,33 @@
# Condor installs some documentation into ${prefix}. Move them into
# ${prefix}/share/doc/${name}.
post-destroot {
+ # Move manpages into place.
eval xinstall [glob ${worksrcpath}/doc/man/man1/*] \
${destroot}${prefix}/share/man/man1
+ # Remove SysV-init and Fedora-style service scripts.
+ # See https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=3684
+ file delete ${destroot}${prefix}/etc/init.d/condor
+ file delete ${destroot}${prefix}/etc/sysconfig/condor
+
+ # Remove packaging scripts.
file delete ${destroot}${prefix}/sbin/condor_configure
file delete ${destroot}${prefix}/sbin/condor_install
+
+ # Move documentation into ${prefix}/share.
file mkdir ${destroot}${prefix}/share/doc/${name}
move \
- ${destroot}${prefix}/DOC \
${destroot}${prefix}/examples \
- ${destroot}${prefix}/INSTALL \
${destroot}${prefix}/LICENSE-2.0.txt \
${destroot}${prefix}/README \
${destroot}${prefix}/share/doc/${name}
+ # Move example configuration files from ${prefix}/etc to ${prefix}/share.
+ move \
+ ${destroot}${prefix}/etc/examples \
+ ${destroot}${prefix}/share/doc/${name}/examples/config
+
+ # If deploying a personal Condor pool, create all necessary directories.
if {[variant_isset personal]} {
xinstall -d ${destroot}${prefix}/etc/condor/config.d
xinstall ${filespath}/condor_config ${destroot}${prefix}/etc/condor
Added: trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff (rev 0)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff 2013-06-09 18:12:57 UTC (rev 106881)
@@ -0,0 +1,11 @@
+--- build/cmake/CondorPackageConfig.cmake.orig 2013-05-20 11:00:54.000000000 -0700
++++ build/cmake/CondorPackageConfig.cmake 2013-05-20 11:01:42.000000000 -0700
+@@ -116,7 +116,7 @@
+ set( C_LIBEXEC libexec )
+ set( C_SBIN sbin)
+
+-set( C_PYTHONARCHLIB lib/python)
++set( C_PYTHONARCHLIB Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages)
+
+ set( C_INCLUDE include)
+ set( C_INCLUDE_PUBLIC include)
Modified: trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff 2013-06-09 17:11:44 UTC (rev 106880)
+++ trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff 2013-06-09 18:12:57 UTC (rev 106881)
@@ -1,6 +1,6 @@
---- src/condor_scripts/macosx_rewrite_libs.orig 2013-03-09 14:23:07.000000000 -0800
-+++ src/condor_scripts/macosx_rewrite_libs 2013-03-09 14:23:53.000000000 -0800
-@@ -1,28 +1 @@
+--- src/condor_scripts/macosx_rewrite_libs.orig 2013-06-07 00:27:47.000000000 -0700
++++ src/condor_scripts/macosx_rewrite_libs 2013-06-07 00:27:52.000000000 -0700
+@@ -1,43 +1 @@
#!/bin/sh
-
-# Given a list of files, rewrite the non-system shared library
@@ -15,6 +15,21 @@
-for filename in "$@" ; do
- type=`file -h $filename`
- if echo $type | grep -q -e 'dynamically linked shared library' -e 'executable' ; then
+- external_resolver="@executable_path/../lib/condor"
+- internal_resolver="@executable_path/../lib"
+- if echo $type | grep -q -e 'dynamically linked shared library' ; then
+- 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"
+- else
+- external_resolver="@loader_path"
+- internal_resolver="@loader_path/.."
+- fi
+- fi
+- if echo $filename | grep -q -e 'htcondor.so' -e 'classad.so' ; then
+- external_resolver="@loader_path/../condor"
+- internal_resolver="@loader_path/.."
+- fi
- basefile=`basename $filename`
- libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v "$basefile "`
-
@@ -22,9 +37,9 @@
- echo $lib
- baselib=`basename $lib`
- if echo $baselib | grep -q -e 'classad' -e 'condor' ; then
-- install_name_tool -change "$lib" "@executable_path/../lib/$baselib" $filename
+- install_name_tool -change "$lib" "$internal_resolver/$baselib" $filename
- else
-- install_name_tool -change "$lib" "@executable_path/../lib/condor/$baselib" $filename
+- install_name_tool -change "$lib" "$external_resolver/$baselib" $filename
- fi
- done
- fi
Modified: trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff 2013-06-09 17:11:44 UTC (rev 106880)
+++ trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff 2013-06-09 18:12:57 UTC (rev 106881)
@@ -1,6 +1,15 @@
---- src/condor_utils/condor_config.cpp.orig 2013-03-19 09:43:16.000000000 -0400
-+++ src/condor_utils/condor_config.cpp 2013-03-19 09:43:43.000000000 -0400
-@@ -614,7 +614,7 @@
+--- src/condor_utils/condor_config.cpp.orig 2013-05-16 14:43:02.000000000 -0700
++++ src/condor_utils/condor_config.cpp 2013-05-16 14:45:12.000000000 -0700
+@@ -35,7 +35,7 @@
+ doesn't exist, we look in the following locations:
+
+ 1) ~/.condor/ # if not started as root
+- 2) /etc/condor/
++ 2) @prefix@/etc/condor/
+ 3) /usr/local/etc/
+ 4) ~condor/
+
+@@ -576,7 +576,7 @@
fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
myDistro->GetUc() );
# if defined UNIX
@@ -9,12 +18,23 @@
myDistro->Get(), myDistro->Get(), myDistro->Get() );
# elif defined WIN32
fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
-@@ -1106,7 +1106,7 @@
+@@ -586,7 +586,7 @@
+ fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
+ "source,\n", myDistro->GetUc() );
+ # if defined UNIX
+- fprintf( stderr,"or put a \"%s_config\" file in /etc/%s or ~%s/\n",
++ fprintf( stderr,"or put a \"%s_config\" file in @prefix@/etc/%s or ~%s/\n",
+ myDistro->Get(), myDistro->Get(), myDistro->Get() );
+ # elif defined WIN32
+ fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"
+@@ -1060,8 +1060,8 @@
+ formatstr( locations[0], "%s/.%s/%s", pw->pw_dir, myDistro->Get(),
file_name );
}
- // 2) /etc/condor/condor_config
-- locations[1].sprintf( "/etc/%s/%s", myDistro->Get(), file_name );
-+ locations[1].sprintf( "@prefix@/etc/%s/%s", myDistro->Get(), file_name );
+- // 2) /etc/condor/condor_config
+- locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
++ // 2) @prefix@/etc/condor/condor_config
++ locations[1].formatstr( "@prefix@/etc/%s/%s", myDistro->Get(), file_name );
// 3) /usr/local/etc/condor_config (FreeBSD)
- locations[2].sprintf( "/usr/local/etc/%s", file_name );
+ locations[2].formatstr( "/usr/local/etc/%s", file_name );
if (tilde) {
Added: trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2013-06-09 18:12:57 UTC (rev 106881)
@@ -0,0 +1,25 @@
+--- src/python-bindings/CMakeLists.txt.orig 2013-06-07 00:30:54.000000000 -0700
++++ src/python-bindings/CMakeLists.txt 2013-06-07 00:31:12.000000000 -0700
+@@ -21,19 +21,19 @@
+ message(FATAL_ERROR "Can't determine HTCondor version!")
+ endif()
+ condor_static_lib( pyclassad classad.cpp classad_wrapper.h exprtree_wrapper.h )
+- target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python )
++ target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python-mt )
+ set_target_properties( pyclassad PROPERTIES OUTPUT_NAME "${PYCLASSAD_LIB_NAME}" )
+ set_target_properties( pyclassad PROPERTIES COMPILE_FLAGS "-fPIC")
+
+ # Note we do not use condor_shared_lib below because we want a separate install target.
+ add_library( classad_module SHARED classad_module.cpp )
+- target_link_libraries( classad_module pyclassad -lboost_python ${PYTHON_LIBRARIES} )
++ target_link_libraries( classad_module pyclassad -lboost_python-mt ${PYTHON_LIBRARIES} )
+ set_target_properties(classad_module PROPERTIES PREFIX "" OUTPUT_NAME classad )
+ set_target_properties(classad_module PROPERTIES SUFFIX ".so" )
+
+ set_source_files_properties(config.cpp collector.cpp secman.cpp dc_tool.cpp schedd.cpp classad.cpp classad_module.cpp PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-cast-qual -Wno-deprecated")
+ add_library( htcondor SHARED htcondor.cpp collector.cpp config.cpp daemon_and_ad_types.cpp dc_tool.cpp export_headers.h old_boost.h schedd.cpp secman.cpp )
+- target_link_libraries( htcondor pyclassad condor_utils -lboost_python ${PYTHON_LIBRARIES} )
++ target_link_libraries( htcondor pyclassad condor_utils -lboost_python-mt ${PYTHON_LIBRARIES} )
+ set_target_properties( htcondor PROPERTIES PREFIX "" )
+ set_target_properties( htcondor PROPERTIES SUFFIX ".so" )
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130609/4d9aa015/attachment-0001.html>
More information about the macports-changes
mailing list