Modified: trunk/dports/python/py-healpy/Portfile (105620 => 105621)

--- trunk/dports/python/py-healpy/Portfile	2013-04-28 01:23:09 UTC (rev 105620)
+++ trunk/dports/python/py-healpy/Portfile	2013-04-28 01:26:57 UTC (rev 105621)
@@ -2,42 +2,61 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               github 1.0
 PortGroup               python 1.0
+PortGroup               active_variants 1.1
 
-github.setup            healpy healpy 1.4.1
 name                    py-healpy
-categories              python science
+version                 1.6.1
+categories-append       science
 license                 GPL-2
 platforms               darwin
 maintainers             aronnax
-description             Python wrapper for healpix
-long_description        Python wrapper for healpix
+description             Python wrapper for HEALPix
+long_description        Software for pixelation, hierarchical indexing, synthesis, \
+                        analysis, and visualization of data on the sphere. This is \
+                        the Python language interface for HEALPix.
 
-checksums               md5     2417bdcadf9602be2c73422035dd6e73 \
-                        sha1    4069ab2d2024f496258419a01d5c34d9a8d6ba36 \
-                        rmd160  e9c1e267fabf65f1b22331a1dd63393241d4738f
+set basename            healpy
+distname                ${basename}-${version}
+master_sites            https://pypi.python.org/packages/source/[string index ${basename} 0]/${basename}/
+homepage                http://pypi.python.org/pypi/${basename}/
 
-python.versions         26 27
+checksums               md5     9795befee883793c41b18f40797516f8 \
+                        sha1    949172f318b081705a63944e8ea8d879233d7049 \
+                        rmd160  81374d46ea754c79525ca1a0347a692cafc66149
 
+python.versions         25 26 27
+
 if {${subport} != ${name}} {
 
-# Blacklist the following compilers that do not support OpenMP.
-compiler.blacklist      clang
+    default_variants    +openmp
 
-# FIXME: remove HEALPY_WITH_OPENMP in next release; see
-# https://github.com/healpy/healpy/pull/73
-build.env-append        HEALPIX_EXT_PREFIX=${prefix} \
-                        HEALPY_WITH_OPENMP=1 \
-                        CFITSIO_EXT_PREFIX=${prefix} \
-                        CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp} \
-                        LDSHARED="${configure.cc} -L${prefix}/lib -bundle -undefined dynamic_lookup"
+    variant openmp description "enable OpenMP parallel acceleration" {
+        compiler.blacklist-append clang
+    }
 
-depends_lib-append      port:py${python.version}-numpy \
+    if {[variant_isset openmp]} {
+        require_active_variants healpix-cxx openmp
+        compiler.blacklist clang
+    } else {
+        require_active_variants healpix-cxx "" openmp
+    }
+
+    depends_build       port:pkgconfig \
+                        port:py${python.version}-distribute
+
+    depends_lib-append  port:cfitsio \
+                        port:py${python.version}-numpy \
                         port:py${python.version}-pyfits \
                         port:py${python.version}-matplotlib \
                         port:healpix-cxx
 
-livecheck.type          none
+    livecheck.type      none
 
+} else {
+
+    livecheck.type      regex
+    livecheck.url       ${homepage}
+    livecheck.regex     {healpy-([0-9]+(\.[0-9]+)*)}
+
 }