Update to 0.4.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12885 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 66 insertions, 45 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 88b812b3f..57939d777 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.6 2009/09/16 02:09:03 avl Exp $
+#   $MCom: ports/graphics/libchamplain/Makefile,v 1.7 2009/09/16 04:36:31 marcus Exp $
 #
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.3.92
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -34,6 +33,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 # get released upstream too.
 CONFIGURE_ARGS+=--enable-managed=no
 
+PLIST_SUB=	VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
 .if !defined(WITHOUT_PYTHON)
 USE_PYTHON=	yes
 PYCLUTTER_GTK=		${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.9.pc
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 8aedc7e5e..2fa07735a 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-MD5 (libchamplain-0.3.92.tar.bz2) = 4e363754a317f84cd7b7fdd5741c0acd
-SHA256 (libchamplain-0.3.92.tar.bz2) = 74a3258fc728af85be43d1fb58b7cc8c0457e0f454dec921534bab7b43fab8ed
-SIZE (libchamplain-0.3.92.tar.bz2) = 526576
+MD5 (libchamplain-0.4.0.tar.bz2) = 159f8befb4b7ef616227977cda61e08d
+SHA256 (libchamplain-0.4.0.tar.bz2) = 43675f381cef04fbf1ec89bc632e50c3edd967be6b476a62a2c400a387e94965
+SIZE (libchamplain-0.4.0.tar.bz2) = 537485
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 000000000..591c171df
--- /dev/null
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -0,0 +1,10 @@
+--- champlain-gtk/Makefile.in.orig	2009-09-16 02:44:48.000000000 -0400
++++ champlain-gtk/Makefile.in	2009-09-16 02:45:14.000000000 -0400
+@@ -714,6 +714,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
+ @HAVE_INTROSPECTION_TRUE@	$(INCLUDES) \
+ @HAVE_INTROSPECTION_TRUE@	--add-include-path=$(srcdir) --add-include=path=. \
+ @HAVE_INTROSPECTION_TRUE@	--c-include="$(libchamplain_include_HEADERS)" \
++@HAVE_INTROSPECTION_TRUE@	--libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@	--include=Clutter-1.0 \
+ @HAVE_INTROSPECTION_TRUE@	--include=Gtk-2.0 \
+ @HAVE_INTROSPECTION_TRUE@	--library=champlain-gtk-0.4 \
diff --git a/graphics/libchamplain/files/patch-champlain_Makefile.in b/graphics/libchamplain/files/patch-champlain_Makefile.in
new file mode 100644
index 000000000..4f6481714
--- /dev/null
+++ b/graphics/libchamplain/files/patch-champlain_Makefile.in
@@ -0,0 +1,10 @@
+--- champlain/Makefile.in.orig	2009-09-16 02:42:09.000000000 -0400
++++ champlain/Makefile.in	2009-09-16 02:42:41.000000000 -0400
+@@ -860,6 +860,7 @@ champlain-enum-types.c: $(libchamplain_h
+ @HAVE_INTROSPECTION_TRUE@	$(INCLUDES) \
+ @HAVE_INTROSPECTION_TRUE@	--add-include-path=$(srcdir) --add-include=path=. \
+ @HAVE_INTROSPECTION_TRUE@	--c-include="$(libchamplain_include_HEADERS)" \
++@HAVE_INTROSPECTION_TRUE@	--libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@	--include=Clutter-1.0 \
+ @HAVE_INTROSPECTION_TRUE@	--include=Gtk-2.0 \
+ @HAVE_INTROSPECTION_TRUE@	--library=champlain-0.4 \
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index 673df8080..084841420 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,43 +1,43 @@
-include/libchamplain-0.3/champlain/champlain-base-marker.h
-include/libchamplain-0.3/champlain/champlain-cache.h
-include/libchamplain-0.3/champlain/champlain-defines.h
-include/libchamplain-0.3/champlain/champlain-enum-types.h
-include/libchamplain-0.3/champlain/champlain-layer.h
-include/libchamplain-0.3/champlain/champlain-map-source-desc.h
-include/libchamplain-0.3/champlain/champlain-map-source-factory.h
-include/libchamplain-0.3/champlain/champlain-map-source.h
-include/libchamplain-0.3/champlain/champlain-marker.h
-include/libchamplain-0.3/champlain/champlain-network-map-source.h
-include/libchamplain-0.3/champlain/champlain-point.h
-include/libchamplain-0.3/champlain/champlain-polygon.h
-include/libchamplain-0.3/champlain/champlain-selection-layer.h
-include/libchamplain-0.3/champlain/champlain-tile.h
-include/libchamplain-0.3/champlain/champlain-version.h
-include/libchamplain-0.3/champlain/champlain-view.h
-include/libchamplain-0.3/champlain/champlain-zoom-level.h
-include/libchamplain-0.3/champlain/champlain.h
-include/libchamplain-gtk-0.3/champlain-gtk/champlain-gtk.h
-include/libchamplain-gtk-0.3/champlain-gtk/gtk-champlain-embed.h
-lib/girepository-1.0/Champlain-0.3.typelib
-lib/girepository-1.0/GtkChamplain-0.3.typelib
-lib/libchamplain-0.3.a
-lib/libchamplain-0.3.la
-lib/libchamplain-0.3.so
-lib/libchamplain-0.3.so.3
-lib/libchamplain-gtk-0.3.a
-lib/libchamplain-gtk-0.3.la
-lib/libchamplain-gtk-0.3.so
-lib/libchamplain-gtk-0.3.so.3
+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.0
+lib/libchamplain-gtk-%%VERSION%%.a
+lib/libchamplain-gtk-%%VERSION%%.la
+lib/libchamplain-gtk-%%VERSION%%.so
+lib/libchamplain-gtk-%%VERSION%%.so.0
 %%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.3.pc
-libdata/pkgconfig/champlain-gtk-0.3.pc
-share/gir-1.0/Champlain-0.3.gir
-share/gir-1.0/GtkChamplain-0.3.gir
+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-gtk/GtkChamplainEmbed.html
 share/gtk-doc/html/libchamplain-gtk/ch01.html
 share/gtk-doc/html/libchamplain-gtk/home.png
@@ -57,6 +57,7 @@ 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/ChamplainPolygon.html
+share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
 share/gtk-doc/html/libchamplain/ChamplainTile.html
 share/gtk-doc/html/libchamplain/ChamplainView.html
 share/gtk-doc/html/libchamplain/ch01.html
@@ -76,7 +77,6 @@ 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-ChamplainPoint.html
-share/gtk-doc/html/libchamplain/libchamplain-ChamplainSelectionLayer.html
 share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
 share/gtk-doc/html/libchamplain/libchamplain.devhelp
 share/gtk-doc/html/libchamplain/libchamplain.devhelp2
@@ -87,7 +87,7 @@ share/gtk-doc/html/libchamplain/up.png
 @dirrm share/gtk-doc/html/libchamplain-gtk
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrm include/libchamplain-gtk-0.3/champlain-gtk
-@dirrm include/libchamplain-gtk-0.3
-@dirrm include/libchamplain-0.3/champlain
-@dirrm include/libchamplain-0.3
+@dirrm include/libchamplain-gtk-%%VERSION%%/champlain-gtk
+@dirrm include/libchamplain-gtk-%%VERSION%%
+@dirrm include/libchamplain-%%VERSION%%/champlain
+@dirrm include/libchamplain-%%VERSION%%