CVS commit: pkgsrc/geography/qgis

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Mar 22 23:51:19 UTC 2019

Modified Files:
        pkgsrc/geography/qgis: Makefile PLIST.python distinfo options.mk

Log Message:
Update to 2.18.28

* QGIS 3.4.x and 3.6.0 cannot handle shape files
  from http://nlftp.mlit.go.jp/ksj/ properly, so stay 2.18 release branch
* Enable python option by default

Changelog:
Many bugfixes and improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/geography/qgis/PLIST.python
cvs rdiff -u -r1.12 -r1.13 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/qgis/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.70 pkgsrc/geography/qgis/Makefile:1.71
--- pkgsrc/geography/qgis/Makefile:1.70 Thu Dec 13 19:51:58 2018
+++ pkgsrc/geography/qgis/Makefile      Fri Mar 22 23:51:18 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2018/12/13 19:51:58 adam Exp $
+# $NetBSD: Makefile,v 1.71 2019/03/22 23:51:18 ryoon Exp $
 
-DISTNAME=      qgis-2.18.16
-PKGREVISION=   9
+DISTNAME=      qgis-2.18.28
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -54,6 +53,7 @@ CMAKE_ARG_PATH=..
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../devel/qjson/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"

Index: pkgsrc/geography/qgis/PLIST.python
diff -u pkgsrc/geography/qgis/PLIST.python:1.3 pkgsrc/geography/qgis/PLIST.python:1.4
--- pkgsrc/geography/qgis/PLIST.python:1.3      Mon Feb 19 12:51:56 2018
+++ pkgsrc/geography/qgis/PLIST.python  Fri Mar 22 23:51:18 2019
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST.python,v 1.3 2018/02/19 12:51:56 ryoon Exp $
+@comment $NetBSD: PLIST.python,v 1.4 2019/03/22 23:51:18 ryoon Exp $
 lib/libqgispython.so
 lib/libqgispython.so.${PKGVERSION}
+lib/qgis/plugins/libarcgisfeatureserverprovider.so
+lib/qgis/plugins/libarcgismapserverprovider.so
 share/qgis/python/_dummy_thread/__init__.py
 share/qgis/python/_markupbase/__init__.py
 share/qgis/python/_thread/__init__.py
@@ -977,7 +979,7 @@ share/qgis/python/plugins/processing/alg
 share/qgis/python/plugins/processing/algs/grass7/description/r.li.shape.txt
 share/qgis/python/plugins/processing/algs/grass7/description/r.li.simpson.ascii.txt
 share/qgis/python/plugins/processing/algs/grass7/description/r.li.simpson.txt
-share/qgis/python/plugins/processing/algs/grass7/description/r.mapcalc.txt
+share/qgis/python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt
 share/qgis/python/plugins/processing/algs/grass7/description/r.mask.rast.txt
 share/qgis/python/plugins/processing/algs/grass7/description/r.mask.vect.txt
 share/qgis/python/plugins/processing/algs/grass7/description/r.median.txt
@@ -1080,6 +1082,7 @@ share/qgis/python/plugins/processing/alg
 share/qgis/python/plugins/processing/algs/grass7/description/v.dissolve.txt
 share/qgis/python/plugins/processing/algs/grass7/description/v.distance.txt
 share/qgis/python/plugins/processing/algs/grass7/description/v.drape.txt
+share/qgis/python/plugins/processing/algs/grass7/description/v.drape.where.txt
 share/qgis/python/plugins/processing/algs/grass7/description/v.edit.txt
 share/qgis/python/plugins/processing/algs/grass7/description/v.extract.txt
 share/qgis/python/plugins/processing/algs/grass7/description/v.extrude.txt

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.12 pkgsrc/geography/qgis/distinfo:1.13
--- pkgsrc/geography/qgis/distinfo:1.12 Mon Feb 19 12:51:56 2018
+++ pkgsrc/geography/qgis/distinfo      Fri Mar 22 23:51:18 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2018/02/19 12:51:56 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2019/03/22 23:51:18 ryoon Exp $
 
-SHA1 (qgis-2.18.16.tar.bz2) = 67700b1c6efb2b91a474650d925c5aa75a8e53ff
-RMD160 (qgis-2.18.16.tar.bz2) = 1cfa929b232363d7883344cca744474bb9079f3a
-SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
-Size (qgis-2.18.16.tar.bz2) = 84976777 bytes
+SHA1 (qgis-2.18.28.tar.bz2) = c75cf5308649a7670412ebe9e81f25a3bcf77241
+RMD160 (qgis-2.18.28.tar.bz2) = 0ca06ff9d37b592611bfe6f6a739563610e7ba2f
+SHA512 (qgis-2.18.28.tar.bz2) = dd7178a965cd03f44a7dda439352fbf465ee594c90fbb9dc62ab0d4da58ab4718990f2de3582c929eab9e86511da8c3997af3285aea95a729f29915062a10fa7
+Size (qgis-2.18.28.tar.bz2) = 84916689 bytes
 SHA1 (patch-CMakeLists.txt) = d9f670b121f508ac6565668e2f57975b19edde76
 SHA1 (patch-cmake_FindGDAL.cmake) = aad87704be813306d2727bac748c3df826ed709e
 SHA1 (patch-cmake_FindGEOS.cmake) = f11f1bead1e31aba3f6167dd8eaf1ad10cf7d6ab

Index: pkgsrc/geography/qgis/options.mk
diff -u pkgsrc/geography/qgis/options.mk:1.9 pkgsrc/geography/qgis/options.mk:1.10
--- pkgsrc/geography/qgis/options.mk:1.9        Mon Feb 19 12:51:56 2018
+++ pkgsrc/geography/qgis/options.mk    Fri Mar 22 23:51:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/02/19 12:51:56 ryoon Exp $
+# $NetBSD: options.mk,v 1.10 2019/03/22 23:51:18 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qgis
 PKG_SUPPORTED_OPTIONS= python
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  python
 # supported by gdal-lib and as a result we get a
 # warning when qgis is launched.
 # XXX fix gdal-lib and reenable this.
-#PKG_SUGGESTED_OPTIONS+= python
+PKG_SUGGESTED_OPTIONS+= python
 
 .include "../../mk/bsd.options.mk"