[108991] trunk/dports/science/ompl/Portfile

[mmoll at macports.org]

Revision: 108991
          https://trac.macports.org/changeset/108991
Author:   mmoll at macports.org
Date:     2013-08-05 14:10:39 -0700 (Mon, 05 Aug 2013)
Log Message:
-----------
science/ompl: update to 0.13.0

Modified Paths:
--------------
    trunk/dports/science/ompl/Portfile

Modified: trunk/dports/science/ompl/Portfile
===================================================================
--- trunk/dports/science/ompl/Portfile	2013-08-05 20:16:47 UTC (rev 108990)
+++ trunk/dports/science/ompl/Portfile	2013-08-05 21:10:39 UTC (rev 108991)
@@ -5,7 +5,7 @@
 PortGroup active_variants 1.1
 
 name                ompl
-version             0.12.2
+version             0.13.0
 categories          science
 maintainers         mmoll
 description         The Open Motion Planning Library (OMPL)
@@ -15,9 +15,9 @@
 platforms           darwin
 license             BSD
 master_sites        https://bitbucket.org/ompl/ompl/downloads
-checksums           md5     0415337bf4e4dc314a36dcf2d44845ca \
-                    sha1    16c835b4760c5dd5633c3b83ad506da97dbc3adb \
-                    rmd160  5ab25b46dc3623c8e9a13ce34960ae52545f6dd6
+checksums           md5     c1169e918a067218562d6c93716b2bce \
+                    sha1    c07dbd0a4e4f4f54813a9171e8182394eed10a7e \
+                    rmd160  91e1ec4740c46c55638f06d9c7c483aeb45921d3
 distname            ${name}-${version}-Source
 depends_lib-append  port:boost port:ode port:flann
 
@@ -28,7 +28,10 @@
 # somewhat dependent on compiler and/or boost version, so we can't
 # pre-generate them and make them available as an extra download.
 post-configure {
-    system "cd ${worksrcpath}; ${build.cmd} update_bindings"
+    # enable parallel build on at most 2 cores. Generating the bindings
+    # uses large amounts of memory, so don't use more cores.
+    if { ${use_parallel_build} } { set cj "-j 2" } else { set cj "" }
+    system "cd ${worksrcpath}; ${build.cmd} ${cj} update_bindings"
 }
 
 # The +app variant includes all the content of the regular OMPL version, but
@@ -48,11 +51,10 @@
     }
     depends_build-append port:pkgconfig
     depends_lib-append  port:assimp port:fcl
-    configure.args-append -DOMPLAPP_PQP=OFF
-    dist_subdir         ${name}/${version}_1
-    checksums           md5     5ce6f5ec2d2a068e17e03a64e90cc07c \
-                        sha1    ad6b346c13e1168ab64f7cfe336d497ad0951e5f \
-                        rmd160  f7e91965e8bbb68c215ff7b283059d5018a40f27
+    configure.args-append -DOMPLAPP_PQP=OFF -DOMPLAPP_RESOURCE_DIR=${prefix}/share/ompl/resources
+    checksums           md5     9f3757e2533419cd6a51686dcc7c8129 \
+                        sha1    cbc3be0a2e123d41056f62cd86e46105f1de2396 \
+                        rmd160  ad96c6d2a1632ad32fa2deb88af4ce3f1b940afa
 }
 
 set pythons_suffixes {26 27 31 32 33}
@@ -78,10 +80,8 @@
     set v [string index ${s} 0].[string index ${s} 1]
     set i [lsearch -exact ${pythons_ports} ${p}]
     set c [lreplace ${pythons_ports} ${i} ${i}]
-    # python 3k conflicts with app, because py-opengl doesn't exist for python 3k
-    if { ${s} > 30 } { set a "app" } else { set a "" }
     eval [subst {
-        variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} ${a} debug {
+        variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} debug {
             depends_build-append    port:py${s}-pyplusplus-devel
             depends_lib-append      port:${p}
             configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python${v}
@@ -94,14 +94,14 @@
                 post-destroot {
                     reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
                         ${destroot}${prefix}/bin/ompl_app
-                    # not needed and causes problems with rpaths
+                    # extra copy of libs not needed in site_packages and causes problems with rpaths
                     set site_packages \[python_dir\]
                     delete ${destroot}\${site_packages}/ompl/util/libompl.dylib \
                            ${destroot}\${site_packages}/ompl/app/libompl_app.dylib
                 }
             } else {
                 post-destroot {
-                    # not needed and causes problems with rpaths
+                    # extra copy of libs not needed in site_packages and causes problems with rpaths
                     set site_packages \[python_dir\]
                     delete ${destroot}\${site_packages}/ompl/util/libompl.dylib
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130805/cd18edec/attachment-0001.html>