[107162] trunk/dports/science/htcondor

[aronnax at macports.org]

Revision: 107162
          https://trac.macports.org/changeset/107162
Author:   aronnax at macports.org
Date:     2013-06-20 12:34:39 -0700 (Thu, 20 Jun 2013)
Log Message:
-----------
htcondor: add variants for different versions of Python

Modified Paths:
--------------
    trunk/dports/science/htcondor/Portfile
    trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff

Modified: trunk/dports/science/htcondor/Portfile
===================================================================
--- trunk/dports/science/htcondor/Portfile	2013-06-20 18:06:20 UTC (rev 107161)
+++ trunk/dports/science/htcondor/Portfile	2013-06-20 19:34:39 UTC (rev 107162)
@@ -8,6 +8,7 @@
 
 github.setup            htcondor htcondor 8_0_0 V
 version                 [strsed ${github.version} g/_/\./]
+revision                1
 maintainers             aronnax
 
 categories              science parallel net
@@ -25,7 +26,7 @@
   ultimately informs the user upon completion.
 homepage                http://research.cs.wisc.edu/htcondor
 
-default_variants        +personal
+default_variants        +personal +python27
 
 variant personal \
   description "configure your computer as a one-node personal Condor pool" {
@@ -38,6 +39,38 @@
     startupitem.stop    "${prefix}/sbin/condor_off -all -master"
 }
 
+set pythons_suffixes {25 26 27 31 32 33}
+
+set pythons_ports {}
+foreach s ${pythons_suffixes} {
+    lappend pythons_ports python${s}
+}
+
+configure.args-append   -DWITH_PYTHON_BINDINGS:BOOL="0"
+
+foreach s ${pythons_suffixes} {
+    set p python${s}
+    set v [string index ${s} 0].[string index ${s} 1]
+    set i [lsearch -exact ${pythons_ports} ${p}]
+    set c [lreplace ${pythons_ports} ${i} ${i}]
+    set d ${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
+    eval [subst {
+        variant ${p} description "Enable Python interface for Python ${v}" conflicts ${c} {
+
+            depends_lib-append      port:${p}
+            require_active_variants boost ${p}
+            configure.args-append   -DC_PYTHONARCHLIB:PATH="${d}/site-packages"
+            configure.args-strsed   s/-DWITH_PYTHON_BINDINGS:BOOL="0"/-DWITH_PYTHON_BINDINGS:BOOL="1"/
+
+            post-patch {
+                reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp
+                reinplace "s|@c_pythonarchlib@|${d}/site-packages|g" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
+            }
+
+        }
+    }]
+}
+
 checksums               rmd160  d7a11387a78b1a25d2ecd04f2d136d74f2f5fb6c \
                         sha256  d07e2ccc24beefc84f5c878b702468e52ca20a26ef326b3eca2a2c531fa95876
 
@@ -47,8 +80,7 @@
                         port:expat \
                         port:kerberos5 \
                         port:openssl \
-                        port:pcre \
-                        port:python27
+                        port:pcre
 
 license_noconflict      latex2html
 
@@ -67,7 +99,7 @@
 compiler.blacklist      clang
 
 # FIXME: Globus support is disabled because Globus is not available in MacPorts.
-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"
+configure.args-append   -DWITH_GLOBUS:BOOL="0" -DBUILD_TESTING:BOOL="0"
 
 # Man pages are not part of the default build target.
 post-build {

Modified: trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff	2013-06-20 18:06:20 UTC (rev 107161)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff	2013-06-20 19:34:39 UTC (rev 107162)
@@ -5,7 +5,7 @@
  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_PYTHONARCHLIB @c_pythonarchlib@)
  
  set( C_INCLUDE		include)
  set( C_INCLUDE_PUBLIC		include)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130620/6e2afede/attachment.html>