Ignore:
Timestamp:
Jun 9, 2013, 6:12:57 PM (7 years ago)
Author:
aronnax@…
Message:

htcondor: update to 8.0.0

Location:
trunk/dports/science/htcondor
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/htcondor/Portfile

    r105542 r106881  
    77PortGroup               active_variants 1.1
    88
    9 github.setup            htcondor htcondor 7_8_8 V
     9github.setup            htcondor htcondor 8_0_0 V
    1010version                 [strsed ${github.version} g/_/\./]
    1111maintainers             aronnax
     
    3939}
    4040
    41 checksums               rmd160  05bf7ab149aef9590776efe3f48c83a7038f346d \
    42                         sha256  2077dcc0e74d84f45793b50dde84854519931649fad9c6a33550a5fa715a6f21
     41checksums               rmd160  d7a11387a78b1a25d2ecd04f2d136d74f2f5fb6c \
     42                        sha256  d07e2ccc24beefc84f5c878b702468e52ca20a26ef326b3eca2a2c531fa95876
    4343
    4444depends_build-append    port:latex2html
     
    4848                        port:kerberos5 \
    4949                        port:openssl \
    50                         port:pcre
     50                        port:pcre \
     51                        port:python27
    5152
    5253license_noconflict      latex2html
     
    5657# @executable_path/../lib/libexpat.1.dylib, etc. Why?
    5758patchfiles              patch-src-condor_scripts-macosx_rewrite_libs.diff \
    58                         patch-src-condor_utils-condor_config.cpp.diff
     59                        patch-src-condor_utils-condor_config.cpp.diff \
     60                        patch-src-python-bindings-CMakeLists.txt.diff \
     61                        patch-build-cmake-CondorPackageConfig.cmake.diff
    5962
    6063post-patch {
     
    6568
    6669# FIXME: Globus support is disabled because Globus is not available in MacPorts.
    67 configure.args-append   -DWITH_GLOBUS:BOOL="0"
     70configure.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"
    6871
     72# Man pages are not part of the default build target.
    6973post-build {
    7074    system -W ${worksrcpath}/doc "make just-man-pages"
    7175}
    7276
     77# These are empty directories that are needed by the personal Condor pool.
    7378destroot.keepdirs       ${destroot}${prefix}/etc/condor/config.d \
    7479                        ${destroot}${prefix}/var/lib/condor/execute \
     
    7984# ${prefix}/share/doc/${name}.
    8085post-destroot {
     86    # Move manpages into place.
    8187    eval xinstall [glob ${worksrcpath}/doc/man/man1/*] \
    8288        ${destroot}${prefix}/share/man/man1
    8389
     90    # Remove SysV-init and Fedora-style service scripts.
     91    # See https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=3684
     92    file delete ${destroot}${prefix}/etc/init.d/condor
     93    file delete ${destroot}${prefix}/etc/sysconfig/condor
     94
     95    # Remove packaging scripts.
    8496    file delete ${destroot}${prefix}/sbin/condor_configure
    8597    file delete ${destroot}${prefix}/sbin/condor_install
     98
     99    # Move documentation into ${prefix}/share.
    86100    file mkdir ${destroot}${prefix}/share/doc/${name}
    87101    move \
    88       ${destroot}${prefix}/DOC \
    89102      ${destroot}${prefix}/examples \
    90       ${destroot}${prefix}/INSTALL \
    91103      ${destroot}${prefix}/LICENSE-2.0.txt \
    92104      ${destroot}${prefix}/README \
    93105      ${destroot}${prefix}/share/doc/${name}
    94106
     107    # Move example configuration files from ${prefix}/etc to ${prefix}/share.
     108    move \
     109      ${destroot}${prefix}/etc/examples \
     110      ${destroot}${prefix}/share/doc/${name}/examples/config
     111
     112    # If deploying a personal Condor pool, create all necessary directories.
    95113    if {[variant_isset personal]} {
    96114        xinstall -d ${destroot}${prefix}/etc/condor/config.d
  • trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff

    r105270 r106881  
    1 --- src/condor_scripts/macosx_rewrite_libs.orig 2013-03-09 14:23:07.000000000 -0800
    2 +++ src/condor_scripts/macosx_rewrite_libs      2013-03-09 14:23:53.000000000 -0800
    3 @@ -1,28 +1 @@
     1--- src/condor_scripts/macosx_rewrite_libs.orig 2013-06-07 00:27:47.000000000 -0700
     2+++ src/condor_scripts/macosx_rewrite_libs      2013-06-07 00:27:52.000000000 -0700
     3@@ -1,43 +1 @@
    44 #!/bin/sh
    55-
     
    1616-  type=`file -h $filename`
    1717-  if echo $type | grep -q -e 'dynamically linked shared library' -e 'executable' ; then
     18-    external_resolver="@executable_path/../lib/condor"
     19-    internal_resolver="@executable_path/../lib"
     20-    if echo $type | grep -q -e 'dynamically linked shared library' ; then
     21-      if echo $filename | grep -q -e 'libcondor_utils' -e 'libpyclassad' -e 'libclassad' -e 'libchirp_client' -e 'libcondorapi' ; then
     22-        external_resolver="@loader_path/condor"
     23-        internal_resolver="@loader_path"
     24-      else
     25-        external_resolver="@loader_path"
     26-        internal_resolver="@loader_path/.."
     27-      fi
     28-    fi
     29-    if echo $filename | grep -q -e 'htcondor.so' -e 'classad.so' ; then
     30-      external_resolver="@loader_path/../condor"
     31-      internal_resolver="@loader_path/.."
     32-    fi
    1833-    basefile=`basename $filename`
    1934-    libraries=`otool -L $filename | grep '^[[:space:]][^@]' | sed 's|^.\([^ ]*\) .*|\1|' | grep -v '^/usr/lib' | grep -v '^/System/' | grep -v "$basefile "`
     
    2338-      baselib=`basename $lib`
    2439-      if echo $baselib | grep -q -e 'classad' -e 'condor' ; then
    25 -        install_name_tool -change "$lib" "@executable_path/../lib/$baselib" $filename
     40-        install_name_tool -change "$lib" "$internal_resolver/$baselib" $filename
    2641-      else
    27 -        install_name_tool -change "$lib" "@executable_path/../lib/condor/$baselib" $filename
     42-        install_name_tool -change "$lib" "$external_resolver/$baselib" $filename
    2843-      fi
    2944-    done
  • trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff

    r105270 r106881  
    1 --- src/condor_utils/condor_config.cpp.orig     2013-03-19 09:43:16.000000000 -0400
    2 +++ src/condor_utils/condor_config.cpp  2013-03-19 09:43:43.000000000 -0400
    3 @@ -614,7 +614,7 @@
     1--- src/condor_utils/condor_config.cpp.orig     2013-05-16 14:43:02.000000000 -0700
     2+++ src/condor_utils/condor_config.cpp  2013-05-16 14:45:12.000000000 -0700
     3@@ -35,7 +35,7 @@
     4   doesn't exist, we look in the following locations:
     5 
     6       1) ~/.condor/     # if not started as root
     7-      2) /etc/condor/
     8+      2) @prefix@/etc/condor/
     9       3) /usr/local/etc/
     10       4) ~condor/
     11 
     12@@ -576,7 +576,7 @@
    413                fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
    514                                myDistro->GetUc() );
     
    1019 #        elif defined WIN32
    1120                fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
    12 @@ -1106,7 +1106,7 @@
     21@@ -586,7 +586,7 @@
     22                fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
     23                                "source,\n", myDistro->GetUc() );
     24 #        if defined UNIX
     25-               fprintf( stderr,"or put a \"%s_config\" file in /etc/%s or ~%s/\n",
     26+               fprintf( stderr,"or put a \"%s_config\" file in @prefix@/etc/%s or ~%s/\n",
     27                                 myDistro->Get(), myDistro->Get(), myDistro->Get() );
     28 #        elif defined WIN32
     29                fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"
     30@@ -1060,8 +1060,8 @@
     31                        formatstr( locations[0], "%s/.%s/%s", pw->pw_dir, myDistro->Get(),
    1332                                         file_name );
    1433                }
    15                         // 2) /etc/condor/condor_config
    16 -               locations[1].sprintf( "/etc/%s/%s", myDistro->Get(), file_name );
    17 +               locations[1].sprintf( "@prefix@/etc/%s/%s", myDistro->Get(), file_name );
     34-                       // 2) /etc/condor/condor_config
     35-               locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
     36+                       // 2) @prefix@/etc/condor/condor_config
     37+               locations[1].formatstr( "@prefix@/etc/%s/%s", myDistro->Get(), file_name );
    1838                        // 3) /usr/local/etc/condor_config (FreeBSD)
    19                 locations[2].sprintf( "/usr/local/etc/%s", file_name );
     39                locations[2].formatstr( "/usr/local/etc/%s", file_name );
    2040                if (tilde) {
Note: See TracChangeset for help on using the changeset viewer.