Update to 2.0.1.1.

12 files changed, 100 insertions, 70 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 542ba6e5d5ad..d7f5d2e311e1 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.1.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-games
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -25,8 +25,7 @@ USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index bc150231a8b8..b59a00857d88 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.0.1.tar.bz2) = f70b83d1cc7930530008035a4bb69bf5
+MD5 (gnome2/gnome-games-2.0.1.1.tar.bz2) = 24803e993961709548c70fe8ecb15787
diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab
index 777f4217e46c..52736c63495a 100644
--- a/games/gnome-games/files/patch-ab
+++ b/games/gnome-games/files/patch-ab
@@ -1,38 +1,25 @@
---- gnome-stones/Makefile.in.orig	Wed May  8 16:30:26 2002
-+++ gnome-stones/Makefile.in	Wed May  8 16:30:35 2002
-@@ -156,7 +156,7 @@
- Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
- Caves_DATA = $(Caves_in_files:.caves.in=.caves)
- 
--gtkrcdir = $(datadir)
-+gtkrcdir = $(datadir)/gnome-stones
- gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
- 
- Mimedir = $(datadir)/mime-info
---- gnome-stones/objects/Makefile.in.orig	Wed May  8 16:30:10 2002
-+++ gnome-stones/objects/Makefile.in	Wed May  8 16:31:30 2002
-@@ -131,7 +131,7 @@
- 
+--- gnome-stones/objects/Makefile.in.orig	Tue Jul 23 20:35:33 2002
++++ gnome-stones/objects/Makefile.in	Tue Jul 23 20:35:28 2002
+@@ -142,7 +142,7 @@
+ install_sh = @install_sh@
  GSTONES_SRC_DIR = $(srcdir)/../
  
 -objectdir = $(libdir)/gnome-stones/objects
 +objectdir = $(datadir)/gnome-stones/objects
  
- INCLUDES =  	-I$(GSTONES_SRC_DIR)					$(GNOME_GAMES_CFLAGS)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I$(includedir)					
- 
-@@ -148,11 +148,11 @@
+ INCLUDES = \
+ 	-I$(GSTONES_SRC_DIR)				\
+@@ -167,11 +167,11 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(object_LTLIBRARIES)
  
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgnome_stones_la_LDFLAGS = 
--libgnome_stones_la_LIBADD = 
+-libgnome_stones_la_LDFLAGS =
 +libgnome_stones_la_LDFLAGS = -avoid-version
-+libgnome_stones_la_LIBADD =
- libgnome_stones_la_OBJECTS =  gnome-stones.lo
--libgnomekoban_la_LDFLAGS = 
--libgnomekoban_la_LIBADD = 
+ libgnome_stones_la_LIBADD =
+ am_libgnome_stones_la_OBJECTS = gnome-stones.lo
+ libgnome_stones_la_OBJECTS = $(am_libgnome_stones_la_OBJECTS)
+-libgnomekoban_la_LDFLAGS =
 +libgnomekoban_la_LDFLAGS = -avoid-version
-+libgnomekoban_la_LIBADD =
- libgnomekoban_la_OBJECTS =  gnomekoban.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ libgnomekoban_la_LIBADD =
+ am_libgnomekoban_la_OBJECTS = gnomekoban.lo
+ libgnomekoban_la_OBJECTS = $(am_libgnomekoban_la_OBJECTS)
diff --git a/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c b/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c
new file mode 100644
index 000000000000..33f940e2e02b
--- /dev/null
+++ b/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c
@@ -0,0 +1,17 @@
+--- freecell/gdk-card-image/gdk-card-image.c.orig	Tue Jul 23 20:46:35 2002
++++ freecell/gdk-card-image/gdk-card-image.c	Tue Jul 23 20:52:20 2002
+@@ -27,13 +27,8 @@
+ 
+ #include <config.h>
+ #include <gnome.h>
+-#ifdef HAVE_SYS_DIRENT_H
+-#include <sys/dirent.h>
+-#elif defined(HAVE_SYS_DIR_H)
+-#include <sys/dir.h>
+-#else
++#include <sys/types.h>
+ #include <dirent.h>
+-#endif
+ 
+ #ifdef __osf__
+ #undef HAVE_STRUCT_DIRECT
diff --git a/games/gnome-games/files/patch-gnome-stones_Makefile.in b/games/gnome-games/files/patch-gnome-stones_Makefile.in
new file mode 100644
index 000000000000..92fbe9e8806c
--- /dev/null
+++ b/games/gnome-games/files/patch-gnome-stones_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-stones/Makefile.in.orig	Tue Jul 23 20:37:40 2002
++++ gnome-stones/Makefile.in	Tue Jul 23 20:38:10 2002
+@@ -202,7 +202,7 @@
+ Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
+ Caves_DATA = $(Caves_in_files:.caves.in=.caves)
+ 
+-gtkrcdir = $(datadir)
++gtkrcdir = $(datadir)/gnome-stones
+ gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
+ 
+ Mimedir = $(datadir)/mime-info
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index d2cbb830da47..e3d6149e671e 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -727,6 +727,7 @@ 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/lt/LC_MESSAGES/gnome-games.mo
+share/locale/ms/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/nn/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 542ba6e5d5ad..d7f5d2e311e1 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.1.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-games
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -25,8 +25,7 @@ USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index bc150231a8b8..b59a00857d88 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.0.1.tar.bz2) = f70b83d1cc7930530008035a4bb69bf5
+MD5 (gnome2/gnome-games-2.0.1.1.tar.bz2) = 24803e993961709548c70fe8ecb15787
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
index 777f4217e46c..52736c63495a 100644
--- a/games/gnomegames2/files/patch-ab
+++ b/games/gnomegames2/files/patch-ab
@@ -1,38 +1,25 @@
---- gnome-stones/Makefile.in.orig	Wed May  8 16:30:26 2002
-+++ gnome-stones/Makefile.in	Wed May  8 16:30:35 2002
-@@ -156,7 +156,7 @@
- Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
- Caves_DATA = $(Caves_in_files:.caves.in=.caves)
- 
--gtkrcdir = $(datadir)
-+gtkrcdir = $(datadir)/gnome-stones
- gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
- 
- Mimedir = $(datadir)/mime-info
---- gnome-stones/objects/Makefile.in.orig	Wed May  8 16:30:10 2002
-+++ gnome-stones/objects/Makefile.in	Wed May  8 16:31:30 2002
-@@ -131,7 +131,7 @@
- 
+--- gnome-stones/objects/Makefile.in.orig	Tue Jul 23 20:35:33 2002
++++ gnome-stones/objects/Makefile.in	Tue Jul 23 20:35:28 2002
+@@ -142,7 +142,7 @@
+ install_sh = @install_sh@
  GSTONES_SRC_DIR = $(srcdir)/../
  
 -objectdir = $(libdir)/gnome-stones/objects
 +objectdir = $(datadir)/gnome-stones/objects
  
- INCLUDES =  	-I$(GSTONES_SRC_DIR)					$(GNOME_GAMES_CFLAGS)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I$(includedir)					
- 
-@@ -148,11 +148,11 @@
+ INCLUDES = \
+ 	-I$(GSTONES_SRC_DIR)				\
+@@ -167,11 +167,11 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(object_LTLIBRARIES)
  
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgnome_stones_la_LDFLAGS = 
--libgnome_stones_la_LIBADD = 
+-libgnome_stones_la_LDFLAGS =
 +libgnome_stones_la_LDFLAGS = -avoid-version
-+libgnome_stones_la_LIBADD =
- libgnome_stones_la_OBJECTS =  gnome-stones.lo
--libgnomekoban_la_LDFLAGS = 
--libgnomekoban_la_LIBADD = 
+ libgnome_stones_la_LIBADD =
+ am_libgnome_stones_la_OBJECTS = gnome-stones.lo
+ libgnome_stones_la_OBJECTS = $(am_libgnome_stones_la_OBJECTS)
+-libgnomekoban_la_LDFLAGS =
 +libgnomekoban_la_LDFLAGS = -avoid-version
-+libgnomekoban_la_LIBADD =
- libgnomekoban_la_OBJECTS =  gnomekoban.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ libgnomekoban_la_LIBADD =
+ am_libgnomekoban_la_OBJECTS = gnomekoban.lo
+ libgnomekoban_la_OBJECTS = $(am_libgnomekoban_la_OBJECTS)
diff --git a/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c b/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c
new file mode 100644
index 000000000000..33f940e2e02b
--- /dev/null
+++ b/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c
@@ -0,0 +1,17 @@
+--- freecell/gdk-card-image/gdk-card-image.c.orig	Tue Jul 23 20:46:35 2002
++++ freecell/gdk-card-image/gdk-card-image.c	Tue Jul 23 20:52:20 2002
+@@ -27,13 +27,8 @@
+ 
+ #include <config.h>
+ #include <gnome.h>
+-#ifdef HAVE_SYS_DIRENT_H
+-#include <sys/dirent.h>
+-#elif defined(HAVE_SYS_DIR_H)
+-#include <sys/dir.h>
+-#else
++#include <sys/types.h>
+ #include <dirent.h>
+-#endif
+ 
+ #ifdef __osf__
+ #undef HAVE_STRUCT_DIRECT
diff --git a/games/gnomegames2/files/patch-gnome-stones_Makefile.in b/games/gnomegames2/files/patch-gnome-stones_Makefile.in
new file mode 100644
index 000000000000..92fbe9e8806c
--- /dev/null
+++ b/games/gnomegames2/files/patch-gnome-stones_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-stones/Makefile.in.orig	Tue Jul 23 20:37:40 2002
++++ gnome-stones/Makefile.in	Tue Jul 23 20:38:10 2002
+@@ -202,7 +202,7 @@
+ Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
+ Caves_DATA = $(Caves_in_files:.caves.in=.caves)
+ 
+-gtkrcdir = $(datadir)
++gtkrcdir = $(datadir)/gnome-stones
+ gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
+ 
+ Mimedir = $(datadir)/mime-info
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index d2cbb830da47..e3d6149e671e 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -727,6 +727,7 @@ 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/lt/LC_MESSAGES/gnome-games.mo
+share/locale/ms/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/nn/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo