Update to 2.31.3.

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

6 files changed, 30 insertions, 114 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 1720183d3..e16c090a7 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/gnome-games/Makefile,v 1.220 2010/05/28 08:55:41 kwm Exp $
+#   $MCom: ports/games/gnome-games/Makefile,v 1.221 2010/05/29 17:23:49 kwm Exp $
 #
 
 PORTNAME=	gnome-games
-PORTVERSION=	2.31.2
+PORTVERSION=	2.31.3
 PORTREVISION=	0
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
@@ -65,6 +65,11 @@ post-patch:
 	    	${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
 		${WRKSRC}/glchess/src/lib/defaults.py.in
 
+pre-install:
+	@cd ${WRKSRC}/libgames-support && gmake org.gnome.Games.WindowState.gschema.xml
+	@${INSTALL_DATA} ${WRKSRC}/libgames-support/org.gnome.Games.WindowState.gschema.xml \
+		${PREFIX}/share/glib-2.0/schemas/
+
 post-install:
 	@-update-desktop-database
 
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index b34110ee8..c47d50149 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.31.2.tar.bz2) = 72a941c94cd1fb740e9c8dfbcb56adbc
-SHA256 (gnome2/gnome-games-2.31.2.tar.bz2) = b285bc89ce6dc87273dd39bc07e9ba4709d0e46358f43a36aaa7e8cca7a8eba1
-SIZE (gnome2/gnome-games-2.31.2.tar.bz2) = 27686019
+MD5 (gnome2/gnome-games-2.31.3.tar.bz2) = 3119c824e45e9a2d113e6f9cfb389f2c
+SHA256 (gnome2/gnome-games-2.31.3.tar.bz2) = ec4115bf6294e040038faee0dec4f99dcdbcde071a7534f262bc36f6904fb0cc
+SIZE (gnome2/gnome-games-2.31.3.tar.bz2) = 27715350
diff --git a/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c b/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c
deleted file mode 100644
index 51cda79a9..000000000
--- a/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c
+++ /dev/null
@@ -1,71 +0,0 @@
-From a4dd39444218a98fb80c5d9e4a0337a12bc858c2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Tue, 25 May 2010 19:14:52 +0000
-Subject: aisleriot: Fix for recent GDBus API change
-
-Adapt to the API change, and update gio req to 2.25.7.
----
-diff --git a/aisleriot/lib/ar-card-themes.c b/aisleriot/lib/ar-card-themes.c
-index e82904f..d3e326a 100644
---- aisleriot/lib/ar-card-themes.c
-+++ aisleriot/lib/ar-card-themes.c
-@@ -25,7 +25,7 @@
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <gtk/gtk.h>
- 
--#if GLIB_CHECK_VERSION (2, 25, 5)
-+#if GLIB_CHECK_VERSION (2, 25, 7)
- #include <gio/gio.h>
- #endif
- 
-@@ -368,7 +368,7 @@ themes_foreach_any (gpointer key,
-   data->theme = ar_card_themes_get_theme (data->theme_manager, theme_info);
- }
- 
--#if GLIB_CHECK_VERSION (2, 25, 5)
-+#if GLIB_CHECK_VERSION (2, 25, 7)
- 
- static void
- theme_install_reply_cb (GDBusConnection  *connection,
-@@ -395,7 +395,7 @@ theme_install_reply_cb (GDBusConnection  *connection,
-   g_object_unref (theme_manager);
- }
- 
--#endif /* GLIB >= 2.25.5 */
-+#endif /* GLIB >= 2.25.7 */
- 
- /* Class implementation */
- 
-@@ -650,7 +650,7 @@ ar_card_themes_get_themes (ArCardThemes *theme_manager)
- gboolean
- ar_card_themes_can_install_themes (ArCardThemes *theme_manager)
- {
--#if GLIB_CHECK_VERSION (2, 25, 5)
-+#if GLIB_CHECK_VERSION (2, 25, 7)
-   return TRUE;
- #else
-   return FALSE;
-@@ -670,7 +670,7 @@ ar_card_themes_install_themes (ArCardThemes *theme_manager,
-                                   GtkWindow *parent_window,
-                                   guint user_time)
- {
--#if GLIB_CHECK_VERSION (2, 25, 5)
-+#if GLIB_CHECK_VERSION (2, 25, 7)
-   static const char *formats[] = {
- #ifdef ENABLE_CARD_THEME_FORMAT_SVG
-     "ThemesSVG",
-@@ -753,10 +753,11 @@ ar_card_themes_install_themes (ArCardThemes *theme_manager,
-                           "org.freedesktop.PackageKit.Modify",
-                           "InstallPackageNames",
-                           g_variant_builder_end (&builder),
-+                          G_VARIANT_TYPE ("()"),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           G_MAXINT /* no timeout */,
-                           NULL,
-                           (GAsyncReadyCallback) theme_install_reply_cb,
-                           g_object_ref (theme_manager));
--#endif /* GLIB >= 2.25.5 */
-+#endif /* GLIB >= 2.25.7 */
- }
---
-cgit v0.8.3.1
diff --git a/games/gnome-games/files/patch-libgames-support_Makefile.in b/games/gnome-games/files/patch-libgames-support_Makefile.in
deleted file mode 100644
index 607fac314..000000000
--- a/games/gnome-games/files/patch-libgames-support_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgames-support/Makefile.in.orig	2010-05-29 15:45:53.000000000 +0200
-+++ libgames-support/Makefile.in	2010-05-29 15:46:23.000000000 +0200
-@@ -1582,7 +1582,7 @@
- 
- install-data-hook:
- @GSETTINGS_SCHEMAS_INSTALL_TRUE@	if test -z "$(DATADIR)"; then \
--@GSETTINGS_SCHEMAS_INSTALL_TRUE@		$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) ; \
-+@GSETTINGS_SCHEMAS_INSTALL_TRUE@		$(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(gsettingsschemadir) ; \
- @GSETTINGS_SCHEMAS_INSTALL_TRUE@	fi
- 
- @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in b/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in
deleted file mode 100644
index d3ef1dd98..000000000
--- a/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- libgames-support/org.gnome.Games.WindowState.gschema.xml.in.orig	2010-05-29 15:21:00.000000000 +0200
-+++ libgames-support/org.gnome.Games.WindowState.gschema.xml.in	2010-05-29 15:20:34.000000000 +0200
-@@ -0,0 +1,24 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<schemalist>
-+  <!-- This schema is relocatable -->
-+  <schema id="org.gnome.Games.WindowState" gettext-domain="gnome-games">
-+    <key name="maximized" type="b">
-+      <default>false</default>
-+      <_summary>Whether the window is maximized</_summary>
-+    </key>
-+    <key name="fullscreen" type="b">
-+      <default>false</default>
-+      <_summary>Whether the window is fullscreen</_summary>
-+    </key>
-+    <key name="width" type="i">
-+      <!-- <range min="-1" max="65535" /> -->
-+      <default>-1</default>
-+      <_summary>Window width</_summary>
-+    </key>
-+    <key name="height" type="i">
-+      <!-- <range min="-1" max="65535" /> -->
-+      <default>-1</default>
-+      <_summary>Window height</_summary>
-+    </key>
-+  </schema>
-+</schemalist>
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 38ed0e832..ca87a807a 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1515,6 +1515,7 @@ share/gnome/help/gnomine/zh_CN/figures/preferences.png
 share/gnome/help/gnomine/zh_CN/figures/statusbar.png
 share/gnome/help/gnomine/zh_CN/gnomine.xml
 share/gnome/help/gnomine/sv/gnomine.xml
+share/gnome/help/gnotravex/C/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/C/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/C/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/C/gameplay.page
@@ -1527,6 +1528,7 @@ share/gnome/help/gnotravex/C/shortcut.page
 share/gnome/help/gnotravex/C/size.page
 share/gnome/help/gnotravex/C/usage.page
 share/gnome/help/gnotravex/C/winning.page
+share/gnome/help/gnotravex/ca/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/ca/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/ca/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/ca/gameplay.page
@@ -1539,6 +1541,7 @@ share/gnome/help/gnotravex/ca/shortcut.page
 share/gnome/help/gnotravex/ca/size.page
 share/gnome/help/gnotravex/ca/usage.page
 share/gnome/help/gnotravex/ca/winning.page
+share/gnome/help/gnotravex/cs/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/cs/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/cs/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/cs/gameplay.page
@@ -1551,6 +1554,7 @@ share/gnome/help/gnotravex/cs/shortcut.page
 share/gnome/help/gnotravex/cs/size.page
 share/gnome/help/gnotravex/cs/usage.page
 share/gnome/help/gnotravex/cs/winning.page
+share/gnome/help/gnotravex/da/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/da/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/da/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/da/gameplay.page
@@ -1563,6 +1567,7 @@ share/gnome/help/gnotravex/da/shortcut.page
 share/gnome/help/gnotravex/da/size.page
 share/gnome/help/gnotravex/da/usage.page
 share/gnome/help/gnotravex/da/winning.page
+share/gnome/help/gnotravex/de/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/de/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/de/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/de/gameplay.page
@@ -1575,6 +1580,7 @@ share/gnome/help/gnotravex/de/shortcut.page
 share/gnome/help/gnotravex/de/size.page
 share/gnome/help/gnotravex/de/usage.page
 share/gnome/help/gnotravex/de/winning.page
+share/gnome/help/gnotravex/el/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/el/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/el/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/el/gameplay.page
@@ -1587,6 +1593,7 @@ share/gnome/help/gnotravex/el/shortcut.page
 share/gnome/help/gnotravex/el/size.page
 share/gnome/help/gnotravex/el/usage.page
 share/gnome/help/gnotravex/el/winning.page
+share/gnome/help/gnotravex/en_GB/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/en_GB/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/en_GB/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/en_GB/gameplay.page
@@ -1599,6 +1606,7 @@ share/gnome/help/gnotravex/en_GB/shortcut.page
 share/gnome/help/gnotravex/en_GB/size.page
 share/gnome/help/gnotravex/en_GB/usage.page
 share/gnome/help/gnotravex/en_GB/winning.page
+share/gnome/help/gnotravex/es/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/es/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/es/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/es/gameplay.page
@@ -1611,6 +1619,7 @@ share/gnome/help/gnotravex/es/shortcut.page
 share/gnome/help/gnotravex/es/size.page
 share/gnome/help/gnotravex/es/usage.page
 share/gnome/help/gnotravex/es/winning.page
+share/gnome/help/gnotravex/eu/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/eu/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/eu/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/eu/gameplay.page
@@ -1623,6 +1632,7 @@ share/gnome/help/gnotravex/eu/shortcut.page
 share/gnome/help/gnotravex/eu/size.page
 share/gnome/help/gnotravex/eu/usage.page
 share/gnome/help/gnotravex/eu/winning.page
+share/gnome/help/gnotravex/fr/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/fr/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/fr/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/fr/gameplay.page
@@ -1635,6 +1645,7 @@ share/gnome/help/gnotravex/fr/shortcut.page
 share/gnome/help/gnotravex/fr/size.page
 share/gnome/help/gnotravex/fr/usage.page
 share/gnome/help/gnotravex/fr/winning.page
+share/gnome/help/gnotravex/it/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/it/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/it/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/it/gameplay.page
@@ -1647,6 +1658,7 @@ share/gnome/help/gnotravex/it/shortcut.page
 share/gnome/help/gnotravex/it/size.page
 share/gnome/help/gnotravex/it/usage.page
 share/gnome/help/gnotravex/it/winning.page
+share/gnome/help/gnotravex/oc/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/oc/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/oc/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/oc/gameplay.page
@@ -1659,6 +1671,7 @@ share/gnome/help/gnotravex/oc/shortcut.page
 share/gnome/help/gnotravex/oc/size.page
 share/gnome/help/gnotravex/oc/usage.page
 share/gnome/help/gnotravex/oc/winning.page
+share/gnome/help/gnotravex/ru/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/ru/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/ru/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/ru/gameplay.page
@@ -1671,6 +1684,7 @@ share/gnome/help/gnotravex/ru/shortcut.page
 share/gnome/help/gnotravex/ru/size.page
 share/gnome/help/gnotravex/ru/usage.page
 share/gnome/help/gnotravex/ru/winning.page
+share/gnome/help/gnotravex/sl/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/sl/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/sl/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/sl/gameplay.page
@@ -1683,6 +1697,7 @@ share/gnome/help/gnotravex/sl/shortcut.page
 share/gnome/help/gnotravex/sl/size.page
 share/gnome/help/gnotravex/sl/usage.page
 share/gnome/help/gnotravex/sl/winning.page
+share/gnome/help/gnotravex/sr/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/sr/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/sr/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/sr/gameplay.page
@@ -1695,6 +1710,7 @@ share/gnome/help/gnotravex/sr/shortcut.page
 share/gnome/help/gnotravex/sr/size.page
 share/gnome/help/gnotravex/sr/usage.page
 share/gnome/help/gnotravex/sr/winning.page
+share/gnome/help/gnotravex/sr@latin/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/sr@latin/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/sr@latin/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/sr@latin/gameplay.page
@@ -1707,6 +1723,7 @@ share/gnome/help/gnotravex/sr@latin/shortcut.page
 share/gnome/help/gnotravex/sr@latin/size.page
 share/gnome/help/gnotravex/sr@latin/usage.page
 share/gnome/help/gnotravex/sr@latin/winning.page
+share/gnome/help/gnotravex/sv/figures/gnotravex-logo.png
 share/gnome/help/gnotravex/sv/figures/gnotravex-main-window.png
 share/gnome/help/gnotravex/sv/figures/gnotravex-video.ogv
 share/gnome/help/gnotravex/sv/gameplay.page
@@ -1941,6 +1958,7 @@ share/gnome/help/lightsoff/C/lightsoff.xml
 share/gnome/help/lightsoff/de/lightsoff.xml
 share/gnome/help/lightsoff/el/lightsoff.xml
 share/gnome/help/lightsoff/es/lightsoff.xml
+share/gnome/help/lightsoff/fi/lightsoff.xml
 share/gnome/help/lightsoff/fr/lightsoff.xml
 share/gnome/help/mahjongg/C/figures/mahjongg.png
 share/gnome/help/mahjongg/C/figures/no-move.png
@@ -2493,6 +2511,7 @@ share/omf/lightsoff/lightsoff-C.omf
 share/omf/lightsoff/lightsoff-de.omf
 share/omf/lightsoff/lightsoff-el.omf
 share/omf/lightsoff/lightsoff-es.omf
+share/omf/lightsoff/lightsoff-fi.omf
 share/omf/lightsoff/lightsoff-fr.omf
 share/omf/mahjongg/mahjongg-C.omf
 share/omf/mahjongg/mahjongg-ca.omf
@@ -2635,6 +2654,7 @@ share/omf/swell-foop/swell-foop-sv.omf
 @dirrm share/gnome/help/mahjongg/C
 @dirrm share/gnome/help/mahjongg
 @dirrm share/gnome/help/lightsoff/fr
+@dirrm share/gnome/help/lightsoff/fi
 @dirrm share/gnome/help/lightsoff/es
 @dirrm share/gnome/help/lightsoff/el
 @dirrm share/gnome/help/lightsoff/de