PR: ports/14303

Submitted by:Ade Lovett<ade@lovett.com>
Update to 1.0.51

15 files changed, 882 insertions, 765 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index dd442d5bf23c..ed1dc286681c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	gnomegames
-# Version required:			1.0.2
+# Version required:			1.0.51
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-games-1.0.2
-PKGNAME=	gnomegames-1.0.2
+DISTNAME=	gnome-games-1.0.51
+PKGNAME=	gnomegames-1.0.51
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 9af51a776243..f7a4a06afa65 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-1.0.2.tar.gz) = 1fbe5076d9234522f6f6401e672a02fe
+MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9
diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab
index a0f6935380e5..b36831ec5ecb 100644
--- a/games/gnome-games/files/patch-ab
+++ b/games/gnome-games/files/patch-ab
@@ -1,6 +1,6 @@
---- aisleriot/Makefile.in.orig	Mon Mar  1 02:50:59 1999
-+++ aisleriot/Makefile.in	Wed Mar  3 00:00:04 1999
-@@ -126,12 +126,12 @@
+--- aisleriot/Makefile.in.orig	Sun Sep 26 13:29:13 1999
++++ aisleriot/Makefile.in	Mon Sep 27 09:30:04 1999
+@@ -128,12 +128,12 @@
  scoredir = $(localstatedir)/games
  cardimagedir = $(datadir)/pixmaps/cards
  icondir = $(datadir)/pixmaps
@@ -11,13 +11,13 @@
 -SUBDIRS = docs pixmaps
 +SUBDIRS = pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
  
  
  bin_PROGRAMS = sol
-@@ -152,7 +152,7 @@
- EXTRA_DIST = TODO FIXME  AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
+@@ -154,7 +154,7 @@
+ EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
  
  
 -sysdir = $(datadir)/gnome/apps/Games
@@ -25,20 +25,20 @@
  sys_DATA = sol.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
---- aisleriot/docs/Makefile.in.orig	Mon Mar  1 02:51:00 1999
-+++ aisleriot/docs/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -129,7 +129,7 @@
+--- aisleriot/docs/Makefile.in.orig	Sun Sep 26 13:29:29 1999
++++ aisleriot/docs/Makefile.in	Mon Sep 27 09:30:38 1999
+@@ -131,7 +131,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -helpdir = $(datadir)/gnome/help/aisleriot/C
 +helpdir = $(datadir)/help/aisleriot/C
  
- help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html klondike.html 	fourteen.html pileon.html auld-lang-syne.html hopscotch.html 	neighbor.html odessa.html osmosis.html spider.html yukon.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html 	camelot-goal.gif clock-rules.gif docbook.css topic.dat
+ help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html 	kansas.html klondike.html first-law.html 	fourteen.html pileon.html auld-lang-syne.html 	hopscotch.html scorpion.html thumb-and-pouch.html 	neighbor.html odessa.html osmosis.html spider.html 	yukon.html westhaven.html royal-east.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html union-square.html 	camelot-goal.gif clock-rules.gif docbook.css 	topic.dat straight-up.html zebra.html lady-jane.html
  
---- freecell/src/Makefile.in.orig	Mon Mar  1 02:50:27 1999
-+++ freecell/src/Makefile.in	Wed Mar  3 00:01:13 1999
-@@ -123,9 +123,9 @@
+--- freecell/src/Makefile.in.orig	Sun Sep 26 13:28:36 1999
++++ freecell/src/Makefile.in	Mon Sep 27 09:31:48 1999
+@@ -125,9 +125,9 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -50,62 +50,55 @@
  
  
  bin_PROGRAMS = freecell
---- gnibbles/Makefile.in.orig	Mon Mar  1 02:51:08 1999
-+++ gnibbles/Makefile.in	Wed Mar  3 00:00:39 1999
+--- gataxx/Makefile.in.orig	Sun Sep 26 13:29:41 1999
++++ gataxx/Makefile.in	Mon Sep 27 09:47:28 1999
 @@ -127,10 +127,10 @@
- configdir = $(datadir)/gnibbles
- appicondir = $(datadir)/pixmaps
- soundlistdir = $(sysconfdir)/sound/events
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/gataxx
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
+ appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
  
- bin_PROGRAMS = gnibbles
---- gnobots/Makefile.in.orig	Mon Mar  1 02:50:42 1999
-+++ gnobots/Makefile.in	Wed Mar  3 00:00:54 1999
-@@ -126,11 +126,11 @@
+ bin_PROGRAMS = gataxx
+--- glines/Makefile.in.orig	Sun Sep 26 13:29:40 1999
++++ glines/Makefile.in	Mon Sep 27 09:48:33 1999
+@@ -128,11 +128,11 @@
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnobots
- appicondir = $(datadir)/pixmaps
+ pixmapdir = $(datadir)/pixmaps/glines
+ icondir = $(datadir)/pixmaps
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  
- SUBDIRS = help
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+ #SUBDIRS = help
  
+-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = gnobots
---- gnobots/help/C/Makefile.in.orig	Mon Mar  1 02:50:44 1999
-+++ gnobots/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
  
+ bin_PROGRAMS = glines
+--- gnibbles/Makefile.in.orig	Sun Sep 26 13:29:38 1999
++++ gnibbles/Makefile.in	Mon Sep 27 09:32:42 1999
+@@ -129,10 +129,10 @@
+ configdir = $(datadir)/gnibbles
+ icondir = $(datadir)/pixmaps
+ soundlistdir = $(sysconfdir)/sound/events
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/C
-+gnobots_helpdir = $(datadir)/help/gnobots/C
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots/help/es/Makefile.in.orig	Mon Mar  1 02:50:45 1999
-+++ gnobots/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/es
-+gnobots_helpdir = $(datadir)/help/gnobots/es
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots2/Makefile.in.orig	Mon Mar  1 02:50:46 1999
-+++ gnobots2/Makefile.in	Wed Mar  3 00:00:36 1999
-@@ -129,11 +129,11 @@
+ bin_PROGRAMS = gnibbles
+--- gnobots2/Makefile.in.orig	Sun Sep 26 13:29:01 1999
++++ gnobots2/Makefile.in	Mon Sep 27 09:33:16 1999
+@@ -131,11 +131,11 @@
  soundlistdir = $(sysconfdir)/sound/events
  sounddir = $(datadir)/sounds/gnobots2
  appicondir = $(datadir)/pixmaps
@@ -119,9 +112,9 @@
  
  
  bin_PROGRAMS = gnobots2
---- gnobots2/help/C/Makefile.in.orig	Mon Mar  1 02:50:49 1999
-+++ gnobots2/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/C/Makefile.in.orig	Sun Sep 26 13:29:03 1999
++++ gnobots2/help/C/Makefile.in	Mon Sep 27 09:34:12 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -130,9 +123,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots2/help/es/Makefile.in.orig	Mon Mar  1 02:50:50 1999
-+++ gnobots2/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/es/Makefile.in.orig	Sun Sep 26 13:29:04 1999
++++ gnobots2/help/es/Makefile.in	Mon Sep 27 09:34:44 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -141,9 +134,20 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnome-stones/Makefile.in.orig	Mon Mar  1 02:50:55 1999
-+++ gnome-stones/Makefile.in	Wed Mar  3 00:33:00 1999
-@@ -125,12 +125,12 @@
+--- gnobots2/help/it/Makefile.in.orig	Sun Sep 26 13:29:05 1999
++++ gnobots2/help/it/Makefile.in	Mon Sep 27 09:34:56 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it
++gnobots2_helpdir = $(datadir)/help/gnobots2/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gnome-stones/Makefile.in.orig	Sun Sep 26 13:29:10 1999
++++ gnome-stones/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,12 +127,12 @@
  
  SUBDIRS = objects graphics
  
@@ -158,7 +162,7 @@
  
  
  bin_PROGRAMS = gnome-stones
-@@ -145,7 +145,7 @@
+@@ -147,7 +147,7 @@
  Games_DATA = gnome-stones.desktop
  Caves_DATA = default.caves tutorial.caves gnomekoban.caves
  
@@ -166,10 +170,10 @@
 +gtkrcdir = $(datadir)/gnome-stones
  gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
  
- EXTRA_DIST =  	$(Pixmap_DATA)					$(Games_DATA)					$(Caves_DATA)					$(gtkrc_DATA)					TODO						README
---- gnome-stones/objects/Makefile.in.orig	Mon Mar  1 02:50:56 1999
-+++ gnome-stones/objects/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -125,9 +125,9 @@
+ Mimedir = $(datadir)/mime-info
+--- gnome-stones/objects/Makefile.in.orig	Sun Sep 26 13:29:11 1999
++++ gnome-stones/objects/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  GSTONES_SRC_DIR = $(srcdir)/../
  
@@ -181,7 +185,7 @@
  
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
-@@ -143,10 +143,10 @@
+@@ -144,10 +144,10 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -194,9 +198,9 @@
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- gnometris/Makefile.in.orig	Mon Mar  1 02:51:03 1999
-+++ gnometris/Makefile.in	Wed Mar  3 00:00:33 1999
-@@ -125,9 +125,9 @@
+--- gnometris/Makefile.in.orig	Sun Sep 26 13:29:31 1999
++++ gnometris/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  SUBDIRS = pix
  scoredir = $(localstatedir)/games
@@ -208,9 +212,9 @@
  
  
  bin_PROGRAMS = gnometris
---- gnomine/Makefile.in.orig	Mon Mar  1 02:50:28 1999
-+++ gnomine/Makefile.in	Wed Mar  3 00:00:48 1999
-@@ -124,9 +124,9 @@
+--- gnomine/Makefile.in.orig	Sun Sep 26 13:28:37 1999
++++ gnomine/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -126,9 +126,9 @@
  l = @l@
  
  scoredir = $(localstatedir)/games
@@ -222,38 +226,51 @@
  
  
  bin_PROGRAMS = gnomine
---- gnothello/Makefile.in.orig	Mon Mar  1 02:50:51 1999
-+++ gnothello/Makefile.in	Wed Mar  3 00:00:29 1999
-@@ -125,10 +125,10 @@
+--- gnotravex/Makefile.in.orig	Sun Sep 26 13:29:09 1999
++++ gnotravex/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -127,9 +127,9 @@
  
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/iagno
+ pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
-+INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  
- bin_PROGRAMS = iagno
---- gnotravex/Makefile.in.orig	Mon Mar  1 02:50:54 1999
-+++ gnotravex/Makefile.in	Wed Mar  3 00:00:45 1999
-@@ -125,9 +125,9 @@
+ bin_PROGRAMS = gnotravex
+--- gtali/Makefile.in.orig	Sun Sep 26 13:28:57 1999
++++ gtali/Makefile.in	Mon Sep 27 09:44:54 1999
+@@ -125,12 +125,12 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ SUBDIRS = pix help
  
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
  
- bin_PROGRAMS = gnotravex
---- gturing/Makefile.in.orig	Mon Mar  1 02:50:36 1999
-+++ gturing/Makefile.in	Wed Mar  3 00:00:25 1999
-@@ -124,12 +124,12 @@
+ 
+ @HAS_CURSES_TRUE@CTALI = ctali
+--- gtali/help/C/Makefile.in.orig	Sun Sep 26 13:29:00 1999
++++ gtali/help/C/Makefile.in	Mon Sep 27 09:45:28 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gtali_helpdir = $(datadir)/gnome/help/gtali/C
++gtali_helpdir = $(datadir)/help/gtali/C
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gturing/Makefile.in.orig	Sun Sep 26 13:28:54 1999
++++ gturing/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,12 +125,12 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -269,9 +286,9 @@
  
  
  bin_PROGRAMS = gturing
---- gturing/help/C/Makefile.in.orig	Mon Mar  1 02:50:38 1999
-+++ gturing/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- gturing/help/C/Makefile.in.orig	Sun Sep 26 13:28:56 1999
++++ gturing/help/C/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -280,35 +297,27 @@
  
  gturing_help_DATA =  	index.html			topic.dat
  
---- gyahtzee/Makefile.in.orig	Mon Mar  1 02:50:39 1999
-+++ gyahtzee/Makefile.in	Wed Mar  3 00:00:42 1999
-@@ -123,17 +123,17 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+--- iagno/Makefile.in.orig	Sun Sep 26 13:29:07 1999
++++ iagno/Makefile.in	Mon Sep 27 09:49:30 1999
+@@ -127,10 +127,10 @@
  
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/iagno
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
- 
- SUBDIRS = pix
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
- 
- 
- @HAS_CURSES_TRUE@CTALI = ctali
- 
--bin_PROGRAMS = gtali	$(CTALI)
-+bin_PROGRAMS = gtali
+ appicondir = $(datadir)/pixmaps
  
- gtali_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
+-INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
---- mahjongg/Makefile.in.orig	Mon Mar  1 02:50:35 1999
-+++ mahjongg/Makefile.in	Wed Mar  3 00:01:32 1999
-@@ -125,10 +125,10 @@
  
+ bin_PROGRAMS = iagno
+--- mahjongg/Makefile.in.orig	Sun Sep 26 13:28:53 1999
++++ mahjongg/Makefile.in	Mon Sep 27 09:46:10 1999
+@@ -128,10 +128,10 @@
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/mahjongg
+ bgdir = $(datadir)/pixmaps/mahjongg/bg
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  appicondir = $(datadir)/pixmaps
@@ -318,29 +327,9 @@
  
  
  bin_PROGRAMS = mahjongg
---- metatris/Makefile.in.orig	Mon Mar  1 02:51:06 1999
-+++ metatris/Makefile.in	Wed Mar  3 00:01:34 1999
-@@ -128,7 +128,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-metatris.png
- 
--sysdir = $(datadir)/gnome/apps/Games
-+sysdir = $(datadir)/apps/Games
- sys_DATA = metatris.desktop
- 
- mydatadir = $(datadir)/metatris/default-theme
-@@ -146,7 +146,7 @@
- metatris_LDFLAGS = $(GTK_LIBS)		$(GNOME_LIBDIR) 		$(GNOMEUI_LIBS)			$(INTLLIBS)
- 
- 
--CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
-+CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
- 
- 
- scoredir = $(localstatedir)/games
---- same-gnome/Makefile.in.orig	Mon Mar  1 02:50:30 1999
-+++ same-gnome/Makefile.in	Wed Mar  3 00:01:52 1999
-@@ -125,11 +125,11 @@
+--- same-gnome/Makefile.in.orig	Sun Sep 26 13:28:38 1999
++++ same-gnome/Makefile.in	Mon Sep 27 09:50:47 1999
+@@ -127,11 +127,11 @@
  
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/same-gnome
@@ -354,9 +343,9 @@
  
  
  bin_PROGRAMS = same-gnome
---- same-gnome/help/C/Makefile.in.orig	Mon Mar  1 02:50:32 1999
-+++ same-gnome/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- same-gnome/help/C/Makefile.in.orig	Sun Sep 26 13:28:50 1999
++++ same-gnome/help/C/Makefile.in	Mon Sep 27 09:51:19 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -365,9 +354,9 @@
  
  same_gnome_help_DATA =  	index.html			topic.dat
  
---- scottfree/Makefile.in.orig	Mon Mar  1 02:50:33 1999
-+++ scottfree/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- scottfree/Makefile.in.orig	Sun Sep 26 13:28:52 1999
++++ scottfree/Makefile.in	Mon Sep 27 09:52:29 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -376,3 +365,14 @@
  
  
  bin_PROGRAMS = GnomeScott
+--- xbill/Makefile.in.orig	Sun Sep 26 13:29:33 1999
++++ xbill/Makefile.in	Mon Sep 27 09:53:11 1999
+@@ -143,7 +143,7 @@
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = xbill.png
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ Games_DATA = xbill.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/games/gnome-games/files/patch-ag b/games/gnome-games/files/patch-ag
new file mode 100644
index 000000000000..a192fe907dc4
--- /dev/null
+++ b/games/gnome-games/files/patch-ag
@@ -0,0 +1,18 @@
+--- gtali/cyahtzee.c.orig	Sat Apr 10 22:42:17 1999
++++ gtali/cyahtzee.c	Mon Oct  4 16:29:56 1999
+@@ -37,13 +37,14 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ 
++#include <config.h>
++
+ #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+ #include <ncurses.h>
+ #else
+ #include <curses.h>
+ #endif
+ 
+-#include <config.h>
+ #include "yahtzee.h"
+ #include "cyahtzee.h"
+ #include "scores.h"
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 419803d9cd85..4af7937c6669 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1,9 +1,12 @@
 bin/GnomeScott
+bin/ctali
 bin/freecell
+bin/gataxx
+bin/glines
 bin/gnibbles
-bin/gnobots
 bin/gnobots2
 bin/gnome-stones
+bin/gnome-xbill
 bin/gnometris
 bin/gnomine
 bin/gnotravex
@@ -11,9 +14,9 @@ bin/gtali
 bin/gturing
 bin/iagno
 bin/mahjongg
-bin/metatris
 bin/same-gnome
 bin/sol
+etc/sound/events/gataxx.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
@@ -24,19 +27,22 @@ lib/libgdkcardimage.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/gnome/apps/Games/freecell.desktop
+share/gnome/apps/Games/gataxx.desktop
+share/gnome/apps/Games/glines.desktop
 share/gnome/apps/Games/gnibbles.desktop
-share/gnome/apps/Games/gnobots.desktop
 share/gnome/apps/Games/gnobots2.desktop
 share/gnome/apps/Games/gnome-stones.desktop
 share/gnome/apps/Games/gnometris.desktop
 share/gnome/apps/Games/gnomine.desktop
 share/gnome/apps/Games/gnotravex.desktop
 share/gnome/apps/Games/gtali.desktop
+share/gnome/apps/Games/gturing.desktop
 share/gnome/apps/Games/iagno.desktop
 share/gnome/apps/Games/mahjongg.desktop
-share/gnome/apps/Games/metatris.desktop
 share/gnome/apps/Games/same-gnome.desktop
 share/gnome/apps/Games/sol.desktop
+share/gnome/apps/Games/xbill.desktop
+share/gnome/games/glines.scores
 share/gnome/games/gnibbles.1.0.scores
 share/gnome/games/gnibbles.1.1.scores
 share/gnome/games/gnibbles.2.0.scores
@@ -45,8 +51,6 @@ share/gnome/games/gnibbles.3.0.scores
 share/gnome/games/gnibbles.3.1.scores
 share/gnome/games/gnibbles.4.0.scores
 share/gnome/games/gnibbles.4.1.scores
-share/gnome/games/gnobots.safe.scores
-share/gnome/games/gnobots.unsafe.scores
 share/gnome/games/gnobots2.classic_robots-safe.scores
 share/gnome/games/gnobots2.classic_robots.scores
 share/gnome/games/gnobots2.nightmare-safe.scores
@@ -58,6 +62,7 @@ share/gnome/games/gnobots2.robots2_easy.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport.scores
 share/gnome/games/gnome-stones.scores
+share/gnome/games/gnome-xbill.scores
 share/gnome/games/gnometris.scores
 share/gnome/games/gnomine.Biiiig.scores
 share/gnome/games/gnomine.Custom.scores
@@ -75,8 +80,7 @@ share/gnome/games/iagno.b3.scores
 share/gnome/games/iagno.w1.scores
 share/gnome/games/iagno.w2.scores
 share/gnome/games/iagno.w3.scores
-share/gnome/games/mahjongg.scores
-share/gnome/games/metatris.scores
+share/gnome/games/mahjongg.{easy,difficult}.scores
 share/gnome/games/same-gnome.scores
 share/gnome/gnibbles/level001.gnl
 share/gnome/gnibbles/level002.gnl
@@ -126,14 +130,14 @@ share/gnome/gturing/examples/bin2dec.tur
 share/gnome/gturing/examples/dashnumbers.tur
 share/gnome/gturing/examples/dec2bin.tur
 share/gnome/gturing/examples/subst.tur
-share/gnome/help/gnobots/C/index.html
-share/gnome/help/gnobots/C/topic.dat
-share/gnome/help/gnobots/es/index.html
-share/gnome/help/gnobots/es/topic.dat
 share/gnome/help/gnobots2/C/index.html
 share/gnome/help/gnobots2/C/topic.dat
 share/gnome/help/gnobots2/es/index.html
 share/gnome/help/gnobots2/es/topic.dat
+share/gnome/help/gnobots2/it/index.html
+share/gnome/help/gnobots2/it/topic.dat
+share/gnome/help/gtali/C/index.html
+share/gnome/help/gtali/C/topic.dat
 share/gnome/help/samegnome/C/authors.html
 share/gnome/help/samegnome/C/book1.html
 share/gnome/help/samegnome/C/bugs.html
@@ -143,81 +147,6 @@ share/gnome/help/samegnome/C/index.html
 share/gnome/help/samegnome/C/ln9.html
 share/gnome/help/samegnome/C/newthemes.html
 share/gnome/help/samegnome/C/topic.dat
-share/gnome/metatris/default-theme/metatris-bg.png
-share/gnome/metatris/default-theme/metatris-piece-00-01.png
-share/gnome/metatris/default-theme/metatris-piece-00-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-00.png
-share/gnome/metatris/default-theme/metatris-piece-02-01.png
-share/gnome/metatris/default-theme/metatris-piece-02-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-02.png
-share/gnome/metatris/default-theme/metatris-piece-08-01.png
-share/gnome/metatris/default-theme/metatris-piece-08-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-08.png
-share/gnome/metatris/default-theme/metatris-piece-0a-01.png
-share/gnome/metatris/default-theme/metatris-piece-0a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0a.png
-share/gnome/metatris/default-theme/metatris-piece-0e-01.png
-share/gnome/metatris/default-theme/metatris-piece-0e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0e.png
-share/gnome/metatris/default-theme/metatris-piece-20-01.png
-share/gnome/metatris/default-theme/metatris-piece-20-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-20.png
-share/gnome/metatris/default-theme/metatris-piece-22-01.png
-share/gnome/metatris/default-theme/metatris-piece-22-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-22.png
-share/gnome/metatris/default-theme/metatris-piece-28-01.png
-share/gnome/metatris/default-theme/metatris-piece-28-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-28.png
-share/gnome/metatris/default-theme/metatris-piece-2a-01.png
-share/gnome/metatris/default-theme/metatris-piece-2a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-2a.png
-share/gnome/metatris/default-theme/metatris-piece-38-01.png
-share/gnome/metatris/default-theme/metatris-piece-38-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-38.png
-share/gnome/metatris/default-theme/metatris-piece-3e-01.png
-share/gnome/metatris/default-theme/metatris-piece-3e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-3e.png
-share/gnome/metatris/default-theme/metatris-piece-80-01.png
-share/gnome/metatris/default-theme/metatris-piece-80-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-80.png
-share/gnome/metatris/default-theme/metatris-piece-82-01.png
-share/gnome/metatris/default-theme/metatris-piece-82-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-82.png
-share/gnome/metatris/default-theme/metatris-piece-83-01.png
-share/gnome/metatris/default-theme/metatris-piece-83-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-83.png
-share/gnome/metatris/default-theme/metatris-piece-88-01.png
-share/gnome/metatris/default-theme/metatris-piece-88-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-88.png
-share/gnome/metatris/default-theme/metatris-piece-8a-01.png
-share/gnome/metatris/default-theme/metatris-piece-8a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8a.png
-share/gnome/metatris/default-theme/metatris-piece-8f-01.png
-share/gnome/metatris/default-theme/metatris-piece-8f-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8f.png
-share/gnome/metatris/default-theme/metatris-piece-a0-01.png
-share/gnome/metatris/default-theme/metatris-piece-a0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a0.png
-share/gnome/metatris/default-theme/metatris-piece-a2-01.png
-share/gnome/metatris/default-theme/metatris-piece-a2-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a2.png
-share/gnome/metatris/default-theme/metatris-piece-a8-01.png
-share/gnome/metatris/default-theme/metatris-piece-a8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a8.png
-share/gnome/metatris/default-theme/metatris-piece-e0-01.png
-share/gnome/metatris/default-theme/metatris-piece-e0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e0.png
-share/gnome/metatris/default-theme/metatris-piece-e3-01.png
-share/gnome/metatris/default-theme/metatris-piece-e3-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e3.png
-share/gnome/metatris/default-theme/metatris-piece-f8-01.png
-share/gnome/metatris/default-theme/metatris-piece-f8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-f8.png
-share/gnome/metatris/default-theme/metatris-piece-ff-01.png
-share/gnome/metatris/default-theme/metatris-piece-ff-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-ff.png
-share/gnome/metatris/default-theme/metatris.png
-share/gnome/metatris/default-theme/metatris.theme
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/pixmaps/cards/backs/beige.png
@@ -251,16 +180,19 @@ 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/gataxx.png
+share/gnome/pixmaps/gataxx/blend.png
+share/gnome/pixmaps/gataxx/classic.png
+share/gnome/pixmaps/gataxx/flipblend.png
+share/gnome/pixmaps/gataxx/metal.png
+share/gnome/pixmaps/gataxx/metal2.png
+share/gnome/pixmaps/gataxx/shrink.png
+share/gnome/pixmaps/gataxx/woodtrim.png
+share/gnome/pixmaps/glines.xpm
+share/gnome/pixmaps/glines/ball.xpm
+share/gnome/pixmaps/glines/box.xpm
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
-share/gnome/pixmaps/gnobots/aieee.png
-share/gnome/pixmaps/gnobots/cows.png
-share/gnome/pixmaps/gnobots/eggs.png
-share/gnome/pixmaps/gnobots/gnomes.png
-share/gnome/pixmaps/gnobots/mice.png
-share/gnome/pixmaps/gnobots/robots.png
-share/gnome/pixmaps/gnobots/windows.png
-share/gnome/pixmaps/gnobots/yahoo.png
 share/gnome/pixmaps/gnobots2/aieee.png
 share/gnome/pixmaps/gnobots2/cows.png
 share/gnome/pixmaps/gnobots2/eggs.png
@@ -271,17 +203,18 @@ share/gnome/pixmaps/gnobots2/splat.png
 share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
 share/gnome/pixmaps/gnome-aisleriot.png
-share/gnome/pixmaps/gnome-gnobots.png
 share/gnome/pixmaps/gnome-gnobots2.png
 share/gnome/pixmaps/gnome-gtali.png
 share/gnome/pixmaps/gnome-gtetris.png
 share/gnome/pixmaps/gnome-mahjongg.png
-share/gnome/pixmaps/gnome-metatris.png
+share/gnome/pixmaps/gnome-nibbles.png
 share/gnome/pixmaps/gnome-stones-file.png
 share/gnome/pixmaps/gnome-stones.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
+share/gnome/pixmaps/gnome-stones/background.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png
+share/gnome/pixmaps/gnome-stones/crate.png
 share/gnome/pixmaps/gnome-stones/curtain.png
 share/gnome/pixmaps/gnome-stones/diamond.png
 share/gnome/pixmaps/gnome-stones/dirt.png
@@ -297,13 +230,16 @@ 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/7blocks-tig.png
 share/gnome/pixmaps/gnometris/bg/fishy-bg.png
 share/gnome/pixmaps/gnometris/bg/greyprint-bg.png
 share/gnome/pixmaps/gnometris/bg/leaves-bg.png
 share/gnome/pixmaps/gnometris/bg/sweet-bg.png
 share/gnome/pixmaps/gnometris/bg/watery-bg.png
+share/gnome/pixmaps/gnometris/bg/vortex-bg.png
 share/gnome/pixmaps/gnometris/bg/weirdo-bg.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
+share/gnome/pixmaps/gnotravex/gnome-gnotravex.png
 share/gnome/pixmaps/iagno.png
 share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
@@ -312,6 +248,10 @@ share/gnome/pixmaps/iagno/metal.png
 share/gnome/pixmaps/iagno/metal2.png
 share/gnome/pixmaps/iagno/shrink.png
 share/gnome/pixmaps/iagno/woodtrim.png
+share/gnome/pixmaps/mahjongg/bg/bg1.png
+share/gnome/pixmaps/mahjongg/bg/bg2.png
+share/gnome/pixmaps/mahjongg/bg/bg3.png
+share/gnome/pixmaps/mahjongg/bg/bg4.png
 share/gnome/pixmaps/mahjongg/default.png
 share/gnome/pixmaps/mahjongg/seta.png
 share/gnome/pixmaps/same-gnome/blink-sync.png
@@ -319,6 +259,7 @@ share/gnome/pixmaps/same-gnome/marbles.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/xbill.png
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/beleaguered_castle.scm
 share/gnome/sol-games/bristol.scm
@@ -328,12 +269,14 @@ share/gnome/sol-games/clock.scm
 share/gnome/sol-games/doublets.scm
 share/gnome/sol-games/eagle_wing.scm
 share/gnome/sol-games/elevator.scm
+share/gnome/sol-games/first_law.scm
 share/gnome/sol-games/fortunes.scm
 share/gnome/sol-games/fourteen.scm
 share/gnome/sol-games/freecell.scm
 share/gnome/sol-games/hopscotch.scm
 share/gnome/sol-games/kansas.scm
 share/gnome/sol-games/klondike.scm
+share/gnome/sol-games/lady_jane.scm
 share/gnome/sol-games/neighbor.scm
 share/gnome/sol-games/odessa.scm
 share/gnome/sol-games/osmosis.scm
@@ -342,12 +285,16 @@ share/gnome/sol-games/royal_east.scm
 share/gnome/sol-games/scorpion.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/straight_up.scm
 share/gnome/sol-games/thieves.scm
 share/gnome/sol-games/thirteen.scm
 share/gnome/sol-games/thumb_and_pouch.scm
 share/gnome/sol-games/union_square.scm
 share/gnome/sol-games/westhaven.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
@@ -365,24 +312,99 @@ share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
+share/gnome/xbill/cursors/apple.xpm
+share/gnome/xbill/cursors/bsd.xpm
+share/gnome/xbill/cursors/bucket.xpm
+share/gnome/xbill/cursors/hand_down.xpm
+share/gnome/xbill/cursors/hand_down_mask.xpm
+share/gnome/xbill/cursors/hand_up.xpm
+share/gnome/xbill/cursors/hand_up_mask.xpm
+share/gnome/xbill/cursors/hurd.xpm
+share/gnome/xbill/cursors/linux.xpm
+share/gnome/xbill/cursors/next.xpm
+share/gnome/xbill/cursors/os2.xpm
+share/gnome/xbill/cursors/redhat.xpm
+share/gnome/xbill/cursors/sgi.xpm
+share/gnome/xbill/cursors/sun.xpm
+share/gnome/xbill/pixmaps/about.xpm
+share/gnome/xbill/pixmaps/apple.xpm
+share/gnome/xbill/pixmaps/billA_0.xpm
+share/gnome/xbill/pixmaps/billA_1.xpm
+share/gnome/xbill/pixmaps/billA_10.xpm
+share/gnome/xbill/pixmaps/billA_11.xpm
+share/gnome/xbill/pixmaps/billA_12.xpm
+share/gnome/xbill/pixmaps/billA_2.xpm
+share/gnome/xbill/pixmaps/billA_3.xpm
+share/gnome/xbill/pixmaps/billA_4.xpm
+share/gnome/xbill/pixmaps/billA_5.xpm
+share/gnome/xbill/pixmaps/billA_6.xpm
+share/gnome/xbill/pixmaps/billA_7.xpm
+share/gnome/xbill/pixmaps/billA_8.xpm
+share/gnome/xbill/pixmaps/billA_9.xpm
+share/gnome/xbill/pixmaps/billD_0.xpm
+share/gnome/xbill/pixmaps/billD_1.xpm
+share/gnome/xbill/pixmaps/billD_2.xpm
+share/gnome/xbill/pixmaps/billD_3.xpm
+share/gnome/xbill/pixmaps/billD_4.xpm
+share/gnome/xbill/pixmaps/billL_0.xpm
+share/gnome/xbill/pixmaps/billL_1.xpm
+share/gnome/xbill/pixmaps/billL_2.xpm
+share/gnome/xbill/pixmaps/billR_0.xpm
+share/gnome/xbill/pixmaps/billR_1.xpm
+share/gnome/xbill/pixmaps/billR_2.xpm
+share/gnome/xbill/pixmaps/bsd.xpm
+share/gnome/xbill/pixmaps/bsdcpu.xpm
+share/gnome/xbill/pixmaps/bucket.xpm
+share/gnome/xbill/pixmaps/hurd.xpm
+share/gnome/xbill/pixmaps/icon.xpm
+share/gnome/xbill/pixmaps/linux.xpm
+share/gnome/xbill/pixmaps/logo.xpm
+share/gnome/xbill/pixmaps/maccpu.xpm
+share/gnome/xbill/pixmaps/next.xpm
+share/gnome/xbill/pixmaps/nextcpu.xpm
+share/gnome/xbill/pixmaps/os2.xpm
+share/gnome/xbill/pixmaps/os2cpu.xpm
+share/gnome/xbill/pixmaps/redhat.xpm
+share/gnome/xbill/pixmaps/sgi.xpm
+share/gnome/xbill/pixmaps/sgicpu.xpm
+share/gnome/xbill/pixmaps/spark_0.xpm
+share/gnome/xbill/pixmaps/spark_1.xpm
+share/gnome/xbill/pixmaps/sun.xpm
+share/gnome/xbill/pixmaps/suncpu.xpm
+share/gnome/xbill/pixmaps/toaster.xpm
+share/gnome/xbill/pixmaps/wingdows.xpm
 share/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/en_GB/LC_MESSAGES/gnome-games.mo
 share/locale/es/LC_MESSAGES/gnome-games.mo
+share/locale/et/LC_MESSAGES/gnome-games.mo
 share/locale/fi/LC_MESSAGES/gnome-games.mo
 share/locale/fr/LC_MESSAGES/gnome-games.mo
 share/locale/ga/LC_MESSAGES/gnome-games.mo
+share/locale/hu/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
+share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
 share/locale/pl/LC_MESSAGES/gnome-games.mo
 share/locale/pt/LC_MESSAGES/gnome-games.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
+share/locale/ru/LC_MESSAGES/gnome-games.mo
+share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/wa/LC_MESSAGES/gnome-games.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
+@dirrm share/gnome/xbill/pixmaps
+@dirrm share/gnome/xbill/cursors
+@dirrm share/gnome/xbill
 @dirrm share/gnome/sounds/iagno
 @dirrm share/gnome/sounds/gnobots2
 @dirrm share/gnome/sounds/gnibbles
+@dirrm share/gnome/sounds/gataxx
 @dirrm share/gnome/sol-games
 @dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/pixmaps/mahjongg/bg
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
 @dirrm share/gnome/pixmaps/gnotravex
@@ -390,8 +412,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/gnometris
 @dirrm share/gnome/pixmaps/gnome-stones
 @dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnobots
 @dirrm share/gnome/pixmaps/gnibbles
+@dirrm share/gnome/pixmaps/glines
+@dirrm share/gnome/pixmaps/gataxx
 @dirrm share/gnome/pixmaps/cards/suits_small
 @dirrm share/gnome/pixmaps/cards/suits_medium
 @dirrm share/gnome/pixmaps/cards/suits_large
@@ -401,16 +424,14 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/honors
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/metatris/default-theme
-@dirrm share/gnome/metatris
 @dirrm share/gnome/help/samegnome/C
 @dirrm share/gnome/help/samegnome
+@dirrm share/gnome/help/gtali/C
+@dirrm share/gnome/help/gtali
+@dirrm share/gnome/help/gnobots2/it
 @dirrm share/gnome/help/gnobots2/es
 @dirrm share/gnome/help/gnobots2/C
 @dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnobots/es
-@dirrm share/gnome/help/gnobots/C
-@dirrm share/gnome/help/gnobots
 @dirrm share/gnome/gturing/examples
 @dirrm share/gnome/gturing
 @dirrm share/gnome/gnome-stones/objects
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index dd442d5bf23c..ed1dc286681c 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	gnomegames
-# Version required:			1.0.2
+# Version required:			1.0.51
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-games-1.0.2
-PKGNAME=	gnomegames-1.0.2
+DISTNAME=	gnome-games-1.0.51
+PKGNAME=	gnomegames-1.0.51
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
diff --git a/games/gnomegames/distinfo b/games/gnomegames/distinfo
index 9af51a776243..f7a4a06afa65 100644
--- a/games/gnomegames/distinfo
+++ b/games/gnomegames/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-1.0.2.tar.gz) = 1fbe5076d9234522f6f6401e672a02fe
+MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9
diff --git a/games/gnomegames/files/patch-ab b/games/gnomegames/files/patch-ab
index a0f6935380e5..b36831ec5ecb 100644
--- a/games/gnomegames/files/patch-ab
+++ b/games/gnomegames/files/patch-ab
@@ -1,6 +1,6 @@
---- aisleriot/Makefile.in.orig	Mon Mar  1 02:50:59 1999
-+++ aisleriot/Makefile.in	Wed Mar  3 00:00:04 1999
-@@ -126,12 +126,12 @@
+--- aisleriot/Makefile.in.orig	Sun Sep 26 13:29:13 1999
++++ aisleriot/Makefile.in	Mon Sep 27 09:30:04 1999
+@@ -128,12 +128,12 @@
  scoredir = $(localstatedir)/games
  cardimagedir = $(datadir)/pixmaps/cards
  icondir = $(datadir)/pixmaps
@@ -11,13 +11,13 @@
 -SUBDIRS = docs pixmaps
 +SUBDIRS = pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
  
  
  bin_PROGRAMS = sol
-@@ -152,7 +152,7 @@
- EXTRA_DIST = TODO FIXME  AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
+@@ -154,7 +154,7 @@
+ EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
  
  
 -sysdir = $(datadir)/gnome/apps/Games
@@ -25,20 +25,20 @@
  sys_DATA = sol.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
---- aisleriot/docs/Makefile.in.orig	Mon Mar  1 02:51:00 1999
-+++ aisleriot/docs/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -129,7 +129,7 @@
+--- aisleriot/docs/Makefile.in.orig	Sun Sep 26 13:29:29 1999
++++ aisleriot/docs/Makefile.in	Mon Sep 27 09:30:38 1999
+@@ -131,7 +131,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -helpdir = $(datadir)/gnome/help/aisleriot/C
 +helpdir = $(datadir)/help/aisleriot/C
  
- help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html klondike.html 	fourteen.html pileon.html auld-lang-syne.html hopscotch.html 	neighbor.html odessa.html osmosis.html spider.html yukon.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html 	camelot-goal.gif clock-rules.gif docbook.css topic.dat
+ help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html 	kansas.html klondike.html first-law.html 	fourteen.html pileon.html auld-lang-syne.html 	hopscotch.html scorpion.html thumb-and-pouch.html 	neighbor.html odessa.html osmosis.html spider.html 	yukon.html westhaven.html royal-east.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html union-square.html 	camelot-goal.gif clock-rules.gif docbook.css 	topic.dat straight-up.html zebra.html lady-jane.html
  
---- freecell/src/Makefile.in.orig	Mon Mar  1 02:50:27 1999
-+++ freecell/src/Makefile.in	Wed Mar  3 00:01:13 1999
-@@ -123,9 +123,9 @@
+--- freecell/src/Makefile.in.orig	Sun Sep 26 13:28:36 1999
++++ freecell/src/Makefile.in	Mon Sep 27 09:31:48 1999
+@@ -125,9 +125,9 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -50,62 +50,55 @@
  
  
  bin_PROGRAMS = freecell
---- gnibbles/Makefile.in.orig	Mon Mar  1 02:51:08 1999
-+++ gnibbles/Makefile.in	Wed Mar  3 00:00:39 1999
+--- gataxx/Makefile.in.orig	Sun Sep 26 13:29:41 1999
++++ gataxx/Makefile.in	Mon Sep 27 09:47:28 1999
 @@ -127,10 +127,10 @@
- configdir = $(datadir)/gnibbles
- appicondir = $(datadir)/pixmaps
- soundlistdir = $(sysconfdir)/sound/events
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/gataxx
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
+ appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
  
- bin_PROGRAMS = gnibbles
---- gnobots/Makefile.in.orig	Mon Mar  1 02:50:42 1999
-+++ gnobots/Makefile.in	Wed Mar  3 00:00:54 1999
-@@ -126,11 +126,11 @@
+ bin_PROGRAMS = gataxx
+--- glines/Makefile.in.orig	Sun Sep 26 13:29:40 1999
++++ glines/Makefile.in	Mon Sep 27 09:48:33 1999
+@@ -128,11 +128,11 @@
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnobots
- appicondir = $(datadir)/pixmaps
+ pixmapdir = $(datadir)/pixmaps/glines
+ icondir = $(datadir)/pixmaps
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  
- SUBDIRS = help
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+ #SUBDIRS = help
  
+-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = gnobots
---- gnobots/help/C/Makefile.in.orig	Mon Mar  1 02:50:44 1999
-+++ gnobots/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
  
+ bin_PROGRAMS = glines
+--- gnibbles/Makefile.in.orig	Sun Sep 26 13:29:38 1999
++++ gnibbles/Makefile.in	Mon Sep 27 09:32:42 1999
+@@ -129,10 +129,10 @@
+ configdir = $(datadir)/gnibbles
+ icondir = $(datadir)/pixmaps
+ soundlistdir = $(sysconfdir)/sound/events
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/C
-+gnobots_helpdir = $(datadir)/help/gnobots/C
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots/help/es/Makefile.in.orig	Mon Mar  1 02:50:45 1999
-+++ gnobots/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/es
-+gnobots_helpdir = $(datadir)/help/gnobots/es
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots2/Makefile.in.orig	Mon Mar  1 02:50:46 1999
-+++ gnobots2/Makefile.in	Wed Mar  3 00:00:36 1999
-@@ -129,11 +129,11 @@
+ bin_PROGRAMS = gnibbles
+--- gnobots2/Makefile.in.orig	Sun Sep 26 13:29:01 1999
++++ gnobots2/Makefile.in	Mon Sep 27 09:33:16 1999
+@@ -131,11 +131,11 @@
  soundlistdir = $(sysconfdir)/sound/events
  sounddir = $(datadir)/sounds/gnobots2
  appicondir = $(datadir)/pixmaps
@@ -119,9 +112,9 @@
  
  
  bin_PROGRAMS = gnobots2
---- gnobots2/help/C/Makefile.in.orig	Mon Mar  1 02:50:49 1999
-+++ gnobots2/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/C/Makefile.in.orig	Sun Sep 26 13:29:03 1999
++++ gnobots2/help/C/Makefile.in	Mon Sep 27 09:34:12 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -130,9 +123,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots2/help/es/Makefile.in.orig	Mon Mar  1 02:50:50 1999
-+++ gnobots2/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/es/Makefile.in.orig	Sun Sep 26 13:29:04 1999
++++ gnobots2/help/es/Makefile.in	Mon Sep 27 09:34:44 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -141,9 +134,20 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnome-stones/Makefile.in.orig	Mon Mar  1 02:50:55 1999
-+++ gnome-stones/Makefile.in	Wed Mar  3 00:33:00 1999
-@@ -125,12 +125,12 @@
+--- gnobots2/help/it/Makefile.in.orig	Sun Sep 26 13:29:05 1999
++++ gnobots2/help/it/Makefile.in	Mon Sep 27 09:34:56 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it
++gnobots2_helpdir = $(datadir)/help/gnobots2/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gnome-stones/Makefile.in.orig	Sun Sep 26 13:29:10 1999
++++ gnome-stones/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,12 +127,12 @@
  
  SUBDIRS = objects graphics
  
@@ -158,7 +162,7 @@
  
  
  bin_PROGRAMS = gnome-stones
-@@ -145,7 +145,7 @@
+@@ -147,7 +147,7 @@
  Games_DATA = gnome-stones.desktop
  Caves_DATA = default.caves tutorial.caves gnomekoban.caves
  
@@ -166,10 +170,10 @@
 +gtkrcdir = $(datadir)/gnome-stones
  gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
  
- EXTRA_DIST =  	$(Pixmap_DATA)					$(Games_DATA)					$(Caves_DATA)					$(gtkrc_DATA)					TODO						README
---- gnome-stones/objects/Makefile.in.orig	Mon Mar  1 02:50:56 1999
-+++ gnome-stones/objects/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -125,9 +125,9 @@
+ Mimedir = $(datadir)/mime-info
+--- gnome-stones/objects/Makefile.in.orig	Sun Sep 26 13:29:11 1999
++++ gnome-stones/objects/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  GSTONES_SRC_DIR = $(srcdir)/../
  
@@ -181,7 +185,7 @@
  
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
-@@ -143,10 +143,10 @@
+@@ -144,10 +144,10 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -194,9 +198,9 @@
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- gnometris/Makefile.in.orig	Mon Mar  1 02:51:03 1999
-+++ gnometris/Makefile.in	Wed Mar  3 00:00:33 1999
-@@ -125,9 +125,9 @@
+--- gnometris/Makefile.in.orig	Sun Sep 26 13:29:31 1999
++++ gnometris/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  SUBDIRS = pix
  scoredir = $(localstatedir)/games
@@ -208,9 +212,9 @@
  
  
  bin_PROGRAMS = gnometris
---- gnomine/Makefile.in.orig	Mon Mar  1 02:50:28 1999
-+++ gnomine/Makefile.in	Wed Mar  3 00:00:48 1999
-@@ -124,9 +124,9 @@
+--- gnomine/Makefile.in.orig	Sun Sep 26 13:28:37 1999
++++ gnomine/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -126,9 +126,9 @@
  l = @l@
  
  scoredir = $(localstatedir)/games
@@ -222,38 +226,51 @@
  
  
  bin_PROGRAMS = gnomine
---- gnothello/Makefile.in.orig	Mon Mar  1 02:50:51 1999
-+++ gnothello/Makefile.in	Wed Mar  3 00:00:29 1999
-@@ -125,10 +125,10 @@
+--- gnotravex/Makefile.in.orig	Sun Sep 26 13:29:09 1999
++++ gnotravex/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -127,9 +127,9 @@
  
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/iagno
+ pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
-+INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  
- bin_PROGRAMS = iagno
---- gnotravex/Makefile.in.orig	Mon Mar  1 02:50:54 1999
-+++ gnotravex/Makefile.in	Wed Mar  3 00:00:45 1999
-@@ -125,9 +125,9 @@
+ bin_PROGRAMS = gnotravex
+--- gtali/Makefile.in.orig	Sun Sep 26 13:28:57 1999
++++ gtali/Makefile.in	Mon Sep 27 09:44:54 1999
+@@ -125,12 +125,12 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ SUBDIRS = pix help
  
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
  
- bin_PROGRAMS = gnotravex
---- gturing/Makefile.in.orig	Mon Mar  1 02:50:36 1999
-+++ gturing/Makefile.in	Wed Mar  3 00:00:25 1999
-@@ -124,12 +124,12 @@
+ 
+ @HAS_CURSES_TRUE@CTALI = ctali
+--- gtali/help/C/Makefile.in.orig	Sun Sep 26 13:29:00 1999
++++ gtali/help/C/Makefile.in	Mon Sep 27 09:45:28 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gtali_helpdir = $(datadir)/gnome/help/gtali/C
++gtali_helpdir = $(datadir)/help/gtali/C
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gturing/Makefile.in.orig	Sun Sep 26 13:28:54 1999
++++ gturing/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,12 +125,12 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -269,9 +286,9 @@
  
  
  bin_PROGRAMS = gturing
---- gturing/help/C/Makefile.in.orig	Mon Mar  1 02:50:38 1999
-+++ gturing/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- gturing/help/C/Makefile.in.orig	Sun Sep 26 13:28:56 1999
++++ gturing/help/C/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -280,35 +297,27 @@
  
  gturing_help_DATA =  	index.html			topic.dat
  
---- gyahtzee/Makefile.in.orig	Mon Mar  1 02:50:39 1999
-+++ gyahtzee/Makefile.in	Wed Mar  3 00:00:42 1999
-@@ -123,17 +123,17 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+--- iagno/Makefile.in.orig	Sun Sep 26 13:29:07 1999
++++ iagno/Makefile.in	Mon Sep 27 09:49:30 1999
+@@ -127,10 +127,10 @@
  
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/iagno
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
- 
- SUBDIRS = pix
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
- 
- 
- @HAS_CURSES_TRUE@CTALI = ctali
- 
--bin_PROGRAMS = gtali	$(CTALI)
-+bin_PROGRAMS = gtali
+ appicondir = $(datadir)/pixmaps
  
- gtali_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
+-INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
---- mahjongg/Makefile.in.orig	Mon Mar  1 02:50:35 1999
-+++ mahjongg/Makefile.in	Wed Mar  3 00:01:32 1999
-@@ -125,10 +125,10 @@
  
+ bin_PROGRAMS = iagno
+--- mahjongg/Makefile.in.orig	Sun Sep 26 13:28:53 1999
++++ mahjongg/Makefile.in	Mon Sep 27 09:46:10 1999
+@@ -128,10 +128,10 @@
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/mahjongg
+ bgdir = $(datadir)/pixmaps/mahjongg/bg
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  appicondir = $(datadir)/pixmaps
@@ -318,29 +327,9 @@
  
  
  bin_PROGRAMS = mahjongg
---- metatris/Makefile.in.orig	Mon Mar  1 02:51:06 1999
-+++ metatris/Makefile.in	Wed Mar  3 00:01:34 1999
-@@ -128,7 +128,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-metatris.png
- 
--sysdir = $(datadir)/gnome/apps/Games
-+sysdir = $(datadir)/apps/Games
- sys_DATA = metatris.desktop
- 
- mydatadir = $(datadir)/metatris/default-theme
-@@ -146,7 +146,7 @@
- metatris_LDFLAGS = $(GTK_LIBS)		$(GNOME_LIBDIR) 		$(GNOMEUI_LIBS)			$(INTLLIBS)
- 
- 
--CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
-+CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
- 
- 
- scoredir = $(localstatedir)/games
---- same-gnome/Makefile.in.orig	Mon Mar  1 02:50:30 1999
-+++ same-gnome/Makefile.in	Wed Mar  3 00:01:52 1999
-@@ -125,11 +125,11 @@
+--- same-gnome/Makefile.in.orig	Sun Sep 26 13:28:38 1999
++++ same-gnome/Makefile.in	Mon Sep 27 09:50:47 1999
+@@ -127,11 +127,11 @@
  
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/same-gnome
@@ -354,9 +343,9 @@
  
  
  bin_PROGRAMS = same-gnome
---- same-gnome/help/C/Makefile.in.orig	Mon Mar  1 02:50:32 1999
-+++ same-gnome/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- same-gnome/help/C/Makefile.in.orig	Sun Sep 26 13:28:50 1999
++++ same-gnome/help/C/Makefile.in	Mon Sep 27 09:51:19 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -365,9 +354,9 @@
  
  same_gnome_help_DATA =  	index.html			topic.dat
  
---- scottfree/Makefile.in.orig	Mon Mar  1 02:50:33 1999
-+++ scottfree/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- scottfree/Makefile.in.orig	Sun Sep 26 13:28:52 1999
++++ scottfree/Makefile.in	Mon Sep 27 09:52:29 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -376,3 +365,14 @@
  
  
  bin_PROGRAMS = GnomeScott
+--- xbill/Makefile.in.orig	Sun Sep 26 13:29:33 1999
++++ xbill/Makefile.in	Mon Sep 27 09:53:11 1999
+@@ -143,7 +143,7 @@
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = xbill.png
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ Games_DATA = xbill.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/games/gnomegames/files/patch-ag b/games/gnomegames/files/patch-ag
new file mode 100644
index 000000000000..a192fe907dc4
--- /dev/null
+++ b/games/gnomegames/files/patch-ag
@@ -0,0 +1,18 @@
+--- gtali/cyahtzee.c.orig	Sat Apr 10 22:42:17 1999
++++ gtali/cyahtzee.c	Mon Oct  4 16:29:56 1999
+@@ -37,13 +37,14 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ 
++#include <config.h>
++
+ #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+ #include <ncurses.h>
+ #else
+ #include <curses.h>
+ #endif
+ 
+-#include <config.h>
+ #include "yahtzee.h"
+ #include "cyahtzee.h"
+ #include "scores.h"
diff --git a/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist
index 419803d9cd85..4af7937c6669 100644
--- a/games/gnomegames/pkg-plist
+++ b/games/gnomegames/pkg-plist
@@ -1,9 +1,12 @@
 bin/GnomeScott
+bin/ctali
 bin/freecell
+bin/gataxx
+bin/glines
 bin/gnibbles
-bin/gnobots
 bin/gnobots2
 bin/gnome-stones
+bin/gnome-xbill
 bin/gnometris
 bin/gnomine
 bin/gnotravex
@@ -11,9 +14,9 @@ bin/gtali
 bin/gturing
 bin/iagno
 bin/mahjongg
-bin/metatris
 bin/same-gnome
 bin/sol
+etc/sound/events/gataxx.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
@@ -24,19 +27,22 @@ lib/libgdkcardimage.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/gnome/apps/Games/freecell.desktop
+share/gnome/apps/Games/gataxx.desktop
+share/gnome/apps/Games/glines.desktop
 share/gnome/apps/Games/gnibbles.desktop
-share/gnome/apps/Games/gnobots.desktop
 share/gnome/apps/Games/gnobots2.desktop
 share/gnome/apps/Games/gnome-stones.desktop
 share/gnome/apps/Games/gnometris.desktop
 share/gnome/apps/Games/gnomine.desktop
 share/gnome/apps/Games/gnotravex.desktop
 share/gnome/apps/Games/gtali.desktop
+share/gnome/apps/Games/gturing.desktop
 share/gnome/apps/Games/iagno.desktop
 share/gnome/apps/Games/mahjongg.desktop
-share/gnome/apps/Games/metatris.desktop
 share/gnome/apps/Games/same-gnome.desktop
 share/gnome/apps/Games/sol.desktop
+share/gnome/apps/Games/xbill.desktop
+share/gnome/games/glines.scores
 share/gnome/games/gnibbles.1.0.scores
 share/gnome/games/gnibbles.1.1.scores
 share/gnome/games/gnibbles.2.0.scores
@@ -45,8 +51,6 @@ share/gnome/games/gnibbles.3.0.scores
 share/gnome/games/gnibbles.3.1.scores
 share/gnome/games/gnibbles.4.0.scores
 share/gnome/games/gnibbles.4.1.scores
-share/gnome/games/gnobots.safe.scores
-share/gnome/games/gnobots.unsafe.scores
 share/gnome/games/gnobots2.classic_robots-safe.scores
 share/gnome/games/gnobots2.classic_robots.scores
 share/gnome/games/gnobots2.nightmare-safe.scores
@@ -58,6 +62,7 @@ share/gnome/games/gnobots2.robots2_easy.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport.scores
 share/gnome/games/gnome-stones.scores
+share/gnome/games/gnome-xbill.scores
 share/gnome/games/gnometris.scores
 share/gnome/games/gnomine.Biiiig.scores
 share/gnome/games/gnomine.Custom.scores
@@ -75,8 +80,7 @@ share/gnome/games/iagno.b3.scores
 share/gnome/games/iagno.w1.scores
 share/gnome/games/iagno.w2.scores
 share/gnome/games/iagno.w3.scores
-share/gnome/games/mahjongg.scores
-share/gnome/games/metatris.scores
+share/gnome/games/mahjongg.{easy,difficult}.scores
 share/gnome/games/same-gnome.scores
 share/gnome/gnibbles/level001.gnl
 share/gnome/gnibbles/level002.gnl
@@ -126,14 +130,14 @@ share/gnome/gturing/examples/bin2dec.tur
 share/gnome/gturing/examples/dashnumbers.tur
 share/gnome/gturing/examples/dec2bin.tur
 share/gnome/gturing/examples/subst.tur
-share/gnome/help/gnobots/C/index.html
-share/gnome/help/gnobots/C/topic.dat
-share/gnome/help/gnobots/es/index.html
-share/gnome/help/gnobots/es/topic.dat
 share/gnome/help/gnobots2/C/index.html
 share/gnome/help/gnobots2/C/topic.dat
 share/gnome/help/gnobots2/es/index.html
 share/gnome/help/gnobots2/es/topic.dat
+share/gnome/help/gnobots2/it/index.html
+share/gnome/help/gnobots2/it/topic.dat
+share/gnome/help/gtali/C/index.html
+share/gnome/help/gtali/C/topic.dat
 share/gnome/help/samegnome/C/authors.html
 share/gnome/help/samegnome/C/book1.html
 share/gnome/help/samegnome/C/bugs.html
@@ -143,81 +147,6 @@ share/gnome/help/samegnome/C/index.html
 share/gnome/help/samegnome/C/ln9.html
 share/gnome/help/samegnome/C/newthemes.html
 share/gnome/help/samegnome/C/topic.dat
-share/gnome/metatris/default-theme/metatris-bg.png
-share/gnome/metatris/default-theme/metatris-piece-00-01.png
-share/gnome/metatris/default-theme/metatris-piece-00-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-00.png
-share/gnome/metatris/default-theme/metatris-piece-02-01.png
-share/gnome/metatris/default-theme/metatris-piece-02-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-02.png
-share/gnome/metatris/default-theme/metatris-piece-08-01.png
-share/gnome/metatris/default-theme/metatris-piece-08-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-08.png
-share/gnome/metatris/default-theme/metatris-piece-0a-01.png
-share/gnome/metatris/default-theme/metatris-piece-0a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0a.png
-share/gnome/metatris/default-theme/metatris-piece-0e-01.png
-share/gnome/metatris/default-theme/metatris-piece-0e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0e.png
-share/gnome/metatris/default-theme/metatris-piece-20-01.png
-share/gnome/metatris/default-theme/metatris-piece-20-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-20.png
-share/gnome/metatris/default-theme/metatris-piece-22-01.png
-share/gnome/metatris/default-theme/metatris-piece-22-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-22.png
-share/gnome/metatris/default-theme/metatris-piece-28-01.png
-share/gnome/metatris/default-theme/metatris-piece-28-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-28.png
-share/gnome/metatris/default-theme/metatris-piece-2a-01.png
-share/gnome/metatris/default-theme/metatris-piece-2a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-2a.png
-share/gnome/metatris/default-theme/metatris-piece-38-01.png
-share/gnome/metatris/default-theme/metatris-piece-38-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-38.png
-share/gnome/metatris/default-theme/metatris-piece-3e-01.png
-share/gnome/metatris/default-theme/metatris-piece-3e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-3e.png
-share/gnome/metatris/default-theme/metatris-piece-80-01.png
-share/gnome/metatris/default-theme/metatris-piece-80-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-80.png
-share/gnome/metatris/default-theme/metatris-piece-82-01.png
-share/gnome/metatris/default-theme/metatris-piece-82-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-82.png
-share/gnome/metatris/default-theme/metatris-piece-83-01.png
-share/gnome/metatris/default-theme/metatris-piece-83-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-83.png
-share/gnome/metatris/default-theme/metatris-piece-88-01.png
-share/gnome/metatris/default-theme/metatris-piece-88-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-88.png
-share/gnome/metatris/default-theme/metatris-piece-8a-01.png
-share/gnome/metatris/default-theme/metatris-piece-8a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8a.png
-share/gnome/metatris/default-theme/metatris-piece-8f-01.png
-share/gnome/metatris/default-theme/metatris-piece-8f-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8f.png
-share/gnome/metatris/default-theme/metatris-piece-a0-01.png
-share/gnome/metatris/default-theme/metatris-piece-a0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a0.png
-share/gnome/metatris/default-theme/metatris-piece-a2-01.png
-share/gnome/metatris/default-theme/metatris-piece-a2-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a2.png
-share/gnome/metatris/default-theme/metatris-piece-a8-01.png
-share/gnome/metatris/default-theme/metatris-piece-a8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a8.png
-share/gnome/metatris/default-theme/metatris-piece-e0-01.png
-share/gnome/metatris/default-theme/metatris-piece-e0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e0.png
-share/gnome/metatris/default-theme/metatris-piece-e3-01.png
-share/gnome/metatris/default-theme/metatris-piece-e3-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e3.png
-share/gnome/metatris/default-theme/metatris-piece-f8-01.png
-share/gnome/metatris/default-theme/metatris-piece-f8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-f8.png
-share/gnome/metatris/default-theme/metatris-piece-ff-01.png
-share/gnome/metatris/default-theme/metatris-piece-ff-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-ff.png
-share/gnome/metatris/default-theme/metatris.png
-share/gnome/metatris/default-theme/metatris.theme
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/pixmaps/cards/backs/beige.png
@@ -251,16 +180,19 @@ 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/gataxx.png
+share/gnome/pixmaps/gataxx/blend.png
+share/gnome/pixmaps/gataxx/classic.png
+share/gnome/pixmaps/gataxx/flipblend.png
+share/gnome/pixmaps/gataxx/metal.png
+share/gnome/pixmaps/gataxx/metal2.png
+share/gnome/pixmaps/gataxx/shrink.png
+share/gnome/pixmaps/gataxx/woodtrim.png
+share/gnome/pixmaps/glines.xpm
+share/gnome/pixmaps/glines/ball.xpm
+share/gnome/pixmaps/glines/box.xpm
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
-share/gnome/pixmaps/gnobots/aieee.png
-share/gnome/pixmaps/gnobots/cows.png
-share/gnome/pixmaps/gnobots/eggs.png
-share/gnome/pixmaps/gnobots/gnomes.png
-share/gnome/pixmaps/gnobots/mice.png
-share/gnome/pixmaps/gnobots/robots.png
-share/gnome/pixmaps/gnobots/windows.png
-share/gnome/pixmaps/gnobots/yahoo.png
 share/gnome/pixmaps/gnobots2/aieee.png
 share/gnome/pixmaps/gnobots2/cows.png
 share/gnome/pixmaps/gnobots2/eggs.png
@@ -271,17 +203,18 @@ share/gnome/pixmaps/gnobots2/splat.png
 share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
 share/gnome/pixmaps/gnome-aisleriot.png
-share/gnome/pixmaps/gnome-gnobots.png
 share/gnome/pixmaps/gnome-gnobots2.png
 share/gnome/pixmaps/gnome-gtali.png
 share/gnome/pixmaps/gnome-gtetris.png
 share/gnome/pixmaps/gnome-mahjongg.png
-share/gnome/pixmaps/gnome-metatris.png
+share/gnome/pixmaps/gnome-nibbles.png
 share/gnome/pixmaps/gnome-stones-file.png
 share/gnome/pixmaps/gnome-stones.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
+share/gnome/pixmaps/gnome-stones/background.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png
+share/gnome/pixmaps/gnome-stones/crate.png
 share/gnome/pixmaps/gnome-stones/curtain.png
 share/gnome/pixmaps/gnome-stones/diamond.png
 share/gnome/pixmaps/gnome-stones/dirt.png
@@ -297,13 +230,16 @@ 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/7blocks-tig.png
 share/gnome/pixmaps/gnometris/bg/fishy-bg.png
 share/gnome/pixmaps/gnometris/bg/greyprint-bg.png
 share/gnome/pixmaps/gnometris/bg/leaves-bg.png
 share/gnome/pixmaps/gnometris/bg/sweet-bg.png
 share/gnome/pixmaps/gnometris/bg/watery-bg.png
+share/gnome/pixmaps/gnometris/bg/vortex-bg.png
 share/gnome/pixmaps/gnometris/bg/weirdo-bg.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
+share/gnome/pixmaps/gnotravex/gnome-gnotravex.png
 share/gnome/pixmaps/iagno.png
 share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
@@ -312,6 +248,10 @@ share/gnome/pixmaps/iagno/metal.png
 share/gnome/pixmaps/iagno/metal2.png
 share/gnome/pixmaps/iagno/shrink.png
 share/gnome/pixmaps/iagno/woodtrim.png
+share/gnome/pixmaps/mahjongg/bg/bg1.png
+share/gnome/pixmaps/mahjongg/bg/bg2.png
+share/gnome/pixmaps/mahjongg/bg/bg3.png
+share/gnome/pixmaps/mahjongg/bg/bg4.png
 share/gnome/pixmaps/mahjongg/default.png
 share/gnome/pixmaps/mahjongg/seta.png
 share/gnome/pixmaps/same-gnome/blink-sync.png
@@ -319,6 +259,7 @@ share/gnome/pixmaps/same-gnome/marbles.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/xbill.png
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/beleaguered_castle.scm
 share/gnome/sol-games/bristol.scm
@@ -328,12 +269,14 @@ share/gnome/sol-games/clock.scm
 share/gnome/sol-games/doublets.scm
 share/gnome/sol-games/eagle_wing.scm
 share/gnome/sol-games/elevator.scm
+share/gnome/sol-games/first_law.scm
 share/gnome/sol-games/fortunes.scm
 share/gnome/sol-games/fourteen.scm
 share/gnome/sol-games/freecell.scm
 share/gnome/sol-games/hopscotch.scm
 share/gnome/sol-games/kansas.scm
 share/gnome/sol-games/klondike.scm
+share/gnome/sol-games/lady_jane.scm
 share/gnome/sol-games/neighbor.scm
 share/gnome/sol-games/odessa.scm
 share/gnome/sol-games/osmosis.scm
@@ -342,12 +285,16 @@ share/gnome/sol-games/royal_east.scm
 share/gnome/sol-games/scorpion.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/straight_up.scm
 share/gnome/sol-games/thieves.scm
 share/gnome/sol-games/thirteen.scm
 share/gnome/sol-games/thumb_and_pouch.scm
 share/gnome/sol-games/union_square.scm
 share/gnome/sol-games/westhaven.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
@@ -365,24 +312,99 @@ share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
+share/gnome/xbill/cursors/apple.xpm
+share/gnome/xbill/cursors/bsd.xpm
+share/gnome/xbill/cursors/bucket.xpm
+share/gnome/xbill/cursors/hand_down.xpm
+share/gnome/xbill/cursors/hand_down_mask.xpm
+share/gnome/xbill/cursors/hand_up.xpm
+share/gnome/xbill/cursors/hand_up_mask.xpm
+share/gnome/xbill/cursors/hurd.xpm
+share/gnome/xbill/cursors/linux.xpm
+share/gnome/xbill/cursors/next.xpm
+share/gnome/xbill/cursors/os2.xpm
+share/gnome/xbill/cursors/redhat.xpm
+share/gnome/xbill/cursors/sgi.xpm
+share/gnome/xbill/cursors/sun.xpm
+share/gnome/xbill/pixmaps/about.xpm
+share/gnome/xbill/pixmaps/apple.xpm
+share/gnome/xbill/pixmaps/billA_0.xpm
+share/gnome/xbill/pixmaps/billA_1.xpm
+share/gnome/xbill/pixmaps/billA_10.xpm
+share/gnome/xbill/pixmaps/billA_11.xpm
+share/gnome/xbill/pixmaps/billA_12.xpm
+share/gnome/xbill/pixmaps/billA_2.xpm
+share/gnome/xbill/pixmaps/billA_3.xpm
+share/gnome/xbill/pixmaps/billA_4.xpm
+share/gnome/xbill/pixmaps/billA_5.xpm
+share/gnome/xbill/pixmaps/billA_6.xpm
+share/gnome/xbill/pixmaps/billA_7.xpm
+share/gnome/xbill/pixmaps/billA_8.xpm
+share/gnome/xbill/pixmaps/billA_9.xpm
+share/gnome/xbill/pixmaps/billD_0.xpm
+share/gnome/xbill/pixmaps/billD_1.xpm
+share/gnome/xbill/pixmaps/billD_2.xpm
+share/gnome/xbill/pixmaps/billD_3.xpm
+share/gnome/xbill/pixmaps/billD_4.xpm
+share/gnome/xbill/pixmaps/billL_0.xpm
+share/gnome/xbill/pixmaps/billL_1.xpm
+share/gnome/xbill/pixmaps/billL_2.xpm
+share/gnome/xbill/pixmaps/billR_0.xpm
+share/gnome/xbill/pixmaps/billR_1.xpm
+share/gnome/xbill/pixmaps/billR_2.xpm
+share/gnome/xbill/pixmaps/bsd.xpm
+share/gnome/xbill/pixmaps/bsdcpu.xpm
+share/gnome/xbill/pixmaps/bucket.xpm
+share/gnome/xbill/pixmaps/hurd.xpm
+share/gnome/xbill/pixmaps/icon.xpm
+share/gnome/xbill/pixmaps/linux.xpm
+share/gnome/xbill/pixmaps/logo.xpm
+share/gnome/xbill/pixmaps/maccpu.xpm
+share/gnome/xbill/pixmaps/next.xpm
+share/gnome/xbill/pixmaps/nextcpu.xpm
+share/gnome/xbill/pixmaps/os2.xpm
+share/gnome/xbill/pixmaps/os2cpu.xpm
+share/gnome/xbill/pixmaps/redhat.xpm
+share/gnome/xbill/pixmaps/sgi.xpm
+share/gnome/xbill/pixmaps/sgicpu.xpm
+share/gnome/xbill/pixmaps/spark_0.xpm
+share/gnome/xbill/pixmaps/spark_1.xpm
+share/gnome/xbill/pixmaps/sun.xpm
+share/gnome/xbill/pixmaps/suncpu.xpm
+share/gnome/xbill/pixmaps/toaster.xpm
+share/gnome/xbill/pixmaps/wingdows.xpm
 share/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/en_GB/LC_MESSAGES/gnome-games.mo
 share/locale/es/LC_MESSAGES/gnome-games.mo
+share/locale/et/LC_MESSAGES/gnome-games.mo
 share/locale/fi/LC_MESSAGES/gnome-games.mo
 share/locale/fr/LC_MESSAGES/gnome-games.mo
 share/locale/ga/LC_MESSAGES/gnome-games.mo
+share/locale/hu/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
+share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
 share/locale/pl/LC_MESSAGES/gnome-games.mo
 share/locale/pt/LC_MESSAGES/gnome-games.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
+share/locale/ru/LC_MESSAGES/gnome-games.mo
+share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/wa/LC_MESSAGES/gnome-games.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
+@dirrm share/gnome/xbill/pixmaps
+@dirrm share/gnome/xbill/cursors
+@dirrm share/gnome/xbill
 @dirrm share/gnome/sounds/iagno
 @dirrm share/gnome/sounds/gnobots2
 @dirrm share/gnome/sounds/gnibbles
+@dirrm share/gnome/sounds/gataxx
 @dirrm share/gnome/sol-games
 @dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/pixmaps/mahjongg/bg
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
 @dirrm share/gnome/pixmaps/gnotravex
@@ -390,8 +412,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/gnometris
 @dirrm share/gnome/pixmaps/gnome-stones
 @dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnobots
 @dirrm share/gnome/pixmaps/gnibbles
+@dirrm share/gnome/pixmaps/glines
+@dirrm share/gnome/pixmaps/gataxx
 @dirrm share/gnome/pixmaps/cards/suits_small
 @dirrm share/gnome/pixmaps/cards/suits_medium
 @dirrm share/gnome/pixmaps/cards/suits_large
@@ -401,16 +424,14 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/honors
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/metatris/default-theme
-@dirrm share/gnome/metatris
 @dirrm share/gnome/help/samegnome/C
 @dirrm share/gnome/help/samegnome
+@dirrm share/gnome/help/gtali/C
+@dirrm share/gnome/help/gtali
+@dirrm share/gnome/help/gnobots2/it
 @dirrm share/gnome/help/gnobots2/es
 @dirrm share/gnome/help/gnobots2/C
 @dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnobots/es
-@dirrm share/gnome/help/gnobots/C
-@dirrm share/gnome/help/gnobots
 @dirrm share/gnome/gturing/examples
 @dirrm share/gnome/gturing
 @dirrm share/gnome/gnome-stones/objects
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index dd442d5bf23c..ed1dc286681c 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	gnomegames
-# Version required:			1.0.2
+# Version required:			1.0.51
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-games-1.0.2
-PKGNAME=	gnomegames-1.0.2
+DISTNAME=	gnome-games-1.0.51
+PKGNAME=	gnomegames-1.0.51
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 9af51a776243..f7a4a06afa65 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-1.0.2.tar.gz) = 1fbe5076d9234522f6f6401e672a02fe
+MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
index a0f6935380e5..b36831ec5ecb 100644
--- a/games/gnomegames2/files/patch-ab
+++ b/games/gnomegames2/files/patch-ab
@@ -1,6 +1,6 @@
---- aisleriot/Makefile.in.orig	Mon Mar  1 02:50:59 1999
-+++ aisleriot/Makefile.in	Wed Mar  3 00:00:04 1999
-@@ -126,12 +126,12 @@
+--- aisleriot/Makefile.in.orig	Sun Sep 26 13:29:13 1999
++++ aisleriot/Makefile.in	Mon Sep 27 09:30:04 1999
+@@ -128,12 +128,12 @@
  scoredir = $(localstatedir)/games
  cardimagedir = $(datadir)/pixmaps/cards
  icondir = $(datadir)/pixmaps
@@ -11,13 +11,13 @@
 -SUBDIRS = docs pixmaps
 +SUBDIRS = pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)                      	$(GUILE_INCS)
  
  
  bin_PROGRAMS = sol
-@@ -152,7 +152,7 @@
- EXTRA_DIST = TODO FIXME  AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
+@@ -154,7 +154,7 @@
+ EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
  
  
 -sysdir = $(datadir)/gnome/apps/Games
@@ -25,20 +25,20 @@
  sys_DATA = sol.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
---- aisleriot/docs/Makefile.in.orig	Mon Mar  1 02:51:00 1999
-+++ aisleriot/docs/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -129,7 +129,7 @@
+--- aisleriot/docs/Makefile.in.orig	Sun Sep 26 13:29:29 1999
++++ aisleriot/docs/Makefile.in	Mon Sep 27 09:30:38 1999
+@@ -131,7 +131,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -helpdir = $(datadir)/gnome/help/aisleriot/C
 +helpdir = $(datadir)/help/aisleriot/C
  
- help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html klondike.html 	fourteen.html pileon.html auld-lang-syne.html hopscotch.html 	neighbor.html odessa.html osmosis.html spider.html yukon.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html 	camelot-goal.gif clock-rules.gif docbook.css topic.dat
+ help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html elevator.html fortunes.html 	kansas.html klondike.html first-law.html 	fourteen.html pileon.html auld-lang-syne.html 	hopscotch.html scorpion.html thumb-and-pouch.html 	neighbor.html odessa.html osmosis.html spider.html 	yukon.html westhaven.html royal-east.html 	beleaguered-castle.html thirteen.html thieves.html 	freecell.html bristol.html union-square.html 	camelot-goal.gif clock-rules.gif docbook.css 	topic.dat straight-up.html zebra.html lady-jane.html
  
---- freecell/src/Makefile.in.orig	Mon Mar  1 02:50:27 1999
-+++ freecell/src/Makefile.in	Wed Mar  3 00:01:13 1999
-@@ -123,9 +123,9 @@
+--- freecell/src/Makefile.in.orig	Sun Sep 26 13:28:36 1999
++++ freecell/src/Makefile.in	Mon Sep 27 09:31:48 1999
+@@ -125,9 +125,9 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -50,62 +50,55 @@
  
  
  bin_PROGRAMS = freecell
---- gnibbles/Makefile.in.orig	Mon Mar  1 02:51:08 1999
-+++ gnibbles/Makefile.in	Wed Mar  3 00:00:39 1999
+--- gataxx/Makefile.in.orig	Sun Sep 26 13:29:41 1999
++++ gataxx/Makefile.in	Mon Sep 27 09:47:28 1999
 @@ -127,10 +127,10 @@
- configdir = $(datadir)/gnibbles
- appicondir = $(datadir)/pixmaps
- soundlistdir = $(sysconfdir)/sound/events
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/gataxx
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
+ appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
  
- bin_PROGRAMS = gnibbles
---- gnobots/Makefile.in.orig	Mon Mar  1 02:50:42 1999
-+++ gnobots/Makefile.in	Wed Mar  3 00:00:54 1999
-@@ -126,11 +126,11 @@
+ bin_PROGRAMS = gataxx
+--- glines/Makefile.in.orig	Sun Sep 26 13:29:40 1999
++++ glines/Makefile.in	Mon Sep 27 09:48:33 1999
+@@ -128,11 +128,11 @@
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnobots
- appicondir = $(datadir)/pixmaps
+ pixmapdir = $(datadir)/pixmaps/glines
+ icondir = $(datadir)/pixmaps
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  
- SUBDIRS = help
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+ #SUBDIRS = help
  
+-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = gnobots
---- gnobots/help/C/Makefile.in.orig	Mon Mar  1 02:50:44 1999
-+++ gnobots/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
  
+ bin_PROGRAMS = glines
+--- gnibbles/Makefile.in.orig	Sun Sep 26 13:29:38 1999
++++ gnibbles/Makefile.in	Mon Sep 27 09:32:42 1999
+@@ -129,10 +129,10 @@
+ configdir = $(datadir)/gnibbles
+ icondir = $(datadir)/pixmaps
+ soundlistdir = $(sysconfdir)/sound/events
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/C
-+gnobots_helpdir = $(datadir)/help/gnobots/C
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots/help/es/Makefile.in.orig	Mon Mar  1 02:50:45 1999
-+++ gnobots/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
- EXTRA_DIST = index.html 	     topic.dat
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
--gnobots_helpdir = $(datadir)/gnome/help/gnobots/es
-+gnobots_helpdir = $(datadir)/help/gnobots/es
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- gnobots2/Makefile.in.orig	Mon Mar  1 02:50:46 1999
-+++ gnobots2/Makefile.in	Wed Mar  3 00:00:36 1999
-@@ -129,11 +129,11 @@
+ bin_PROGRAMS = gnibbles
+--- gnobots2/Makefile.in.orig	Sun Sep 26 13:29:01 1999
++++ gnobots2/Makefile.in	Mon Sep 27 09:33:16 1999
+@@ -131,11 +131,11 @@
  soundlistdir = $(sysconfdir)/sound/events
  sounddir = $(datadir)/sounds/gnobots2
  appicondir = $(datadir)/pixmaps
@@ -119,9 +112,9 @@
  
  
  bin_PROGRAMS = gnobots2
---- gnobots2/help/C/Makefile.in.orig	Mon Mar  1 02:50:49 1999
-+++ gnobots2/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/C/Makefile.in.orig	Sun Sep 26 13:29:03 1999
++++ gnobots2/help/C/Makefile.in	Mon Sep 27 09:34:12 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -130,9 +123,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots2/help/es/Makefile.in.orig	Mon Mar  1 02:50:50 1999
-+++ gnobots2/help/es/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -126,7 +126,7 @@
+--- gnobots2/help/es/Makefile.in.orig	Sun Sep 26 13:29:04 1999
++++ gnobots2/help/es/Makefile.in	Mon Sep 27 09:34:44 1999
+@@ -128,7 +128,7 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -141,9 +134,20 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnome-stones/Makefile.in.orig	Mon Mar  1 02:50:55 1999
-+++ gnome-stones/Makefile.in	Wed Mar  3 00:33:00 1999
-@@ -125,12 +125,12 @@
+--- gnobots2/help/it/Makefile.in.orig	Sun Sep 26 13:29:05 1999
++++ gnobots2/help/it/Makefile.in	Mon Sep 27 09:34:56 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it
++gnobots2_helpdir = $(datadir)/help/gnobots2/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gnome-stones/Makefile.in.orig	Sun Sep 26 13:29:10 1999
++++ gnome-stones/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,12 +127,12 @@
  
  SUBDIRS = objects graphics
  
@@ -158,7 +162,7 @@
  
  
  bin_PROGRAMS = gnome-stones
-@@ -145,7 +145,7 @@
+@@ -147,7 +147,7 @@
  Games_DATA = gnome-stones.desktop
  Caves_DATA = default.caves tutorial.caves gnomekoban.caves
  
@@ -166,10 +170,10 @@
 +gtkrcdir = $(datadir)/gnome-stones
  gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
  
- EXTRA_DIST =  	$(Pixmap_DATA)					$(Games_DATA)					$(Caves_DATA)					$(gtkrc_DATA)					TODO						README
---- gnome-stones/objects/Makefile.in.orig	Mon Mar  1 02:50:56 1999
-+++ gnome-stones/objects/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -125,9 +125,9 @@
+ Mimedir = $(datadir)/mime-info
+--- gnome-stones/objects/Makefile.in.orig	Sun Sep 26 13:29:11 1999
++++ gnome-stones/objects/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  GSTONES_SRC_DIR = $(srcdir)/../
  
@@ -181,7 +185,7 @@
  
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
-@@ -143,10 +143,10 @@
+@@ -144,10 +144,10 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -194,9 +198,9 @@
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- gnometris/Makefile.in.orig	Mon Mar  1 02:51:03 1999
-+++ gnometris/Makefile.in	Wed Mar  3 00:00:33 1999
-@@ -125,9 +125,9 @@
+--- gnometris/Makefile.in.orig	Sun Sep 26 13:29:31 1999
++++ gnometris/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -127,9 +127,9 @@
  
  SUBDIRS = pix
  scoredir = $(localstatedir)/games
@@ -208,9 +212,9 @@
  
  
  bin_PROGRAMS = gnometris
---- gnomine/Makefile.in.orig	Mon Mar  1 02:50:28 1999
-+++ gnomine/Makefile.in	Wed Mar  3 00:00:48 1999
-@@ -124,9 +124,9 @@
+--- gnomine/Makefile.in.orig	Sun Sep 26 13:28:37 1999
++++ gnomine/Makefile.in	Mon Sep 27 09:36:59 1999
+@@ -126,9 +126,9 @@
  l = @l@
  
  scoredir = $(localstatedir)/games
@@ -222,38 +226,51 @@
  
  
  bin_PROGRAMS = gnomine
---- gnothello/Makefile.in.orig	Mon Mar  1 02:50:51 1999
-+++ gnothello/Makefile.in	Wed Mar  3 00:00:29 1999
-@@ -125,10 +125,10 @@
+--- gnotravex/Makefile.in.orig	Sun Sep 26 13:29:09 1999
++++ gnotravex/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -127,9 +127,9 @@
  
  scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/iagno
+ pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- appicondir = $(datadir)/pixmaps
  
--INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
-+INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  
- bin_PROGRAMS = iagno
---- gnotravex/Makefile.in.orig	Mon Mar  1 02:50:54 1999
-+++ gnotravex/Makefile.in	Wed Mar  3 00:00:45 1999
-@@ -125,9 +125,9 @@
+ bin_PROGRAMS = gnotravex
+--- gtali/Makefile.in.orig	Sun Sep 26 13:28:57 1999
++++ gtali/Makefile.in	Mon Sep 27 09:44:54 1999
+@@ -125,12 +125,12 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- scoredir = $(localstatedir)/games
- pixmapdir = $(datadir)/pixmaps/gnotravex
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ SUBDIRS = pix help
  
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
  
- bin_PROGRAMS = gnotravex
---- gturing/Makefile.in.orig	Mon Mar  1 02:50:36 1999
-+++ gturing/Makefile.in	Wed Mar  3 00:00:25 1999
-@@ -124,12 +124,12 @@
+ 
+ @HAS_CURSES_TRUE@CTALI = ctali
+--- gtali/help/C/Makefile.in.orig	Sun Sep 26 13:29:00 1999
++++ gtali/help/C/Makefile.in	Mon Sep 27 09:45:28 1999
+@@ -128,7 +128,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gtali_helpdir = $(datadir)/gnome/help/gtali/C
++gtali_helpdir = $(datadir)/help/gtali/C
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gturing/Makefile.in.orig	Sun Sep 26 13:28:54 1999
++++ gturing/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,12 +125,12 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -269,9 +286,9 @@
  
  
  bin_PROGRAMS = gturing
---- gturing/help/C/Makefile.in.orig	Mon Mar  1 02:50:38 1999
-+++ gturing/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- gturing/help/C/Makefile.in.orig	Sun Sep 26 13:28:56 1999
++++ gturing/help/C/Makefile.in	Mon Sep 27 09:37:08 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -280,35 +297,27 @@
  
  gturing_help_DATA =  	index.html			topic.dat
  
---- gyahtzee/Makefile.in.orig	Mon Mar  1 02:50:39 1999
-+++ gyahtzee/Makefile.in	Wed Mar  3 00:00:42 1999
-@@ -123,17 +123,17 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+--- iagno/Makefile.in.orig	Sun Sep 26 13:29:07 1999
++++ iagno/Makefile.in	Mon Sep 27 09:49:30 1999
+@@ -127,10 +127,10 @@
  
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/iagno
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
- scoredir = $(localstatedir)/games
- 
- SUBDIRS = pix
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
- 
- 
- @HAS_CURSES_TRUE@CTALI = ctali
- 
--bin_PROGRAMS = gtali	$(CTALI)
-+bin_PROGRAMS = gtali
+ appicondir = $(datadir)/pixmaps
  
- gtali_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
+-INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
++INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
  
---- mahjongg/Makefile.in.orig	Mon Mar  1 02:50:35 1999
-+++ mahjongg/Makefile.in	Wed Mar  3 00:01:32 1999
-@@ -125,10 +125,10 @@
  
+ bin_PROGRAMS = iagno
+--- mahjongg/Makefile.in.orig	Sun Sep 26 13:28:53 1999
++++ mahjongg/Makefile.in	Mon Sep 27 09:46:10 1999
+@@ -128,10 +128,10 @@
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/mahjongg
+ bgdir = $(datadir)/pixmaps/mahjongg/bg
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  appicondir = $(datadir)/pixmaps
@@ -318,29 +327,9 @@
  
  
  bin_PROGRAMS = mahjongg
---- metatris/Makefile.in.orig	Mon Mar  1 02:51:06 1999
-+++ metatris/Makefile.in	Wed Mar  3 00:01:34 1999
-@@ -128,7 +128,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-metatris.png
- 
--sysdir = $(datadir)/gnome/apps/Games
-+sysdir = $(datadir)/apps/Games
- sys_DATA = metatris.desktop
- 
- mydatadir = $(datadir)/metatris/default-theme
-@@ -146,7 +146,7 @@
- metatris_LDFLAGS = $(GTK_LIBS)		$(GNOME_LIBDIR) 		$(GNOMEUI_LIBS)			$(INTLLIBS)
- 
- 
--CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
-+CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
- 
- 
- scoredir = $(localstatedir)/games
---- same-gnome/Makefile.in.orig	Mon Mar  1 02:50:30 1999
-+++ same-gnome/Makefile.in	Wed Mar  3 00:01:52 1999
-@@ -125,11 +125,11 @@
+--- same-gnome/Makefile.in.orig	Sun Sep 26 13:28:38 1999
++++ same-gnome/Makefile.in	Mon Sep 27 09:50:47 1999
+@@ -127,11 +127,11 @@
  
  scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/same-gnome
@@ -354,9 +343,9 @@
  
  
  bin_PROGRAMS = same-gnome
---- same-gnome/help/C/Makefile.in.orig	Mon Mar  1 02:50:32 1999
-+++ same-gnome/help/C/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- same-gnome/help/C/Makefile.in.orig	Sun Sep 26 13:28:50 1999
++++ same-gnome/help/C/Makefile.in	Mon Sep 27 09:51:19 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -365,9 +354,9 @@
  
  same_gnome_help_DATA =  	index.html			topic.dat
  
---- scottfree/Makefile.in.orig	Mon Mar  1 02:50:33 1999
-+++ scottfree/Makefile.in	Tue Mar  2 23:58:05 1999
-@@ -123,7 +123,7 @@
+--- scottfree/Makefile.in.orig	Sun Sep 26 13:28:52 1999
++++ scottfree/Makefile.in	Mon Sep 27 09:52:29 1999
+@@ -125,7 +125,7 @@
  ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
@@ -376,3 +365,14 @@
  
  
  bin_PROGRAMS = GnomeScott
+--- xbill/Makefile.in.orig	Sun Sep 26 13:29:33 1999
++++ xbill/Makefile.in	Mon Sep 27 09:53:11 1999
+@@ -143,7 +143,7 @@
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = xbill.png
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ Games_DATA = xbill.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/games/gnomegames2/files/patch-ag b/games/gnomegames2/files/patch-ag
new file mode 100644
index 000000000000..a192fe907dc4
--- /dev/null
+++ b/games/gnomegames2/files/patch-ag
@@ -0,0 +1,18 @@
+--- gtali/cyahtzee.c.orig	Sat Apr 10 22:42:17 1999
++++ gtali/cyahtzee.c	Mon Oct  4 16:29:56 1999
+@@ -37,13 +37,14 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ 
++#include <config.h>
++
+ #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+ #include <ncurses.h>
+ #else
+ #include <curses.h>
+ #endif
+ 
+-#include <config.h>
+ #include "yahtzee.h"
+ #include "cyahtzee.h"
+ #include "scores.h"
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 419803d9cd85..4af7937c6669 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -1,9 +1,12 @@
 bin/GnomeScott
+bin/ctali
 bin/freecell
+bin/gataxx
+bin/glines
 bin/gnibbles
-bin/gnobots
 bin/gnobots2
 bin/gnome-stones
+bin/gnome-xbill
 bin/gnometris
 bin/gnomine
 bin/gnotravex
@@ -11,9 +14,9 @@ bin/gtali
 bin/gturing
 bin/iagno
 bin/mahjongg
-bin/metatris
 bin/same-gnome
 bin/sol
+etc/sound/events/gataxx.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
@@ -24,19 +27,22 @@ lib/libgdkcardimage.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/gnome/apps/Games/freecell.desktop
+share/gnome/apps/Games/gataxx.desktop
+share/gnome/apps/Games/glines.desktop
 share/gnome/apps/Games/gnibbles.desktop
-share/gnome/apps/Games/gnobots.desktop
 share/gnome/apps/Games/gnobots2.desktop
 share/gnome/apps/Games/gnome-stones.desktop
 share/gnome/apps/Games/gnometris.desktop
 share/gnome/apps/Games/gnomine.desktop
 share/gnome/apps/Games/gnotravex.desktop
 share/gnome/apps/Games/gtali.desktop
+share/gnome/apps/Games/gturing.desktop
 share/gnome/apps/Games/iagno.desktop
 share/gnome/apps/Games/mahjongg.desktop
-share/gnome/apps/Games/metatris.desktop
 share/gnome/apps/Games/same-gnome.desktop
 share/gnome/apps/Games/sol.desktop
+share/gnome/apps/Games/xbill.desktop
+share/gnome/games/glines.scores
 share/gnome/games/gnibbles.1.0.scores
 share/gnome/games/gnibbles.1.1.scores
 share/gnome/games/gnibbles.2.0.scores
@@ -45,8 +51,6 @@ share/gnome/games/gnibbles.3.0.scores
 share/gnome/games/gnibbles.3.1.scores
 share/gnome/games/gnibbles.4.0.scores
 share/gnome/games/gnibbles.4.1.scores
-share/gnome/games/gnobots.safe.scores
-share/gnome/games/gnobots.unsafe.scores
 share/gnome/games/gnobots2.classic_robots-safe.scores
 share/gnome/games/gnobots2.classic_robots.scores
 share/gnome/games/gnobots2.nightmare-safe.scores
@@ -58,6 +62,7 @@ share/gnome/games/gnobots2.robots2_easy.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
 share/gnome/games/gnobots2.robots_with_safe_teleport.scores
 share/gnome/games/gnome-stones.scores
+share/gnome/games/gnome-xbill.scores
 share/gnome/games/gnometris.scores
 share/gnome/games/gnomine.Biiiig.scores
 share/gnome/games/gnomine.Custom.scores
@@ -75,8 +80,7 @@ share/gnome/games/iagno.b3.scores
 share/gnome/games/iagno.w1.scores
 share/gnome/games/iagno.w2.scores
 share/gnome/games/iagno.w3.scores
-share/gnome/games/mahjongg.scores
-share/gnome/games/metatris.scores
+share/gnome/games/mahjongg.{easy,difficult}.scores
 share/gnome/games/same-gnome.scores
 share/gnome/gnibbles/level001.gnl
 share/gnome/gnibbles/level002.gnl
@@ -126,14 +130,14 @@ share/gnome/gturing/examples/bin2dec.tur
 share/gnome/gturing/examples/dashnumbers.tur
 share/gnome/gturing/examples/dec2bin.tur
 share/gnome/gturing/examples/subst.tur
-share/gnome/help/gnobots/C/index.html
-share/gnome/help/gnobots/C/topic.dat
-share/gnome/help/gnobots/es/index.html
-share/gnome/help/gnobots/es/topic.dat
 share/gnome/help/gnobots2/C/index.html
 share/gnome/help/gnobots2/C/topic.dat
 share/gnome/help/gnobots2/es/index.html
 share/gnome/help/gnobots2/es/topic.dat
+share/gnome/help/gnobots2/it/index.html
+share/gnome/help/gnobots2/it/topic.dat
+share/gnome/help/gtali/C/index.html
+share/gnome/help/gtali/C/topic.dat
 share/gnome/help/samegnome/C/authors.html
 share/gnome/help/samegnome/C/book1.html
 share/gnome/help/samegnome/C/bugs.html
@@ -143,81 +147,6 @@ share/gnome/help/samegnome/C/index.html
 share/gnome/help/samegnome/C/ln9.html
 share/gnome/help/samegnome/C/newthemes.html
 share/gnome/help/samegnome/C/topic.dat
-share/gnome/metatris/default-theme/metatris-bg.png
-share/gnome/metatris/default-theme/metatris-piece-00-01.png
-share/gnome/metatris/default-theme/metatris-piece-00-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-00.png
-share/gnome/metatris/default-theme/metatris-piece-02-01.png
-share/gnome/metatris/default-theme/metatris-piece-02-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-02.png
-share/gnome/metatris/default-theme/metatris-piece-08-01.png
-share/gnome/metatris/default-theme/metatris-piece-08-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-08.png
-share/gnome/metatris/default-theme/metatris-piece-0a-01.png
-share/gnome/metatris/default-theme/metatris-piece-0a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0a.png
-share/gnome/metatris/default-theme/metatris-piece-0e-01.png
-share/gnome/metatris/default-theme/metatris-piece-0e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-0e.png
-share/gnome/metatris/default-theme/metatris-piece-20-01.png
-share/gnome/metatris/default-theme/metatris-piece-20-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-20.png
-share/gnome/metatris/default-theme/metatris-piece-22-01.png
-share/gnome/metatris/default-theme/metatris-piece-22-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-22.png
-share/gnome/metatris/default-theme/metatris-piece-28-01.png
-share/gnome/metatris/default-theme/metatris-piece-28-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-28.png
-share/gnome/metatris/default-theme/metatris-piece-2a-01.png
-share/gnome/metatris/default-theme/metatris-piece-2a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-2a.png
-share/gnome/metatris/default-theme/metatris-piece-38-01.png
-share/gnome/metatris/default-theme/metatris-piece-38-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-38.png
-share/gnome/metatris/default-theme/metatris-piece-3e-01.png
-share/gnome/metatris/default-theme/metatris-piece-3e-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-3e.png
-share/gnome/metatris/default-theme/metatris-piece-80-01.png
-share/gnome/metatris/default-theme/metatris-piece-80-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-80.png
-share/gnome/metatris/default-theme/metatris-piece-82-01.png
-share/gnome/metatris/default-theme/metatris-piece-82-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-82.png
-share/gnome/metatris/default-theme/metatris-piece-83-01.png
-share/gnome/metatris/default-theme/metatris-piece-83-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-83.png
-share/gnome/metatris/default-theme/metatris-piece-88-01.png
-share/gnome/metatris/default-theme/metatris-piece-88-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-88.png
-share/gnome/metatris/default-theme/metatris-piece-8a-01.png
-share/gnome/metatris/default-theme/metatris-piece-8a-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8a.png
-share/gnome/metatris/default-theme/metatris-piece-8f-01.png
-share/gnome/metatris/default-theme/metatris-piece-8f-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-8f.png
-share/gnome/metatris/default-theme/metatris-piece-a0-01.png
-share/gnome/metatris/default-theme/metatris-piece-a0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a0.png
-share/gnome/metatris/default-theme/metatris-piece-a2-01.png
-share/gnome/metatris/default-theme/metatris-piece-a2-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a2.png
-share/gnome/metatris/default-theme/metatris-piece-a8-01.png
-share/gnome/metatris/default-theme/metatris-piece-a8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-a8.png
-share/gnome/metatris/default-theme/metatris-piece-e0-01.png
-share/gnome/metatris/default-theme/metatris-piece-e0-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e0.png
-share/gnome/metatris/default-theme/metatris-piece-e3-01.png
-share/gnome/metatris/default-theme/metatris-piece-e3-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-e3.png
-share/gnome/metatris/default-theme/metatris-piece-f8-01.png
-share/gnome/metatris/default-theme/metatris-piece-f8-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-f8.png
-share/gnome/metatris/default-theme/metatris-piece-ff-01.png
-share/gnome/metatris/default-theme/metatris-piece-ff-yellow.png
-share/gnome/metatris/default-theme/metatris-piece-ff.png
-share/gnome/metatris/default-theme/metatris.png
-share/gnome/metatris/default-theme/metatris.theme
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/pixmaps/cards/backs/beige.png
@@ -251,16 +180,19 @@ 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/gataxx.png
+share/gnome/pixmaps/gataxx/blend.png
+share/gnome/pixmaps/gataxx/classic.png
+share/gnome/pixmaps/gataxx/flipblend.png
+share/gnome/pixmaps/gataxx/metal.png
+share/gnome/pixmaps/gataxx/metal2.png
+share/gnome/pixmaps/gataxx/shrink.png
+share/gnome/pixmaps/gataxx/woodtrim.png
+share/gnome/pixmaps/glines.xpm
+share/gnome/pixmaps/glines/ball.xpm
+share/gnome/pixmaps/glines/box.xpm
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
-share/gnome/pixmaps/gnobots/aieee.png
-share/gnome/pixmaps/gnobots/cows.png
-share/gnome/pixmaps/gnobots/eggs.png
-share/gnome/pixmaps/gnobots/gnomes.png
-share/gnome/pixmaps/gnobots/mice.png
-share/gnome/pixmaps/gnobots/robots.png
-share/gnome/pixmaps/gnobots/windows.png
-share/gnome/pixmaps/gnobots/yahoo.png
 share/gnome/pixmaps/gnobots2/aieee.png
 share/gnome/pixmaps/gnobots2/cows.png
 share/gnome/pixmaps/gnobots2/eggs.png
@@ -271,17 +203,18 @@ share/gnome/pixmaps/gnobots2/splat.png
 share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
 share/gnome/pixmaps/gnome-aisleriot.png
-share/gnome/pixmaps/gnome-gnobots.png
 share/gnome/pixmaps/gnome-gnobots2.png
 share/gnome/pixmaps/gnome-gtali.png
 share/gnome/pixmaps/gnome-gtetris.png
 share/gnome/pixmaps/gnome-mahjongg.png
-share/gnome/pixmaps/gnome-metatris.png
+share/gnome/pixmaps/gnome-nibbles.png
 share/gnome/pixmaps/gnome-stones-file.png
 share/gnome/pixmaps/gnome-stones.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
+share/gnome/pixmaps/gnome-stones/background.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png
+share/gnome/pixmaps/gnome-stones/crate.png
 share/gnome/pixmaps/gnome-stones/curtain.png
 share/gnome/pixmaps/gnome-stones/diamond.png
 share/gnome/pixmaps/gnome-stones/dirt.png
@@ -297,13 +230,16 @@ 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/7blocks-tig.png
 share/gnome/pixmaps/gnometris/bg/fishy-bg.png
 share/gnome/pixmaps/gnometris/bg/greyprint-bg.png
 share/gnome/pixmaps/gnometris/bg/leaves-bg.png
 share/gnome/pixmaps/gnometris/bg/sweet-bg.png
 share/gnome/pixmaps/gnometris/bg/watery-bg.png
+share/gnome/pixmaps/gnometris/bg/vortex-bg.png
 share/gnome/pixmaps/gnometris/bg/weirdo-bg.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
+share/gnome/pixmaps/gnotravex/gnome-gnotravex.png
 share/gnome/pixmaps/iagno.png
 share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
@@ -312,6 +248,10 @@ share/gnome/pixmaps/iagno/metal.png
 share/gnome/pixmaps/iagno/metal2.png
 share/gnome/pixmaps/iagno/shrink.png
 share/gnome/pixmaps/iagno/woodtrim.png
+share/gnome/pixmaps/mahjongg/bg/bg1.png
+share/gnome/pixmaps/mahjongg/bg/bg2.png
+share/gnome/pixmaps/mahjongg/bg/bg3.png
+share/gnome/pixmaps/mahjongg/bg/bg4.png
 share/gnome/pixmaps/mahjongg/default.png
 share/gnome/pixmaps/mahjongg/seta.png
 share/gnome/pixmaps/same-gnome/blink-sync.png
@@ -319,6 +259,7 @@ share/gnome/pixmaps/same-gnome/marbles.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/xbill.png
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/beleaguered_castle.scm
 share/gnome/sol-games/bristol.scm
@@ -328,12 +269,14 @@ share/gnome/sol-games/clock.scm
 share/gnome/sol-games/doublets.scm
 share/gnome/sol-games/eagle_wing.scm
 share/gnome/sol-games/elevator.scm
+share/gnome/sol-games/first_law.scm
 share/gnome/sol-games/fortunes.scm
 share/gnome/sol-games/fourteen.scm
 share/gnome/sol-games/freecell.scm
 share/gnome/sol-games/hopscotch.scm
 share/gnome/sol-games/kansas.scm
 share/gnome/sol-games/klondike.scm
+share/gnome/sol-games/lady_jane.scm
 share/gnome/sol-games/neighbor.scm
 share/gnome/sol-games/odessa.scm
 share/gnome/sol-games/osmosis.scm
@@ -342,12 +285,16 @@ share/gnome/sol-games/royal_east.scm
 share/gnome/sol-games/scorpion.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/straight_up.scm
 share/gnome/sol-games/thieves.scm
 share/gnome/sol-games/thirteen.scm
 share/gnome/sol-games/thumb_and_pouch.scm
 share/gnome/sol-games/union_square.scm
 share/gnome/sol-games/westhaven.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
@@ -365,24 +312,99 @@ share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
+share/gnome/xbill/cursors/apple.xpm
+share/gnome/xbill/cursors/bsd.xpm
+share/gnome/xbill/cursors/bucket.xpm
+share/gnome/xbill/cursors/hand_down.xpm
+share/gnome/xbill/cursors/hand_down_mask.xpm
+share/gnome/xbill/cursors/hand_up.xpm
+share/gnome/xbill/cursors/hand_up_mask.xpm
+share/gnome/xbill/cursors/hurd.xpm
+share/gnome/xbill/cursors/linux.xpm
+share/gnome/xbill/cursors/next.xpm
+share/gnome/xbill/cursors/os2.xpm
+share/gnome/xbill/cursors/redhat.xpm
+share/gnome/xbill/cursors/sgi.xpm
+share/gnome/xbill/cursors/sun.xpm
+share/gnome/xbill/pixmaps/about.xpm
+share/gnome/xbill/pixmaps/apple.xpm
+share/gnome/xbill/pixmaps/billA_0.xpm
+share/gnome/xbill/pixmaps/billA_1.xpm
+share/gnome/xbill/pixmaps/billA_10.xpm
+share/gnome/xbill/pixmaps/billA_11.xpm
+share/gnome/xbill/pixmaps/billA_12.xpm
+share/gnome/xbill/pixmaps/billA_2.xpm
+share/gnome/xbill/pixmaps/billA_3.xpm
+share/gnome/xbill/pixmaps/billA_4.xpm
+share/gnome/xbill/pixmaps/billA_5.xpm
+share/gnome/xbill/pixmaps/billA_6.xpm
+share/gnome/xbill/pixmaps/billA_7.xpm
+share/gnome/xbill/pixmaps/billA_8.xpm
+share/gnome/xbill/pixmaps/billA_9.xpm
+share/gnome/xbill/pixmaps/billD_0.xpm
+share/gnome/xbill/pixmaps/billD_1.xpm
+share/gnome/xbill/pixmaps/billD_2.xpm
+share/gnome/xbill/pixmaps/billD_3.xpm
+share/gnome/xbill/pixmaps/billD_4.xpm
+share/gnome/xbill/pixmaps/billL_0.xpm
+share/gnome/xbill/pixmaps/billL_1.xpm
+share/gnome/xbill/pixmaps/billL_2.xpm
+share/gnome/xbill/pixmaps/billR_0.xpm
+share/gnome/xbill/pixmaps/billR_1.xpm
+share/gnome/xbill/pixmaps/billR_2.xpm
+share/gnome/xbill/pixmaps/bsd.xpm
+share/gnome/xbill/pixmaps/bsdcpu.xpm
+share/gnome/xbill/pixmaps/bucket.xpm
+share/gnome/xbill/pixmaps/hurd.xpm
+share/gnome/xbill/pixmaps/icon.xpm
+share/gnome/xbill/pixmaps/linux.xpm
+share/gnome/xbill/pixmaps/logo.xpm
+share/gnome/xbill/pixmaps/maccpu.xpm
+share/gnome/xbill/pixmaps/next.xpm
+share/gnome/xbill/pixmaps/nextcpu.xpm
+share/gnome/xbill/pixmaps/os2.xpm
+share/gnome/xbill/pixmaps/os2cpu.xpm
+share/gnome/xbill/pixmaps/redhat.xpm
+share/gnome/xbill/pixmaps/sgi.xpm
+share/gnome/xbill/pixmaps/sgicpu.xpm
+share/gnome/xbill/pixmaps/spark_0.xpm
+share/gnome/xbill/pixmaps/spark_1.xpm
+share/gnome/xbill/pixmaps/sun.xpm
+share/gnome/xbill/pixmaps/suncpu.xpm
+share/gnome/xbill/pixmaps/toaster.xpm
+share/gnome/xbill/pixmaps/wingdows.xpm
 share/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/en_GB/LC_MESSAGES/gnome-games.mo
 share/locale/es/LC_MESSAGES/gnome-games.mo
+share/locale/et/LC_MESSAGES/gnome-games.mo
 share/locale/fi/LC_MESSAGES/gnome-games.mo
 share/locale/fr/LC_MESSAGES/gnome-games.mo
 share/locale/ga/LC_MESSAGES/gnome-games.mo
+share/locale/hu/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
+share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
 share/locale/pl/LC_MESSAGES/gnome-games.mo
 share/locale/pt/LC_MESSAGES/gnome-games.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
+share/locale/ru/LC_MESSAGES/gnome-games.mo
+share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/wa/LC_MESSAGES/gnome-games.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
+@dirrm share/gnome/xbill/pixmaps
+@dirrm share/gnome/xbill/cursors
+@dirrm share/gnome/xbill
 @dirrm share/gnome/sounds/iagno
 @dirrm share/gnome/sounds/gnobots2
 @dirrm share/gnome/sounds/gnibbles
+@dirrm share/gnome/sounds/gataxx
 @dirrm share/gnome/sol-games
 @dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/pixmaps/mahjongg/bg
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
 @dirrm share/gnome/pixmaps/gnotravex
@@ -390,8 +412,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/gnometris
 @dirrm share/gnome/pixmaps/gnome-stones
 @dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnobots
 @dirrm share/gnome/pixmaps/gnibbles
+@dirrm share/gnome/pixmaps/glines
+@dirrm share/gnome/pixmaps/gataxx
 @dirrm share/gnome/pixmaps/cards/suits_small
 @dirrm share/gnome/pixmaps/cards/suits_medium
 @dirrm share/gnome/pixmaps/cards/suits_large
@@ -401,16 +424,14 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/honors
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/metatris/default-theme
-@dirrm share/gnome/metatris
 @dirrm share/gnome/help/samegnome/C
 @dirrm share/gnome/help/samegnome
+@dirrm share/gnome/help/gtali/C
+@dirrm share/gnome/help/gtali
+@dirrm share/gnome/help/gnobots2/it
 @dirrm share/gnome/help/gnobots2/es
 @dirrm share/gnome/help/gnobots2/C
 @dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnobots/es
-@dirrm share/gnome/help/gnobots/C
-@dirrm share/gnome/help/gnobots
 @dirrm share/gnome/gturing/examples
 @dirrm share/gnome/gturing
 @dirrm share/gnome/gnome-stones/objects