Update to 0.4.1.

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

5 files changed, 25 insertions, 26 deletions

diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 56e6c79d0..9ba974318 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.8 2009/09/16 06:57:23 marcus Exp $
+#   $MCom: ports/graphics/libchamplain/Makefile,v 1.9 2009/09/17 00:57:28 avl Exp $
 #
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTVERSION=	0.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 2fa07735a..eb6fa8b3f 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-MD5 (libchamplain-0.4.0.tar.bz2) = 159f8befb4b7ef616227977cda61e08d
-SHA256 (libchamplain-0.4.0.tar.bz2) = 43675f381cef04fbf1ec89bc632e50c3edd967be6b476a62a2c400a387e94965
-SIZE (libchamplain-0.4.0.tar.bz2) = 537485
+MD5 (libchamplain-0.4.1.tar.bz2) = cd41e989c4c609e37fac2ad331919bcf
+SHA256 (libchamplain-0.4.1.tar.bz2) = 439ef8228c233b7333c8f24f0d28f136336a07f95ef87c35427806214ea67927
+SIZE (libchamplain-0.4.1.tar.bz2) = 519193
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
index 591c171df..2c4455f73 100644
--- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -1,10 +1,20 @@
---- 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=. \
+--- champlain-gtk/Makefile.in.orig	2009-10-19 16:10:37.000000000 +0200
++++ champlain-gtk/Makefile.in	2009-10-19 16:21:13.000000000 +0200
+@@ -715,7 +715,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
+ @HAVE_INTROSPECTION_TRUE@	$(SOUP_CFLAGS) \
+ @HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir)			\
+ @HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION 	\
+-@HAVE_INTROSPECTION_TRUE@	--add-include-path=$(builddir) \
++@HAVE_INTROSPECTION_TRUE@	--add-include-path=$(top_builddir)/champlain \
  @HAVE_INTROSPECTION_TRUE@	--c-include="$(libchamplain_include_HEADERS)" \
-+@HAVE_INTROSPECTION_TRUE@	--libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@	--include=Champlain-0.4 \
  @HAVE_INTROSPECTION_TRUE@	--include=Clutter-1.0 \
- @HAVE_INTROSPECTION_TRUE@	--include=Gtk-2.0 \
- @HAVE_INTROSPECTION_TRUE@	--library=champlain-gtk-0.4 \
+@@ -729,7 +729,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
+ @HAVE_INTROSPECTION_TRUE@	$(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
+ 
+ @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
+-@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
++@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=$(top_builddir)/champlain $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/libchamplain/files/patch-champlain_Makefile.in b/graphics/libchamplain/files/patch-champlain_Makefile.in
deleted file mode 100644
index 4f6481714..000000000
--- a/graphics/libchamplain/files/patch-champlain_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 084841420..1ecbf217c 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -23,11 +23,11 @@ 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-%%VERSION%%.so.1
 lib/libchamplain-gtk-%%VERSION%%.a
 lib/libchamplain-gtk-%%VERSION%%.la
 lib/libchamplain-gtk-%%VERSION%%.so
-lib/libchamplain-gtk-%%VERSION%%.so.0
+lib/libchamplain-gtk-%%VERSION%%.so.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.so