Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 science/proj/BUILD     |    2 +-
 science/proj/CONFIGURE |    1 +
 science/proj/DEPENDS   |    2 ++
 science/proj/DETAILS   |   11 ++++++-----
 science/proj/HISTORY   |    9 +++++++++
 science/proj/PRE_BUILD |    2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 9c8a68a1873172b3dfd822d1eae7559ab0f18960
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    proj: => 6.0.0

diff --git a/science/proj/BUILD b/science/proj/BUILD
index ef63980..035d93f 100755
--- a/science/proj/BUILD
+++ b/science/proj/BUILD
@@ -1,2 +1,2 @@
-OPTS+=" --without-jni" &&
+OPTS+=" -DPROJ_TESTS=0"
 default_build
diff --git a/science/proj/CONFIGURE b/science/proj/CONFIGURE
new file mode 100755
index 0000000..7601680
--- /dev/null
+++ b/science/proj/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
\ No newline at end of file
diff --git a/science/proj/DEPENDS b/science/proj/DEPENDS
new file mode 100755
index 0000000..2917174
--- /dev/null
+++ b/science/proj/DEPENDS
@@ -0,0 +1,2 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends sqlite
\ No newline at end of file
diff --git a/science/proj/DETAILS b/science/proj/DETAILS
index e25ec0e..cd92c72 100755
--- a/science/proj/DETAILS
+++ b/science/proj/DETAILS
@@ -1,12 +1,13 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
            SPELL=proj
-         VERSION=5.1.0
+         VERSION=6.0.0
+     
SOURCE_HASH=sha512:bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
           SOURCE="$SPELL-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://download.osgeo.org/proj/${SOURCE}
-     
SOURCE_HASH=sha512:6e851485c03ca0b3b82e1dcff88a024990551919e203083c46ce6d14f824daed89fa774a2edf1ec543370a3f9792d6502f3037992496984912d8fa4ba7a37859
-           DGVER=1.7
-         SOURCE2="proj-datumgrid-$DGVER.zip"
+           DGVER=1.8
+    
SOURCE2_HASH=sha512:23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
+         SOURCE2="proj-datumgrid-$DGVER.tar.gz"
   SOURCE2_URL[0]=http://download.osgeo.org/proj/$SOURCE2
-    
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 f94465e..0be2462 100644
--- a/science/proj/HISTORY
+++ b/science/proj/HISTORY
@@ -1,3 +1,12 @@
+2019-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 6.0.0
+         use cmake build
+         additional datum-grid files are available for europe, north america,
+         oceania and world. They can simply be unpacked into /usr/share/proj
+       * DEPENDS CONFIGURE: added
+       * BUILD: adjust
+       * PRE_BUILD: deleted
+
 2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 5.1.0, datum-grid version 1.7
 
diff --git a/science/proj/PRE_BUILD b/science/proj/PRE_BUILD
index bcfc397..f6f6239 100755
--- a/science/proj/PRE_BUILD
+++ b/science/proj/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY/nad &&
+cd $SOURCE_DIRECTORY/data &&
 unpack_file 2