Upgrade to 0.99.5, and portlint.

PR:		ports/9825
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 421 insertions, 168 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 7a01d3cefdac..39e91642ff85 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,22 +1,21 @@
-# New ports collection makefile for:   gnomegames
-# Version required:    0.99.3
-# Date created:        03 July 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnomegames
+# Version required:			0.99.5
+# Date created:				03 July 1998
+# Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.10 1999/01/15 18:10:22 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/01/27 08:31:50 fenner Exp $
 #
 
-DISTNAME=	gnome-games-0.99.3
-PKGNAME=	gnomegames-0.99.3
-CATEGORIES=	games
+DISTNAME=	gnome-games-0.99.5
+PKGNAME=	gnomegames-0.99.5
+CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-games
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		guile.4:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -24,10 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 05748dff6c42..a7995b06c8e4 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-0.99.3.tar.gz) = 77915ffb46164c3a2b37366da9ad00c0
+MD5 (gnome-games-0.99.5.tar.gz) = 83235f66cca51818cb4b0406b97956e4
diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab
index 8da8f4c9df41..77e59a670def 100644
--- a/games/gnome-games/files/patch-ab
+++ b/games/gnome-games/files/patch-ab
@@ -1,144 +1,256 @@
---- freecell/src/Makefile.in.orig	Fri Dec 18 01:54:30 1998
-+++ freecell/src/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -122,7 +122,7 @@
- Gamesdir = $(datadir)/apps/Games
+--- aisleriot/Makefile.in.orig	Tue Feb  2 18:48:57 1999
++++ aisleriot/Makefile.in	Tue Feb  2 18:49:20 1999
+@@ -130,7 +130,7 @@
+ 
+ SUBDIRS = docs 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	Tue Feb  2 18:49:25 1999
++++ aisleriot/docs/Makefile.in	Tue Feb  2 18:49:38 1999
+@@ -128,7 +128,7 @@
+ XPM_LIBS = @XPM_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
+ 
+--- freecell/src/Makefile.in.orig	Tue Feb  2 18:49:55 1999
++++ freecell/src/Makefile.in	Tue Feb  2 18:50:10 1999
+@@ -124,7 +124,7 @@
  
- INCLUDES = \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
- 	-I$(srcdir)/../gdk-card-image
---- gnobots/Makefile.in.orig	Fri Dec 18 01:54:54 1998
-+++ gnobots/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -123,10 +123,10 @@
- pixmapdir=$(datadir)/pixmaps/gnobots
- appicondir=$(datadir)/pixmaps
  Gamesdir = $(datadir)/apps/Games
--helpdir = $(datadir)/gnome/help/gnobots/C
-+helpdir = $(datadir)/help/gnobots/C
  
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)				 \
- 	$(GNOME_INCLUDEDIR)
+-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
  
---- gnome-stones/Makefile.in.orig	Fri Dec 18 01:55:01 1998
-+++ gnome-stones/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -127,7 +127,7 @@
+ 
+ bin_PROGRAMS = freecell
+--- gnobots/Makefile.in.orig	Tue Feb  2 18:50:29 1999
++++ gnobots/Makefile.in	Tue Feb  2 18:50:44 1999
+@@ -129,7 +129,7 @@
+ 
+ SUBDIRS = help
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gnobots
+--- gnobots/help/C/Makefile.in.orig	Tue Feb  2 18:50:49 1999
++++ gnobots/help/C/Makefile.in	Tue Feb  2 18:50:58 1999
+@@ -125,7 +125,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-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	Tue Feb  2 18:51:02 1999
++++ gnobots/help/es/Makefile.in	Tue Feb  2 18:51:08 1999
+@@ -125,7 +125,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-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	Tue Feb  2 18:51:15 1999
++++ gnobots2/Makefile.in	Tue Feb  2 18:51:29 1999
+@@ -132,7 +132,7 @@
+ 
+ SUBDIRS = help
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gnobots2
+--- gnobots2/help/es/Makefile.in.orig	Tue Feb  2 18:51:50 1999
++++ gnobots2/help/es/Makefile.in	Tue Feb  2 18:51:56 1999
+@@ -125,7 +125,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/es
++gnobots2_helpdir = $(datadir)/help/gnobots2/es
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gnobots2/help/C/Makefile.in.orig	Tue Feb  2 18:51:33 1999
++++ gnobots2/help/C/Makefile.in	Tue Feb  2 18:51:43 1999
+@@ -125,7 +125,7 @@
+ EXTRA_DIST = index.html 	     topic.dat
+ 
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/C
++gnobots2_helpdir = $(datadir)/help/gnobots2/C
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- gnome-stones/Makefile.in.orig	Tue Feb  2 18:52:11 1999
++++ gnome-stones/Makefile.in	Tue Feb  2 18:52:23 1999
+@@ -129,7 +129,7 @@
+ Pixmapdir = $(datadir)/pixmaps
  Cavesdir = $(datadir)/gnome-stones
  
- INCLUDES =					\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
- 	-DCAVESDIR=\""$(Cavesdir)"\"			\
- 	-I$(includedir)					\
---- gnome-stones/objects/Makefile.in.orig	Fri Dec 18 01:55:04 1998
-+++ gnome-stones/objects/Makefile.in	Fri Jan  1 15:33:20 1999
-@@ -121,11 +121,11 @@
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-DCAVESDIR=\""$(Cavesdir)"\"				-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-DCAVESDIR=\""$(Cavesdir)"\"				-I$(includedir)						$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gnome-stones
+--- gnome-stones/objects/Makefile.in.orig	Tue Feb  2 18:52:28 1999
++++ gnome-stones/objects/Makefile.in	Tue Feb  2 18:52:50 1999
+@@ -124,9 +124,9 @@
  
  GSTONES_SRC_DIR = $(srcdir)/../
  
--objectdir= $(libdir)/gnome-stones/objects
-+objectdir= $(datadir)/gnome-stones/objects
+-objectdir = $(libdir)/gnome-stones/objects
++objectdir = $(datadir)/gnome-stones/objects
+ 
+-INCLUDES =  	-I$(GSTONES_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GSTONES_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I$(includedir)						$(GNOME_INCLUDEDIR)
+ 
+ 
+ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
+--- gnometris/Makefile.in.orig	Tue Feb  2 18:53:00 1999
++++ gnometris/Makefile.in	Tue Feb  2 18:53:13 1999
+@@ -126,7 +126,7 @@
+ scoredir = $(localstatedir)/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	Tue Feb  2 18:53:19 1999
++++ gnomine/Makefile.in	Tue Feb  2 18:53:28 1999
+@@ -125,7 +125,7 @@
+ scoredir = $(localstatedir)/games
+ Gamesdir = $(datadir)/apps/Games
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
- INCLUDES = 						\
- 	-I$(GSTONES_SRC_DIR)				\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)
  
---- gnomine/Makefile.in.orig	Fri Dec 18 01:54:32 1998
-+++ gnomine/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -123,7 +123,7 @@
+ bin_PROGRAMS = gnomine
+--- gnothello/Makefile.in.orig	Tue Feb  2 18:53:32 1999
++++ gnothello/Makefile.in	Tue Feb  2 18:53:44 1999
+@@ -127,7 +127,7 @@
  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"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)				 \
- 	$(GNOME_INCLUDEDIR)
  
---- gnothello/Makefile.in.orig	Fri Dec 18 01:54:58 1998
-+++ gnothello/Makefile.in	Fri Jan  1 15:10:26 1999
+ bin_PROGRAMS = iagno
+--- gnotravex/Makefile.in.orig	Tue Feb  2 18:53:52 1999
++++ gnotravex/Makefile.in	Tue Feb  2 18:54:03 1999
 @@ -126,7 +126,7 @@
+ pixmapdir = $(datadir)/pixmaps/gnotravex
+ Gamesdir = $(datadir)/apps/Games
  
- INCLUDES = 			\
- 	-DHAVE_ORBIT \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)				 \
- 	$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gnotravex
+--- gturing/Makefile.in.orig	Tue Feb  2 18:54:08 1999
++++ gturing/Makefile.in	Tue Feb  2 18:54:18 1999
+@@ -124,7 +124,7 @@
  
---- gturing/Makefile.in.orig	Fri Dec 18 01:54:44 1998
-+++ gturing/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -122,7 +122,7 @@
  Gamesdir = $(datadir)/apps/Games
  
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)				 \
- 	$(GNOME_INCLUDEDIR)			 \
- 	-DVERSION=\""$(VERSION)"\"
---- gyahtzee/Makefile.in.orig	Fri Dec 18 01:54:49 1998
-+++ gyahtzee/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -125,7 +125,7 @@
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)			 	-DVERSION=\""$(VERSION)"\"
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)			 	-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ bin_PROGRAMS = gturing
+--- gyahtzee/Makefile.in.orig	Tue Feb  2 18:54:24 1999
++++ gyahtzee/Makefile.in	Tue Feb  2 18:59:41 1999
+@@ -127,12 +127,12 @@
+ 
  SUBDIRS = pix
  
- INCLUDES =					\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
-@@ -133,7 +133,7 @@
+-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@CYAHTZEE=cyahtzee
+ @HAS_CURSES_TRUE@CYAHTZEE = cyahtzee
  
 -bin_PROGRAMS = gyahtzee	$(CYAHTZEE)
 +bin_PROGRAMS = gyahtzee
  
- gyahtzee_SOURCES =       \
-         gyahtzee.c       \
---- mahjongg/Makefile.in.orig	Fri Dec 18 01:54:41 1998
-+++ mahjongg/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -125,7 +125,7 @@
- appicondir=$(datadir)/pixmaps
+ gyahtzee_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
  
- INCLUDES = -I.. -I$(srcdir)/..		\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)			\
- 	$(GNOME_INCLUDEDIR)
- 
---- same-gnome/Makefile.in.orig	Fri Dec 18 01:54:36 1998
-+++ same-gnome/Makefile.in	Fri Jan  1 15:08:49 1999
-@@ -124,7 +124,7 @@
+--- mahjongg/Makefile.in.orig	Tue Feb  2 18:54:40 1999
++++ mahjongg/Makefile.in	Tue Feb  2 18:54:53 1999
+@@ -127,7 +127,7 @@
  Gamesdir = $(datadir)/apps/Games
+ appicondir = $(datadir)/pixmaps
+ 
+-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
+ 
  
- INCLUDES = -I.. -I$(srcdir)/..		\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)			\
- 	$(GNOME_INCLUDEDIR)
+ bin_PROGRAMS = mahjongg
+--- metatris/Makefile.in.orig	Tue Feb  2 18:54:58 1999
++++ metatris/Makefile.in	Tue Feb  2 18:55:11 1999
+@@ -145,7 +145,7 @@
+ metatris_LDFLAGS = $(GTK_LIBS)		$(GNOME_LIBDIR) 		$(GNOMEUI_LIBS)			$(INTLLIBS)
  
---- scottfree/Makefile.in.orig	Fri Dec 18 01:54:39 1998
-+++ scottfree/Makefile.in	Fri Jan  1 15:11:32 1999
-@@ -120,7 +120,7 @@
+ 
+-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	Tue Feb  2 18:55:18 1999
++++ same-gnome/Makefile.in	Tue Feb  2 18:55:29 1999
+@@ -128,7 +128,7 @@
+ 
+ SUBDIRS = C
+ 
+-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 = same-gnome
+--- same-gnome/C/Makefile.in.orig	Tue Feb  2 18:55:35 1999
++++ same-gnome/C/Makefile.in	Tue Feb  2 18:55:43 1999
+@@ -122,7 +122,7 @@
+ XPM_LIBS = @XPM_LIBS@
  l = @l@
  
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)		\
- 	$(GNOME_INCLUDEDIR)
+-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C
++same_gnome_helpdir = $(datadir)/help/samegnome/C
+ 
+ same_gnome_help_DATA =  	index.html			topic.dat
  
---- po/Makefile.in.in.orig	Fri Jan  1 15:19:04 1999
-+++ po/Makefile.in.in	Fri Jan  1 15:19:15 1999
+--- scottfree/Makefile.in.orig	Tue Feb  2 18:55:50 1999
++++ scottfree/Makefile.in	Tue Feb  2 18:56:02 1999
+@@ -122,7 +122,7 @@
+ XPM_LIBS = @XPM_LIBS@
+ l = @l@
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)			$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)			$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = GnomeScott
+--- po/Makefile.in.in.orig	Tue Feb  2 19:00:59 1999
++++ po/Makefile.in.in	Tue Feb  2 19:01:07 1999
 @@ -18,7 +18,7 @@
  
  prefix = @prefix@
@@ -148,29 +260,3 @@
  localedir = $(datadir)/locale
  gnulocaledir = $(prefix)/share/locale
  gettextsrcdir = $(prefix)/share/gettext/po
---- gnotravex/Makefile.in.orig	Tue Jan  5 15:42:26 1999
-+++ gnotravex/Makefile.in	Tue Jan  5 15:42:48 1999
-@@ -124,7 +124,7 @@
- Gamesdir=$(datadir)/apps/Games
- 
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = gnotravex
---- aisleriot/Makefile.in.orig	Mon Jan  4 06:40:58 1999
-+++ aisleriot/Makefile.in	Tue Jan  5 17:01:29 1999
-@@ -125,10 +125,10 @@
- Gamesdir  = $(datadir)/apps/Games
- typesdir  = $(datadir)/sol-games
- 
--SUBDIRS=docs pixmaps
-+SUBDIRS=pixmaps
- 
- INCLUDES = \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir)				 \
- 	$(GNOME_INCLUDEDIR)
- 
diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac
index 685f59007139..2507ea7dbbc4 100644
--- a/games/gnome-games/files/patch-ac
+++ b/games/gnome-games/files/patch-ac
@@ -5,7 +5,7 @@
  libgdkcardimageincludedir = $(includedir)/gdkcardimage
  libgdkcardimageinclude_HEADERS = gdk-card-image.h
 -libgdkcardimage_la_LDFLAGS = -version-info 0:0:0
-+libgdkcardimage_la_LDFLAGS = -version-info 0:99:0
++libgdkcardimage_la_LDFLAGS = -version-info 1:0:0
  libgdkcardimage_la_LIBADD = $(GTK_LIBS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 2b44ff811bd8..4091e2662c9d 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1,54 +1,78 @@
 bin/GnomeScott
 bin/freecell
 bin/gnobots
+bin/gnobots2
 bin/gnome-stones
+bin/gnometris
 bin/gnomine
-bin/gnothello
 bin/gnotravex
 bin/gturing
 bin/gyahtzee
+bin/iagno
 bin/mahjongg
+bin/metatris
 bin/same-gnome
 bin/sol
-etc/sound/events/gnothello.soundlist
+etc/sound/events/gnobots2.soundlist
+etc/sound/events/iagno.soundlist
 include/gdkcardimage/gdk-card-image.h
 lib/libgdkcardimage.a
 lib/libgdkcardimage.la
 lib/libgdkcardimage.so
-lib/libgdkcardimage.so.0.99
+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/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/gnothello.desktop
 share/gnome/apps/Games/gnotravex.desktop
 share/gnome/apps/Games/gyahtzee.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/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
+share/gnome/games/gnobots2.nightmare.scores
+share/gnome/games/gnobots2.robots2-safe.scores
+share/gnome/games/gnobots2.robots2.scores
+share/gnome/games/gnobots2.robots2_easy-safe.scores
+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/gnometris.scores
 share/gnome/games/gnomine.Biiiig.scores
 share/gnome/games/gnomine.Custom.scores
 share/gnome/games/gnomine.Medium.scores
 share/gnome/games/gnomine.Tiny.scores
-share/gnome/games/gnothello.b1.scores
-share/gnome/games/gnothello.b2.scores
-share/gnome/games/gnothello.b3.scores
-share/gnome/games/gnothello.w1.scores
-share/gnome/games/gnothello.w2.scores
-share/gnome/games/gnothello.w3.scores
 share/gnome/games/gnotravex.2x2.scores
 share/gnome/games/gnotravex.3x3.scores
 share/gnome/games/gnotravex.4x4.scores
 share/gnome/games/gnotravex.5x5.scores
 share/gnome/games/gnotravex.6x6.scores
 share/gnome/games/gyahtzee.scores
+share/gnome/games/iagno.b1.scores
+share/gnome/games/iagno.b2.scores
+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/same-gnome.scores
+share/gnome/gnobots2/classic_robots.cfg
+share/gnome/gnobots2/nightmare.cfg
+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/gnomekoban.caves
 share/gnome/gnome-stones/tutorial.caves
@@ -60,8 +84,120 @@ 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/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
+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/samegnome/C/authors.html
+share/gnome/help/samegnome/C/book1.html
+share/gnome/help/samegnome/C/bugs.html
+share/gnome/help/samegnome/C/c11.html
+share/gnome/help/samegnome/C/docbook.css
+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/pixmaps/cards/backs/beige.png
 share/gnome/pixmaps/cards/backs/face.png
 share/gnome/pixmaps/cards/backs/grey.png
@@ -91,6 +227,15 @@ 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
+share/gnome/pixmaps/gnobots2/gnomes.png
+share/gnome/pixmaps/gnobots2/mice.png
+share/gnome/pixmaps/gnobots2/robots.png
+share/gnome/pixmaps/gnobots2/splat.png
+share/gnome/pixmaps/gnobots2/windows.png
+share/gnome/pixmaps/gnobots2/yahoo.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png
@@ -105,13 +250,14 @@ 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/gnothello/blend.png
-share/gnome/pixmaps/gnothello/classic.png
-share/gnome/pixmaps/gnothello/flipblend.png
-share/gnome/pixmaps/gnothello/metal.png
-share/gnome/pixmaps/gnothello/metal2.png
-share/gnome/pixmaps/gnothello/shrink.png
-share/gnome/pixmaps/gnothello/woodtrim.png
+share/gnome/pixmaps/gnometris/5blocks.png
+share/gnome/pixmaps/iagno/blend.png
+share/gnome/pixmaps/iagno/classic.png
+share/gnome/pixmaps/iagno/flipblend.png
+share/gnome/pixmaps/iagno/metal.png
+share/gnome/pixmaps/iagno/metal2.png
+share/gnome/pixmaps/iagno/shrink.png
+share/gnome/pixmaps/iagno/woodtrim.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
 share/gnome/pixmaps/mahjongg/default.png
 share/gnome/pixmaps/mahjongg/seta.png
@@ -122,10 +268,13 @@ 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-gtetris.png
 share/gnome/pixmaps/gnome-gyahtzee.png
 share/gnome/pixmaps/gnome-mahjongg.png
+share/gnome/pixmaps/gnome-metatris.png
 share/gnome/pixmaps/gnome-stones.png
-share/gnome/pixmaps/gnothello.png
+share/gnome/pixmaps/iagno.png
 share/gnome/sol-games/beleaguered_castle.scm
 share/gnome/sol-games/camelot.scm
 share/gnome/sol-games/canfield.scm
@@ -142,6 +291,12 @@ share/gnome/sol-games/pileon.scm
 share/gnome/sol-games/sol.scm
 share/gnome/sol-games/spider.scm
 share/gnome/sol-games/yukon.scm
+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/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
@@ -155,9 +310,21 @@ 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/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/gnobots2
+@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
@@ -166,11 +333,14 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/suits
 @dirrm share/gnome/pixmaps/cards
 @dirrm share/gnome/pixmaps/gnobots
+@dirrm share/gnome/pixmaps/gnobots2
 @dirrm share/gnome/pixmaps/gnome-stones
-@dirrm share/gnome/pixmaps/gnothello
+@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/gnome-stones/objects
 @dirrm share/gnome/gnome-stones