Ticket #36488: bob-1.1.0-ryandesign.diff

Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 PortGroup           cmake 1.0
+PortGroup           github 1.0
 
-name                bob
-version             1.0.6
-set soversion       1.0
+github.setup        idiap bob 1.1.0 v
+set soversion       1.1
 categories          science math devel
 platforms           darwin
 maintainers         idiap.ch:andre.anjos \
@@ -22 +22 @@
 
 license             GPL-3
 homepage            http://idiap.github.com/bob/
-master_sites        https://github.com/idiap/bob/downloads/
-use_zip             yes
 
-checksums           rmd160 eac3e390ed25c69d8c6038f815ea473c21118a0f \
-                    sha256 767e22bddb2bfb59458b76eb37cab3791bf1bfbe33fc7ad11ca29038343b5dea
+checksums           rmd160  488fadd37b5f1c7047035d791e21863d5d258b9c \
+                    sha256  dcdd59727185d4df85d68e644cc8f2ce6d9e9132cab3a7d8a0b981b0d7eb926a
 
 use_parallel_build  no
 
@@ -42 +40 @@
 
 configure.args      -DCMAKE_BUILD_TYPE=Release -DBOB_VERSION=${version} -DBOB_SOVERSION=${soversion}
 
-compiler.blacklist  clang
-
 universal_variant   no
 default_variants    +qt4 +opencv
 
@@ -51 +47 @@
     default_variants-append +python27
 }
 
-variant python26 conflicts python27 description "Builds for python 2.6." {
-    depends_lib-append    port:py26-numpy \
+variant python26 conflicts python27 description "Build for python 2.6" {
+    depends_build-append  port:py26-sphinx
+    
+    depends_lib-append    port:py26-distribute \
+      port:py26-numpy \
       port:py26-matplotlib \
       port:py26-sqlalchemy \
       port:py26-argparse \
-      port:py26-scipy
+      port:py26-scipy \
+      port:py26-nose
 }
 
-variant python27 conflicts python26 description "Builds for python 2.7." {
-    depends_lib-append    port:py27-numpy \
+variant python27 conflicts python26 description "Build for python 2.7" {
+    depends_build-append  port:py27-sphinx
+    
+    depends_lib-append    port:py27-distribute \
+      port:py27-numpy \
       port:py27-matplotlib \
       port:py27-sqlalchemy \
-      port:py27-scipy
+      port:py27-scipy \
+      port:py27-nose
 }
 
-variant qt4 description "Compile Qt4 extensions." {
+variant qt4 description "Compile Qt4 extensions" {
     depends_lib-append      port:qt4-mac
 }
 
-variant opencv description "Compile OpenCV extensions." {
+variant opencv description "Compile OpenCV extensions" {
     depends_lib-append      port:opencv
 }
 
-variant doc description "Builds documentation." {
+variant doc description "Build documentation" {
     depends_build-append    port:dvipng \
         port:doxygen \
         port:texlive-latex-extra \
         port:texlive-fonts-recommended
     destroot.target-append  sphinx-latex install-sphinx install-doxygen
 
-    if {[variant_isset python26]} {
-      depends_build-append  port:py26-sphinx
-    }
-    if {[variant_isset python27]} {
-      depends_build-append  port:py27-sphinx
-    }
     test.run yes
     test.target sphinx-doctest
 }