libchamplain012: update to 0.12.20.

libchamplain 0.12.20 (2019-10-28)
=================================

Stable release

Changes:

* Remove autotools-based build and all the related files (Jiří Techet)
* Fix gtk-doc module name (Mart Raudsepp)
* Add missing gdk required dependency (Mart Raudsepp)
* Make the build reproducible (Chris Lamb)

libchamplain 0.12.19 (2019-03-03)
=================================

Stable release

Changes:

* Fix incorrect Requires in pc files when using meson (Jan Alexander Steffens)
* Various meson-related fixes and cleanups (Jan Alexander Steffens)

libchamplain 0.12.18 (2019-02-21)
=================================

Stable release

Changes:

* Fix incorrect so version when using meson (Jiří Techet)
* Avoid exporting marshaler functions by dropping the use of glib-genmarshal and
  using the generic marshaler instead (Jiří Techet)
* Don't use glib-mkenums for champlain-gtk where it's not needed (Jiří Techet)

libchamplain 0.12.17 (2019-02-20)
=================================

Stable release

Changes:

* Use of meson build system, CI tests and automatized generation of
  documentation (Martin Blanchard)
* Various map wrapping fixes (Tomasz Miąsko, Jiří Techet)
* Pass data as uint8 pointer in champlain_renderer_set_data() and make this
  function introspectable (James Westman)
* Bump versions of some dependencies - clutter (1.24), glib (2.38) - and fix
  depreciation warnings (Jiří Techet)
* Use https for all map sources that support it (Jiří Techet)
* Don't version-control generated vapi files (Jiří Techet)
* Combine champlain and champlain-gtk documentations into one (Jiří Techet)
* More helpful README.md with links to pages related to libchamplain
  (Jiří Techet)
* Various housekeeping and cleanups (Jiří Techet, Andre Klapper)

libchamplain 0.12.16 (2017-09-06)
=================================

Stable release

Changes:

* Add possibility to set User-Agent for requests (Jens Georg)
* Fix touch gesture zoom (Jan-Michael Brummer)
* Python demo fixes and cleanups (Chris Mayo)

libchamplain 0.12.15 (2017-03-08)
=================================

Stable release

Changes:

* Fix path layer surface exporting when no clone is visible (Marius Stanciu)
* Fix printing in gnome-maps (Marcus Lundblad)
* Fix build on RHEL 7.3 (Matthias Clasen)
* Minor example updates (Jiří Techet)

libchamplain 0.12.14 (2016-09-06)
=================================

Stable release

Changes:

* Add support for horizontal map wrapping (Marius Stanciu, Jonas Danielsson,
  Jiří Techet)
* Make the number of parallel connections of network tile source configurable
  (Mattias Bengtsson)
* Remove Mapquest map source as the tile server is not accessible any more
  (Nayan Deshmukh, Jiří Techet)
* Remove Maemo-related code (Jiří Techet)
* Fix small memory leaks (Marius Stanciu)
* Bump libsoup dependency requirement to 2.42 and drop deprecated function
  calls (Nayan Deshmukh)
* Various minor improvements, fixes, depreciaton warning removals and cleanups
  (Nayan Deshmukh, Marius Stanciu, Mattias Bengtsson, Jiří Techet)

libchamplain 0.12.13 (2016-02-25)
=================================

Stable release

Changes:

* Implement ChamplainExportable in MarkerLayer and ChamplainPoint
  (Jonas Danielsson)
* Avoid runtime warnings due to the use of deprecated API (Cosimo Cecchi)
* Make sure enums are introspectable (Jonas Danielsson)
* Fix occasional crash when closing map with layers (Jonas Danielsson)
* Various minor fixes and improvements (Emmanuele Bassi, Hashem Nasarat,
  Pavel Machek, Jiří Techet)

libchamplain 0.12.12 (2015-12-02)
=================================

Stable release

Changes:

* Add possibility to export maps (Jonas Danielsson)
* Fix map getting blank after some mouse actions (Carlos Garnacho)
* Fix tile loading at higher zoom levels (Rémy Oudompheng)
* Improve mouse wheel zoom handling (Carlos Garnacho, Jiri Techet)

libchamplain 0.12.11 (2015-09-18)
=================================

Stable release

Changes:

* Improved touch-screen support, pinch-to-zoom (Carlos Garnacho)
* Add champlain_view_set_world() to limit the world to the specified bounding
  box (Jonas Danielsson)
* Various minor fixes (Jonas Danielsson, Ting-Wei Lan, Jiří Techet)

3 files changed, 68 insertions, 145 deletions

diff --git a/geography/libchamplain012/Makefile b/geography/libchamplain012/Makefile
index d576ed08799..6851c654a46 100644
--- a/geography/libchamplain012/Makefile
+++ b/geography/libchamplain012/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2020/03/10 22:08:47 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2020/03/11 10:48:51 wiz Exp $
 
-DISTNAME=	libchamplain-0.12.10
-PKGNAME=	libchamplain012-0.12.10
-PKGREVISION=	24
+DISTNAME=	libchamplain-0.12.20
+PKGNAME=	${DISTNAME:S/ain/ain012/}
 CATEGORIES=	geography
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/0.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,22 +11,24 @@ HOMEPAGE=	https://projects.gnome.org/libchamplain
 COMMENT=	Map widget
 LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	pkg-config
+MESON_ARGS+=	-Dmemphis=true
 
-CONFIGURE_ARGS+=	--disable-gtk-doc
-CONFIGURE_ARGS+=	--enable-memphis
+PKGCONFIG_OVERRIDE_STAGE=	post-configure
+PKGCONFIG_OVERRIDE+=		output/meson-private/champlain-0.12.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/champlain-gtk-0.12.pc
 
-PKGCONFIG_OVERRIDE+=	champlain-gtk.pc.in
-PKGCONFIG_OVERRIDE+=	champlain.pc.in
+# TODO:
+# add vala option?
+# add introspection option?
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../geography/libmemphis02/buildlink3.mk"
-.include "../../graphics/clutter/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../graphics/clutter/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-#.include "../../textproc/gtk-doc/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/libchamplain012/PLIST b/geography/libchamplain012/PLIST
index e1e442278b4..e07cb7b333e 100644
--- a/geography/libchamplain012/PLIST
+++ b/geography/libchamplain012/PLIST
@@ -1,128 +1,50 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/31 11:50:12 nros Exp $
-include/libchamplain-0.12/champlain/champlain-adjustment.h
-include/libchamplain-0.12/champlain/champlain-bounding-box.h
-include/libchamplain-0.12/champlain/champlain-coordinate.h
-include/libchamplain-0.12/champlain/champlain-custom-marker.h
-include/libchamplain-0.12/champlain/champlain-defines.h
-include/libchamplain-0.12/champlain/champlain-enum-types.h
-include/libchamplain-0.12/champlain/champlain-error-tile-renderer.h
-include/libchamplain-0.12/champlain/champlain-features.h
-include/libchamplain-0.12/champlain/champlain-file-cache.h
-include/libchamplain-0.12/champlain/champlain-file-tile-source.h
-include/libchamplain-0.12/champlain/champlain-image-renderer.h
-include/libchamplain-0.12/champlain/champlain-kinetic-scroll-view.h
-include/libchamplain-0.12/champlain/champlain-label.h
-include/libchamplain-0.12/champlain/champlain-layer.h
-include/libchamplain-0.12/champlain/champlain-license.h
-include/libchamplain-0.12/champlain/champlain-location.h
-include/libchamplain-0.12/champlain/champlain-map-source-chain.h
-include/libchamplain-0.12/champlain/champlain-map-source-desc.h
-include/libchamplain-0.12/champlain/champlain-map-source-factory.h
-include/libchamplain-0.12/champlain/champlain-map-source.h
-include/libchamplain-0.12/champlain/champlain-marker-layer.h
-include/libchamplain-0.12/champlain/champlain-marker.h
-include/libchamplain-0.12/champlain/champlain-marshal.h
-include/libchamplain-0.12/champlain/champlain-memory-cache.h
-include/libchamplain-0.12/champlain/champlain-memphis-renderer.h
-include/libchamplain-0.12/champlain/champlain-network-bbox-tile-source.h
-include/libchamplain-0.12/champlain/champlain-network-tile-source.h
-include/libchamplain-0.12/champlain/champlain-null-tile-source.h
-include/libchamplain-0.12/champlain/champlain-path-layer.h
-include/libchamplain-0.12/champlain/champlain-point.h
-include/libchamplain-0.12/champlain/champlain-renderer.h
-include/libchamplain-0.12/champlain/champlain-scale.h
-include/libchamplain-0.12/champlain/champlain-tile-cache.h
-include/libchamplain-0.12/champlain/champlain-tile-source.h
-include/libchamplain-0.12/champlain/champlain-tile.h
-include/libchamplain-0.12/champlain/champlain-version.h
-include/libchamplain-0.12/champlain/champlain-view.h
-include/libchamplain-0.12/champlain/champlain-viewport.h
-include/libchamplain-0.12/champlain/champlain.h
-include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk-enum-types.h
-include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk-marshal.h
-include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk.h
-include/libchamplain-gtk-0.12/champlain-gtk/gtk-champlain-embed.h
-lib/libchamplain-0.12.la
-lib/libchamplain-gtk-0.12.la
+@comment $NetBSD: PLIST,v 1.2 2020/03/11 10:48:51 wiz Exp $
+include/champlain-0.12/champlain-gtk/champlain-gtk.h
+include/champlain-0.12/champlain-gtk/gtk-champlain-embed.h
+include/champlain-0.12/champlain/champlain-adjustment.h
+include/champlain-0.12/champlain/champlain-bounding-box.h
+include/champlain-0.12/champlain/champlain-coordinate.h
+include/champlain-0.12/champlain/champlain-custom-marker.h
+include/champlain-0.12/champlain/champlain-defines.h
+include/champlain-0.12/champlain/champlain-enum-types.h
+include/champlain-0.12/champlain/champlain-error-tile-renderer.h
+include/champlain-0.12/champlain/champlain-exportable.h
+include/champlain-0.12/champlain/champlain-features.h
+include/champlain-0.12/champlain/champlain-file-cache.h
+include/champlain-0.12/champlain/champlain-file-tile-source.h
+include/champlain-0.12/champlain/champlain-image-renderer.h
+include/champlain-0.12/champlain/champlain-kinetic-scroll-view.h
+include/champlain-0.12/champlain/champlain-label.h
+include/champlain-0.12/champlain/champlain-layer.h
+include/champlain-0.12/champlain/champlain-license.h
+include/champlain-0.12/champlain/champlain-location.h
+include/champlain-0.12/champlain/champlain-map-source-chain.h
+include/champlain-0.12/champlain/champlain-map-source-desc.h
+include/champlain-0.12/champlain/champlain-map-source-factory.h
+include/champlain-0.12/champlain/champlain-map-source.h
+include/champlain-0.12/champlain/champlain-marker-layer.h
+include/champlain-0.12/champlain/champlain-marker.h
+include/champlain-0.12/champlain/champlain-memory-cache.h
+include/champlain-0.12/champlain/champlain-memphis-renderer.h
+include/champlain-0.12/champlain/champlain-network-bbox-tile-source.h
+include/champlain-0.12/champlain/champlain-network-tile-source.h
+include/champlain-0.12/champlain/champlain-null-tile-source.h
+include/champlain-0.12/champlain/champlain-path-layer.h
+include/champlain-0.12/champlain/champlain-point.h
+include/champlain-0.12/champlain/champlain-renderer.h
+include/champlain-0.12/champlain/champlain-scale.h
+include/champlain-0.12/champlain/champlain-tile-cache.h
+include/champlain-0.12/champlain/champlain-tile-source.h
+include/champlain-0.12/champlain/champlain-tile.h
+include/champlain-0.12/champlain/champlain-version.h
+include/champlain-0.12/champlain/champlain-view.h
+include/champlain-0.12/champlain/champlain-viewport.h
+include/champlain-0.12/champlain/champlain.h
+lib/libchamplain-0.12.so
+lib/libchamplain-0.12.so.0
+lib/libchamplain-0.12.so.0.11.10
+lib/libchamplain-gtk-0.12.so
+lib/libchamplain-gtk-0.12.so.0
+lib/libchamplain-gtk-0.12.so.0.11.10
 lib/pkgconfig/champlain-0.12.pc
 lib/pkgconfig/champlain-gtk-0.12.pc
-share/gtk-doc/html/libchamplain-0.12/ChamplainBoundingBox.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainCoordinate.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainCustomMarker.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainErrorTileRenderer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainFileCache.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainFileTileSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainImageRenderer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainLabel.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainLayer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainLicense.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainLocation.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMapSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceChain.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceDesc.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceFactory.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMarker.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMarkerLayer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainMemoryCache.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainNetworkBboxTileSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainNetworkTileSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainNullTileSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainPathLayer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainPoint.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainRenderer.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainScale.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainTile.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainTileCache.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainTileSource.html
-share/gtk-doc/html/libchamplain-0.12/ChamplainView.html
-share/gtk-doc/html/libchamplain-0.12/annotation-glossary.html
-share/gtk-doc/html/libchamplain-0.12/ch01.html
-share/gtk-doc/html/libchamplain-0.12/ch02.html
-share/gtk-doc/html/libchamplain-0.12/ch03.html
-share/gtk-doc/html/libchamplain-0.12/ch04.html
-share/gtk-doc/html/libchamplain-0.12/ch05.html
-share/gtk-doc/html/libchamplain-0.12/ch06.html
-share/gtk-doc/html/libchamplain-0.12/home.png
-share/gtk-doc/html/libchamplain-0.12/index.html
-share/gtk-doc/html/libchamplain-0.12/index.sgml
-share/gtk-doc/html/libchamplain-0.12/ix01.html
-share/gtk-doc/html/libchamplain-0.12/ix02.html
-share/gtk-doc/html/libchamplain-0.12/ix03.html
-share/gtk-doc/html/libchamplain-0.12/ix04.html
-share/gtk-doc/html/libchamplain-0.12/ix05.html
-share/gtk-doc/html/libchamplain-0.12/ix06.html
-share/gtk-doc/html/libchamplain-0.12/ix07.html
-share/gtk-doc/html/libchamplain-0.12/ix08.html
-share/gtk-doc/html/libchamplain-0.12/ix09.html
-share/gtk-doc/html/libchamplain-0.12/left-insensitive.png
-share/gtk-doc/html/libchamplain-0.12/left.png
-share/gtk-doc/html/libchamplain-0.12/libchamplain-0.12.devhelp2
-share/gtk-doc/html/libchamplain-0.12/libchamplain-ChamplainVersion.html
-share/gtk-doc/html/libchamplain-0.12/pt01.html
-share/gtk-doc/html/libchamplain-0.12/pt02.html
-share/gtk-doc/html/libchamplain-0.12/pt03.html
-share/gtk-doc/html/libchamplain-0.12/pt04.html
-share/gtk-doc/html/libchamplain-0.12/pt05.html
-share/gtk-doc/html/libchamplain-0.12/pt06.html
-share/gtk-doc/html/libchamplain-0.12/pt07.html
-share/gtk-doc/html/libchamplain-0.12/right-insensitive.png
-share/gtk-doc/html/libchamplain-0.12/right.png
-share/gtk-doc/html/libchamplain-0.12/style.css
-share/gtk-doc/html/libchamplain-0.12/up-insensitive.png
-share/gtk-doc/html/libchamplain-0.12/up.png
-share/gtk-doc/html/libchamplain-gtk-0.12/GtkChamplainEmbed.html
-share/gtk-doc/html/libchamplain-gtk-0.12/annotation-glossary.html
-share/gtk-doc/html/libchamplain-gtk-0.12/home.png
-share/gtk-doc/html/libchamplain-gtk-0.12/index.html
-share/gtk-doc/html/libchamplain-gtk-0.12/index.sgml
-share/gtk-doc/html/libchamplain-gtk-0.12/left-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-0.12/left.png
-share/gtk-doc/html/libchamplain-gtk-0.12/libchamplain-gtk-0.12.devhelp2
-share/gtk-doc/html/libchamplain-gtk-0.12/pt01.html
-share/gtk-doc/html/libchamplain-gtk-0.12/right-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-0.12/right.png
-share/gtk-doc/html/libchamplain-gtk-0.12/style.css
-share/gtk-doc/html/libchamplain-gtk-0.12/up-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-0.12/up.png
-share/vala/vapi/champlain-0.12.vapi
-share/vala/vapi/champlain-gtk-0.12.vapi
diff --git a/geography/libchamplain012/distinfo b/geography/libchamplain012/distinfo
index 5c0299ef667..27a4f219956 100644
--- a/geography/libchamplain012/distinfo
+++ b/geography/libchamplain012/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 00:08:42 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/03/11 10:48:51 wiz Exp $
 
-SHA1 (libchamplain-0.12.10.tar.xz) = 8d32b4a3c20470e36065990a8bb4dabb675017d9
-RMD160 (libchamplain-0.12.10.tar.xz) = 546773195dcee0f118f2c25bacb7d2206c9f49a0
-SHA512 (libchamplain-0.12.10.tar.xz) = e9ac75f3fb785c8c124a4ac3e0d3ea7a0c1b2115342a8f18c77cd912f7d0e3946dd9000459cb91cf7fe90c6e6459da038cee7a3726734fb8013d8beb5e778496
-Size (libchamplain-0.12.10.tar.xz) = 597476 bytes
+SHA1 (libchamplain-0.12.20.tar.xz) = dbba5d51847fbc91136dcf19cf63b71a6c3fd271
+RMD160 (libchamplain-0.12.20.tar.xz) = 32492f660a672d3cb08228415d416cd75d8998cc
+SHA512 (libchamplain-0.12.20.tar.xz) = 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
+Size (libchamplain-0.12.20.tar.xz) = 222168 bytes