[151647] trunk/dports/science/magicspp

takeshi at macports.org takeshi at macports.org
Thu Aug 18 22:08:34 PDT 2016


Revision: 151647
          https://trac.macports.org/changeset/151647
Author:   takeshi at macports.org
Date:     2016-08-18 22:08:33 -0700 (Thu, 18 Aug 2016)
Log Message:
-----------
magicspp: update to 2.29.4

Modified Paths:
--------------
    trunk/dports/science/magicspp/Portfile
    trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff

Removed Paths:
-------------
    trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff

Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile	2016-08-19 05:07:59 UTC (rev 151646)
+++ trunk/dports/science/magicspp/Portfile	2016-08-19 05:08:33 UTC (rev 151647)
@@ -10,8 +10,7 @@
 perl5.branches      5.22
 
 name                magicspp
-version             2.26.2
-revision            3
+version             2.29.4
 platforms           darwin
 maintainers         takeshi
 license             Apache-2
@@ -20,8 +19,8 @@
 homepage            http://software.ecmwf.int/wiki/display/MAGP/Magics
 master_sites        https://software.ecmwf.int/wiki/download/attachments/3473464/
 distname            Magics-${version}-Source
-checksums           rmd160  6645fae67dedaee821ce4a5a8a9d3878a279f4e0 \
-                    sha256  176f95e46552cf52f43c2084b11c72df9749c843a981081d8c50af4419d4edc4
+checksums           rmd160  82c7a98b2a083985ab29bb33743067fbb94c9e74 \
+                    sha256  82bdb4f7e38776776d2155a82d0acaa017402365a043731708345ac4ac00198f
 long_description \
     Magics++ is the latest generation of the ECMWF's Meteorological plotting \
     software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
@@ -73,8 +72,9 @@
 
 default_variants-append +python27
 
-patchfiles          patch-CMakeLists.txt.diff \
-                    patch-src-drivers-CairoDriver.cc.diff
+patchfiles          patch-CMakeLists.txt.diff
+#patchfiles          patch-CMakeLists.txt.diff \
+#                    patch-src-drivers-CairoDriver.cc.diff
 
 configure.args-append   -DBOOST_ROOT=${prefix} \
                         -DCMAKE_Fortran_COMPILER=${configure.fc} \
@@ -88,7 +88,7 @@
                         -DENABLE_PYTHON=ON \
                         -DEXPAT_INCLUDE_DIR=${prefix}/include \
                         -DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
-                        -Dgrib_api_DIR=${prefix} \
+                        -DGRIB_API_PATH=${prefix} \
                         -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
                         -DHDF5_C_INCLUDE_DIR=${prefix}/include \
                         -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \

Modified: trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff	2016-08-19 05:07:59 UTC (rev 151646)
+++ trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff	2016-08-19 05:08:33 UTC (rev 151647)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-12-15 18:31:27.000000000 +0900
-+++ CMakeLists.txt	2016-01-31 15:48:44.000000000 +0900
-@@ -265,7 +265,7 @@
+--- CMakeLists.txt.orig	2016-08-02 22:12:55.000000000 +0900
++++ CMakeLists.txt	2016-08-19 13:13:45.000000000 +0900
+@@ -278,7 +278,7 @@
  if( HAVE_GEOTIFF )
  	list( APPEND MAGICS_EXTRA_INCLUDE_DIRS  ${GEOTIFF_INCLUDE_DIR} )
  	list( APPEND MAGICS_EXTRA_LIBRARIES  ${GEOTIFF_LIBRARY} )

Deleted: trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff	2016-08-19 05:07:59 UTC (rev 151646)
+++ trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff	2016-08-19 05:08:33 UTC (rev 151647)
@@ -1,10 +0,0 @@
---- src/drivers/CairoDriver.cc.orig	2015-12-15 18:33:04.000000000 +0900
-+++ src/drivers/CairoDriver.cc	2016-01-31 15:10:53.000000000 +0900
-@@ -539,6 +539,7 @@
- 
-     // DPI
-     TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
-+    const double resolution_ = 72.;
-     TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) resolution_);
-     TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) resolution_);
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160818/eb26543c/attachment.html>


More information about the macports-changes mailing list