4 files changed, 122 insertions, 106 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index b4b99d94e7ba..7fc3bb64b8be 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -1,29 +1,29 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $
+#   $MCom: ports/trunk/graphics/libchamplain/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.8.1
-PORTREVISION=	7
+PORTVERSION=	0.12.9
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	C library provides a Gtk+ widget to display rasterized maps/markers
+COMMENT=	C library aimed to provide a Gtk+ widget to display rasterized maps and markers
 
-LIB_DEPENDS=	libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \
+LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_GNOME=	gnomeprefix gtk20 introspection:build,run
-USE_SQLITE=	3
+USES=		gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gtk30 introspection:build
 USE_GL=		gl
+USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgthread-2.0
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--enable-gtk-doc-html=no
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB=	VERSION=0.8
+PLIST_SUB=	VERSION=0.12
 
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 04a163c1af22..d15158ad410f 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libchamplain-0.8.1.tar.bz2) = 307f4e13cf902b58eaf8d52551b92fa90d0470f4a27b46746beb2c4fd0fdd57c
-SIZE (libchamplain-0.8.1.tar.bz2) = 669156
+SHA256 (libchamplain-0.12.9.tar.xz) = b25ce832334976c07bf9564bf7f31e628881c69cf871a256cf4530cb277917e3
+SIZE (libchamplain-0.12.9.tar.xz) = 594280
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
index 44e96bce19aa..4f7ef42e5f24 100644
--- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -1,6 +1,17 @@
---- champlain-gtk/Makefile.in.orig	2012-03-15 20:21:20.000000000 -0500
-+++ champlain-gtk/Makefile.in	2012-03-15 20:35:27.000000000 -0500
-@@ -370,15 +370,15 @@
+--- 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 = \
@@ -14,21 +25,8 @@
  	-no-undefined \
  	-export-symbols-regex ^gtk_champlain_.*
  
--AM_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
-+AM_CPPFLAGS = -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION $(GTK_CFLAGS) $(WARN_CFLAGS)
+-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)
-@@ -394,9 +394,9 @@
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 Champlain-@CHAMPLAIN_API_VERSION@
- @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
--@HAVE_INTROSPECTION_TRUE@	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS) \
--@HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir) -I$(top_builddir)\
--@HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
-+@HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir) -I$(top_builddir) \
-+@HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION \
-+@HAVE_INTROSPECTION_TRUE@	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS)
- 
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index a8d8ea26e4bf..24f40ceb719c 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,5 +1,7 @@
-include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h
+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
@@ -7,112 +9,128 @@ 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-polygon.h
 include/libchamplain-%%VERSION%%/champlain/champlain-renderer.h
-include/libchamplain-%%VERSION%%/champlain/champlain-selection-layer.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.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
 lib/girepository-1.0/Champlain-%%VERSION%%.typelib
 lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
 lib/libchamplain-%%VERSION%%.a
-lib/libchamplain-%%VERSION%%.la
 lib/libchamplain-%%VERSION%%.so
-lib/libchamplain-%%VERSION%%.so.1
-lib/libchamplain-%%VERSION%%.so.1.1.2
+lib/libchamplain-%%VERSION%%.so.0
+lib/libchamplain-%%VERSION%%.so.0.4.4
 lib/libchamplain-gtk-%%VERSION%%.a
-lib/libchamplain-gtk-%%VERSION%%.la
 lib/libchamplain-gtk-%%VERSION%%.so
-lib/libchamplain-gtk-%%VERSION%%.so.1
-lib/libchamplain-gtk-%%VERSION%%.so.1.1.2
+lib/libchamplain-gtk-%%VERSION%%.so.0
+lib/libchamplain-gtk-%%VERSION%%.so.0.4.4
 libdata/pkgconfig/champlain-%%VERSION%%.pc
 libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
-share/doc/libchamplain-gtk/GtkChamplainEmbed.html
-share/doc/libchamplain-gtk/home.png
-share/doc/libchamplain-gtk/index.html
-share/doc/libchamplain-gtk/index.sgml
-share/doc/libchamplain-gtk/left.png
-share/doc/libchamplain-gtk/libchamplain-gtk.devhelp
-share/doc/libchamplain-gtk/libchamplain-gtk.devhelp2
-share/doc/libchamplain-gtk/pt01.html
-share/doc/libchamplain-gtk/right.png
-share/doc/libchamplain-gtk/style.css
-share/doc/libchamplain-gtk/up.png
-%%DOCSDIR%%/ChamplainBaseMarker.html
-%%DOCSDIR%%/ChamplainErrorTileRenderer.html
-%%DOCSDIR%%/ChamplainFileCache.html
-%%DOCSDIR%%/ChamplainFileTileSource.html
-%%DOCSDIR%%/ChamplainImageRenderer.html
-%%DOCSDIR%%/ChamplainLayer.html
-%%DOCSDIR%%/ChamplainMapSource.html
-%%DOCSDIR%%/ChamplainMapSourceChain.html
-%%DOCSDIR%%/ChamplainMapSourceFactory.html
-%%DOCSDIR%%/ChamplainMarker.html
-%%DOCSDIR%%/ChamplainMemoryCache.html
-%%DOCSDIR%%/ChamplainMemphisRenderer.html
-%%DOCSDIR%%/ChamplainNetworkBboxTileSource.html
-%%DOCSDIR%%/ChamplainNetworkTileSource.html
-%%DOCSDIR%%/ChamplainNullTileSource.html
-%%DOCSDIR%%/ChamplainPolygon.html
-%%DOCSDIR%%/ChamplainRenderer.html
-%%DOCSDIR%%/ChamplainSelectionLayer.html
-%%DOCSDIR%%/ChamplainTile.html
-%%DOCSDIR%%/ChamplainTileCache.html
-%%DOCSDIR%%/ChamplainTileSource.html
-%%DOCSDIR%%/ChamplainView.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/ch05.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/ix02.html
-%%DOCSDIR%%/ix03.html
-%%DOCSDIR%%/ix04.html
-%%DOCSDIR%%/ix05.html
-%%DOCSDIR%%/ix06.html
-%%DOCSDIR%%/ix07.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libchamplain-ChamplainBoundingBox.html
-%%DOCSDIR%%/libchamplain-ChamplainMapSourceDesc.html
-%%DOCSDIR%%/libchamplain-ChamplainPoint.html
-%%DOCSDIR%%/libchamplain-ChamplainVersion.html
-%%DOCSDIR%%/libchamplain.devhelp
-%%DOCSDIR%%/libchamplain.devhelp2
-%%DOCSDIR%%/pt01.html
-%%DOCSDIR%%/pt02.html
-%%DOCSDIR%%/pt03.html
-%%DOCSDIR%%/pt04.html
-%%DOCSDIR%%/pt05.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
 share/gir-1.0/Champlain-%%VERSION%%.gir
 share/gir-1.0/GtkChamplain-%%VERSION%%.gir
-share/vala/vapi/champlain-%%VERSION%%.deps
+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%%/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%%/index.sgml
+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.png
+share/gtk-doc/html/libchamplain-%%VERSION%%/left-insensitive.png
+share/gtk-doc/html/libchamplain-%%VERSION%%/libchamplain-ChamplainVersion.html
+share/gtk-doc/html/libchamplain-%%VERSION%%/libchamplain-%%VERSION%%.devhelp2
+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.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%%/index.sgml
+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-%%VERSION%%/up-insensitive.png
+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%%.deps
 share/vala/vapi/champlain-gtk-%%VERSION%%.vapi