Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 292 insertions, 178 deletions

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 6686ad0c71e5..3d41cefdec38 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomegames
-# Version required:			0.99.8
+# Version required:			1.0.1
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.12 1999/02/02 13:01:33 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $
 #
 
-DISTNAME=	gnome-games-0.99.8
-PKGNAME=	gnomegames-0.99.8
+DISTNAME=	gnome-games-1.0.1
+PKGNAME=	gnomegames-1.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-games
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 6fd23676236f..1aa47351f807 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e
+MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
index 7dc73811102f..de972c331051 100644
--- a/games/gnomegames2/files/patch-ab
+++ b/games/gnomegames2/files/patch-ab
@@ -1,50 +1,78 @@
---- aisleriot/Makefile.in.orig	Mon Feb 15 13:57:56 1999
-+++ aisleriot/Makefile.in	Fri Feb 19 13:24:41 1999
-@@ -130,7 +130,7 @@
+--- 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 @@
+ scoredir = $(localstatedir)/games
+ cardimagedir = $(datadir)/pixmaps/cards
+ icondir = $(datadir)/pixmaps
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ typesdir = $(datadir)/sol-games
  
- SUBDIRS = docs pixmaps
+-SUBDIRS = docs pixmaps
++SUBDIRS = pixmaps
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = sol
---- aisleriot/docs/Makefile.in.orig	Mon Feb 15 13:58:07 1999
-+++ aisleriot/docs/Makefile.in	Fri Feb 19 13:24:41 1999
-@@ -128,7 +128,7 @@
- XPM_LIBS = @XPM_LIBS@
+@@ -152,7 +152,7 @@
+ EXTRA_DIST = TODO FIXME  AUTHORS $(types_DATA) $(cardimage_DATA) 	$(icon_DATA) sol.desktop SCHEME_GAMES.h
+ 
+ 
+-sysdir = $(datadir)/gnome/apps/Games
++sysdir = $(datadir)/apps/Games
+ 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 @@
+ 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 fortunes.html klondike.html pileon.html 	neighbor.html odessa.html osmosis.html spider.html yukon.html 	beleaguered-castle.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 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
  
---- freecell/src/Makefile.in.orig	Mon Feb 15 13:57:16 1999
-+++ freecell/src/Makefile.in	Fri Feb 19 13:24:41 1999
-@@ -124,7 +124,7 @@
+--- 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 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- Gamesdir = $(datadir)/apps/Games
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					-I$(srcdir)/../gdk-card-image
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					-I$(srcdir)/../gdk-card-image
  
  
  bin_PROGRAMS = freecell
---- gnibbles/Makefile.in.orig	Sun Feb 21 03:28:13 1999
-+++ gnibbles/Makefile.in	Sun Feb 21 03:28:33 1999
-@@ -128,7 +128,7 @@
+--- gnibbles/Makefile.in.orig	Mon Mar  1 02:51:08 1999
++++ gnibbles/Makefile.in	Wed Mar  3 00:00:39 1999
+@@ -127,10 +127,10 @@
+ configdir = $(datadir)/gnibbles
+ appicondir = $(datadir)/pixmaps
  soundlistdir = $(sysconfdir)/sound/events
- Gamesdir = $(datadir)/apps/Games
+-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)
  
  
  bin_PROGRAMS = gnibbles
---- gnobots/Makefile.in.orig	Mon Feb 15 13:57:38 1999
-+++ gnobots/Makefile.in	Fri Feb 19 13:24:41 1999
-@@ -129,7 +129,7 @@
+--- 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 @@
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/gnobots
+ appicondir = $(datadir)/pixmaps
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
  SUBDIRS = help
  
@@ -53,9 +81,9 @@
  
  
  bin_PROGRAMS = gnobots
---- gnobots/help/C/Makefile.in.orig	Mon Feb 15 13:57:40 1999
-+++ gnobots/help/C/Makefile.in	Fri Feb 19 13:24:41 1999
-@@ -125,7 +125,7 @@
+--- 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
  
  
@@ -64,9 +92,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots/help/es/Makefile.in.orig	Mon Feb 15 13:57:41 1999
-+++ gnobots/help/es/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -125,7 +125,7 @@
+--- 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
  
  
@@ -75,9 +103,14 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots2/Makefile.in.orig	Mon Feb 15 13:57:43 1999
-+++ gnobots2/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -132,7 +132,7 @@
+--- 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 @@
+ soundlistdir = $(sysconfdir)/sound/events
+ sounddir = $(datadir)/sounds/gnobots2
+ appicondir = $(datadir)/pixmaps
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
  SUBDIRS = help
  
@@ -86,9 +119,9 @@
  
  
  bin_PROGRAMS = gnobots2
---- gnobots2/help/C/Makefile.in.orig	Mon Feb 15 13:57:45 1999
-+++ gnobots2/help/C/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -125,7 +125,7 @@
+--- 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 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -97,9 +130,9 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnobots2/help/es/Makefile.in.orig	Mon Feb 15 13:57:46 1999
-+++ gnobots2/help/es/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -125,7 +125,7 @@
+--- 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 @@
  EXTRA_DIST = index.html 	     topic.dat
  
  
@@ -108,9 +141,15 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
---- gnome-stones/Makefile.in.orig	Mon Feb 15 13:57:53 1999
-+++ gnome-stones/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -129,7 +129,7 @@
+--- 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 @@
+ 
+ SUBDIRS = objects graphics
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  Pixmapdir = $(datadir)/pixmaps
  Cavesdir = $(datadir)/gnome-stones
  
@@ -119,9 +158,18 @@
  
  
  bin_PROGRAMS = gnome-stones
---- gnome-stones/objects/Makefile.in.orig	Mon Feb 15 13:57:54 1999
-+++ gnome-stones/objects/Makefile.in	Sun Feb 21 04:22:07 1999
-@@ -124,9 +124,9 @@
+@@ -145,7 +145,7 @@
+ Games_DATA = gnome-stones.desktop
+ Caves_DATA = default.caves tutorial.caves gnomekoban.caves
+ 
+-gtkrcdir = $(datadir)
++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 @@
  
  GSTONES_SRC_DIR = $(srcdir)/../
  
@@ -133,7 +181,7 @@
  
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
-@@ -141,10 +141,10 @@
+@@ -142,10 +142,10 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -146,32 +194,42 @@
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- gnometris/Makefile.in.orig	Mon Feb 15 13:58:10 1999
-+++ gnometris/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -126,7 +126,7 @@
+--- 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 @@
+ 
+ SUBDIRS = pix
  scoredir = $(localstatedir)/games
- Gamesdir = $(datadir)/apps/Games
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = gnometris
---- gnomine/Makefile.in.orig	Mon Feb 15 13:57:17 1999
-+++ gnomine/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -125,7 +125,7 @@
+--- 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 @@
+ l = @l@
+ 
  scoredir = $(localstatedir)/games
- Gamesdir = $(datadir)/apps/Games
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = gnomine
---- gnothello/Makefile.in.orig	Mon Feb 15 13:57:49 1999
-+++ gnothello/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -127,7 +127,7 @@
- Gamesdir = $(datadir)/apps/Games
+--- 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 @@
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/iagno
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  appicondir = $(datadir)/pixmaps
  
 -INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
@@ -179,26 +237,31 @@
  
  
  bin_PROGRAMS = iagno
---- gnotravex/Makefile.in.orig	Mon Feb 15 13:57:51 1999
-+++ gnotravex/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -126,7 +126,7 @@
+--- 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 @@
+ 
+ scoredir = $(localstatedir)/games
  pixmapdir = $(datadir)/pixmaps/gnotravex
- Gamesdir = $(datadir)/apps/Games
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = gnotravex
---- gturing/Makefile.in.orig	Mon Feb 15 13:57:32 1999
-+++ gturing/Makefile.in	Sun Feb 21 04:24:15 1999
-@@ -122,12 +122,10 @@
- XPM_LIBS = @XPM_LIBS@
+--- 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 @@
+ ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -SUBDIRS = help
--
- Gamesdir = $(datadir)/apps/Games
++# SUBDIRS = help
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  examplesdir = $(datadir)/gturing/examples
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)			 	-DVERSION=\""$(VERSION)"\" 	-DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\"
@@ -206,9 +269,26 @@
  
  
  bin_PROGRAMS = gturing
---- gyahtzee/Makefile.in.orig	Mon Feb 15 13:57:35 1999
-+++ gyahtzee/Makefile.in	Sun Feb 21 04:25:11 1999
-@@ -127,12 +127,12 @@
+--- 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 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
+ 
+-gturing_helpdir = $(datadir)/gnome/help/gturing/C
++gturing_helpdir = $(datadir)/help/gturing/C
+ 
+ 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@
+ 
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ scoredir = $(localstatedir)/games
  
  SUBDIRS = pix
  
@@ -223,10 +303,14 @@
  
  gtali_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
  
---- mahjongg/Makefile.in.orig	Mon Feb 15 13:57:31 1999
-+++ mahjongg/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -127,7 +127,7 @@
- Gamesdir = $(datadir)/apps/Games
+--- 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 @@
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/mahjongg
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  appicondir = $(datadir)/pixmaps
  
 -INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
@@ -234,9 +318,18 @@
  
  
  bin_PROGRAMS = mahjongg
---- metatris/Makefile.in.orig	Mon Feb 15 13:58:13 1999
-+++ metatris/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -145,7 +145,7 @@
+--- 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)
  
  
@@ -245,9 +338,14 @@
  
  
  scoredir = $(localstatedir)/games
---- same-gnome/Makefile.in.orig	Mon Feb 15 13:57:18 1999
-+++ same-gnome/Makefile.in	Fri Feb 19 13:24:42 1999
-@@ -128,7 +128,7 @@
+--- 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 @@
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/same-gnome
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
  
  SUBDIRS = help
  
@@ -256,10 +354,10 @@
  
  
  bin_PROGRAMS = same-gnome
---- same-gnome/help/C/Makefile.in.orig	Sun Feb 21 04:26:30 1999
-+++ same-gnome/help/C/Makefile.in	Sun Feb 21 04:26:40 1999
-@@ -122,7 +122,7 @@
- XPM_LIBS = @XPM_LIBS@
+--- 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 @@
+ ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C
@@ -267,10 +365,10 @@
  
  same_gnome_help_DATA =  	index.html			topic.dat
  
---- scottfree/Makefile.in.orig	Sun Feb 21 04:27:05 1999
-+++ scottfree/Makefile.in	Sun Feb 21 04:27:17 1999
-@@ -122,7 +122,7 @@
- XPM_LIBS = @XPM_LIBS@
+--- 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 @@
+ ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)			$(GNOME_INCLUDEDIR)
@@ -278,14 +376,3 @@
  
  
  bin_PROGRAMS = GnomeScott
---- po/Makefile.in.in.orig	Sun Feb 21 04:27:30 1999
-+++ po/Makefile.in.in	Sun Feb 21 04:27:40 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 7a7ca05f6d25..fd19493b71e8 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -38,6 +38,14 @@ 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/games/gnibbles.1.0.scores
+share/gnome/games/gnibbles.1.1.scores
+share/gnome/games/gnibbles.2.0.scores
+share/gnome/games/gnibbles.2.1.scores
+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
@@ -103,8 +111,9 @@ share/gnome/gnobots2/robots2.cfg
 share/gnome/gnobots2/robots2_easy.cfg
 share/gnome/gnobots2/robots_with_safe_teleport.cfg
 share/gnome/gnome-stones/default.caves
+share/gnome/gnome-stones/gnome-stonesrc
+share/gnome/gnome-stones/gnome-stonesrc.ko
 share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/tutorial.caves
 share/gnome/gnome-stones/objects/libgnome-stones.a
 share/gnome/gnome-stones/objects/libgnome-stones.la
 share/gnome/gnome-stones/objects/libgnome-stones.so
@@ -113,6 +122,7 @@ share/gnome/gnome-stones/objects/libgnomekoban.a
 share/gnome/gnome-stones/objects/libgnomekoban.la
 share/gnome/gnome-stones/objects/libgnomekoban.so
 share/gnome/gnome-stones/objects/libgnomekoban.so.0
+share/gnome/gnome-stones/tutorial.caves
 share/gnome/gturing/examples/3ones2zeroes.tur
 share/gnome/gturing/examples/add.tur
 share/gnome/gturing/examples/addbin.tur
@@ -123,28 +133,6 @@ 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/aisleriot/C/beleaguered-castle.html
-share/gnome/help/aisleriot/C/camelot-goal.gif
-share/gnome/help/aisleriot/C/camelot.html
-share/gnome/help/aisleriot/C/canfield.html
-share/gnome/help/aisleriot/C/clock-rules.gif
-share/gnome/help/aisleriot/C/clock.html
-share/gnome/help/aisleriot/C/docbook.css
-share/gnome/help/aisleriot/C/doublets.html
-share/gnome/help/aisleriot/C/eagle-wing.html
-share/gnome/help/aisleriot/C/fortunes.html
-share/gnome/help/aisleriot/C/glossary.html
-share/gnome/help/aisleriot/C/gpl.html
-share/gnome/help/aisleriot/C/index.html
-share/gnome/help/aisleriot/C/intro.html
-share/gnome/help/aisleriot/C/klondike.html
-share/gnome/help/aisleriot/C/neighbor.html
-share/gnome/help/aisleriot/C/odessa.html
-share/gnome/help/aisleriot/C/osmosis.html
-share/gnome/help/aisleriot/C/pileon.html
-share/gnome/help/aisleriot/C/spider.html
-share/gnome/help/aisleriot/C/topic.dat
-share/gnome/help/aisleriot/C/yukon.html
 share/gnome/help/gnobots/C/index.html
 share/gnome/help/gnobots/C/topic.dat
 share/gnome/help/gnobots/es/index.html
@@ -241,6 +229,7 @@ share/gnome/pixmaps/cards/backs/beige.png
 share/gnome/pixmaps/cards/backs/face.png
 share/gnome/pixmaps/cards/backs/grey.png
 share/gnome/pixmaps/cards/backs/rods.png
+share/gnome/pixmaps/cards/baize.png
 share/gnome/pixmaps/cards/honors/bonded.png
 share/gnome/pixmaps/cards/honors/xpat.png
 share/gnome/pixmaps/cards/jokers/gnome.png
@@ -248,16 +237,25 @@ share/gnome/pixmaps/cards/ranks/bold-09x14.png
 share/gnome/pixmaps/cards/ranks/fine-07x12.png
 share/gnome/pixmaps/cards/slots/hand.png
 share/gnome/pixmaps/cards/slots/plain.png
-share/gnome/pixmaps/cards/suits/knuth-09x10.png
-share/gnome/pixmaps/cards/suits/knuth-15x19.png
-share/gnome/pixmaps/cards/suits/knuth-18x21.png
-share/gnome/pixmaps/cards/suits/knuth-21x25.png
-share/gnome/pixmaps/cards/suits/xpat-11x11.png
-share/gnome/pixmaps/cards/suits/xpat-15x15.png
-share/gnome/pixmaps/cards/suits/xpat-21x21.png
-share/gnome/pixmaps/cards/suits/xpat-41x41.png
-share/gnome/pixmaps/cards/baize.png
 share/gnome/pixmaps/cards/splash.png
+share/gnome/pixmaps/cards/suits_large/knuth-09x10.png
+share/gnome/pixmaps/cards/suits_large/knuth-15x19.png
+share/gnome/pixmaps/cards/suits_large/knuth-18x21.png
+share/gnome/pixmaps/cards/suits_large/knuth-21x25.png
+share/gnome/pixmaps/cards/suits_large/xpat-11x11.png
+share/gnome/pixmaps/cards/suits_large/xpat-15x15.png
+share/gnome/pixmaps/cards/suits_large/xpat-21x21.png
+share/gnome/pixmaps/cards/suits_large/xpat-41x41.png
+share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png
+share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png
+share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png
+share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png
+share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png
+share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png
+share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png
+share/gnome/pixmaps/cards/suits_small/knuth-09x10.png
+share/gnome/pixmaps/cards/suits_small/xpat-11x11.png
+share/gnome/pixmaps/cards/suits_small/xpat-15x15.png
 share/gnome/pixmaps/gnibbles/gnibbles.png
 share/gnome/pixmaps/gnibbles/gnibbles_logo.png
 share/gnome/pixmaps/gnobots/aieee.png
@@ -277,6 +275,14 @@ share/gnome/pixmaps/gnobots2/robots.png
 share/gnome/pixmaps/gnobots2/splat.png
 share/gnome/pixmaps/gnobots2/windows.png
 share/gnome/pixmaps/gnobots2/yahoo.png
+share/gnome/pixmaps/gnome-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-stones.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png
@@ -291,10 +297,18 @@ share/gnome/pixmaps/gnome-stones/frame.png
 share/gnome/pixmaps/gnome-stones/gnome.png
 share/gnome/pixmaps/gnome-stones/title.png
 share/gnome/pixmaps/gnome-stones/wall.png
+share/gnome/pixmaps/gnometris/5blocks-tig.png
 share/gnome/pixmaps/gnometris/5blocks-tim.png
 share/gnome/pixmaps/gnometris/5blocks.png
 share/gnome/pixmaps/gnometris/7blocks.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/weirdo-bg.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
+share/gnome/pixmaps/iagno.png
 share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
 share/gnome/pixmaps/iagno/flipblend.png
@@ -309,37 +323,48 @@ 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/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-stones.png
-share/gnome/pixmaps/iagno.png
+share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/beleaguered_castle.scm
+share/gnome/sol-games/bristol.scm
 share/gnome/sol-games/camelot.scm
 share/gnome/sol-games/canfield.scm
 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/fortunes.scm
+share/gnome/sol-games/fourteen.scm
 share/gnome/sol-games/freecell.scm
+share/gnome/sol-games/hopscotch.scm
 share/gnome/sol-games/klondike.scm
 share/gnome/sol-games/neighbor.scm
 share/gnome/sol-games/odessa.scm
 share/gnome/sol-games/osmosis.scm
 share/gnome/sol-games/pileon.scm
+share/gnome/sol-games/plait.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
+share/gnome/sol-games/thieves.scm
+share/gnome/sol-games/thirteen.scm
 share/gnome/sol-games/yukon.scm
+share/gnome/sounds/gnibbles/appear.wav
+share/gnome/sounds/gnibbles/bonus.wav
+share/gnome/sounds/gnibbles/crash.wav
+share/gnome/sounds/gnibbles/gobble.wav
+share/gnome/sounds/gnibbles/laughter.wav
+share/gnome/sounds/gnibbles/life.wav
+share/gnome/sounds/gnibbles/pop.wav
+share/gnome/sounds/gnibbles/reverse.wav
+share/gnome/sounds/gnibbles/start.wav
+share/gnome/sounds/gnibbles/teleport.wav
 share/gnome/sounds/gnobots2/bad.wav
 share/gnome/sounds/gnobots2/die.wav
 share/gnome/sounds/gnobots2/splat.wav
 share/gnome/sounds/gnobots2/teleport.wav
 share/gnome/sounds/gnobots2/victory.wav
 share/gnome/sounds/gnobots2/yahoo.wav
+share/gnome/sounds/iagno/flip-piece.wav
+share/gnome/sounds/iagno/gameover.wav
 share/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
@@ -353,41 +378,43 @@ share/locale/ko/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/ru/LC_MESSAGES/gnome-games.mo
-@dirrm include/gdkcardimage
-@dirrm share/gnome/gnibbles
-@dirrm share/gnome/gnobots2
-@dirrm share/gnome/gturing/examples
-@dirrm share/gnome/gturing
-@dirrm share/gnome/help/aisleriot/C
-@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/help/gnobots/C
-@dirrm share/gnome/help/gnobots/es
-@dirrm share/gnome/help/gnobots
-@dirrm share/gnome/help/gnobots2/C
-@dirrm share/gnome/help/gnobots2/es
-@dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/samegnome/C
-@dirrm share/gnome/help/samegnome
-@dirrm share/gnome/metatris/default-theme
-@dirrm share/gnome/metatris
-@dirrm share/gnome/pixmaps/cards/backs
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/ranks
+@dirrm share/gnome/sounds/iagno
+@dirrm share/gnome/sounds/gnobots2
+@dirrm share/gnome/sounds/gnibbles
+@dirrm share/gnome/sol-games
+@dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/pixmaps/mahjongg
+@dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gnotravex
+@dirrm share/gnome/pixmaps/gnometris/bg
+@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/cards/suits_small
+@dirrm share/gnome/pixmaps/cards/suits_medium
+@dirrm share/gnome/pixmaps/cards/suits_large
 @dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/suits
+@dirrm share/gnome/pixmaps/cards/ranks
+@dirrm share/gnome/pixmaps/cards/jokers
+@dirrm share/gnome/pixmaps/cards/honors
+@dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/pixmaps/gnibbles
-@dirrm share/gnome/pixmaps/gnobots
-@dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnome-stones
-@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnotravex
-@dirrm share/gnome/pixmaps/iagno
-@dirrm share/gnome/pixmaps/mahjongg
-@dirrm share/gnome/pixmaps/same-gnome
-@dirrm share/gnome/sol-games
-@dirrm share/gnome/sounds/gnobots2
+@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/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
 @dirrm share/gnome/gnome-stones
+@dirrm share/gnome/gnobots2
+@dirrm share/gnome/gnibbles
+@dirrm include/gdkcardimage