[124152] trunk/dports/python

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


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

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

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

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

Modified: trunk/dports/python/py-ngl/Portfile
===================================================================
--- trunk/dports/python/py26-ngl/Portfile	2014-08-11 21:34:49 UTC (rev 123646)
+++ trunk/dports/python/py-ngl/Portfile	2014-08-19 23:53:55 UTC (rev 124152)
@@ -2,27 +2,29 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup python26  1.0
+PortGroup python    1.0
 
-name                py26-ngl
+name                py-ngl
 version             1.3.0b1
 revision            1
+categories-append   science
 platforms           darwin
+license             PyNGL
 maintainers         nomaintainer
-license             PyNGL
-categories-append   science
+
 description         module  to visualize scientific data
+long_description \
+    PyNGL is a Python language module used to visualize scientific data, \
+    with an emphasis on high quality 2D visualizations.
+
 homepage            http://www.pyngl.ucar.edu/
 master_sites        http://www.pyngl.ucar.edu/Download/
 distname            PyNGL-${version}
+
 checksums           md5     231e0ad8ab7f295483f131367ab856cc \
                     sha1    76bbb03c05f0acb1591172543d3decc7c4397422 \
                     rmd160  bd4357d46af0a723cd81c16bdb0ecc3df03fa6a2
 
-long_description \
-    PyNGL is a Python language module used to visualize scientific data, \
-    with an emphasis on high quality 2D visualizations.
-
 fetch {
     if {![file exists ${distpath}/${distfiles}]} {
         xinstall -d ${distpath}
@@ -31,96 +33,103 @@
     }
 }
 
-patch {
-    reinplace "s|/usr/X11R6/lib|${prefix}/lib|" ${worksrcpath}/setup.py
-    reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|" ${worksrcpath}/examples/pynglex
-    reinplace "s|py_cmd = 'python'|py_cmd = '${prefix}/bin/python2.6'|" ${worksrcpath}/examples/pynglex
-}
+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:py26-nio
 
-depends_lib-append  port:py26-nio
+    # ncarg is not universal (and thus py26-nio is not universal)
+    universal_variant   no
 
-build.env           PNG_PREFIX=${prefix} \
-                    ZLIB_PREFIX=${prefix} \
-                    NCARG_ROOT=${prefix}
-destroot.env        NCARG_ROOT=${prefix}
+    patch {
+        reinplace "s|/usr/X11R6/lib|${prefix}/lib|" ${worksrcpath}/setup.py
+        reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|" ${worksrcpath}/examples/pynglex
+        reinplace "s|py_cmd = 'python'|py_cmd = '${prefix}/bin/python2.6'|" ${worksrcpath}/examples/pynglex
+    }
 
-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           PNG_PREFIX=${prefix} \
+                        ZLIB_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}"
+        eval $variant_line
+
+        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 ""
+            }
+        }
     }
-    append variant_line { {}}
 
-    eval $variant_line
+    eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+    if {[variant_isset g95]} {
+        if {${default_fortran_variant} != "+g95"} {
             set default_fortran_variant ""
         }
     }
-}
 
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-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}]} {
+            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}
+        }
+    }
+
+    if {[variant_isset g95]} {
         depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
+        depends_build-append port:g95
 
-        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/g95
+        configure.f77 ${prefix}/bin/g95
+        configure.f90 ${prefix}/bin/g95
 
-        build.env-append    F2CLIBS=gfortran \
-                            F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
+        configure.fflags-append -fno-second-underscore
+
+        build.env-append    F2CLIBS=f95 \
+                            F2CLIBS_PREFIX=${prefix}/lib/ \
                             CC=${configure.cc}
     }
-}
 
-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.fflags-append -fno-second-underscore
-
-    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 PyNGL 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/8a41ca4b/attachment.html>


More information about the macports-changes mailing list