4 files changed, 50 insertions, 163 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index d52df5328764..0f7874632284 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.12.16
+PORTVERSION=	0.12.20
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -12,20 +12,19 @@ COMMENT=	C library aimed to provide a Gtk+ widget to display rasterized maps and
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libcogl.so:graphics/cogl \
 		libclutter-1.0.so:graphics/clutter \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup
 
-USES=		gettext-runtime gl gmake gnome libtool localbase pathfix \
+USES=		gettext-runtime gl gnome localbase meson \
 		pkgconfig sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
 USE_GL=		egl
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-gtk-doc-html=no
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=0.12
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index f25e25b032a8..f206dbcad635 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516304081
-SHA256 (libchamplain-0.12.16.tar.xz) = 4a7e31cf7889669aebf04631543af64435edd989685159b804911c6005db908d
-SIZE (libchamplain-0.12.16.tar.xz) = 623912
+TIMESTAMP = 1592254600
+SHA256 (libchamplain-0.12.20.tar.xz) = 0232b4bfcd130a1c5bda7b6aec266bf2d06e701e8093df1886f1e26bc1ba3066
+SIZE (libchamplain-0.12.20.tar.xz) = 222168
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
deleted file mode 100644
index 4f7ef42e5f24..000000000000
--- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- champlain-gtk/Makefile.in.orig	2014-07-02 09:20:14.564390009 +0000
-+++ champlain-gtk/Makefile.in	2014-07-02 09:22:14.312426331 +0000
-@@ -141,8 +141,8 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_DEPENDENCIES =  \
--	$(am__DEPENDENCIES_1) \
--	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la \
-+	$(am__DEPENDENCIES_1)
- am__objects_1 =
- am__objects_2 = gtk-champlain-embed.lo
- am_libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_OBJECTS =  \
-@@ -405,15 +405,15 @@
- 	$(libchamplain_gtk_sources_built)
- 
- libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \
--	$(GTK_LIBS) 	\
--	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la \
-+	$(GTK_LIBS)
- 
- libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
- 	-version-info $(LIBRARY_VERSION) \
- 	-no-undefined \
- 	-export-symbols-regex ^gtk_champlain_.*
- 
--AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
-+AM_CPPFLAGS = -I$(top_srcdir) $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -DCHAMPLAIN_GTK_COMPILATION
- lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la
- libchamplain_gtkdir = $(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk
- libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public)
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index b91eaf60d347..ca618ac9b8af 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,136 +1,56 @@
-include/libchamplain-%%VERSION%%/champlain/champlain-adjustment.h
-include/libchamplain-%%VERSION%%/champlain/champlain-bounding-box.h
-include/libchamplain-%%VERSION%%/champlain/champlain-coordinate.h
-include/libchamplain-%%VERSION%%/champlain/champlain-custom-marker.h
-include/libchamplain-%%VERSION%%/champlain/champlain-defines.h
-include/libchamplain-%%VERSION%%/champlain/champlain-enum-types.h
-include/libchamplain-%%VERSION%%/champlain/champlain-error-tile-renderer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-exportable.h
-include/libchamplain-%%VERSION%%/champlain/champlain-features.h
-include/libchamplain-%%VERSION%%/champlain/champlain-file-cache.h
-include/libchamplain-%%VERSION%%/champlain/champlain-file-tile-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-image-renderer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-kinetic-scroll-view.h
-include/libchamplain-%%VERSION%%/champlain/champlain-label.h
-include/libchamplain-%%VERSION%%/champlain/champlain-layer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-license.h
-include/libchamplain-%%VERSION%%/champlain/champlain-location.h
-include/libchamplain-%%VERSION%%/champlain/champlain-map-source-chain.h
-include/libchamplain-%%VERSION%%/champlain/champlain-map-source-desc.h
-include/libchamplain-%%VERSION%%/champlain/champlain-map-source-factory.h
-include/libchamplain-%%VERSION%%/champlain/champlain-map-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-marker-layer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-marker.h
-include/libchamplain-%%VERSION%%/champlain/champlain-marshal.h
-include/libchamplain-%%VERSION%%/champlain/champlain-memory-cache.h
-include/libchamplain-%%VERSION%%/champlain/champlain-network-bbox-tile-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-network-tile-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-null-tile-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-path-layer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-point.h
-include/libchamplain-%%VERSION%%/champlain/champlain-renderer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-scale.h
-include/libchamplain-%%VERSION%%/champlain/champlain-tile-cache.h
-include/libchamplain-%%VERSION%%/champlain/champlain-tile-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-tile.h
-include/libchamplain-%%VERSION%%/champlain/champlain-version.h
-include/libchamplain-%%VERSION%%/champlain/champlain-view.h
-include/libchamplain-%%VERSION%%/champlain/champlain-viewport.h
-include/libchamplain-%%VERSION%%/champlain/champlain.h
-include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk-enum-types.h
-include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk-marshal.h
-include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk.h
-include/libchamplain-gtk-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h
+include/champlain-%%VERSION%%/champlain/champlain-adjustment.h
+include/champlain-%%VERSION%%/champlain/champlain-bounding-box.h
+include/champlain-%%VERSION%%/champlain/champlain-coordinate.h
+include/champlain-%%VERSION%%/champlain/champlain-custom-marker.h
+include/champlain-%%VERSION%%/champlain/champlain-defines.h
+include/champlain-%%VERSION%%/champlain/champlain-enum-types.h
+include/champlain-%%VERSION%%/champlain/champlain-error-tile-renderer.h
+include/champlain-%%VERSION%%/champlain/champlain-exportable.h
+include/champlain-%%VERSION%%/champlain/champlain-features.h
+include/champlain-%%VERSION%%/champlain/champlain-file-cache.h
+include/champlain-%%VERSION%%/champlain/champlain-file-tile-source.h
+include/champlain-%%VERSION%%/champlain/champlain-image-renderer.h
+include/champlain-%%VERSION%%/champlain/champlain-kinetic-scroll-view.h
+include/champlain-%%VERSION%%/champlain/champlain-label.h
+include/champlain-%%VERSION%%/champlain/champlain-layer.h
+include/champlain-%%VERSION%%/champlain/champlain-license.h
+include/champlain-%%VERSION%%/champlain/champlain-location.h
+include/champlain-%%VERSION%%/champlain/champlain-map-source-chain.h
+include/champlain-%%VERSION%%/champlain/champlain-map-source-desc.h
+include/champlain-%%VERSION%%/champlain/champlain-map-source-factory.h
+include/champlain-%%VERSION%%/champlain/champlain-map-source.h
+include/champlain-%%VERSION%%/champlain/champlain-marker-layer.h
+include/champlain-%%VERSION%%/champlain/champlain-marker.h
+include/champlain-%%VERSION%%/champlain/champlain-memory-cache.h
+include/champlain-%%VERSION%%/champlain/champlain-network-bbox-tile-source.h
+include/champlain-%%VERSION%%/champlain/champlain-network-tile-source.h
+include/champlain-%%VERSION%%/champlain/champlain-null-tile-source.h
+include/champlain-%%VERSION%%/champlain/champlain-path-layer.h
+include/champlain-%%VERSION%%/champlain/champlain-point.h
+include/champlain-%%VERSION%%/champlain/champlain-renderer.h
+include/champlain-%%VERSION%%/champlain/champlain-scale.h
+include/champlain-%%VERSION%%/champlain/champlain-tile-cache.h
+include/champlain-%%VERSION%%/champlain/champlain-tile-source.h
+include/champlain-%%VERSION%%/champlain/champlain-tile.h
+include/champlain-%%VERSION%%/champlain/champlain-version.h
+include/champlain-%%VERSION%%/champlain/champlain-view.h
+include/champlain-%%VERSION%%/champlain/champlain-viewport.h
+include/champlain-%%VERSION%%/champlain/champlain.h
+include/champlain-%%VERSION%%/champlain-gtk/champlain-gtk.h
+include/champlain-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h
 lib/girepository-1.0/Champlain-%%VERSION%%.typelib
 lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
-lib/libchamplain-%%VERSION%%.a
 lib/libchamplain-%%VERSION%%.so
 lib/libchamplain-%%VERSION%%.so.0
-lib/libchamplain-%%VERSION%%.so.0.10.0
-lib/libchamplain-gtk-%%VERSION%%.a
+lib/libchamplain-%%VERSION%%.so.0.11.10
 lib/libchamplain-gtk-%%VERSION%%.so
 lib/libchamplain-gtk-%%VERSION%%.so.0
-lib/libchamplain-gtk-%%VERSION%%.so.0.10.0
+lib/libchamplain-gtk-%%VERSION%%.so.0.11.10
 libdata/pkgconfig/champlain-%%VERSION%%.pc
 libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
 share/gir-1.0/Champlain-%%VERSION%%.gir
 share/gir-1.0/GtkChamplain-%%VERSION%%.gir
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainBoundingBox.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainCoordinate.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainCustomMarker.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainErrorTileRenderer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainExportable.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainFileCache.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainFileTileSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainImageRenderer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainLabel.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainLayer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainLicense.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainLocation.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMapSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMapSourceChain.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMapSourceDesc.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMapSourceFactory.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMarker.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMarkerLayer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainMemoryCache.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainNetworkBboxTileSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainNetworkTileSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainNullTileSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainPathLayer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainPoint.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainRenderer.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainScale.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainTile.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainTileCache.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainTileSource.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ChamplainView.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/annotation-glossary.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch01.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch02.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch03.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch04.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch05.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ch06.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/home.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/index.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix01.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix02.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix03.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix04.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix05.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix06.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix07.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix08.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/ix09.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/left-insensitive.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/left.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/libchamplain-%%VERSION%%.devhelp2
-share/gtk-doc/html/libchamplain-%%VERSION%%/libchamplain-ChamplainVersion.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt01.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt02.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt03.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt04.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt05.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt06.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/pt07.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/right-insensitive.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/right.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/style.css
-share/gtk-doc/html/libchamplain-%%VERSION%%/up-insensitive.png
-share/gtk-doc/html/libchamplain-%%VERSION%%/up.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/GtkChamplainEmbed.html
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/annotation-glossary.html
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/home.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/index.html
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/left-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/left.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/libchamplain-gtk-%%VERSION%%.devhelp2
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/pt01.html
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/right-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/right.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/style.css
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/up-insensitive.png
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/up.png
 share/vala/vapi/champlain-%%VERSION%%.vapi
 share/vala/vapi/champlain-gtk-%%VERSION%%.vapi
+share/vala/vapi/champlain-%%VERSION%%.deps
+share/vala/vapi/champlain-gtk-%%VERSION%%.deps