Changeset 82697

Timestamp:

08/18/11 11:02:26 (4 years ago)

Author:

ryandesign@…

Message:

freeciv, freeciv-x11: update to 2.3.0

Location:

trunk/dports/games

Files:

• freeciv-x11/Portfile (modified) (3 diffs)
• freeciv-x11/files/patch-client-options.c.diff (modified) (2 diffs)
• freeciv/Portfile (modified) (2 diffs)
• freeciv/files/patch-client-options.c.diff (modified) (2 diffs)

trunk/dports/games/freeciv-x11/Portfile

@@ -4 +4 @@
 
 name                freeciv-x11
-version             2.2.7
+version             2.3.0
+set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          games
 maintainers         nomaintainer
@@ -17 +18 @@
 
 homepage            http://www.freeciv.org/
-master_sites        sourceforge:project/freeciv/Freeciv%202.2/${version}/ \
+master_sites        sourceforge:project/freeciv/Freeciv%20${branch}/${version}/ \
                     ftp://ftp.freeciv.org/freeciv/stable/
 distname            freeciv-${version}
@@ -23 +24 @@
 use_bzip2           yes
 
-checksums           sha1    b7cf680a25e9006cb3a289a2e5c786dd385577cb \
-                    rmd160  a1114cd9805dfeeab238071f9b7736b948474dde
+checksums           rmd160  1f017139c5ac4c24d1b4b6767aca84e18b9db31b \
+                    sha256  f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
 
 conflicts           freeciv

trunk/dports/games/freeciv-x11/files/patch-client-options.c.diff

@@ -1 @@
---- client/options.c    2010-07-25 12:58:28.000000000 -0700
-+++ client/options-hacked.c     2010-08-04 01:35:30.000000000 -0700
-@@ -472,7 +472,7 @@
+--- client/options.c.orig       2011-08-07 23:20:48.000000000 -0500
++++ client/options.c    2011-08-18 12:40:36.000000000 -0500
+@@ -1661,7 +1661,7 @@
                           "the sound plugin.  The new plugin won't take "
                           "effect until you restart Freeciv.  Changing this "
@@ -7 +7 @@
 -                      COC_SOUND, GUI_LAST, NULL, get_soundplugin_list, NULL),
 +                      COC_SOUND, GUI_LAST, "sdl", get_soundplugin_list, NULL),
-   /* gui_gtk2_default_theme_name and gui_sdl_default_theme_name are
-    * different settings to avoid client crash after loading the
-    * style for the other gui.  Keeps 2 different options! */
+   GEN_STR_OPTION(default_chat_logfile,
+                  N_("The chat log file"),
+                  N_("The name of the chat log file."),

trunk/dports/games/freeciv/Portfile

@@ -5 +5 @@
 
 name                freeciv
-version             2.2.7
+version             2.3.0
+set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          games
 maintainers         nomaintainer
@@ -18 +19 @@
 
 homepage            http://www.freeciv.org/
-master_sites        sourceforge:project/${name}/Freeciv%202.2/${version}/ \
+master_sites        sourceforge:project/${name}/Freeciv%20${branch}/${version}/ \
                     ftp://ftp.freeciv.org/freeciv/stable/
 use_bzip2           yes
 
-checksums           sha1    b7cf680a25e9006cb3a289a2e5c786dd385577cb \
-                    rmd160  a1114cd9805dfeeab238071f9b7736b948474dde
+checksums           rmd160  1f017139c5ac4c24d1b4b6767aca84e18b9db31b \
+                    sha256  f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
 
 conflicts           freeciv-x11

trunk/dports/games/freeciv/files/patch-client-options.c.diff

@@ -1 @@
---- client/options.c    2010-07-25 12:58:28.000000000 -0700
-+++ client/options-hacked.c     2010-08-04 01:35:30.000000000 -0700
-@@ -472,7 +472,7 @@
+--- client/options.c.orig       2011-08-07 23:20:48.000000000 -0500
++++ client/options.c    2011-08-18 12:40:36.000000000 -0500
+@@ -1661,7 +1661,7 @@
                           "the sound plugin.  The new plugin won't take "
                           "effect until you restart Freeciv.  Changing this "
@@ -7 +7 @@
 -                      COC_SOUND, GUI_LAST, NULL, get_soundplugin_list, NULL),
 +                      COC_SOUND, GUI_LAST, "sdl", get_soundplugin_list, NULL),
-   /* gui_gtk2_default_theme_name and gui_sdl_default_theme_name are
-    * different settings to avoid client crash after loading the
-    * style for the other gui.  Keeps 2 different options! */
+   GEN_STR_OPTION(default_chat_logfile,
+                  N_("The chat log file"),
+                  N_("The name of the chat log file."),