diff --git
a/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
b/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
deleted file mode 100644
index a796d6a..0000000
--- a/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 3782d6e5056e2c2704a339f653a9c6c1b669af61 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sat, 14 Jan 2017 21:08:33 +0100
-Subject: [PATCH] fix compile error due to missing uchar type
-
----
- frmts/jpeg2000/jpeg2000_vsil_io.cpp | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 74f1e64..f478558 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -9,7 +9,7 @@
-
- /* Following code is mostly derived from jas_stream.c, which is licensed */
- /* under the below terms */
--
-+
- /*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- * British Columbia.
-@@ -19,15 +19,15 @@
- */
-
- /* __START_OF_JASPER_LICENSE__
-- *
-+ *
- * JasPer License Version 2.0
-- *
-+ *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
-- *
-+ *
- * All rights reserved.
-- *
-+ *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
-@@ -35,15 +35,15 @@
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
-- *
-+ *
- * 1. The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
-- *
-+ *
- * 2. The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
-- *
-+ *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
-@@ -70,7 +70,7 @@
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
-- *
-+ *
- * __END_OF_JASPER_LICENSE__
- */
-
-@@ -209,7 +209,7 @@ static void
JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode,
- /* The buffer must be large enough to accommodate
maximum
- putback. */
- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-+ stream->bufbase_ = JAS_CAST(unsigned char *, buf);
- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
- }
- } else {
---
-2.11.0
-
diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index b692023..80c6958 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,6 +1,6 @@
SPELL=gdal
- VERSION=2.1.2
-
SOURCE_HASH=sha512:fbd43a090d1343256e3a77ee3e36c897c7f27a983d925f36688ba43cdb7c8ee305a532ff9005e945dc32ec3f840e32cad214d6d144d716696cdbdb5259d3b3cd
+ VERSION=2.3.1
+
SOURCE_HASH=sha512:9c016788478d15155d8be69eac2988a31bd59bd8dc6ef440cef71c833a3f9563cdb37e6c9b2219eb416f9e11bed199268469e15f3228c520dc6e74f1ce2fdbf3
SOURCE="$SPELL-$VERSION.tar.xz"
SOURCE_URL[0]=http://download.osgeo.org/$SPELL/$VERSION/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 5168e99..d386623 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,7 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.1
+ * 0001-fix-compile-error-due-to-missing-uchar-type.patch, PRE_BUILD:
removed
+
2017-01-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.2
* PRE_BUILD, 0001-fix-compile-error-due-to-missing-uchar-type.patch:
fix
diff --git a/science/gdal/PRE_BUILD b/science/gdal/PRE_BUILD
deleted file mode 100755
index da7ab89..0000000
--- a/science/gdal/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 <
"$SPELL_DIRECTORY/0001-fix-compile-error-due-to-missing-uchar-type.patch"
diff --git a/science/proj/DETAILS b/science/proj/DETAILS
index d2d33dd..e25ec0e 100755
--- a/science/proj/DETAILS
+++ b/science/proj/DETAILS
@@ -1,12 +1,12 @@
SPELL=proj
- VERSION=4.7.0
+ VERSION=5.1.0
SOURCE="$SPELL-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.osgeo.org/proj/${SOURCE}
-
SOURCE_HASH=sha512:fb1e2653c399b15cf323e63ef122af87daaae9bc19616558cd104d5a11f76967a5cffbe731ebaf2bd5f783b83bafa6a74d59a9376b2c68d2a9b1c7a97b82b469
- DGVER=1.5
+
SOURCE_HASH=sha512:6e851485c03ca0b3b82e1dcff88a024990551919e203083c46ce6d14f824daed89fa774a2edf1ec543370a3f9792d6502f3037992496984912d8fa4ba7a37859
+ DGVER=1.7
SOURCE2="proj-datumgrid-$DGVER.zip"
SOURCE2_URL[0]=http://download.osgeo.org/proj/$SOURCE2
-
SOURCE2_HASH=sha512:9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
+
SOURCE2_HASH=sha512:90514f156402b7f0e8eb4d5630f6c74f1566f15ebaec28e3d6a835a59d28551eebbbe390c3b0cbd38611a58037b3cfef73df0ca7b84b047905c15f98ceb2bc0e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-${VERSION}"
WEB_SITE="http://trac.osgeo.org/proj/"
LICENSE[0]="MIT"
diff --git a/science/proj/HISTORY b/science/proj/HISTORY
index 1b0f89a..f94465e 100644
--- a/science/proj/HISTORY
+++ b/science/proj/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.1.0, datum-grid version 1.7
+
2012-06-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.7.0, 4.8.0 is incompatible with ogdi
# Required for multi-threaded support (comment these two lines out if not
required)
CFLAGS+=-pthread -DUSE_PTHREADS
@@ -64,6 +60,17 @@ index cc112e0..7e38466 100644
ifneq ($(HOST),MINGW)
+@@ -139,8 +134,8 @@ LDFLAGS+=-lz
+
+
+ # Required for xz support (uncomment these two lines if required)
+-#CFLAGS+=-DUSE_XZ
+-#LDFLAGS+=-llzma
++CFLAGS+=-DUSE_XZ
++LDFLAGS+=-llzma
+
+
+ # Required to use stdio with files > 2GiB on 32-bit system.
--
-2.7.0
+2.18.0