Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

26 files changed, 568 insertions, 440 deletions

diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
new file mode 100644
index 000000000000..cfc08d4f3f99
--- /dev/null
+++ b/games/gnome-games-extra-data/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	gnomegames2-extra-data
+# Date created:				16 August 2004
+# Whom:					Adam Weinberger <adamw@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomegames2-extra-data
+PORTVERSION=	2.8.0
+CATEGORIES=	games gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-games-extra-data/2.8
+DISTNAME=	gnome-games-extra-data-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Themes and artwork for the gnomegames2 package
+
+RUN_DEPENDS=	${X11BASE}/bin/sol:${PORTSDIR}/games/gnomegames2
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnomeprefix
+CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
new file mode 100644
index 000000000000..8327f7a2740c
--- /dev/null
+++ b/games/gnome-games-extra-data/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2
+SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341
diff --git a/games/gnome-games-extra-data/pkg-descr b/games/gnome-games-extra-data/pkg-descr
new file mode 100644
index 000000000000..992c00ea920e
--- /dev/null
+++ b/games/gnome-games-extra-data/pkg-descr
@@ -0,0 +1,3 @@
+This package contains extra data files for the gnome-games package. At
+the moment this is almost entirely extra themes and artwork for the
+games.
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
new file mode 100644
index 000000000000..cf3cdea0e8c1
--- /dev/null
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -0,0 +1,30 @@
+share/gnome/pixmaps/glines/classic.png
+share/gnome/pixmaps/glines/dots.png
+share/gnome/pixmaps/glines/gumball.png
+share/gnome/pixmaps/glines/pulse.png
+share/gnome/pixmaps/gnobots2/cows.png
+share/gnome/pixmaps/gnobots2/eggs.png
+share/gnome/pixmaps/gnobots2/mice.png
+share/gnome/pixmaps/gnobots2/windows.png
+share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
+share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
+share/gnome/pixmaps/gnometris/5blocks-tig.png
+share/gnome/pixmaps/gnometris/5blocks-tim.png
+share/gnome/pixmaps/gnometris/5blocks.png
+share/gnome/pixmaps/gnometris/7blocks.png
+share/gnome/pixmaps/gnometris/7stones-gn.png
+share/gnome/pixmaps/gnometris/7stones2-gn.png
+share/gnome/pixmaps/iagno/blend.png
+share/gnome/pixmaps/iagno/flipblend.png
+share/gnome/pixmaps/iagno/metal.png
+share/gnome/pixmaps/iagno/metal2.png
+share/gnome/pixmaps/iagno/shrink.png
+share/gnome/pixmaps/iagno/sunmoon.png
+share/gnome/pixmaps/mahjongg/default.png
+share/gnome/pixmaps/mahjongg/default2.png
+share/gnome/pixmaps/mahjongg/maya.png
+share/gnome/pixmaps/mahjongg/seta.png
+share/gnome/pixmaps/same-gnome/blink-sync.png
+share/gnome/pixmaps/same-gnome/glass.png
+share/gnome/pixmaps/same-gnome/marbles.png
+share/gnome/pixmaps/same-gnome/rotate.png
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 78ed7dc5f2cf..b17fa1d94f68 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTVERSION=	2.8.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-games/2.8
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,13 +22,18 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \
-		librsvg2
-USE_INC_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui \
+		librsvg2 desktopfileutils
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	aisleriot.schemas blackjack.schemas gataxx.schemas \
+		glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
+		gnome-stones.schemas gnometris.schemas gnomine.schemas \
+		gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \
+		same-gnome.schemas
+
 CONFLICTS=	sol-1.0.*
 
 post-patch:
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index daee81986fc9..fb6cc99cba4e 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.6.2.tar.bz2) = 3b43e035912ec7e941568b571f1237ae
-SIZE (gnome2/gnome-games-2.6.2.tar.bz2) = 8269706
+MD5 (gnome2/gnome-games-2.8.1.tar.bz2) = d3c675e29c835cfa765fbd6ae4a289cc
+SIZE (gnome2/gnome-games-2.8.1.tar.bz2) = 5926555
diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac
deleted file mode 100644
index 2605cefdfe3f..000000000000
--- a/games/gnome-games/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk-card-image/Makefile.in.orig	Wed Dec 10 11:44:58 2003
-+++ gdk-card-image/Makefile.in	Wed Dec 10 11:45:48 2003
-@@ -243,7 +243,7 @@
- libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c
- libgdkcardimageincludedir = $(includedir)/gdkcardimage
- libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h
--libgdkcardimage_la_LDFLAGS = -version-info 0:0:0
-+libgdkcardimage_la_LDFLAGS = -version-info 1:0:0
- libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@
- subdir = gdk-card-image
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games/gnome-games/files/patch-aisleriot::sol.c b/games/gnome-games/files/patch-aisleriot::sol.c
deleted file mode 100644
index 7a281c20a24e..000000000000
--- a/games/gnome-games/files/patch-aisleriot::sol.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- aisleriot/sol.c.orig	Wed Oct  1 20:19:36 2003
-+++ aisleriot/sol.c	Tue Nov 25 16:30:44 2003
-@@ -83,6 +83,15 @@
- #define DEFAULT_VARIATION "klondike.scm"
- #define GNOME_SESSION_BUG
- 
-+gchar* game_file_to_variation (const gchar* file)
-+{
-+  char* p, *buf = g_path_get_basename(file);
-+
-+  if ((p = strrchr (buf, '.'))) *p = '\0';
-+  
-+  return buf;
-+}  
-+
- gchar* game_file_to_name (const gchar* file)
- {
-   char* p, *buf = g_path_get_basename(file);
-@@ -545,14 +554,14 @@
- 	  n_games = 0;
- 
-   for (i = 0; i < n_games; i++) {
--    gchar *game_name = game_file_to_name (game_dents[i]->d_name);
--    if (!strcasecmp (variation, game_name)) {
-+    gchar *game_variation = game_file_to_variation (game_dents[i]->d_name);
-+    if (!strcasecmp (variation, game_variation)) {
-       dont_save = TRUE;
-       start_game = g_strdup ((gchar*) game_dents[i]->d_name);
--      g_free (game_name);
-+      g_free (game_variation);
-       break;
-     }
--    g_free (game_name);
-+    g_free (game_variation);
-   }
-   
-   gh_enter(argc, argv, main_prog);
diff --git a/games/gnome-games/files/patch-blackjack_src_player.cpp b/games/gnome-games/files/patch-blackjack_src_player.cpp
new file mode 100644
index 000000000000..0a2d1ac3b8b0
--- /dev/null
+++ b/games/gnome-games/files/patch-blackjack_src_player.cpp
@@ -0,0 +1,75 @@
+--- blackjack/src/player.cpp.orig	Tue Jul  6 12:56:50 2004
++++ blackjack/src/player.cpp	Tue Jul  6 12:59:29 2004
+@@ -262,8 +262,8 @@
+         // Player can always stand.
+ 
+         bestValue = value = getValueStand (*lplayer, upCard);
+-        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                    _("Stand"), value * 100);
++        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                    _("Stand"), (long double)(value * 100));
+         bestOption = KEY_S;
+         bestOptionNumber = num_options;
+ 
+@@ -271,8 +271,8 @@
+         if (bj_hand_can_be_hit ()) {
+                 value = getValueHit (*lplayer, upCard);
+                 
+-                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2lf%%\n", 
+-                                                            _("Hit"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2Lf%%\n", 
++                                                            _("Hit"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_H;
+@@ -282,8 +282,8 @@
+                 // Check if player can double down.
+                 if (bj_hand_can_be_doubled ()) {
+                         value = getValueDoubleDown (*lplayer, upCard);
+-                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2lf%%\n", 
+-                                                                    _("Double"), value * 100);
++                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2Lf%%\n", 
++                                                                    _("Double"), (long double)(value * 100));
+                         if (value > bestValue) {
+                                 bestValue = value;
+                                 bestOption = KEY_D;
+@@ -296,8 +296,8 @@
+ 
+         if (bj_hand_can_be_split ()) {
+                 value = getValueSplit(lplayer->cards[0].value (), upCard);
+-                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                            _("Split"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                            _("Split"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_P;
+@@ -308,8 +308,8 @@
+         // Check if player can surrender.
+         if (bj_hand_can_be_surrendered ()) {
+                 value = -0.5;
+-                mark_list[num_options++] = g_strdup_printf ("  %s %8.2lf%%\n", 
+-                                                            _("Surrender"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s %8.2Lf%%\n", 
++                                                            _("Surrender"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_R;
+@@ -439,12 +439,12 @@
+         reset ();
+ 
+         mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities"));
+-        mark_list[1] = g_strdup_printf ("  %s         %5.2lf%%\n", _("Bust"),
+-                                        getProbabilityBust (lupCard) * 100.0 / notBlackjack);
++        mark_list[1] = g_strdup_printf ("  %s         %5.2Lf%%\n", _("Bust"),
++                                        (long double)(getProbabilityBust (lupCard) * 100.0 / notBlackjack));
+         for (int count = 17; count <= 21; count++) {
+-                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2lf%%\n", count,
+-                                                       getProbabilityCount (count, lupCard)
+-                                                       * 100.0 / notBlackjack);
++                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2Lf%%\n", count,
++                                                       (long double)(getProbabilityCount (count, lupCard)
++                                                       * 100.0 / notBlackjack));
+         }
+ 
+         markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", 
diff --git a/games/gnome-games/files/patch-gataxx_gtkgridboard.c b/games/gnome-games/files/patch-gataxx_gtkgridboard.c
new file mode 100644
index 000000000000..9ceabef83f4f
--- /dev/null
+++ b/games/gnome-games/files/patch-gataxx_gtkgridboard.c
@@ -0,0 +1,21 @@
+--- gataxx/gtkgridboard.c.orig	Thu May 20 17:17:56 2004
++++ gataxx/gtkgridboard.c	Thu May 20 17:18:13 2004
+@@ -140,6 +140,7 @@
+ static gint gtk_gridboard_button_press(GtkWidget *widget, GdkEventButton *event)
+  {
+         GtkGridBoard * gridboard;
++	int x, y;
+         
+         g_return_val_if_fail (widget != NULL, FALSE);
+         g_return_val_if_fail (GTK_IS_GRIDBOARD(widget), FALSE);
+@@ -147,8 +148,8 @@
+ 
+         gridboard=GTK_GRIDBOARD(widget);
+         
+-        int x=event->x/gridboard->tilewidth;
+-        int y=event->y/gridboard->tileheight;
++        x=event->x/gridboard->tilewidth;
++        y=event->y/gridboard->tileheight;
+         g_signal_emit (G_OBJECT(widget), 
+                 gridboard_signals[BOXCLICKED], 0, x, y);
+         return TRUE;
diff --git a/games/gnome-games/files/patch-iagno_othello.c b/games/gnome-games/files/patch-iagno_othello.c
new file mode 100644
index 000000000000..4b87018a5f18
--- /dev/null
+++ b/games/gnome-games/files/patch-iagno_othello.c
@@ -0,0 +1,38 @@
+--- iagno/othello.c.orig	Thu May 20 17:20:21 2004
++++ iagno/othello.c	Thu May 20 17:21:11 2004
+@@ -544,7 +544,7 @@
+ 					memcpy (tboard, board, sizeof (gint8) * 8 * 8);
+ 					move_board(tboard, i, j, me, 0);
+ 	
+-					// assume that opponent takes best move
++					/* assume that opponent takes best move */
+ 					tmp_move = find_best_move(tboard, not_me, ply_depth-1,
+ 						-pass_thresh, -use_thresh, 0, 0);
+ 
+@@ -559,7 +559,7 @@
+ 					}
+ 				}
+ 		
+-		// check if we have to pass
++		/* check if we have to pass */
+ 		if (best_x == 8 && best_y == 8) {
+ 			tmp_move = find_best_move(board, not_me, ply_depth-1,
+ 				-pass_thresh, -use_thresh, 0, 0);
+@@ -802,14 +802,14 @@
+ 				found_free = TRUE;
+ 		}
+ 		
+-	// check if a player is dead
++	/* check if a player is dead */
+ 	if (!found_me && found_not_me)
+ 		return (-10000);
+ 	else if (found_me && !found_not_me)
+ 		return (10000);
+ 	
+-	// if the game is finished, return the actual score rather than
+-	// a huristic
++	/* if the game is finished, return the actual score rather than
++	 * a huristic */
+ 	if (!found_free)
+ 		return (actual_score);
+ 	
diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install
index 38f82a6246e5..da897732169d 100644
--- a/games/gnome-games/pkg-install
+++ b/games/gnome-games/pkg-install
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin
 case $2 in
 POST-INSTALL)
     mkdir -p ${PKG_PREFIX}/share/gnome/games
-    SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores same-gnome.scores"
+    SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
     for i in ${SCORES}; do
 	if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
 	    touch -f ${PKG_PREFIX}/share/gnome/games/${i}
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index d8d26bbe1ffd..e2a994af5003 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -14,63 +14,12 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/aisleriot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/blackjack.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gataxx.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/glines.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnect.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnibbles.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnobots2.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-stones.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnometris.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomine.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnotravex.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gtali.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/iagno.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mahjongg.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/same-gnome.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
-etc/sound/events/gataxx.soundlist
 etc/sound/events/gnect.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
-include/gdkcardimage/card-style-file.h
-include/gdkcardimage/gdk-card-image.h
 lib/gnome-stones/objects/libgnome-stones.so
 lib/gnome-stones/objects/libgnomekoban.so
-lib/libgdkcardimage.a
-lib/libgdkcardimage.so
-lib/libgdkcardimage.so.1
 share/gnome/applications/blackjack.desktop
 share/gnome/applications/freecell.desktop
 share/gnome/applications/gataxx.desktop
@@ -88,6 +37,7 @@ share/gnome/applications/iagno.desktop
 share/gnome/applications/mahjongg.desktop
 share/gnome/applications/same-gnome.desktop
 share/gnome/applications/sol.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/blackjack/Ameristar.rules
 share/gnome/blackjack/Atlantic_City.rules
 share/gnome/blackjack/Vegas_Downtown.rules
@@ -156,6 +106,7 @@ share/gnome/blackjack/Vegas_Strip.rules
 @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
+@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
 @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
 share/gnome/gnect/white_ob.cn4
 share/gnome/gnibbles/level001.gnl
@@ -254,6 +205,8 @@ share/gnome/help/aisleriot/C/scuffle.xml
 share/gnome/help/aisleriot/C/seahaven.xml
 share/gnome/help/aisleriot/C/sir_tommy.xml
 share/gnome/help/aisleriot/C/spider.xml
+share/gnome/help/aisleriot/C/spider_one_suit.xml
+share/gnome/help/aisleriot/C/spider_two_suit.xml
 share/gnome/help/aisleriot/C/spiderette.xml
 share/gnome/help/aisleriot/C/straight_up.xml
 share/gnome/help/aisleriot/C/streets_and_alleys.xml
@@ -289,7 +242,6 @@ share/gnome/help/gnect/C/figures/tileset.png
 share/gnome/help/gnect/C/gnect.xml
 share/gnome/help/gnect/C/legal.xml
 share/gnome/help/gnibbles/C/figures/game.png
-share/gnome/help/gnibbles/C/figures/graphics.png
 share/gnome/help/gnibbles/C/figures/intro.png
 share/gnome/help/gnibbles/C/figures/playing.png
 share/gnome/help/gnibbles/C/figures/worm_op.png
@@ -404,53 +356,16 @@ share/gnome/omf/gnome-games/same-gnome-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/blackjack/baize.png
 share/gnome/pixmaps/blackjack/blackjack-splash.png
-share/gnome/pixmaps/blackjack/chip-1.png
-share/gnome/pixmaps/blackjack/chip-100.png
-share/gnome/pixmaps/blackjack/chip-25.png
-share/gnome/pixmaps/blackjack/chip-5.png
-share/gnome/pixmaps/cards/backs/antique-red.png
-share/gnome/pixmaps/cards/backs/beige.png
-share/gnome/pixmaps/cards/backs/dondorf-flower.png
-share/gnome/pixmaps/cards/backs/face.png
-share/gnome/pixmaps/cards/backs/grey.png
-share/gnome/pixmaps/cards/backs/rods.png
-share/gnome/pixmaps/cards/backs/tux.png
+share/gnome/pixmaps/blackjack/chip-1.svg
+share/gnome/pixmaps/blackjack/chip-100.svg
+share/gnome/pixmaps/blackjack/chip-25.svg
+share/gnome/pixmaps/blackjack/chip-5.svg
 share/gnome/pixmaps/cards/baize.png
-share/gnome/pixmaps/cards/card-styles.xml
-share/gnome/pixmaps/cards/honors/bonded.png
-share/gnome/pixmaps/cards/honors/dondorf.png
-share/gnome/pixmaps/cards/honors/xpat.png
-share/gnome/pixmaps/cards/jokers/gnome.png
-share/gnome/pixmaps/cards/ranks/bold-09x14.png
-share/gnome/pixmaps/cards/ranks/fine-07x12.png
-share/gnome/pixmaps/cards/slots/hand.png
-share/gnome/pixmaps/cards/slots/plain.png
-share/gnome/pixmaps/cards/slots/white-outline.png
-share/gnome/pixmaps/cards/suits_large/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_large/knuth-15x19.png
-share/gnome/pixmaps/cards/suits_large/knuth-18x21.png
-share/gnome/pixmaps/cards/suits_large/knuth-21x25.png
-share/gnome/pixmaps/cards/suits_large/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_large/xpat-15x15.png
-share/gnome/pixmaps/cards/suits_large/xpat-21x21.png
-share/gnome/pixmaps/cards/suits_large/xpat-41x41.png
-share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png
-share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png
-share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png
-share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png
-share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png
-share/gnome/pixmaps/cards/suits_small/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_small/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_small/xpat-15x15.png
+share/gnome/pixmaps/cards/slot.png
+share/gnome/pixmaps/cards/slots/white-outline.svg
 share/gnome/pixmaps/gataxx.png
 share/gnome/pixmaps/glines.png
 share/gnome/pixmaps/glines/balls.svg
-share/gnome/pixmaps/glines/classic.png
-share/gnome/pixmaps/glines/dots.png
-share/gnome/pixmaps/glines/gumball.png
-share/gnome/pixmaps/glines/pulse.png
 share/gnome/pixmaps/glines/shapes.svg
 share/gnome/pixmaps/gnect-icon.png
 share/gnome/pixmaps/gnect/bg_grotty.jpg
@@ -461,26 +376,46 @@ share/gnome/pixmaps/gnect/tileset_50x50_classic.png
 share/gnome/pixmaps/gnect/tileset_50x50_glassy.png
 share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png
 share/gnome/pixmaps/gnect/tileset_50x50_square.png
+share/gnome/pixmaps/gnibbles/blank.svg
+share/gnome/pixmaps/gnibbles/bonus1.svg
+share/gnome/pixmaps/gnibbles/bonus2.svg
+share/gnome/pixmaps/gnibbles/bonus3.svg
+share/gnome/pixmaps/gnibbles/bonus4.svg
+share/gnome/pixmaps/gnibbles/bonus5.svg
+share/gnome/pixmaps/gnibbles/diamond.svg
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
+share/gnome/pixmaps/gnibbles/life.svg
+share/gnome/pixmaps/gnibbles/questionmark.svg
+share/gnome/pixmaps/gnibbles/snake-blue.svg
+share/gnome/pixmaps/gnibbles/snake-cyan.svg
+share/gnome/pixmaps/gnibbles/snake-green.svg
+share/gnome/pixmaps/gnibbles/snake-grey.svg
+share/gnome/pixmaps/gnibbles/snake-magenta.svg
+share/gnome/pixmaps/gnibbles/snake-red.svg
+share/gnome/pixmaps/gnibbles/snake-yellow.svg
+share/gnome/pixmaps/gnibbles/wall-corner-bottom-left.svg
+share/gnome/pixmaps/gnibbles/wall-corner-bottom-right.svg
+share/gnome/pixmaps/gnibbles/wall-corner-top-left.svg
+share/gnome/pixmaps/gnibbles/wall-corner-top-right.svg
+share/gnome/pixmaps/gnibbles/wall-cross.svg
+share/gnome/pixmaps/gnibbles/wall-empty.svg
+share/gnome/pixmaps/gnibbles/wall-straight-side.svg
+share/gnome/pixmaps/gnibbles/wall-straight-up.svg
+share/gnome/pixmaps/gnibbles/wall-tee-down.svg
+share/gnome/pixmaps/gnibbles/wall-tee-left.svg
+share/gnome/pixmaps/gnibbles/wall-tee-right.svg
+share/gnome/pixmaps/gnibbles/wall-tee-up.svg
 share/gnome/pixmaps/gnobots2/aieee.png
-share/gnome/pixmaps/gnobots2/cows.png
-share/gnome/pixmaps/gnobots2/eggs.png
 share/gnome/pixmaps/gnobots2/gnomes.png
-share/gnome/pixmaps/gnobots2/mice.png
 share/gnome/pixmaps/gnobots2/robots.png
 share/gnome/pixmaps/gnobots2/splat.png
-share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
+share/gnome/pixmaps/gnome-games-common/cards/bonded.png
+share/gnome/pixmaps/gnome-games-common/cards/paris.svg
 share/gnome/pixmaps/gnome-aisleriot.png
 share/gnome/pixmaps/gnome-blackjack.png
 share/gnome/pixmaps/gnome-cardgame.png
-share/gnome/pixmaps/gnome-die1.png
-share/gnome/pixmaps/gnome-die2.png
-share/gnome/pixmaps/gnome-die3.png
-share/gnome/pixmaps/gnome-die4.png
-share/gnome/pixmaps/gnome-die5.png
-share/gnome/pixmaps/gnome-die6.png
 share/gnome/pixmaps/gnome-gnobots2.png
 share/gnome/pixmaps/gnome-gnomine.png
 share/gnome/pixmaps/gnome-gnotravex.png
@@ -508,58 +443,34 @@ share/gnome/pixmaps/gnome-stones/frame.png
 share/gnome/pixmaps/gnome-stones/gnome.png
 share/gnome/pixmaps/gnome-stones/title-tile.png
 share/gnome/pixmaps/gnome-stones/wall.png
-share/gnome/pixmaps/gnometris/5blocks-tig.png
-share/gnome/pixmaps/gnometris/5blocks-tim.png
-share/gnome/pixmaps/gnometris/5blocks.png
 share/gnome/pixmaps/gnometris/7blocks-gw.png
 share/gnome/pixmaps/gnometris/7blocks-tig.png
-share/gnome/pixmaps/gnometris/7blocks.png
-share/gnome/pixmaps/gnometris/7stones-gn.png
-share/gnome/pixmaps/gnometris/7stones2-gn.png
-share/gnome/pixmaps/gnometris/bg/dog-bg.jpg
-share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg
-share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg
-share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg
-share/gnome/pixmaps/gnometris/bg/gnome2-foot.png
-share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg
-share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg
-share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg
-share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg
-share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg
-share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg
-share/gnome/pixmaps/gnometris/bg/trees-bg.jpg
-share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg
-share/gnome/pixmaps/gnometris/bg/watery-bg.jpg
-share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg
-share/gnome/pixmaps/gnomine/face-cool.xpm
-share/gnome/pixmaps/gnomine/face-sad.xpm
-share/gnome/pixmaps/gnomine/face-smile.xpm
-share/gnome/pixmaps/gnomine/face-win.xpm
-share/gnome/pixmaps/gnomine/face-worried.xpm
+share/gnome/pixmaps/gnomine/face-cool.png
+share/gnome/pixmaps/gnomine/face-sad.png
+share/gnome/pixmaps/gnomine/face-smile.png
+share/gnome/pixmaps/gnomine/face-win.png
+share/gnome/pixmaps/gnomine/face-worried.png
 share/gnome/pixmaps/gnomine/flag-question.svg
 share/gnome/pixmaps/gnomine/flag.svg
 share/gnome/pixmaps/gnomine/mine.svg
 share/gnome/pixmaps/gnotski-icon.png
 share/gnome/pixmaps/gnotski.png
+share/gnome/pixmaps/gtali/gnome-dice-1.svg
+share/gnome/pixmaps/gtali/gnome-dice-2.svg
+share/gnome/pixmaps/gtali/gnome-dice-3.svg
+share/gnome/pixmaps/gtali/gnome-dice-4.svg
+share/gnome/pixmaps/gtali/gnome-dice-5.svg
+share/gnome/pixmaps/gtali/gnome-dice-6.svg
+share/gnome/pixmaps/gtali/gnome-dice-none.svg
 share/gnome/pixmaps/iagno.png
-share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
-share/gnome/pixmaps/iagno/flipblend.png
-share/gnome/pixmaps/iagno/metal.png
-share/gnome/pixmaps/iagno/metal2.png
-share/gnome/pixmaps/iagno/shrink.png
-share/gnome/pixmaps/iagno/sunmoon.png
 share/gnome/pixmaps/iagno/woodtrim.png
-share/gnome/pixmaps/mahjongg/default.png
-share/gnome/pixmaps/mahjongg/maya.png
 share/gnome/pixmaps/mahjongg/postmodern.svg
 share/gnome/pixmaps/mahjongg/smooth.png
-share/gnome/pixmaps/same-gnome/blink-sync.png
-share/gnome/pixmaps/same-gnome/glass.png
-share/gnome/pixmaps/same-gnome/marbles.png
+share/gnome/pixmaps/rteleport.png
 share/gnome/pixmaps/same-gnome/planets.png
-share/gnome/pixmaps/same-gnome/rotate.png
 share/gnome/pixmaps/same-gnome/stones.png
+share/gnome/pixmaps/teleport.png
 share/gnome/sol-games/agnes.scm
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/bakers_dozen.scm
@@ -615,6 +526,8 @@ share/gnome/sol-games/seahaven.scm
 share/gnome/sol-games/sir_tommy.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/spider_one_suit.scm
+share/gnome/sol-games/spider_two_suit.scm
 share/gnome/sol-games/spiderette.scm
 share/gnome/sol-games/straight_up.scm
 share/gnome/sol-games/streets_and_alleys.scm
@@ -631,8 +544,6 @@ share/gnome/sol-games/will_o_the_wisp.scm
 share/gnome/sol-games/yield.scm
 share/gnome/sol-games/yukon.scm
 share/gnome/sol-games/zebra.scm
-share/gnome/sounds/gataxx/flip-piece.wav
-share/gnome/sounds/gataxx/gameover.wav
 share/gnome/sounds/gnibbles/appear.wav
 share/gnome/sounds/gnibbles/bonus.wav
 share/gnome/sounds/gnibbles/crash.wav
@@ -648,13 +559,14 @@ share/gnome/sounds/gnobots2/splat.wav
 share/gnome/sounds/gnobots2/teleport.wav
 share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
-share/gnome/sounds/gnome-stones/born.wav
-share/gnome/sounds/gnome-stones/boulder.wav
-share/gnome/sounds/gnome-stones/dig.wav
-share/gnome/sounds/gnome-stones/door_open.wav
-share/gnome/sounds/gnome-stones/explosion.wav
-share/gnome/sounds/gnome-stones/get_diamond.wav
-share/gnome/sounds/gnome-stones/title.wav
+share/gnome/sounds/gnometris/gameover.wav
+share/gnome/sounds/gnometris/gnometris.wav
+share/gnome/sounds/gnometris/land.wav
+share/gnome/sounds/gnometris/lines1.wav
+share/gnome/sounds/gnometris/lines2.wav
+share/gnome/sounds/gnometris/lines3.wav
+share/gnome/sounds/gnometris/slide.wav
+share/gnome/sounds/gnometris/turn.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
 share/locale/am/LC_MESSAGES/gnome-games.mo
@@ -685,6 +597,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo
 share/locale/hr/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
 share/locale/id/LC_MESSAGES/gnome-games.mo
+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/ko/LC_MESSAGES/gnome-games.mo
@@ -694,6 +607,7 @@ share/locale/mk/LC_MESSAGES/gnome-games.mo
 share/locale/ml/LC_MESSAGES/gnome-games.mo
 share/locale/mn/LC_MESSAGES/gnome-games.mo
 share/locale/ms/LC_MESSAGES/gnome-games.mo
+share/locale/nb/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/nn/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
@@ -709,6 +623,7 @@ share/locale/sq/LC_MESSAGES/gnome-games.mo
 share/locale/sr/LC_MESSAGES/gnome-games.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo
 share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/ta/LC_MESSAGES/gnome-games.mo
 share/locale/tr/LC_MESSAGES/gnome-games.mo
 share/locale/uk/LC_MESSAGES/gnome-games.mo
 share/locale/vi/LC_MESSAGES/gnome-games.mo
@@ -716,31 +631,25 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/sounds/iagno
-@dirrm share/gnome/sounds/gnome-stones
+@dirrm share/gnome/sounds/gnometris
 @dirrm share/gnome/sounds/gnobots2
 @dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gataxx
 @dirrm share/gnome/sol-games/glade
 @dirrm share/gnome/sol-games
 @dirrm share/gnome/pixmaps/same-gnome
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gtali
 @dirrm share/gnome/pixmaps/gnomine
-@dirrm share/gnome/pixmaps/gnometris/bg
 @dirrm share/gnome/pixmaps/gnometris
 @dirrm share/gnome/pixmaps/gnome-stones
+@dirrm share/gnome/pixmaps/gnome-games-common/cards
+@dirrm share/gnome/pixmaps/gnome-games-common
 @dirrm share/gnome/pixmaps/gnobots2
 @dirrm share/gnome/pixmaps/gnibbles
 @dirrm share/gnome/pixmaps/gnect
 @dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/cards/suits_small
-@dirrm share/gnome/pixmaps/cards/suits_medium
-@dirrm share/gnome/pixmaps/cards/suits_large
 @dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/ranks
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
 @dirrm share/gnome/pixmaps/blackjack
 @dirrm share/gnome/omf/gnome-games
@@ -822,3 +731,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile
new file mode 100644
index 000000000000..cfc08d4f3f99
--- /dev/null
+++ b/games/gnomegames2-extra-data/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	gnomegames2-extra-data
+# Date created:				16 August 2004
+# Whom:					Adam Weinberger <adamw@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomegames2-extra-data
+PORTVERSION=	2.8.0
+CATEGORIES=	games gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-games-extra-data/2.8
+DISTNAME=	gnome-games-extra-data-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Themes and artwork for the gnomegames2 package
+
+RUN_DEPENDS=	${X11BASE}/bin/sol:${PORTSDIR}/games/gnomegames2
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnomeprefix
+CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo
new file mode 100644
index 000000000000..8327f7a2740c
--- /dev/null
+++ b/games/gnomegames2-extra-data/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2
+SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341
diff --git a/games/gnomegames2-extra-data/pkg-descr b/games/gnomegames2-extra-data/pkg-descr
new file mode 100644
index 000000000000..992c00ea920e
--- /dev/null
+++ b/games/gnomegames2-extra-data/pkg-descr
@@ -0,0 +1,3 @@
+This package contains extra data files for the gnome-games package. At
+the moment this is almost entirely extra themes and artwork for the
+games.
diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist
new file mode 100644
index 000000000000..cf3cdea0e8c1
--- /dev/null
+++ b/games/gnomegames2-extra-data/pkg-plist
@@ -0,0 +1,30 @@
+share/gnome/pixmaps/glines/classic.png
+share/gnome/pixmaps/glines/dots.png
+share/gnome/pixmaps/glines/gumball.png
+share/gnome/pixmaps/glines/pulse.png
+share/gnome/pixmaps/gnobots2/cows.png
+share/gnome/pixmaps/gnobots2/eggs.png
+share/gnome/pixmaps/gnobots2/mice.png
+share/gnome/pixmaps/gnobots2/windows.png
+share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
+share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
+share/gnome/pixmaps/gnometris/5blocks-tig.png
+share/gnome/pixmaps/gnometris/5blocks-tim.png
+share/gnome/pixmaps/gnometris/5blocks.png
+share/gnome/pixmaps/gnometris/7blocks.png
+share/gnome/pixmaps/gnometris/7stones-gn.png
+share/gnome/pixmaps/gnometris/7stones2-gn.png
+share/gnome/pixmaps/iagno/blend.png
+share/gnome/pixmaps/iagno/flipblend.png
+share/gnome/pixmaps/iagno/metal.png
+share/gnome/pixmaps/iagno/metal2.png
+share/gnome/pixmaps/iagno/shrink.png
+share/gnome/pixmaps/iagno/sunmoon.png
+share/gnome/pixmaps/mahjongg/default.png
+share/gnome/pixmaps/mahjongg/default2.png
+share/gnome/pixmaps/mahjongg/maya.png
+share/gnome/pixmaps/mahjongg/seta.png
+share/gnome/pixmaps/same-gnome/blink-sync.png
+share/gnome/pixmaps/same-gnome/glass.png
+share/gnome/pixmaps/same-gnome/marbles.png
+share/gnome/pixmaps/same-gnome/rotate.png
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 78ed7dc5f2cf..b17fa1d94f68 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTVERSION=	2.8.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-games/2.8
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,13 +22,18 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \
-		librsvg2
-USE_INC_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui \
+		librsvg2 desktopfileutils
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	aisleriot.schemas blackjack.schemas gataxx.schemas \
+		glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
+		gnome-stones.schemas gnometris.schemas gnomine.schemas \
+		gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \
+		same-gnome.schemas
+
 CONFLICTS=	sol-1.0.*
 
 post-patch:
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index daee81986fc9..fb6cc99cba4e 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.6.2.tar.bz2) = 3b43e035912ec7e941568b571f1237ae
-SIZE (gnome2/gnome-games-2.6.2.tar.bz2) = 8269706
+MD5 (gnome2/gnome-games-2.8.1.tar.bz2) = d3c675e29c835cfa765fbd6ae4a289cc
+SIZE (gnome2/gnome-games-2.8.1.tar.bz2) = 5926555
diff --git a/games/gnomegames2/files/patch-ac b/games/gnomegames2/files/patch-ac
deleted file mode 100644
index 2605cefdfe3f..000000000000
--- a/games/gnomegames2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk-card-image/Makefile.in.orig	Wed Dec 10 11:44:58 2003
-+++ gdk-card-image/Makefile.in	Wed Dec 10 11:45:48 2003
-@@ -243,7 +243,7 @@
- libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c
- libgdkcardimageincludedir = $(includedir)/gdkcardimage
- libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h
--libgdkcardimage_la_LDFLAGS = -version-info 0:0:0
-+libgdkcardimage_la_LDFLAGS = -version-info 1:0:0
- libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@
- subdir = gdk-card-image
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games/gnomegames2/files/patch-aisleriot::sol.c b/games/gnomegames2/files/patch-aisleriot::sol.c
deleted file mode 100644
index 7a281c20a24e..000000000000
--- a/games/gnomegames2/files/patch-aisleriot::sol.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- aisleriot/sol.c.orig	Wed Oct  1 20:19:36 2003
-+++ aisleriot/sol.c	Tue Nov 25 16:30:44 2003
-@@ -83,6 +83,15 @@
- #define DEFAULT_VARIATION "klondike.scm"
- #define GNOME_SESSION_BUG
- 
-+gchar* game_file_to_variation (const gchar* file)
-+{
-+  char* p, *buf = g_path_get_basename(file);
-+
-+  if ((p = strrchr (buf, '.'))) *p = '\0';
-+  
-+  return buf;
-+}  
-+
- gchar* game_file_to_name (const gchar* file)
- {
-   char* p, *buf = g_path_get_basename(file);
-@@ -545,14 +554,14 @@
- 	  n_games = 0;
- 
-   for (i = 0; i < n_games; i++) {
--    gchar *game_name = game_file_to_name (game_dents[i]->d_name);
--    if (!strcasecmp (variation, game_name)) {
-+    gchar *game_variation = game_file_to_variation (game_dents[i]->d_name);
-+    if (!strcasecmp (variation, game_variation)) {
-       dont_save = TRUE;
-       start_game = g_strdup ((gchar*) game_dents[i]->d_name);
--      g_free (game_name);
-+      g_free (game_variation);
-       break;
-     }
--    g_free (game_name);
-+    g_free (game_variation);
-   }
-   
-   gh_enter(argc, argv, main_prog);
diff --git a/games/gnomegames2/files/patch-blackjack_src_player.cpp b/games/gnomegames2/files/patch-blackjack_src_player.cpp
new file mode 100644
index 000000000000..0a2d1ac3b8b0
--- /dev/null
+++ b/games/gnomegames2/files/patch-blackjack_src_player.cpp
@@ -0,0 +1,75 @@
+--- blackjack/src/player.cpp.orig	Tue Jul  6 12:56:50 2004
++++ blackjack/src/player.cpp	Tue Jul  6 12:59:29 2004
+@@ -262,8 +262,8 @@
+         // Player can always stand.
+ 
+         bestValue = value = getValueStand (*lplayer, upCard);
+-        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                    _("Stand"), value * 100);
++        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                    _("Stand"), (long double)(value * 100));
+         bestOption = KEY_S;
+         bestOptionNumber = num_options;
+ 
+@@ -271,8 +271,8 @@
+         if (bj_hand_can_be_hit ()) {
+                 value = getValueHit (*lplayer, upCard);
+                 
+-                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2lf%%\n", 
+-                                                            _("Hit"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2Lf%%\n", 
++                                                            _("Hit"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_H;
+@@ -282,8 +282,8 @@
+                 // Check if player can double down.
+                 if (bj_hand_can_be_doubled ()) {
+                         value = getValueDoubleDown (*lplayer, upCard);
+-                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2lf%%\n", 
+-                                                                    _("Double"), value * 100);
++                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2Lf%%\n", 
++                                                                    _("Double"), (long double)(value * 100));
+                         if (value > bestValue) {
+                                 bestValue = value;
+                                 bestOption = KEY_D;
+@@ -296,8 +296,8 @@
+ 
+         if (bj_hand_can_be_split ()) {
+                 value = getValueSplit(lplayer->cards[0].value (), upCard);
+-                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                            _("Split"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                            _("Split"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_P;
+@@ -308,8 +308,8 @@
+         // Check if player can surrender.
+         if (bj_hand_can_be_surrendered ()) {
+                 value = -0.5;
+-                mark_list[num_options++] = g_strdup_printf ("  %s %8.2lf%%\n", 
+-                                                            _("Surrender"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s %8.2Lf%%\n", 
++                                                            _("Surrender"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_R;
+@@ -439,12 +439,12 @@
+         reset ();
+ 
+         mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities"));
+-        mark_list[1] = g_strdup_printf ("  %s         %5.2lf%%\n", _("Bust"),
+-                                        getProbabilityBust (lupCard) * 100.0 / notBlackjack);
++        mark_list[1] = g_strdup_printf ("  %s         %5.2Lf%%\n", _("Bust"),
++                                        (long double)(getProbabilityBust (lupCard) * 100.0 / notBlackjack));
+         for (int count = 17; count <= 21; count++) {
+-                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2lf%%\n", count,
+-                                                       getProbabilityCount (count, lupCard)
+-                                                       * 100.0 / notBlackjack);
++                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2Lf%%\n", count,
++                                                       (long double)(getProbabilityCount (count, lupCard)
++                                                       * 100.0 / notBlackjack));
+         }
+ 
+         markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", 
diff --git a/games/gnomegames2/files/patch-gataxx_gtkgridboard.c b/games/gnomegames2/files/patch-gataxx_gtkgridboard.c
new file mode 100644
index 000000000000..9ceabef83f4f
--- /dev/null
+++ b/games/gnomegames2/files/patch-gataxx_gtkgridboard.c
@@ -0,0 +1,21 @@
+--- gataxx/gtkgridboard.c.orig	Thu May 20 17:17:56 2004
++++ gataxx/gtkgridboard.c	Thu May 20 17:18:13 2004
+@@ -140,6 +140,7 @@
+ static gint gtk_gridboard_button_press(GtkWidget *widget, GdkEventButton *event)
+  {
+         GtkGridBoard * gridboard;
++	int x, y;
+         
+         g_return_val_if_fail (widget != NULL, FALSE);
+         g_return_val_if_fail (GTK_IS_GRIDBOARD(widget), FALSE);
+@@ -147,8 +148,8 @@
+ 
+         gridboard=GTK_GRIDBOARD(widget);
+         
+-        int x=event->x/gridboard->tilewidth;
+-        int y=event->y/gridboard->tileheight;
++        x=event->x/gridboard->tilewidth;
++        y=event->y/gridboard->tileheight;
+         g_signal_emit (G_OBJECT(widget), 
+                 gridboard_signals[BOXCLICKED], 0, x, y);
+         return TRUE;
diff --git a/games/gnomegames2/files/patch-iagno_othello.c b/games/gnomegames2/files/patch-iagno_othello.c
new file mode 100644
index 000000000000..4b87018a5f18
--- /dev/null
+++ b/games/gnomegames2/files/patch-iagno_othello.c
@@ -0,0 +1,38 @@
+--- iagno/othello.c.orig	Thu May 20 17:20:21 2004
++++ iagno/othello.c	Thu May 20 17:21:11 2004
+@@ -544,7 +544,7 @@
+ 					memcpy (tboard, board, sizeof (gint8) * 8 * 8);
+ 					move_board(tboard, i, j, me, 0);
+ 	
+-					// assume that opponent takes best move
++					/* assume that opponent takes best move */
+ 					tmp_move = find_best_move(tboard, not_me, ply_depth-1,
+ 						-pass_thresh, -use_thresh, 0, 0);
+ 
+@@ -559,7 +559,7 @@
+ 					}
+ 				}
+ 		
+-		// check if we have to pass
++		/* check if we have to pass */
+ 		if (best_x == 8 && best_y == 8) {
+ 			tmp_move = find_best_move(board, not_me, ply_depth-1,
+ 				-pass_thresh, -use_thresh, 0, 0);
+@@ -802,14 +802,14 @@
+ 				found_free = TRUE;
+ 		}
+ 		
+-	// check if a player is dead
++	/* check if a player is dead */
+ 	if (!found_me && found_not_me)
+ 		return (-10000);
+ 	else if (found_me && !found_not_me)
+ 		return (10000);
+ 	
+-	// if the game is finished, return the actual score rather than
+-	// a huristic
++	/* if the game is finished, return the actual score rather than
++	 * a huristic */
+ 	if (!found_free)
+ 		return (actual_score);
+ 	
diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install
index 38f82a6246e5..da897732169d 100644
--- a/games/gnomegames2/pkg-install
+++ b/games/gnomegames2/pkg-install
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin
 case $2 in
 POST-INSTALL)
     mkdir -p ${PKG_PREFIX}/share/gnome/games
-    SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores same-gnome.scores"
+    SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
     for i in ${SCORES}; do
 	if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
 	    touch -f ${PKG_PREFIX}/share/gnome/games/${i}
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index d8d26bbe1ffd..e2a994af5003 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -14,63 +14,12 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/aisleriot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/blackjack.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gataxx.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/glines.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnect.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnibbles.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnobots2.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-stones.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnometris.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomine.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnotravex.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gtali.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/iagno.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mahjongg.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/same-gnome.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
-etc/sound/events/gataxx.soundlist
 etc/sound/events/gnect.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
-include/gdkcardimage/card-style-file.h
-include/gdkcardimage/gdk-card-image.h
 lib/gnome-stones/objects/libgnome-stones.so
 lib/gnome-stones/objects/libgnomekoban.so
-lib/libgdkcardimage.a
-lib/libgdkcardimage.so
-lib/libgdkcardimage.so.1
 share/gnome/applications/blackjack.desktop
 share/gnome/applications/freecell.desktop
 share/gnome/applications/gataxx.desktop
@@ -88,6 +37,7 @@ share/gnome/applications/iagno.desktop
 share/gnome/applications/mahjongg.desktop
 share/gnome/applications/same-gnome.desktop
 share/gnome/applications/sol.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/blackjack/Ameristar.rules
 share/gnome/blackjack/Atlantic_City.rules
 share/gnome/blackjack/Vegas_Downtown.rules
@@ -156,6 +106,7 @@ share/gnome/blackjack/Vegas_Strip.rules
 @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
+@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
 @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
 share/gnome/gnect/white_ob.cn4
 share/gnome/gnibbles/level001.gnl
@@ -254,6 +205,8 @@ share/gnome/help/aisleriot/C/scuffle.xml
 share/gnome/help/aisleriot/C/seahaven.xml
 share/gnome/help/aisleriot/C/sir_tommy.xml
 share/gnome/help/aisleriot/C/spider.xml
+share/gnome/help/aisleriot/C/spider_one_suit.xml
+share/gnome/help/aisleriot/C/spider_two_suit.xml
 share/gnome/help/aisleriot/C/spiderette.xml
 share/gnome/help/aisleriot/C/straight_up.xml
 share/gnome/help/aisleriot/C/streets_and_alleys.xml
@@ -289,7 +242,6 @@ share/gnome/help/gnect/C/figures/tileset.png
 share/gnome/help/gnect/C/gnect.xml
 share/gnome/help/gnect/C/legal.xml
 share/gnome/help/gnibbles/C/figures/game.png
-share/gnome/help/gnibbles/C/figures/graphics.png
 share/gnome/help/gnibbles/C/figures/intro.png
 share/gnome/help/gnibbles/C/figures/playing.png
 share/gnome/help/gnibbles/C/figures/worm_op.png
@@ -404,53 +356,16 @@ share/gnome/omf/gnome-games/same-gnome-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/blackjack/baize.png
 share/gnome/pixmaps/blackjack/blackjack-splash.png
-share/gnome/pixmaps/blackjack/chip-1.png
-share/gnome/pixmaps/blackjack/chip-100.png
-share/gnome/pixmaps/blackjack/chip-25.png
-share/gnome/pixmaps/blackjack/chip-5.png
-share/gnome/pixmaps/cards/backs/antique-red.png
-share/gnome/pixmaps/cards/backs/beige.png
-share/gnome/pixmaps/cards/backs/dondorf-flower.png
-share/gnome/pixmaps/cards/backs/face.png
-share/gnome/pixmaps/cards/backs/grey.png
-share/gnome/pixmaps/cards/backs/rods.png
-share/gnome/pixmaps/cards/backs/tux.png
+share/gnome/pixmaps/blackjack/chip-1.svg
+share/gnome/pixmaps/blackjack/chip-100.svg
+share/gnome/pixmaps/blackjack/chip-25.svg
+share/gnome/pixmaps/blackjack/chip-5.svg
 share/gnome/pixmaps/cards/baize.png
-share/gnome/pixmaps/cards/card-styles.xml
-share/gnome/pixmaps/cards/honors/bonded.png
-share/gnome/pixmaps/cards/honors/dondorf.png
-share/gnome/pixmaps/cards/honors/xpat.png
-share/gnome/pixmaps/cards/jokers/gnome.png
-share/gnome/pixmaps/cards/ranks/bold-09x14.png
-share/gnome/pixmaps/cards/ranks/fine-07x12.png
-share/gnome/pixmaps/cards/slots/hand.png
-share/gnome/pixmaps/cards/slots/plain.png
-share/gnome/pixmaps/cards/slots/white-outline.png
-share/gnome/pixmaps/cards/suits_large/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_large/knuth-15x19.png
-share/gnome/pixmaps/cards/suits_large/knuth-18x21.png
-share/gnome/pixmaps/cards/suits_large/knuth-21x25.png
-share/gnome/pixmaps/cards/suits_large/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_large/xpat-15x15.png
-share/gnome/pixmaps/cards/suits_large/xpat-21x21.png
-share/gnome/pixmaps/cards/suits_large/xpat-41x41.png
-share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png
-share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png
-share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png
-share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png
-share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png
-share/gnome/pixmaps/cards/suits_small/knuth-09x10.png
-share/gnome/pixmaps/cards/suits_small/xpat-11x11.png
-share/gnome/pixmaps/cards/suits_small/xpat-15x15.png
+share/gnome/pixmaps/cards/slot.png
+share/gnome/pixmaps/cards/slots/white-outline.svg
 share/gnome/pixmaps/gataxx.png
 share/gnome/pixmaps/glines.png
 share/gnome/pixmaps/glines/balls.svg
-share/gnome/pixmaps/glines/classic.png
-share/gnome/pixmaps/glines/dots.png
-share/gnome/pixmaps/glines/gumball.png
-share/gnome/pixmaps/glines/pulse.png
 share/gnome/pixmaps/glines/shapes.svg
 share/gnome/pixmaps/gnect-icon.png
 share/gnome/pixmaps/gnect/bg_grotty.jpg
@@ -461,26 +376,46 @@ share/gnome/pixmaps/gnect/tileset_50x50_classic.png
 share/gnome/pixmaps/gnect/tileset_50x50_glassy.png
 share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png
 share/gnome/pixmaps/gnect/tileset_50x50_square.png
+share/gnome/pixmaps/gnibbles/blank.svg
+share/gnome/pixmaps/gnibbles/bonus1.svg
+share/gnome/pixmaps/gnibbles/bonus2.svg
+share/gnome/pixmaps/gnibbles/bonus3.svg
+share/gnome/pixmaps/gnibbles/bonus4.svg
+share/gnome/pixmaps/gnibbles/bonus5.svg
+share/gnome/pixmaps/gnibbles/diamond.svg
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
+share/gnome/pixmaps/gnibbles/life.svg
+share/gnome/pixmaps/gnibbles/questionmark.svg
+share/gnome/pixmaps/gnibbles/snake-blue.svg
+share/gnome/pixmaps/gnibbles/snake-cyan.svg
+share/gnome/pixmaps/gnibbles/snake-green.svg
+share/gnome/pixmaps/gnibbles/snake-grey.svg
+share/gnome/pixmaps/gnibbles/snake-magenta.svg
+share/gnome/pixmaps/gnibbles/snake-red.svg
+share/gnome/pixmaps/gnibbles/snake-yellow.svg
+share/gnome/pixmaps/gnibbles/wall-corner-bottom-left.svg
+share/gnome/pixmaps/gnibbles/wall-corner-bottom-right.svg
+share/gnome/pixmaps/gnibbles/wall-corner-top-left.svg
+share/gnome/pixmaps/gnibbles/wall-corner-top-right.svg
+share/gnome/pixmaps/gnibbles/wall-cross.svg
+share/gnome/pixmaps/gnibbles/wall-empty.svg
+share/gnome/pixmaps/gnibbles/wall-straight-side.svg
+share/gnome/pixmaps/gnibbles/wall-straight-up.svg
+share/gnome/pixmaps/gnibbles/wall-tee-down.svg
+share/gnome/pixmaps/gnibbles/wall-tee-left.svg
+share/gnome/pixmaps/gnibbles/wall-tee-right.svg
+share/gnome/pixmaps/gnibbles/wall-tee-up.svg
 share/gnome/pixmaps/gnobots2/aieee.png
-share/gnome/pixmaps/gnobots2/cows.png
-share/gnome/pixmaps/gnobots2/eggs.png
 share/gnome/pixmaps/gnobots2/gnomes.png
-share/gnome/pixmaps/gnobots2/mice.png
 share/gnome/pixmaps/gnobots2/robots.png
 share/gnome/pixmaps/gnobots2/splat.png
-share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
+share/gnome/pixmaps/gnome-games-common/cards/bonded.png
+share/gnome/pixmaps/gnome-games-common/cards/paris.svg
 share/gnome/pixmaps/gnome-aisleriot.png
 share/gnome/pixmaps/gnome-blackjack.png
 share/gnome/pixmaps/gnome-cardgame.png
-share/gnome/pixmaps/gnome-die1.png
-share/gnome/pixmaps/gnome-die2.png
-share/gnome/pixmaps/gnome-die3.png
-share/gnome/pixmaps/gnome-die4.png
-share/gnome/pixmaps/gnome-die5.png
-share/gnome/pixmaps/gnome-die6.png
 share/gnome/pixmaps/gnome-gnobots2.png
 share/gnome/pixmaps/gnome-gnomine.png
 share/gnome/pixmaps/gnome-gnotravex.png
@@ -508,58 +443,34 @@ share/gnome/pixmaps/gnome-stones/frame.png
 share/gnome/pixmaps/gnome-stones/gnome.png
 share/gnome/pixmaps/gnome-stones/title-tile.png
 share/gnome/pixmaps/gnome-stones/wall.png
-share/gnome/pixmaps/gnometris/5blocks-tig.png
-share/gnome/pixmaps/gnometris/5blocks-tim.png
-share/gnome/pixmaps/gnometris/5blocks.png
 share/gnome/pixmaps/gnometris/7blocks-gw.png
 share/gnome/pixmaps/gnometris/7blocks-tig.png
-share/gnome/pixmaps/gnometris/7blocks.png
-share/gnome/pixmaps/gnometris/7stones-gn.png
-share/gnome/pixmaps/gnometris/7stones2-gn.png
-share/gnome/pixmaps/gnometris/bg/dog-bg.jpg
-share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg
-share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg
-share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg
-share/gnome/pixmaps/gnometris/bg/gnome2-foot.png
-share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg
-share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg
-share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg
-share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg
-share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg
-share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg
-share/gnome/pixmaps/gnometris/bg/trees-bg.jpg
-share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg
-share/gnome/pixmaps/gnometris/bg/watery-bg.jpg
-share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg
-share/gnome/pixmaps/gnomine/face-cool.xpm
-share/gnome/pixmaps/gnomine/face-sad.xpm
-share/gnome/pixmaps/gnomine/face-smile.xpm
-share/gnome/pixmaps/gnomine/face-win.xpm
-share/gnome/pixmaps/gnomine/face-worried.xpm
+share/gnome/pixmaps/gnomine/face-cool.png
+share/gnome/pixmaps/gnomine/face-sad.png
+share/gnome/pixmaps/gnomine/face-smile.png
+share/gnome/pixmaps/gnomine/face-win.png
+share/gnome/pixmaps/gnomine/face-worried.png
 share/gnome/pixmaps/gnomine/flag-question.svg
 share/gnome/pixmaps/gnomine/flag.svg
 share/gnome/pixmaps/gnomine/mine.svg
 share/gnome/pixmaps/gnotski-icon.png
 share/gnome/pixmaps/gnotski.png
+share/gnome/pixmaps/gtali/gnome-dice-1.svg
+share/gnome/pixmaps/gtali/gnome-dice-2.svg
+share/gnome/pixmaps/gtali/gnome-dice-3.svg
+share/gnome/pixmaps/gtali/gnome-dice-4.svg
+share/gnome/pixmaps/gtali/gnome-dice-5.svg
+share/gnome/pixmaps/gtali/gnome-dice-6.svg
+share/gnome/pixmaps/gtali/gnome-dice-none.svg
 share/gnome/pixmaps/iagno.png
-share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
-share/gnome/pixmaps/iagno/flipblend.png
-share/gnome/pixmaps/iagno/metal.png
-share/gnome/pixmaps/iagno/metal2.png
-share/gnome/pixmaps/iagno/shrink.png
-share/gnome/pixmaps/iagno/sunmoon.png
 share/gnome/pixmaps/iagno/woodtrim.png
-share/gnome/pixmaps/mahjongg/default.png
-share/gnome/pixmaps/mahjongg/maya.png
 share/gnome/pixmaps/mahjongg/postmodern.svg
 share/gnome/pixmaps/mahjongg/smooth.png
-share/gnome/pixmaps/same-gnome/blink-sync.png
-share/gnome/pixmaps/same-gnome/glass.png
-share/gnome/pixmaps/same-gnome/marbles.png
+share/gnome/pixmaps/rteleport.png
 share/gnome/pixmaps/same-gnome/planets.png
-share/gnome/pixmaps/same-gnome/rotate.png
 share/gnome/pixmaps/same-gnome/stones.png
+share/gnome/pixmaps/teleport.png
 share/gnome/sol-games/agnes.scm
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/bakers_dozen.scm
@@ -615,6 +526,8 @@ share/gnome/sol-games/seahaven.scm
 share/gnome/sol-games/sir_tommy.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/spider_one_suit.scm
+share/gnome/sol-games/spider_two_suit.scm
 share/gnome/sol-games/spiderette.scm
 share/gnome/sol-games/straight_up.scm
 share/gnome/sol-games/streets_and_alleys.scm
@@ -631,8 +544,6 @@ share/gnome/sol-games/will_o_the_wisp.scm
 share/gnome/sol-games/yield.scm
 share/gnome/sol-games/yukon.scm
 share/gnome/sol-games/zebra.scm
-share/gnome/sounds/gataxx/flip-piece.wav
-share/gnome/sounds/gataxx/gameover.wav
 share/gnome/sounds/gnibbles/appear.wav
 share/gnome/sounds/gnibbles/bonus.wav
 share/gnome/sounds/gnibbles/crash.wav
@@ -648,13 +559,14 @@ share/gnome/sounds/gnobots2/splat.wav
 share/gnome/sounds/gnobots2/teleport.wav
 share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
-share/gnome/sounds/gnome-stones/born.wav
-share/gnome/sounds/gnome-stones/boulder.wav
-share/gnome/sounds/gnome-stones/dig.wav
-share/gnome/sounds/gnome-stones/door_open.wav
-share/gnome/sounds/gnome-stones/explosion.wav
-share/gnome/sounds/gnome-stones/get_diamond.wav
-share/gnome/sounds/gnome-stones/title.wav
+share/gnome/sounds/gnometris/gameover.wav
+share/gnome/sounds/gnometris/gnometris.wav
+share/gnome/sounds/gnometris/land.wav
+share/gnome/sounds/gnometris/lines1.wav
+share/gnome/sounds/gnometris/lines2.wav
+share/gnome/sounds/gnometris/lines3.wav
+share/gnome/sounds/gnometris/slide.wav
+share/gnome/sounds/gnometris/turn.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
 share/locale/am/LC_MESSAGES/gnome-games.mo
@@ -685,6 +597,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo
 share/locale/hr/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
 share/locale/id/LC_MESSAGES/gnome-games.mo
+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/ko/LC_MESSAGES/gnome-games.mo
@@ -694,6 +607,7 @@ share/locale/mk/LC_MESSAGES/gnome-games.mo
 share/locale/ml/LC_MESSAGES/gnome-games.mo
 share/locale/mn/LC_MESSAGES/gnome-games.mo
 share/locale/ms/LC_MESSAGES/gnome-games.mo
+share/locale/nb/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/nn/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
@@ -709,6 +623,7 @@ share/locale/sq/LC_MESSAGES/gnome-games.mo
 share/locale/sr/LC_MESSAGES/gnome-games.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo
 share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/ta/LC_MESSAGES/gnome-games.mo
 share/locale/tr/LC_MESSAGES/gnome-games.mo
 share/locale/uk/LC_MESSAGES/gnome-games.mo
 share/locale/vi/LC_MESSAGES/gnome-games.mo
@@ -716,31 +631,25 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/sounds/iagno
-@dirrm share/gnome/sounds/gnome-stones
+@dirrm share/gnome/sounds/gnometris
 @dirrm share/gnome/sounds/gnobots2
 @dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gataxx
 @dirrm share/gnome/sol-games/glade
 @dirrm share/gnome/sol-games
 @dirrm share/gnome/pixmaps/same-gnome
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gtali
 @dirrm share/gnome/pixmaps/gnomine
-@dirrm share/gnome/pixmaps/gnometris/bg
 @dirrm share/gnome/pixmaps/gnometris
 @dirrm share/gnome/pixmaps/gnome-stones
+@dirrm share/gnome/pixmaps/gnome-games-common/cards
+@dirrm share/gnome/pixmaps/gnome-games-common
 @dirrm share/gnome/pixmaps/gnobots2
 @dirrm share/gnome/pixmaps/gnibbles
 @dirrm share/gnome/pixmaps/gnect
 @dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/cards/suits_small
-@dirrm share/gnome/pixmaps/cards/suits_medium
-@dirrm share/gnome/pixmaps/cards/suits_large
 @dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/ranks
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
 @dirrm share/gnome/pixmaps/blackjack
 @dirrm share/gnome/omf/gnome-games
@@ -822,3 +731,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true