3 files changed, 159 insertions, 148 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 00b16320f591..759677ebba2a 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -8,18 +8,21 @@
 
 PORTNAME=	libchamplain
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A C library aimed to provide a Gtk+ widget to display rasterized maps and markers
+COMMENT=	A C library provides a Gtk+ widget to display rasterized maps/markers
 
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
 		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
+RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_BZIP2=	yes
-USE_GNOME=	pkgconfig gtk20 gnomehack ltverhack:1
+USE_GNOME=	gnomeprefix pkgconfig gtk20 gnomehack ltverhack:1
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -29,24 +32,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=0.8
 
-# python bindings need to get ported
-WITHOUT_PYTHON=yes
-
-.if !defined(WITHOUT_PYTHON)
-USE_PYTHON=	yes
-PYCLUTTER_GTK=		${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.10.pc
-BUILD_DEPENDS+=		${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
-RUN_DEPENDS+=		${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
-CONFIGURE_ARGS+=	--enable-python=yes
-PLIST_SUB+=		PYTHON=""
-.else
-CONFIGURE_ARGS+=	--enable-python=no
-PLIST_SUB+=		PYTHON="@comment "
-.endif
-
-.pre-everything:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings"
-	@${ECHO_CMD} ""
-
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
new file mode 100644
index 000000000000..44e96bce19aa
--- /dev/null
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -0,0 +1,34 @@
+--- 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 @@
+ 	$(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 = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
++AM_CPPFLAGS = -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION $(GTK_CFLAGS) $(WARN_CFLAGS)
+ 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 3c7e4bb54a18..1976177e0aeb 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,129 +1,123 @@
-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-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/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/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/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
-share/gtk-doc/html/libchamplain/ix01.html
-share/gtk-doc/html/libchamplain/ix02.html
-share/gtk-doc/html/libchamplain/ix03.html
-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/left.png
-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
-@dirrmtry share/gtk-doc
+include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h
+include/libchamplain-%%VERSION%%/champlain/champlain-bounding-box.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-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-layer.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.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-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-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.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-gtk-%%VERSION%%.a
+lib/libchamplain-gtk-%%VERSION%%.la
+lib/libchamplain-gtk-%%VERSION%%.so
+lib/libchamplain-gtk-%%VERSION%%.so.1
+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/vala/vapi/champlain-%%VERSION%%.vapi
+share/vala/vapi/champlain-gtk-%%VERSION%%.deps
+share/vala/vapi/champlain-gtk-%%VERSION%%.vapi
+@dirrmtry share/gir-1.0
+@dirrm share/doc/libchamplain-gtk
+@dirrm %%DOCSDIR%%
+@dirrmtry lib/girepository-1.0
 @dirrm include/libchamplain-gtk-%%VERSION%%/champlain-gtk
 @dirrm include/libchamplain-gtk-%%VERSION%%
 @dirrm include/libchamplain-%%VERSION%%/champlain