[147102] trunk/dports/science/netcdf-fortran

[takeshi at macports.org]

Revision: 147102
          https://trac.macports.org/changeset/147102
Author:   takeshi at macports.org
Date:     2016-03-27 02:21:25 -0700 (Sun, 27 Mar 2016)
Log Message:
-----------
netcdf-fortran: update to 4.4.3. fix univeral build

Modified Paths:
--------------
    trunk/dports/science/netcdf-fortran/Portfile
    trunk/dports/science/netcdf-fortran/files/nawk.patch

Added Paths:
-----------
    trunk/dports/science/netcdf-fortran/files/patch-Makefile.in.diff

Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile	2016-03-27 09:17:22 UTC (rev 147101)
+++ trunk/dports/science/netcdf-fortran/Portfile	2016-03-27 09:21:25 UTC (rev 147102)
@@ -5,14 +5,14 @@
 PortGroup                   muniversal 1.0
 PortGroup                   mpi 1.0
 PortGroup                   github 1.0
+# Although CMakeLists.txt is provided nf-config is not yet ported.
 
 # netcdf-fortran does not require the fortran interface of hdf5.
 # enforcing hdf5 variant does not allow installation of
 # hdf5+cxx (w/o a fortran variant) and netcdf-fortran.
 #mpi.enforce_variant         hdf5
 
-github.setup                Unidata netcdf-fortran 4.4.2 v
-revision                    1
+github.setup                Unidata netcdf-fortran 4.4.3 v
 maintainers                 takeshi openmaintainer
 platforms                   darwin
 categories                  science
@@ -29,9 +29,8 @@
     This software package provides Fortran application interfaces \
     for accessing netCDF data.
 
-checksums           md5     32f31b3ec1831a363efbad26663f2aae \
-                    sha1    426242a39e235d4973c77a42eea7f84b6fd8e367 \
-                    rmd160  fcbd9921999f830d9f2517956577aa1c1ffd36a0
+checksums           rmd160  60de85d4b59b40ed4cc9698ef54a92c2cf6e686d \
+                    sha256  d0ba76fa0bc27224ca53115da9a7fc27d1b14ee7e5a3c7dc2431133e93cdbaee
 
 compilers.choose    f77 f90 fc
 mpi.setup           require_fortran
@@ -46,6 +45,9 @@
 }
 
 patchfiles          nawk.patch
+if {[variant_isset universal]} {
+    patchfiles-append   patch-Makefile.in.diff
+}
 
 post-patch {
     if {[variant_isset g95]} {
@@ -62,19 +64,5 @@
     configure.ldflags-append    -lf95
 }
 
-post-build {
-    if {[variant_isset universal]} {
-        set dirs {}
-        foreach arch ${universal_archs_to_use} {
-            lappend dirs ${worksrcpath}-${arch}
-        }
-    } else {
-        set dirs ${worksrcpath}
-    }
-    foreach dir ${dirs} {
-        reinplace -E {s/(-arch [a-z0-9_]+|-m32|-m64)//g} ${dir}/nf-config
-    }
-}
-
 test.run                    yes
 test.target                 check

Modified: trunk/dports/science/netcdf-fortran/files/nawk.patch
===================================================================
--- trunk/dports/science/netcdf-fortran/files/nawk.patch	2016-03-27 09:17:22 UTC (rev 147101)
+++ trunk/dports/science/netcdf-fortran/files/nawk.patch	2016-03-27 09:21:25 UTC (rev 147102)
@@ -1,6 +1,6 @@
---- configure.orig	2015-02-02 15:37:32.000000000 -0600
-+++ configure	2015-11-18 12:54:25.000000000 -0600
-@@ -3236,7 +3236,7 @@
+--- configure.orig	2016-01-21 07:49:54.000000000 +0900
++++ configure	2016-03-27 16:09:21.000000000 +0900
+@@ -3226,7 +3226,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  $as_echo "$MKDIR_P" >&6; }
  

Added: trunk/dports/science/netcdf-fortran/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/science/netcdf-fortran/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/science/netcdf-fortran/files/patch-Makefile.in.diff	2016-03-27 09:21:25 UTC (rev 147102)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2016-01-21 07:49:54.000000000 +0900
++++ Makefile.in	2016-03-27 17:53:13.000000000 +0900
+@@ -831,7 +831,7 @@
+ uninstall: uninstall-recursive
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-data-am
+ 
+ installcheck: installcheck-recursive
+ install-strip:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160327/e89bd6d4/attachment.html>