update to 2.32.1

This switches to the gnome-2.32 release branch.

5 files changed, 98 insertions, 28 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index bbbb33063bf..bd84d12381e 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2010/11/15 22:57:02 abs Exp $
+# $NetBSD: Makefile,v 1.113 2010/11/28 13:10:18 drochner Exp $
 
-DISTNAME=		gnome-games-2.30.2
-PKGREVISION=		2
+DISTNAME=		gnome-games-2.32.1
 CATEGORIES=		games gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.30/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.32/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/games/gnome-games/PLIST b/games/gnome-games/PLIST
index b9846f7baf4..687d2b80286 100644
--- a/games/gnome-games/PLIST
+++ b/games/gnome-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2010/07/14 16:30:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.29 2010/11/28 13:10:18 drochner Exp $
 bin/glchess
 bin/glines
 bin/gnect
@@ -124,9 +124,6 @@ ${PYSITELIB}/glchess/scene/__init__.pyo
 ${PYSITELIB}/glchess/scene/cairo/__init__.py
 ${PYSITELIB}/glchess/scene/cairo/__init__.pyc
 ${PYSITELIB}/glchess/scene/cairo/__init__.pyo
-${PYSITELIB}/glchess/scene/cairo/pieces.py
-${PYSITELIB}/glchess/scene/cairo/pieces.pyc
-${PYSITELIB}/glchess/scene/cairo/pieces.pyo
 ${PYSITELIB}/glchess/scene/human.py
 ${PYSITELIB}/glchess/scene/human.pyc
 ${PYSITELIB}/glchess/scene/human.pyo
@@ -139,9 +136,6 @@ ${PYSITELIB}/glchess/scene/opengl/models.pyo
 ${PYSITELIB}/glchess/scene/opengl/opengl.py
 ${PYSITELIB}/glchess/scene/opengl/opengl.pyc
 ${PYSITELIB}/glchess/scene/opengl/opengl.pyo
-${PYSITELIB}/glchess/scene/opengl/png.py
-${PYSITELIB}/glchess/scene/opengl/png.pyc
-${PYSITELIB}/glchess/scene/opengl/png.pyo
 ${PYSITELIB}/glchess/scene/opengl/texture.py
 ${PYSITELIB}/glchess/scene/opengl/texture.pyc
 ${PYSITELIB}/glchess/scene/opengl/texture.pyo
@@ -211,9 +205,6 @@ ${PYSITELIB}/gnome_sudoku/simple_debug.pyo
 ${PYSITELIB}/gnome_sudoku/sudoku.py
 ${PYSITELIB}/gnome_sudoku/sudoku.pyc
 ${PYSITELIB}/gnome_sudoku/sudoku.pyo
-${PYSITELIB}/gnome_sudoku/sudoku_generator_gui.py
-${PYSITELIB}/gnome_sudoku/sudoku_generator_gui.pyc
-${PYSITELIB}/gnome_sudoku/sudoku_generator_gui.pyo
 ${PYSITELIB}/gnome_sudoku/sudoku_maker.py
 ${PYSITELIB}/gnome_sudoku/sudoku_maker.pyc
 ${PYSITELIB}/gnome_sudoku/sudoku_maker.pyo
@@ -223,6 +214,9 @@ ${PYSITELIB}/gnome_sudoku/sudoku_thumber.pyo
 ${PYSITELIB}/gnome_sudoku/timer.py
 ${PYSITELIB}/gnome_sudoku/timer.pyc
 ${PYSITELIB}/gnome_sudoku/timer.pyo
+${PYSITELIB}/gnome_sudoku/tracker_info.py
+${PYSITELIB}/gnome_sudoku/tracker_info.pyc
+${PYSITELIB}/gnome_sudoku/tracker_info.pyo
 man/man6/glchess.6
 man/man6/glines.6
 man/man6/gnect.6
@@ -269,18 +263,42 @@ share/gconf/schemas/mahjongg.schemas
 share/gconf/schemas/quadrapassel.schemas
 share/gconf/schemas/swell-foop.schemas
 share/glchess/ai.xml
-share/glchess/chess_view.ui
 share/glchess/glchess.ui
 share/glchess/load_game.ui
 share/glchess/log.ui
 share/glchess/network_game.ui
 share/glchess/network_new_server.ui
 share/glchess/new_game.ui
+share/glchess/pieces/fancy/blackBishop.svg
+share/glchess/pieces/fancy/blackKing.svg
+share/glchess/pieces/fancy/blackKnight.svg
+share/glchess/pieces/fancy/blackPawn.svg
+share/glchess/pieces/fancy/blackQueen.svg
+share/glchess/pieces/fancy/blackRook.svg
+share/glchess/pieces/fancy/whiteBishop.svg
+share/glchess/pieces/fancy/whiteKing.svg
+share/glchess/pieces/fancy/whiteKnight.svg
+share/glchess/pieces/fancy/whitePawn.svg
+share/glchess/pieces/fancy/whiteQueen.svg
+share/glchess/pieces/fancy/whiteRook.svg
+share/glchess/pieces/simple/blackBishop.svg
+share/glchess/pieces/simple/blackKing.svg
+share/glchess/pieces/simple/blackKnight.svg
+share/glchess/pieces/simple/blackPawn.svg
+share/glchess/pieces/simple/blackQueen.svg
+share/glchess/pieces/simple/blackRook.svg
+share/glchess/pieces/simple/whiteBishop.svg
+share/glchess/pieces/simple/whiteKing.svg
+share/glchess/pieces/simple/whiteKnight.svg
+share/glchess/pieces/simple/whitePawn.svg
+share/glchess/pieces/simple/whiteQueen.svg
+share/glchess/pieces/simple/whiteRook.svg
 share/glchess/preferences.ui
 share/glchess/save_game.ui
 share/glchess/textures/board.png
 share/glchess/textures/piece.png
 share/gnome-games-common/cards/gnomangelo_bitmap.svg
+share/gnome-games-common/theme-install.ini
 share/gnome-games/aisleriot/games/accordion.scm
 share/gnome-games/aisleriot/games/agnes.scm
 share/gnome-games/aisleriot/games/athena.scm
@@ -624,7 +642,6 @@ share/gnome-games/swell-foop/themes/test/theme.js
 share/gnome-games/swell-foop/themes/test/yellow.svg
 share/gnome-sudoku/images/footprints.png
 share/gnome-sudoku/print_games.ui
-share/gnome-sudoku/puzzle_generator.ui
 share/gnome-sudoku/puzzles/easy
 share/gnome-sudoku/puzzles/hard
 share/gnome-sudoku/puzzles/medium
@@ -809,6 +826,11 @@ share/gnome/help/glchess/fr/figures/new_game.png
 share/gnome/help/glchess/fr/figures/preferences_game.png
 share/gnome/help/glchess/fr/figures/preferences_view.png
 share/gnome/help/glchess/fr/glchess.xml
+share/gnome/help/glchess/ja/figures/game.png
+share/gnome/help/glchess/ja/figures/new_game.png
+share/gnome/help/glchess/ja/figures/preferences_game.png
+share/gnome/help/glchess/ja/figures/preferences_view.png
+share/gnome/help/glchess/ja/glchess.xml
 share/gnome/help/glchess/oc/figures/game.png
 share/gnome/help/glchess/oc/figures/new_game.png
 share/gnome/help/glchess/oc/figures/preferences_game.png
@@ -1086,6 +1108,13 @@ share/gnome/help/gnibbles/sv/figures/playing.png
 share/gnome/help/gnibbles/sv/figures/tables.png
 share/gnome/help/gnibbles/sv/figures/worm_op.png
 share/gnome/help/gnibbles/sv/gnibbles.xml
+share/gnome/help/gnibbles/zh_CN/figures/connect.png
+share/gnome/help/gnibbles/zh_CN/figures/game.png
+share/gnome/help/gnibbles/zh_CN/figures/intro.png
+share/gnome/help/gnibbles/zh_CN/figures/playing.png
+share/gnome/help/gnibbles/zh_CN/figures/tables.png
+share/gnome/help/gnibbles/zh_CN/figures/worm_op.png
+share/gnome/help/gnibbles/zh_CN/gnibbles.xml
 share/gnome/help/gnobots2/C/figures/gnobots2-main.png
 share/gnome/help/gnobots2/C/gnobots2.xml
 share/gnome/help/gnobots2/C/legal.xml
@@ -1206,6 +1235,14 @@ share/gnome/help/gnome-sudoku/it/figures/hints.png
 share/gnome/help/gnome-sudoku/it/figures/resuming.png
 share/gnome/help/gnome-sudoku/it/figures/starting.png
 share/gnome/help/gnome-sudoku/it/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/ja/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/ja/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/ja/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/ja/figures/highlighting.png
+share/gnome/help/gnome-sudoku/ja/figures/hints.png
+share/gnome/help/gnome-sudoku/ja/figures/resuming.png
+share/gnome/help/gnome-sudoku/ja/figures/starting.png
+share/gnome/help/gnome-sudoku/ja/gnome-sudoku.xml
 share/gnome/help/gnome-sudoku/oc/figures/Print_Sudokus.png
 share/gnome/help/gnome-sudoku/oc/figures/always_show_hint.png
 share/gnome/help/gnome-sudoku/oc/figures/error_highlighting.png
@@ -1708,6 +1745,19 @@ share/gnome/help/gnotravex/sv/shortcut.page
 share/gnome/help/gnotravex/sv/size.page
 share/gnome/help/gnotravex/sv/usage.page
 share/gnome/help/gnotravex/sv/winning.page
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-logo.png
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-video.ogv
+share/gnome/help/gnotravex/zh_CN/gameplay.page
+share/gnome/help/gnotravex/zh_CN/hint.page
+share/gnome/help/gnotravex/zh_CN/index.page
+share/gnome/help/gnotravex/zh_CN/license.page
+share/gnome/help/gnotravex/zh_CN/move.page
+share/gnome/help/gnotravex/zh_CN/multiplayer.page
+share/gnome/help/gnotravex/zh_CN/shortcut.page
+share/gnome/help/gnotravex/zh_CN/size.page
+share/gnome/help/gnotravex/zh_CN/usage.page
+share/gnome/help/gnotravex/zh_CN/winning.page
 share/gnome/help/gnotski/C/figures/gnotski_start_window.png
 share/gnome/help/gnotski/C/figures/gnotski_win.png
 share/gnome/help/gnotski/C/gnotski.xml
@@ -2013,6 +2063,7 @@ share/gnome/help/quadrapassel/eu/quadrapassel.xml
 share/gnome/help/quadrapassel/fi/quadrapassel.xml
 share/gnome/help/quadrapassel/fr/quadrapassel.xml
 share/gnome/help/quadrapassel/it/quadrapassel.xml
+share/gnome/help/quadrapassel/ja/quadrapassel.xml
 share/gnome/help/quadrapassel/oc/quadrapassel.xml
 share/gnome/help/quadrapassel/sr/quadrapassel.xml
 share/gnome/help/quadrapassel/sr@latin/quadrapassel.xml
@@ -2241,6 +2292,7 @@ share/locale/el/LC_MESSAGES/gnome-games.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-games.mo
 share/locale/en_CA/LC_MESSAGES/gnome-games.mo
 share/locale/en_GB/LC_MESSAGES/gnome-games.mo
+share/locale/eo/LC_MESSAGES/gnome-games.mo
 share/locale/es/LC_MESSAGES/gnome-games.mo
 share/locale/et/LC_MESSAGES/gnome-games.mo
 share/locale/eu/LC_MESSAGES/gnome-games.mo
@@ -2259,6 +2311,7 @@ share/locale/is/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
 share/locale/ka/LC_MESSAGES/gnome-games.mo
+share/locale/kk/LC_MESSAGES/gnome-games.mo
 share/locale/kn/LC_MESSAGES/gnome-games.mo
 share/locale/ko/LC_MESSAGES/gnome-games.mo
 share/locale/ku/LC_MESSAGES/gnome-games.mo
@@ -2324,6 +2377,7 @@ share/omf/glchess/glchess-en_GB.omf
 share/omf/glchess/glchess-es.omf
 share/omf/glchess/glchess-eu.omf
 share/omf/glchess/glchess-fr.omf
+share/omf/glchess/glchess-ja.omf
 share/omf/glchess/glchess-oc.omf
 share/omf/glchess/glchess-pt_BR.omf
 share/omf/glchess/glchess-ru.omf
@@ -2376,6 +2430,7 @@ share/omf/gnibbles/gnibbles-oc.omf
 share/omf/gnibbles/gnibbles-sr.omf
 share/omf/gnibbles/gnibbles-sr@latin.omf
 share/omf/gnibbles/gnibbles-sv.omf
+share/omf/gnibbles/gnibbles-zh_CN.omf
 share/omf/gnobots2/gnobots2-C.omf
 share/omf/gnobots2/gnobots2-ca.omf
 share/omf/gnobots2/gnobots2-cs.omf
@@ -2402,6 +2457,7 @@ share/omf/gnome-sudoku/gnome-sudoku-es.omf
 share/omf/gnome-sudoku/gnome-sudoku-eu.omf
 share/omf/gnome-sudoku/gnome-sudoku-fr.omf
 share/omf/gnome-sudoku/gnome-sudoku-it.omf
+share/omf/gnome-sudoku/gnome-sudoku-ja.omf
 share/omf/gnome-sudoku/gnome-sudoku-oc.omf
 share/omf/gnome-sudoku/gnome-sudoku-pt_BR.omf
 share/omf/gnome-sudoku/gnome-sudoku-ru.omf
@@ -2497,6 +2553,7 @@ share/omf/quadrapassel/quadrapassel-eu.omf
 share/omf/quadrapassel/quadrapassel-fi.omf
 share/omf/quadrapassel/quadrapassel-fr.omf
 share/omf/quadrapassel/quadrapassel-it.omf
+share/omf/quadrapassel/quadrapassel-ja.omf
 share/omf/quadrapassel/quadrapassel-oc.omf
 share/omf/quadrapassel/quadrapassel-sr.omf
 share/omf/quadrapassel/quadrapassel-sr@latin.omf
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 5c4fad7abf4..f795f8bcd69 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.33 2010/07/14 16:30:34 drochner Exp $
+$NetBSD: distinfo,v 1.34 2010/11/28 13:10:18 drochner Exp $
 
-SHA1 (gnome-games-2.30.2.tar.bz2) = 3541ccc991af82603fc3067863bc27a731302b2c
-RMD160 (gnome-games-2.30.2.tar.bz2) = 12c7e5ba3b4a9aca5d9918978e437e774ac0752b
-Size (gnome-games-2.30.2.tar.bz2) = 27683256 bytes
+SHA1 (gnome-games-2.32.1.tar.bz2) = a802c7ad200a14d4380fe27087dd161ce795b0e2
+RMD160 (gnome-games-2.32.1.tar.bz2) = b7d5a138a5f47801101efa3c4784852c4ec4f2d8
+Size (gnome-games-2.32.1.tar.bz2) = 27758241 bytes
 SHA1 (patch-aa) = b6005f94f51f3f1e004a2def3edaa98b362fa29d
-SHA1 (patch-ab) = 543773109afa04082fed7e74118f97ec9fde6872
+SHA1 (patch-ab) = 76baf47fb38d51cdac781b25d49793600e51dd1f
+SHA1 (patch-ac) = 6902a89848a4c2f10801c202f2c23df2bb880405
diff --git a/games/gnome-games/patches/patch-ab b/games/gnome-games/patches/patch-ab
index 82ad86c88f4..60b52bb6cda 100644
--- a/games/gnome-games/patches/patch-ab
+++ b/games/gnome-games/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2010/07/14 16:30:34 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2010/11/28 13:10:18 drochner Exp $
 
---- libgames-support/Makefile.in.orig	2010-04-26 23:20:47.000000000 +0000
+--- libgames-support/Makefile.in.orig	2010-11-15 14:42:24.000000000 +0000
 +++ libgames-support/Makefile.in
-@@ -556,7 +556,7 @@ nodist_libgames_support_la_SOURCES = $(B
+@@ -577,7 +577,7 @@ nodist_libgames_support_la_SOURCES = $(B
  libgames_support_la_CPPFLAGS = -DPKGDATADIR="\"$(pkgdatadir)\"" \
  	-DDATADIR="\"$(datadir)\"" \
  	-DCOMMON_DATADIR="\"$(datadir)/gnome-games-common\"" \
--	-DSCORESDIR="\"$(scoredir)\"" $(AM_CPPFLAGS) $(am__append_8)
-+	-DSCORESDIR="\"/var/games\"" $(AM_CPPFLAGS) $(am__append_8)
+-	-DSCORESDIR="\"$(scoredir)\"" $(AM_CPPFLAGS) $(am__append_10)
++	-DSCORESDIR="\"/var/games\"" $(AM_CPPFLAGS) $(am__append_10)
  libgames_support_la_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) \
- 	$(am__append_5) $(am__append_11) $(am__append_13) \
- 	$(am__append_15) $(am__append_17)
+ 	$(am__append_4) $(am__append_7) $(am__append_13) \
+ 	$(am__append_15) $(am__append_17) $(am__append_19)
diff --git a/games/gnome-games/patches/patch-ac b/games/gnome-games/patches/patch-ac
new file mode 100644
index 00000000000..9363500fd05
--- /dev/null
+++ b/games/gnome-games/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2010/11/28 13:10:18 drochner Exp $
+
+--- glchess/src/lib/scene/cairo/__init__.py.orig	2010-09-27 22:37:29.000000000 +0000
++++ glchess/src/lib/scene/cairo/__init__.py
+@@ -72,7 +72,7 @@ class ChessPiece(glchess.scene.ChessPiec
+         self.path = os.path.join(glchess.defaults.BASE_DIR, 'pieces', style, self.name + '.svg')
+         try:
+             self.svg = rsvg.Handle(file = self.path)
+-        except Exception as e:
++        except Exception, e:
+             raise Exception('Error reading %s: %s' % (self.path, e))
+ 
+     def move(self, coord, delete, animate = True):