[127371] trunk/dports/science/ompl

[mmoll at macports.org]

Revision: 127371
          https://trac.macports.org/changeset/127371
Author:   mmoll at macports.org
Date:     2014-10-26 06:36:31 -0700 (Sun, 26 Oct 2014)
Log Message:
-----------
science/ompl: update to version 1.0.0

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

Removed Paths:
-------------
    trunk/dports/science/ompl/files/

Modified: trunk/dports/science/ompl/Portfile
===================================================================
--- trunk/dports/science/ompl/Portfile	2014-10-26 11:08:35 UTC (rev 127370)
+++ trunk/dports/science/ompl/Portfile	2014-10-26 13:36:31 UTC (rev 127371)
@@ -6,8 +6,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                ompl
-version             0.14.2
-revision            1
+version             1.0.0
 categories          science
 maintainers         mmoll
 description         The Open Motion Planning Library (OMPL)
@@ -17,31 +16,20 @@
 platforms           darwin
 license             BSD
 master_sites        https://bitbucket.org/ompl/ompl/downloads
-checksums           md5     43ea02ca9ffff1719a87edf570874eaf \
-                    sha1    8410ea13e5b58c790cbfff7f369a09c6a0ea3a8f \
-                    rmd160  51dddb685f100bd9ce2772f860f610d5dcf428ef
-distname            ${name}-${version}-Source
-patchfiles          patch-ODESolver.h.diff
-patch.pre_args      -p1
+distfiles           ${name}-${version}-Source${extract.suffix} ${name}-bindings-${version}${extract.suffix}
+checksums           ${name}-${version}-Source${extract.suffix} \
+                        sha1    9d89dd0e9c358ddfc5c0b3c0aa92b4d101c72756 \
+                        rmd160  f85e4f1b501306c08f72f110d61c805ae2668b73 \
+                    ${name}-bindings-${version}${extract.suffix} \
+                        sha1    822c6967958e979f98afda47cd2abba5cd4ddbcc \
+                        rmd160  ab62f7c73f0689a718d9961b081f8168540c8e6d
+worksrcdir          ${name}-${version}-Source
 depends_lib-append  port:boost port:ode port:flann port:triangle
 
-# We "inherit" the compiler fallback and blacklist from the Boost port,
-# since OMPL depends heavily on Boost.
-compiler.fallback-append macports-clang-3.3
-compiler.blacklist {clang < 421} macports-clang-2.9 macports-clang-3.0 llvm-gcc-4.2 macports-llvm-gcc-4.2 apple-gcc-4.2 gcc-4.2 gcc-4.0 apple-gcc-4.0 gcc-3.3
+# We "inherit" the compiler blacklist from the Boost port, since OMPL depends heavily on Boost.
+compiler.blacklist {clang < 421} macports-clang-2.9 macports-clang-3.0 *llvm-gcc-4.2 *gcc-4.0 gcc-3.3
 
-# no universal of gccxml-devel
-universal_variant   no
 configure.args-append   -DOMPL_BUILD_DEMOS=OFF
-# generate the extra C++ code needed for Python bindings. This code seems
-# 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 {
-    # 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
 # adds a simple GUI and an extra library with bindings to the assimp and fcl
@@ -50,8 +38,6 @@
 # this variant are distributed under a slightly different license than the
 # regular OMPL version.
 variant app description {Include GUI and extra demo code} {
-    distname            omplapp-${version}-Source
-    patch.pre_args      -p0
     license             noncommercial
     pre-extract {
         ui_warn "The +app variant causes some extra code to be compiled that is
@@ -62,12 +48,17 @@
     depends_build-append port:pkgconfig
     depends_lib-append  port:assimp port:fcl
     configure.args-append -DOMPLAPP_PQP=OFF -DOMPLAPP_RESOURCE_DIR=${prefix}/share/ompl/resources
-    checksums           md5     c4cd3527630156f284b06d4a33690601 \
-                        sha1    6b43ac91d1c2881be48eea4e22f90b3f4677cfd7 \
-                        rmd160  d834e4322c04ae587c1101fc868336483095067e
+    distfiles           omplapp-${version}-Source${extract.suffix} omplapp-bindings-${version}${extract.suffix}
+    checksums           omplapp-${version}-Source${extract.suffix} \
+                            sha1    4d7d77ed9cdc58718ab664e11e5c9127ba4287cf \
+                            rmd160  a5b07eac786560faeeee0ff72162cc363035bf28 \
+                        omplapp-bindings-${version}${extract.suffix} \
+                            sha1    d322137cb6940075cdd4cb12676fda7a2df99ca5 \
+                            rmd160  73bdb2379e278ef5c98b162cd65a6b1605e661ca
+    worksrcdir          omplapp-${version}-Source
 }
 
-set pythons_suffixes {27 34}
+set pythons_suffixes {26 27 31 32 33 34}
 
 set pythons_ports {}
 foreach s ${pythons_suffixes} {
@@ -92,7 +83,6 @@
     set c [lreplace ${pythons_ports} ${i} ${i}]
     eval [subst {
         variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} debug {
-            depends_build-append    port:py${s}-pyplusplus
             depends_lib-append      port:${p}
             configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python${v}
 
@@ -110,7 +100,8 @@
                     # 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
+                           ${destroot}\${site_packages}/ompl/app/libompl_app.dylib \
+                           ${destroot}\${site_packages}/ompl/app/libompl_app_base.dylib
                 }
             } else {
                 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141026/e6d905c5/attachment-0001.html>