Update to 2.19.0

Changes:	https://confluence.ecmwf.int/display/ECC/Latest+news

5 files changed, 23 insertions, 129 deletions

diff --git a/science/eccodes/Makefile b/science/eccodes/Makefile
index 45acb4baed5f..f590469d36fc 100644
--- a/science/eccodes/Makefile
+++ b/science/eccodes/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eccodes
-PORTVERSION=	2.18.0
+PORTVERSION=	2.19.0
 DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	science
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/45757960/ \
@@ -17,16 +17,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
-CONFLICTS_INSTALL=	grib_api
-
-OPTIONS_DEFINE=	AEC
-OPTIONS_SINGLE=	JPEG
-OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
-OPTIONS_DEFAULT=OPENJPEG
-AEC_DESC=	Adaptive Entropy Coding support
-
-PORTSCOUT=	site:https://confluence.ecmwf.int/display/ECC/Releases
-
 USES=		cmake perl5 shebangfix
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS=BOTH
@@ -47,8 +37,18 @@ CMAKE_ON=	ECCODES_INSTALL_EXTRA_TOOLS \
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	grib_api
+
+PORTSCOUT=	site:https://confluence.ecmwf.int/display/ECC/Releases
+
 SHEBANG_FILES=	tools/bufr_compare_dir
 
+OPTIONS_DEFINE=	AEC
+OPTIONS_SINGLE=	JPEG
+OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
+OPTIONS_DEFAULT=OPENJPEG
+AEC_DESC=	Adaptive Entropy Coding support
+
 AEC_CMAKE_BOOL=		ENABLE_AEC
 AEC_LIB_DEPENDS=	libaec.so:science/libaec
 JASPER_CMAKE_BOOL=	ENABLE_JPG
diff --git a/science/eccodes/distinfo b/science/eccodes/distinfo
index 963c29fe64a8..72a59f13b9d2 100644
--- a/science/eccodes/distinfo
+++ b/science/eccodes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600177154
-SHA256 (eccodes-2.18.0-Source.tar.gz) = d88943df0f246843a1a062796edbf709ef911de7269648eef864be259e9704e3
-SIZE (eccodes-2.18.0-Source.tar.gz) = 11525701
+TIMESTAMP = 1605426355
+SHA256 (eccodes-2.19.0-Source.tar.gz) = a1d080aed1b17a9d4e3aecccc5a328c057830cd4d54f451f5498b80b24c46404
+SIZE (eccodes-2.19.0-Source.tar.gz) = 11532649
diff --git a/science/eccodes/files/patch-src-grib_bits.c b/science/eccodes/files/patch-src-grib_bits.c
deleted file mode 100644
index e4766a798558..000000000000
--- a/science/eccodes/files/patch-src-grib_bits.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Obtained from:	https://github.com/ecmwf/eccodes/commit/7a618fa90aaafa3a28cacae130939c3268e15876
-
---- src/grib_bits.c.orig	2020-06-24 09:11:27 UTC
-+++ src/grib_bits.c
-@@ -30,6 +30,12 @@ long GRIB_MASK = -1; /* Mask of sword bits */
-     ((b) == max_nbits ? GRIB_MASK : (~(GRIB_MASK << (b)) << (max_nbits - ((q) + (b)))))
- 
- 
-+#define VALUE_SIZE_T(p, q, b) \
-+    (((b) == max_nbits_size_t ? GRIB_MASK : ~(GRIB_MASK << (b))) & ((p) >> (max_nbits_size_t - ((q) + (b)))))
-+
-+#define MASKVALUE_SIZE_T(q, b) \
-+    ((b) == max_nbits_size_t ? GRIB_MASK : (~(GRIB_MASK << (b)) << (max_nbits_size_t - ((q) + (b)))))
-+
- static const unsigned long dmasks[] = {
-     0xFF,
-     0xFE,
diff --git a/science/eccodes/files/patch-src-grib_bits_fast_big_endian.c b/science/eccodes/files/patch-src-grib_bits_fast_big_endian.c
deleted file mode 100644
index 8b79c3ad66b2..000000000000
--- a/science/eccodes/files/patch-src-grib_bits_fast_big_endian.c
+++ /dev/null
@@ -1,97 +0,0 @@
-Obtained from:	https://github.com/ecmwf/eccodes/commit/7a618fa90aaafa3a28cacae130939c3268e15876
-
---- src/grib_bits_fast_big_endian.c.orig	2020-06-24 09:11:27 UTC
-+++ src/grib_bits_fast_big_endian.c
-@@ -114,7 +114,6 @@ char* grib_decode_string(const unsigned char* bitStrea
-     return string;
- }
- 
--
- unsigned long grib_decode_unsigned_long(const unsigned char* p, long* bitp, long nbits)
- {
-     long countOfLeftmostBits = 0, leftmostBits = 0;
-@@ -146,6 +145,37 @@ unsigned long grib_decode_unsigned_long(const unsigned
-     return val;
- }
- 
-+size_t grib_decode_size_t(const unsigned char* p, long* bitp, long nbits)
-+{
-+    long countOfLeftmostBits = 0, leftmostBits = 0;
-+    long startBit      = *bitp;
-+    long remainingBits = nbits;
-+    long* pp           = (long*)p;
-+    size_t val  = 0;
-+
-+    if (startBit >= max_nbits_size_t) {
-+        pp += startBit / max_nbits_size_t;
-+        startBit %= max_nbits_size_t;
-+    }
-+
-+    countOfLeftmostBits = startBit + remainingBits;
-+    if (countOfLeftmostBits > max_nbits_size_t) {
-+        countOfLeftmostBits = max_nbits_size_t - startBit;
-+        remainingBits -= countOfLeftmostBits;
-+        leftmostBits = (VALUE_SIZE_T(*pp, startBit, countOfLeftmostBits)) << remainingBits;
-+        startBit     = 0;
-+        pp++;
-+    }
-+    else
-+        leftmostBits = 0;
-+
-+    val = leftmostBits + (VALUE_SIZE_T(*pp, startBit, remainingBits));
-+
-+    *bitp += nbits;
-+
-+    return val;
-+}
-+
- int grib_encode_unsigned_long(unsigned char* p, unsigned long val, long* bitp, long nbits)
- {
-     long* destination        = (long*)p;
-@@ -184,6 +214,46 @@ int grib_encode_unsigned_longb(unsigned char* p, unsig
- {
-     return grib_encode_unsigned_long(p, val, bitp, nbits);
- }
-+
-+int grib_encode_size_t(unsigned char* p, size_t val, long* bitp, long nbits)
-+{
-+    long* destination        = (long*)p;
-+    long countOfLeftmostBits = 0, nextWord = 0, startBit = 0, remainingBits = 0, rightmostBits = 0;
-+
-+    startBit      = *bitp;
-+    remainingBits = nbits;
-+
-+    if (startBit >= max_nbits_size_t) {
-+        nextWord = startBit / max_nbits_size_t;
-+        startBit %= max_nbits_size_t;
-+    }
-+    else
-+        nextWord = 0;
-+
-+    countOfLeftmostBits = startBit + remainingBits;
-+    if (countOfLeftmostBits > max_nbits_size_t) {
-+        countOfLeftmostBits = max_nbits_size_t - startBit;
-+        startBit            = max_nbits_size_t - remainingBits;
-+        remainingBits -= countOfLeftmostBits;
-+        destination[nextWord] =
-+            ((destination[nextWord] >> countOfLeftmostBits) << countOfLeftmostBits) + (VALUE_SIZE_T(val, startBit, countOfLeftmostBits));
-+        startBit = 0;
-+        nextWord++;
-+    }
-+
-+    rightmostBits = VALUE_SIZE_T(val, max_nbits_size_t - remainingBits, remainingBits);
-+    destination[nextWord] =
-+        (destination[nextWord] & ~MASKVALUE_SIZE_T(startBit, remainingBits)) + (rightmostBits << max_nbits_size_t - (remainingBits + startBit));
-+
-+    *bitp += nbits;
-+    return GRIB_SUCCESS;
-+}
-+
-+int grib_encode_size_tb(unsigned char* p, size_t val, long* bitp, long nbits)
-+{
-+    return grib_encode_size_t(p, val, bitp, nbits);
-+}
-+
- 
- #if VECTOR
- #include "grib_bits_fast_big_endian_vector.c" /* Experimental */
diff --git a/science/eccodes/pkg-plist b/science/eccodes/pkg-plist
index bd6b33b3b374..d362c8a0e1a6 100644
--- a/science/eccodes/pkg-plist
+++ b/science/eccodes/pkg-plist
@@ -59,7 +59,6 @@ include/eccodes_windef.h
 include/grib_api.h
 lib/cmake/eccodes/eccodes-config-version.cmake
 lib/cmake/eccodes/eccodes-config.cmake
-lib/cmake/eccodes/eccodes-config.cmake.tpls
 lib/cmake/eccodes/eccodes-import.cmake
 lib/cmake/eccodes/eccodes-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/eccodes/eccodes-targets.cmake
@@ -15341,6 +15340,9 @@ libdata/pkgconfig/eccodes.pc
 %%DATADIR%%/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
 %%DATADIR%%/definitions/grib2/localConcepts/ecmf/units.def
 %%DATADIR%%/definitions/grib2/localConcepts/ecmf/units.legacy.def
+%%DATADIR%%/definitions/grib2/localConcepts/ecmf/unstructuredGrid.def
+%%DATADIR%%/definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def
+%%DATADIR%%/definitions/grib2/localConcepts/ecmf/unstructuredGridType.def
 %%DATADIR%%/definitions/grib2/localConcepts/edzw/default_step_units.def
 %%DATADIR%%/definitions/grib2/localConcepts/edzw/modelName.def
 %%DATADIR%%/definitions/grib2/localConcepts/edzw/name.def
@@ -18696,7 +18698,13 @@ libdata/pkgconfig/eccodes.pc
 %%DATADIR%%/definitions/grib2/tigge_parameter.def
 %%DATADIR%%/definitions/grib2/tigge_short_name.def
 %%DATADIR%%/definitions/grib2/tigge_suiteName.table
+%%DATADIR%%/definitions/grib2/typeOfLevelConcept.def
+%%DATADIR%%/definitions/grib2/typeOfUnstructuredGridConcept.def
 %%DATADIR%%/definitions/grib2/units.def
+%%DATADIR%%/definitions/grib2/unstructuredGridConcept.def
+%%DATADIR%%/definitions/grib2/unstructuredGridSubtype.def
+%%DATADIR%%/definitions/grib2/unstructuredGridType.def
+%%DATADIR%%/definitions/grib2/unstructuredGridUUID.def
 %%DATADIR%%/definitions/grib3/boot.def
 %%DATADIR%%/definitions/grib3/centre.table
 %%DATADIR%%/definitions/grib3/cfName.def