Update to 2.7.2. Much crack was smoked to produce this release... please

test blackjack and aisleriot carefully.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2325 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 40 insertions, 16 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index ffa5b0175..19570d993 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.7
@@ -34,5 +34,6 @@ CONFLICTS=	sol-1.0.*
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
+	@${REINPLACE_CMD} -e '/%[85].2lf%%/s|.2lf%%|.2f%%|g' ${WRKSRC}/blackjack/src/player.cpp
 
 .include <bsd.port.mk>
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index b0f9a3fcc..13806bfa2 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.7.1.tar.bz2) = 12e1eaed710cae46ecae866ecc3c1a6e
-SIZE (gnome2/gnome-games-2.7.1.tar.bz2) = 7988844
+MD5 (gnome2/gnome-games-2.7.2.tar.bz2) = 26a01b42753c19079302d7be485df6d8
+SIZE (gnome2/gnome-games-2.7.2.tar.bz2) = 8064914
diff --git a/games/gnome-games/files/patch-aisleriot::sol.c b/games/gnome-games/files/patch-aisleriot::sol.c
index 7a281c20a..9ebcb0e1b 100644
--- a/games/gnome-games/files/patch-aisleriot::sol.c
+++ b/games/gnome-games/files/patch-aisleriot::sol.c
@@ -1,9 +1,10 @@
---- aisleriot/sol.c.orig	Wed Oct  1 20:19:36 2003
-+++ aisleriot/sol.c	Tue Nov 25 16:30:44 2003
-@@ -83,6 +83,15 @@
+--- aisleriot/sol.c.orig	Sun Apr 25 03:03:33 2004
++++ aisleriot/sol.c	Mon May 31 17:25:15 2004
+@@ -90,6 +90,16 @@
  #define DEFAULT_VARIATION "klondike.scm"
  #define GNOME_SESSION_BUG
  
++gchar* game_file_to_variation (const gchar* file);
 +gchar* game_file_to_variation (const gchar* file)
 +{
 +  char* p, *buf = g_path_get_basename(file);
@@ -16,7 +17,16 @@
  gchar* game_file_to_name (const gchar* file)
  {
    char* p, *buf = g_path_get_basename(file);
-@@ -545,14 +554,14 @@
+@@ -472,7 +482,7 @@
+   dir = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
+ 	                                        GAMESDIR, FALSE, NULL);
+ 
+-  records = scandir (dir, &game_dents, is_game, alphasort);
++  records = scandir (dir, &game_dents, (gpointer)is_game, alphasort);
+   g_free(dir);
+ 
+   if (records >= 0)
+@@ -481,14 +491,14 @@
  	  n_games = 0;
  
    for (i = 0; i < n_games; i++) {
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 468ef3f96..dcd939e17 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -181,7 +181,7 @@ share/gnome/blackjack/Vegas_Strip.rules
 @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.zigurrat.scores
+@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
 @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
 share/gnome/gnect/white_ob.cn4
 share/gnome/gnibbles/level001.gnl
@@ -720,6 +720,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo
 share/locale/hr/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
 share/locale/id/LC_MESSAGES/gnome-games.mo
+share/locale/is/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
 share/locale/ko/LC_MESSAGES/gnome-games.mo
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index ffa5b0175..19570d993 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.7
@@ -34,5 +34,6 @@ CONFLICTS=	sol-1.0.*
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
+	@${REINPLACE_CMD} -e '/%[85].2lf%%/s|.2lf%%|.2f%%|g' ${WRKSRC}/blackjack/src/player.cpp
 
 .include <bsd.port.mk>
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index b0f9a3fcc..13806bfa2 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.7.1.tar.bz2) = 12e1eaed710cae46ecae866ecc3c1a6e
-SIZE (gnome2/gnome-games-2.7.1.tar.bz2) = 7988844
+MD5 (gnome2/gnome-games-2.7.2.tar.bz2) = 26a01b42753c19079302d7be485df6d8
+SIZE (gnome2/gnome-games-2.7.2.tar.bz2) = 8064914
diff --git a/games/gnomegames2/files/patch-aisleriot::sol.c b/games/gnomegames2/files/patch-aisleriot::sol.c
index 7a281c20a..9ebcb0e1b 100644
--- a/games/gnomegames2/files/patch-aisleriot::sol.c
+++ b/games/gnomegames2/files/patch-aisleriot::sol.c
@@ -1,9 +1,10 @@
---- aisleriot/sol.c.orig	Wed Oct  1 20:19:36 2003
-+++ aisleriot/sol.c	Tue Nov 25 16:30:44 2003
-@@ -83,6 +83,15 @@
+--- aisleriot/sol.c.orig	Sun Apr 25 03:03:33 2004
++++ aisleriot/sol.c	Mon May 31 17:25:15 2004
+@@ -90,6 +90,16 @@
  #define DEFAULT_VARIATION "klondike.scm"
  #define GNOME_SESSION_BUG
  
++gchar* game_file_to_variation (const gchar* file);
 +gchar* game_file_to_variation (const gchar* file)
 +{
 +  char* p, *buf = g_path_get_basename(file);
@@ -16,7 +17,16 @@
  gchar* game_file_to_name (const gchar* file)
  {
    char* p, *buf = g_path_get_basename(file);
-@@ -545,14 +554,14 @@
+@@ -472,7 +482,7 @@
+   dir = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
+ 	                                        GAMESDIR, FALSE, NULL);
+ 
+-  records = scandir (dir, &game_dents, is_game, alphasort);
++  records = scandir (dir, &game_dents, (gpointer)is_game, alphasort);
+   g_free(dir);
+ 
+   if (records >= 0)
+@@ -481,14 +491,14 @@
  	  n_games = 0;
  
    for (i = 0; i < n_games; i++) {
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 468ef3f96..dcd939e17 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -181,7 +181,7 @@ share/gnome/blackjack/Vegas_Strip.rules
 @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
 @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.zigurrat.scores
+@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
 @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
 share/gnome/gnect/white_ob.cn4
 share/gnome/gnibbles/level001.gnl
@@ -720,6 +720,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo
 share/locale/hr/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
 share/locale/id/LC_MESSAGES/gnome-games.mo
+share/locale/is/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
 share/locale/ko/LC_MESSAGES/gnome-games.mo