3 files changed, 85 insertions, 55 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 28b656a95890..400ce39fed82 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/libchamplain/Makefile,v 1.17 2010/03/29 10:55:48 kwm Exp $
+#   $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $
 #
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -17,7 +16,7 @@ COMMENT=	A C library aimed to provide a Gtk+ widget to display rasterized maps a
 
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
-		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
+		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
 
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig gtk20 gnomehack ltverhack:1
@@ -28,10 +27,10 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-# clutter-sharp need to get released.
-CONFIGURE_ARGS+=--enable-managed=no
+PLIST_SUB=	VERSION=0.8
 
-PLIST_SUB=	VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+# python bindings need to get ported
+WITHOUT_PYTHON=yes
 
 .if !defined(WITHOUT_PYTHON)
 USE_PYTHON=	yes
@@ -50,10 +49,4 @@ PLIST_SUB+=		PYTHON="@comment "
 	@${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings"
 	@${ECHO_CMD} ""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|pyclutter-gtk-0.9|pyclutter-gtk-0.10|g' \
-		${WRKSRC}/configure
-	# Fix python bindings, can be safely removed after 0.4.7 release
-	@${RM} -f ${WRKSRC}/bindings/python/champlain/pychamplain.c
-
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 8d91140c7ba0..608afa1cce64 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-MD5 (libchamplain-0.4.6.tar.bz2) = 0ea5f87dba0ce3787a36e5f47b39ae2d
-SHA256 (libchamplain-0.4.6.tar.bz2) = 0ffdbd5a067a02c744173174e3f5fa5ae23b444edf0f5dcc6622d295f3059fbc
-SIZE (libchamplain-0.4.6.tar.bz2) = 528683
+MD5 (libchamplain-0.8.0.tar.bz2) = 55bf83ce4cd1fa13fdc5d0a5b478e323
+SHA256 (libchamplain-0.8.0.tar.bz2) = 0784b53f488d690ed878b1bbf30cd9bd9b1baafb5b6b0d0b7b2ba0ef240c49cc
+SIZE (libchamplain-0.8.0.tar.bz2) = 672862
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index 1ecbf217c6b7..3c7e4bb54a18 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,68 +1,96 @@
-include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h
-include/libchamplain-%%VERSION%%/champlain/champlain-cache.h
-include/libchamplain-%%VERSION%%/champlain/champlain-defines.h
-include/libchamplain-%%VERSION%%/champlain/champlain-enum-types.h
-include/libchamplain-%%VERSION%%/champlain/champlain-layer.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.h
-include/libchamplain-%%VERSION%%/champlain/champlain-network-map-source.h
-include/libchamplain-%%VERSION%%/champlain/champlain-point.h
-include/libchamplain-%%VERSION%%/champlain/champlain-polygon.h
-include/libchamplain-%%VERSION%%/champlain/champlain-selection-layer.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-zoom-level.h
-include/libchamplain-%%VERSION%%/champlain/champlain.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-gtk-%%VERSION%%.a
-lib/libchamplain-gtk-%%VERSION%%.la
-lib/libchamplain-gtk-%%VERSION%%.so
-lib/libchamplain-gtk-%%VERSION%%.so.1
+include/libchamplain-0.8/champlain/champlain-base-marker.h
+include/libchamplain-0.8/champlain/champlain-bounding-box.h
+include/libchamplain-0.8/champlain/champlain-defines.h
+include/libchamplain-0.8/champlain/champlain-enum-types.h
+include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h
+include/libchamplain-0.8/champlain/champlain-features.h
+include/libchamplain-0.8/champlain/champlain-file-cache.h
+include/libchamplain-0.8/champlain/champlain-file-tile-source.h
+include/libchamplain-0.8/champlain/champlain-image-renderer.h
+include/libchamplain-0.8/champlain/champlain-layer.h
+include/libchamplain-0.8/champlain/champlain-map-source-chain.h
+include/libchamplain-0.8/champlain/champlain-map-source-desc.h
+include/libchamplain-0.8/champlain/champlain-map-source-factory.h
+include/libchamplain-0.8/champlain/champlain-map-source.h
+include/libchamplain-0.8/champlain/champlain-marker.h
+include/libchamplain-0.8/champlain/champlain-marshal.h
+include/libchamplain-0.8/champlain/champlain-memory-cache.h
+include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h
+include/libchamplain-0.8/champlain/champlain-network-tile-source.h
+include/libchamplain-0.8/champlain/champlain-null-tile-source.h
+include/libchamplain-0.8/champlain/champlain-point.h
+include/libchamplain-0.8/champlain/champlain-polygon.h
+include/libchamplain-0.8/champlain/champlain-renderer.h
+include/libchamplain-0.8/champlain/champlain-selection-layer.h
+include/libchamplain-0.8/champlain/champlain-tile-cache.h
+include/libchamplain-0.8/champlain/champlain-tile-source.h
+include/libchamplain-0.8/champlain/champlain-tile.h
+include/libchamplain-0.8/champlain/champlain-version.h
+include/libchamplain-0.8/champlain/champlain-view.h
+include/libchamplain-0.8/champlain/champlain.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h
+include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h
+lib/girepository-1.0/Champlain-0.8.typelib
+lib/girepository-1.0/GtkChamplain-0.8.typelib
+lib/libchamplain-0.8.a
+lib/libchamplain-0.8.la
+lib/libchamplain-0.8.so
+lib/libchamplain-0.8.so.1
+lib/libchamplain-gtk-0.8.a
+lib/libchamplain-gtk-0.8.la
+lib/libchamplain-gtk-0.8.so
+lib/libchamplain-gtk-0.8.so.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.so
-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
+libdata/pkgconfig/champlain-0.8.pc
+libdata/pkgconfig/champlain-gtk-0.8.pc
+share/gir-1.0/Champlain-0.8.gir
+share/gir-1.0/GtkChamplain-0.8.gir
 share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html
-share/gtk-doc/html/libchamplain-gtk/ch01.html
 share/gtk-doc/html/libchamplain-gtk/home.png
 share/gtk-doc/html/libchamplain-gtk/index.html
 share/gtk-doc/html/libchamplain-gtk/index.sgml
 share/gtk-doc/html/libchamplain-gtk/left.png
 share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp
 share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2
+share/gtk-doc/html/libchamplain-gtk/pt01.html
 share/gtk-doc/html/libchamplain-gtk/right.png
 share/gtk-doc/html/libchamplain-gtk/style.css
 share/gtk-doc/html/libchamplain-gtk/up.png
 share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html
-share/gtk-doc/html/libchamplain/ChamplainCache.html
+share/gtk-doc/html/libchamplain/ChamplainErrorTileRenderer.html
+share/gtk-doc/html/libchamplain/ChamplainFileCache.html
+share/gtk-doc/html/libchamplain/ChamplainFileTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainImageRenderer.html
 share/gtk-doc/html/libchamplain/ChamplainLayer.html
 share/gtk-doc/html/libchamplain/ChamplainMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainMapSourceChain.html
 share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html
 share/gtk-doc/html/libchamplain/ChamplainMarker.html
-share/gtk-doc/html/libchamplain/ChamplainNetworkMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainMemoryCache.html
+share/gtk-doc/html/libchamplain/ChamplainMemphisRenderer.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkBboxTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainNullTileSource.html
 share/gtk-doc/html/libchamplain/ChamplainPolygon.html
+share/gtk-doc/html/libchamplain/ChamplainRenderer.html
 share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
 share/gtk-doc/html/libchamplain/ChamplainTile.html
+share/gtk-doc/html/libchamplain/ChamplainTileCache.html
+share/gtk-doc/html/libchamplain/ChamplainTileSource.html
 share/gtk-doc/html/libchamplain/ChamplainView.html
 share/gtk-doc/html/libchamplain/ch01.html
 share/gtk-doc/html/libchamplain/ch02.html
 share/gtk-doc/html/libchamplain/ch03.html
+share/gtk-doc/html/libchamplain/ch04.html
+share/gtk-doc/html/libchamplain/ch05.html
+share/gtk-doc/html/libchamplain/ch06.html
 share/gtk-doc/html/libchamplain/home.png
 share/gtk-doc/html/libchamplain/index.html
 share/gtk-doc/html/libchamplain/index.sgml
@@ -73,16 +101,25 @@ share/gtk-doc/html/libchamplain/ix04.html
 share/gtk-doc/html/libchamplain/ix05.html
 share/gtk-doc/html/libchamplain/ix06.html
 share/gtk-doc/html/libchamplain/ix07.html
-share/gtk-doc/html/libchamplain/ix08.html
 share/gtk-doc/html/libchamplain/left.png
-share/gtk-doc/html/libchamplain/libchamplain-Champlain.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainBoundingBox.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainMapSourceDesc.html
 share/gtk-doc/html/libchamplain/libchamplain-ChamplainPoint.html
 share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
 share/gtk-doc/html/libchamplain/libchamplain.devhelp
 share/gtk-doc/html/libchamplain/libchamplain.devhelp2
+share/gtk-doc/html/libchamplain/pt01.html
+share/gtk-doc/html/libchamplain/pt02.html
+share/gtk-doc/html/libchamplain/pt03.html
+share/gtk-doc/html/libchamplain/pt04.html
+share/gtk-doc/html/libchamplain/pt05.html
 share/gtk-doc/html/libchamplain/right.png
 share/gtk-doc/html/libchamplain/style.css
 share/gtk-doc/html/libchamplain/up.png
+share/vala/vapi/champlain-0.8.deps
+share/vala/vapi/champlain-0.8.vapi
+share/vala/vapi/champlain-gtk-0.8.deps
+share/vala/vapi/champlain-gtk-0.8.vapi
 @dirrm share/gtk-doc/html/libchamplain
 @dirrm share/gtk-doc/html/libchamplain-gtk
 @dirrmtry share/gtk-doc/html