Revision: 70373 http://trac.macports.org/changeset/70373 Author: blb@macports.org Date: 2010-08-07 12:49:31 -0700 (Sat, 07 Aug 2010) Log Message: ----------- games/freeciv* - update to 2.2.2, enable sound support by default; ticket #25987 Modified Paths: -------------- trunk/dports/games/freeciv/Portfile trunk/dports/games/freeciv-x11/Portfile Added Paths: ----------- trunk/dports/games/freeciv/files/ trunk/dports/games/freeciv/files/patch-client-options.c.diff trunk/dports/games/freeciv-x11/files/ trunk/dports/games/freeciv-x11/files/patch-client-options.c.diff Modified: trunk/dports/games/freeciv/Portfile =================================================================== --- trunk/dports/games/freeciv/Portfile 2010-08-07 11:12:37 UTC (rev 70372) +++ trunk/dports/games/freeciv/Portfile 2010-08-07 19:49:31 UTC (rev 70373) @@ -3,7 +3,7 @@ PortSystem 1.0 name freeciv -version 2.2.1 +version 2.2.2 categories games maintainers nomaintainer description An empire-building strategy game @@ -19,18 +19,20 @@ master_sites sourceforge ftp://ftp.freeciv.org/freeciv/stable/ use_bzip2 yes -checksums md5 b43269e38ecd32cb09850778befc72b3 \ - sha1 f9d141a04e447a57f4fc001dbd789d92717735e4 \ - rmd160 d6d3fd99946e339b63b6e2cfc0e365e8228dc142 +checksums md5 fae46199dedaf0decc3b82dc06f95624 \ + sha1 b306374d5e2e118393b23ff9a0b1a8d391b36c82 \ + rmd160 42714e95f1839592a79a2b60ee64bc58bbe512e8 conflicts freeciv-x11 depends_lib port:freetype port:libpng port:libsdl port:libsdl_image \ port:libsdl_mixer port:readline port:libiconv port:zlib -configure.args --enable-client=sdl --with-readline --with-zlib \ +patchfiles patch-client-options.c.diff + +configure.args --enable-client=sdl --with-readline \ --enable-nls --with-libiconv-prefix=${prefix} \ - --with-sdl-prefix=${prefix} --mandir=${prefix}/share/man + --mandir=${prefix}/share/man --with-sdl-prefix=${prefix} livecheck.type regex livecheck.url ${homepage} Added: trunk/dports/games/freeciv/files/patch-client-options.c.diff =================================================================== --- trunk/dports/games/freeciv/files/patch-client-options.c.diff (rev 0) +++ trunk/dports/games/freeciv/files/patch-client-options.c.diff 2010-08-07 19:49:31 UTC (rev 70373) @@ -0,0 +1,11 @@ +--- 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 @@ + "the sound plugin. The new plugin won't take " + "effect until you restart Freeciv. Changing this " + "is the same as using the -P command-line option."), +- 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! */ Modified: trunk/dports/games/freeciv-x11/Portfile =================================================================== --- trunk/dports/games/freeciv-x11/Portfile 2010-08-07 11:12:37 UTC (rev 70372) +++ trunk/dports/games/freeciv-x11/Portfile 2010-08-07 19:49:31 UTC (rev 70373) @@ -2,10 +2,10 @@ PortSystem 1.0 name freeciv-x11 -version 2.2.1 +version 2.2.2 categories games maintainers nomaintainer -description A civilisation clone for X11 +description A civilisation clone for X11 (with sound support) long_description \ Freeciv is a Free and Open Source empire-building strategy game \ inspired by the history of human civilization. The game commences in \ @@ -20,18 +20,20 @@ dist_subdir freeciv use_bzip2 yes -checksums md5 b43269e38ecd32cb09850778befc72b3 \ - sha1 f9d141a04e447a57f4fc001dbd789d92717735e4 \ - rmd160 d6d3fd99946e339b63b6e2cfc0e365e8228dc142 +checksums md5 fae46199dedaf0decc3b82dc06f95624 \ + sha1 b306374d5e2e118393b23ff9a0b1a8d391b36c82 \ + rmd160 42714e95f1839592a79a2b60ee64bc58bbe512e8 conflicts freeciv depends_lib port:gettext port:libiconv port:readline port:gtk2 \ - port:zlib + port:zlib port:libsdl_mixer -configure.args --enable-client=gtk2 --with-readline --with-zlib \ +patchfiles patch-client-options.c.diff + +configure.args --enable-client=gtk2 --with-readline \ --enable-nls --with-libiconv-prefix=${prefix} \ - --mandir=${prefix}/share/man --disable-sdl-mixer + --mandir=${prefix}/share/man --with-sdl-prefix=${prefix} livecheck.type regex livecheck.url ${homepage} Added: trunk/dports/games/freeciv-x11/files/patch-client-options.c.diff =================================================================== --- trunk/dports/games/freeciv-x11/files/patch-client-options.c.diff (rev 0) +++ trunk/dports/games/freeciv-x11/files/patch-client-options.c.diff 2010-08-07 19:49:31 UTC (rev 70373) @@ -0,0 +1,11 @@ +--- 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 @@ + "the sound plugin. The new plugin won't take " + "effect until you restart Freeciv. Changing this " + "is the same as using the -P command-line option."), +- 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! */