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.

4 files changed, 15 insertions, 12 deletions

diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index 28e4173b6ab..288de7a128d 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -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"
diff --git a/geography/qgis/PLIST.python b/geography/qgis/PLIST.python
index 98b324baa18..5e0b1ca3c65 100644
--- a/geography/qgis/PLIST.python
+++ b/geography/qgis/PLIST.python
@@ -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/algs/grass7/description/r.li.shape.ascii.tx
 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/algs/grass7/description/v.delaunay.txt
 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
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo
index 8b96bf0b95e..45be8bce220 100644
--- a/geography/qgis/distinfo
+++ b/geography/qgis/distinfo
@@ -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
diff --git a/geography/qgis/options.mk b/geography/qgis/options.mk
index a33516c354e..900a167fd89 100644
--- a/geography/qgis/options.mk
+++ b/geography/qgis/options.mk
@@ -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"