[124151] trunk/dports/python

petr at macports.org petr at macports.org
Tue Aug 19 16:53:18 PDT 2014


Revision: 124151
          https://trac.macports.org/changeset/124151
Author:   petr at macports.org
Date:     2014-08-19 16:53:18 -0700 (Tue, 19 Aug 2014)
Log Message:
-----------
py{26}-nio: unified portgroup, rename, format, fix livecheck

Modified Paths:
--------------
    trunk/dports/python/py-nio/Portfile

Added Paths:
-----------
    trunk/dports/python/py-nio/

Removed Paths:
-------------
    trunk/dports/python/py26-nio/

Modified: trunk/dports/python/py-nio/Portfile
===================================================================
--- trunk/dports/python/py26-nio/Portfile	2014-08-11 21:34:49 UTC (rev 123646)
+++ trunk/dports/python/py-nio/Portfile	2014-08-19 23:53:18 UTC (rev 124151)
@@ -2,30 +2,32 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup python26  1.0
+PortGroup python    1.0
 
-name                py26-nio
+name                py-nio
 version             1.3.0b1
 revision            1
+categories-append   science
 platforms           darwin
+license             PyNIO
 maintainers         nomaintainer
-license             PyNIO
-categories-append   science
+
 description         I/O library for scientific data formats 
+long_description \
+    PyNIO is a Python package that allows read and/or write access to \
+    a variety of data formats using an interface modeled on netCDF. \
+    PyNIO is composed of a C library called libnio along with a Python module \
+    based on and with an interface similar to the Scientific.IO.NetCDF module \
+    written by Konrad Hinsen.
+
 homepage            http://www.pyngl.ucar.edu/Nio.shtml
 master_sites        http://www.pyngl.ucar.edu/Download/
 distname            PyNIO-${version}
+
 checksums           md5     c881b552cf914549f46d65a61f2d8cb0 \
                     sha1    288b70d83828e1cb99d3d7c61bd32b5c406c8b1a \
                     rmd160  b33d00041783ba259ae95f772c7fde0cf37d7303
 
-long_description \
-    PyNIO is a Python package that allows read and/or write access to \
-    a variety of data formats using an interface modeled on netCDF. \
-    PyNIO is composed of a C library called libnio along with a Python module \
-    based on and with an interface similar to the Scientific.IO.NetCDF module \
-    written by Konrad Hinsen.
-
 fetch {
     if {![file exists ${distpath}/${distfiles}]} {
         xinstall -d ${distpath}
@@ -34,97 +36,104 @@
     }
 }
 
-patch {
-    reinplace "s|__init__(obj)|__init__()|" ${worksrcpath}/Nio.py
-}
+python.versions     26
 
-# ncarg is not universal (and thus py26-nio is not universal)
-universal_variant no
+if {${name} ne ${subport}} {
+    depends_lib-append  port:ncarg \
+                        port:szip \
+                        port:py${python.version}-numpy
 
-depends_lib-append  port:ncarg \
-                    port:szip \
-                    port:py26-numpy
+    # ncarg is not universal (and thus py26-nio is not universal)
+    universal_variant   no
 
-build.env-append    HAS_GRIB2=1  GRIB2_PREFIX=${prefix} \
-                    HAS_HDFEOS=1 HDFEOS_PREFIX=${prefix} \
-                    HAS_NETCDF4=1 NETCDF4_PREFIX=${prefix} \
-                    NCARG_ROOT=${prefix}
-destroot.env        NCARG_ROOT=${prefix}
+    patch {
+        reinplace "s|__init__(obj)|__init__()|" ${worksrcpath}/Nio.py
+    }
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
+    build.env-append    HAS_GRIB2=1  GRIB2_PREFIX=${prefix} \
+                        HAS_HDFEOS=1 HDFEOS_PREFIX=${prefix} \
+                        HAS_NETCDF4=1 NETCDF4_PREFIX=${prefix} \
+                        NCARG_ROOT=${prefix}
 
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
+    destroot.env        NCARG_ROOT=${prefix}
 
-    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
+    set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+    set default_fortran_variant +gcc48
+    set g95_conflicts {}
 
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
+    foreach ver ${gcc_versions} {
+        set ver_no_dot [join [split ${ver} "."] ""]
+
+        set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
+
+        foreach over ${gcc_versions} {
+            if {${ver} == ${over}} {
+                continue
         }
 
-        set over_no_dot [join [split ${over} "."] ""]
-        append variant_line " conflicts gcc${over_no_dot}"
-    }
-    append variant_line { {}}
+            set over_no_dot [join [split ${over} "."] ""]
+            append variant_line " conflicts gcc${over_no_dot}"
+        }
+        append variant_line { {}}
 
-    eval $variant_line
+        eval $variant_line
 
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
+        append g95_conflicts " conflicts gcc${ver_no_dot}"
 
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-            set default_fortran_variant ""
+        if {[variant_isset gcc${ver_no_dot}]} {
+            if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+                set default_fortran_variant ""
+            }
         }
     }
-}
 
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
+    eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
-if {[variant_isset g95]} {
-    if {${default_fortran_variant} != "+g95"} {
-        set default_fortran_variant ""
+    if {[variant_isset g95]} {
+        if {${default_fortran_variant} != "+g95"} {
+            set default_fortran_variant ""
+        }
     }
-}
 
-if {${default_fortran_variant} != ""} {
-    default_variants-append "${default_fortran_variant}"
-}
+    if {${default_fortran_variant} != ""} {
+        default_variants-append "${default_fortran_variant}"
+    }
 
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
+    foreach ver ${gcc_versions} {
+        set ver_no_dot [join [split ${ver} "."] ""]
 
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
+        if {[variant_isset gcc${ver_no_dot}]} {
+            depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+            depends_build-append port:gcc${ver_no_dot}
 
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+            configure.fc  ${prefix}/bin/gfortran-mp-${ver}
+            configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+            configure.f90 ${prefix}/bin/gfortran-mp-${ver}
 
-        build.env-append    F2CLIBS=gfortran \
-                            F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
-                            CC=${configure.cc}
+            build.env-append    F2CLIBS=gfortran \
+                                F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
+                                CC=${configure.cc}
+        }
     }
-}
 
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
+    if {[variant_isset g95]} {
+        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+        depends_build-append port:g95
 
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
+        configure.fc ${prefix}/bin/g95
+        configure.f77 ${prefix}/bin/g95
+        configure.f90 ${prefix}/bin/g95
 
-    configure.fflags-append -fno-second-underscore
+        configure.fflags-append -fno-second-underscore
 
-    build.env-append    F2CLIBS=f95 \
-                        F2CLIBS_PREFIX=${prefix}/lib/ \
-                        CC=${configure.cc}
+        build.env-append    F2CLIBS=f95 \
+                            F2CLIBS_PREFIX=${prefix}/lib/ \
+                            CC=${configure.cc}
+    }
+
+   livecheck.type   none
+} else {
+    livecheck.type  regex
+    livecheck.url   ${master_sites}
+    livecheck.regex {of PyNIO is ([0-9]\.[0-9]\.[0-9]+)}
 }
-
-livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     {The current version of PyNGL and PyNIO is ([0-9]\.[0-9]\.[0-9][a-z]+[0-9]+)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140819/4fb63b11/attachment-0001.html>


More information about the macports-changes mailing list