Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 Apr 2016 17:42:02 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r414285 - head/science/gnudatalanguage/files
Message-ID:  <201604291742.u3THg21E058590@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: thierry
Date: Fri Apr 29 17:42:02 2016
New Revision: 414285
URL: https://svnweb.freebsd.org/changeset/ports/414285

Log:
  Chase hdf5 upgrade and unbreak.

Added:
  head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp   (contents, props changed)
Modified:
  head/science/gnudatalanguage/files/patch-CMakeLists.txt
  head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
  head/science/gnudatalanguage/files/patch-src__basic_fun.cpp
  head/science/gnudatalanguage/files/patch-src__file.cpp
  head/science/gnudatalanguage/files/patch-src__gshhs.cpp

Modified: head/science/gnudatalanguage/files/patch-CMakeLists.txt
==============================================================================
--- head/science/gnudatalanguage/files/patch-CMakeLists.txt	Fri Apr 29 16:36:27 2016	(r414284)
+++ head/science/gnudatalanguage/files/patch-CMakeLists.txt	Fri Apr 29 17:42:02 2016	(r414285)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-04-22 19:37:22 UTC
+--- CMakeLists.txt.orig	2016-04-29 17:03:25 UTC
 +++ CMakeLists.txt
-@@ -871,7 +871,7 @@ if(NOT PYTHON_MODULE)
+@@ -925,7 +925,7 @@ if(NOT PYTHON_MODULE)
  endif(NOT PYTHON_MODULE)
  
  install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR})

Modified: head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
==============================================================================
--- head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake	Fri Apr 29 16:36:27 2016	(r414284)
+++ head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake	Fri Apr 29 17:42:02 2016	(r414285)
@@ -1,4 +1,4 @@
---- CMakeModules/Findlibps.cmake.orig	2015-04-22 19:37:22 UTC
+--- CMakeModules/Findlibps.cmake.orig	2016-04-29 17:03:25 UTC
 +++ CMakeModules/Findlibps.cmake
 @@ -1,4 +1,4 @@
 -find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib lib/pkgconfig lib64/pkgconfig)

Modified: head/science/gnudatalanguage/files/patch-src__basic_fun.cpp
==============================================================================
--- head/science/gnudatalanguage/files/patch-src__basic_fun.cpp	Fri Apr 29 16:36:27 2016	(r414284)
+++ head/science/gnudatalanguage/files/patch-src__basic_fun.cpp	Fri Apr 29 17:42:02 2016	(r414285)
@@ -1,4 +1,4 @@
---- src/basic_fun.cpp.orig	2016-01-04 19:52:38 UTC
+--- src/basic_fun.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/basic_fun.cpp
 @@ -6523,7 +6523,7 @@ namespace lib {
  	  {

Modified: head/science/gnudatalanguage/files/patch-src__file.cpp
==============================================================================
--- head/science/gnudatalanguage/files/patch-src__file.cpp	Fri Apr 29 16:36:27 2016	(r414284)
+++ head/science/gnudatalanguage/files/patch-src__file.cpp	Fri Apr 29 17:42:02 2016	(r414285)
@@ -1,4 +1,4 @@
---- src/file.cpp.orig	2016-01-04 20:50:45 UTC
+--- src/file.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/file.cpp
 @@ -242,10 +242,11 @@ extern "C"
  #endif

Modified: head/science/gnudatalanguage/files/patch-src__gshhs.cpp
==============================================================================
--- head/science/gnudatalanguage/files/patch-src__gshhs.cpp	Fri Apr 29 16:36:27 2016	(r414284)
+++ head/science/gnudatalanguage/files/patch-src__gshhs.cpp	Fri Apr 29 17:42:02 2016	(r414285)
@@ -1,4 +1,4 @@
---- src/gshhs.cpp.orig	2015-04-22 19:37:22 UTC
+--- src/gshhs.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/gshhs.cpp
 @@ -175,7 +175,7 @@ private:
          double ss = h.south * GSHHS_SCL;

Added: head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp	Fri Apr 29 17:42:02 2016	(r414285)
@@ -0,0 +1,20 @@
+--- src/hdf5_fun.cpp.orig	2016-04-29 17:03:25 UTC
++++ src/hdf5_fun.cpp
+@@ -348,7 +348,7 @@ namespace lib {
+     SizeT nParam=e->NParam(1);
+     hsize_t dims_out[MAXRANK];
+ 
+-    hid_t h5a_id;
++    DLong h5a_id;
+     e->AssureLongScalarPar(0, h5a_id);
+     
+     hid_t h5s_id = H5Aget_space(h5a_id);
+@@ -402,7 +402,7 @@ namespace lib {
+     SizeT nParam=e->NParam(1);
+     hsize_t dims_out[MAXRANK];
+ 
+-    hid_t h5d_id;
++    DLong h5d_id;
+     e->AssureLongScalarPar(0, h5d_id);
+     
+     hid_t h5s_id = H5Dget_space(h5d_id);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604291742.u3THg21E058590>