Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6373/main/finkinfo/games
Modified Files: Tag: pangocairo-branch wesnoth-devel.info wesnoth-devel.patch Log Message: merged from HEAD (tagged as pangocairo-root-2) Index: wesnoth-devel.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.info,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- wesnoth-devel.info 6 Dec 2006 15:46:36 -0000 1.5 +++ wesnoth-devel.info 20 Dec 2006 18:01:01 -0000 1.5.2.1 @@ -1,8 +1,8 @@ Package: wesnoth-devel -Version: 1.1.13 +Version: 1.1.14 Revision: 11 GCC: 4.0 -Source-MD5: 702a98e0dae52b05bcfe7bb6d54ea5a2 +Source-MD5: 9b7238f37faccf1c7be71de9475dc02b Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.gz SourceDirectory: wesnoth-%v BuildDepends: sdl, sdl-mixer, sdl-image, sdl-ttf (>= 2.0.6-1017), sdl-net, fribidi-dev, fribidi, libpng3, freetype219, libiconv-dev, libgettext3-dev, gettext-tools @@ -10,7 +10,7 @@ Depends: sdl-mixer-shlibs, sdl-shlibs, sdl-image-shlibs, sdl-ttf-shlibs (>= 2.0.6-1017), sdl-net-shlibs, fribidi-shlibs, libpng3-shlibs, freetype219-shlibs, libiconv, libgettext3-shlibs Description: Fantasy turn-based strategy game DocFiles: ABOUT-NLS COPYING MANUAL MANUAL.brazilian MANUAL.catalan MANUAL.chinese_simplified MANUAL.czech MANUAL.danish MANUAL.french MANUAL.german MANUAL.hungarian MANUAL.indonesian MANUAL.italian MANUAL.japanese MANUAL.norwegian MANUAL.polish MANUAL.russian MANUAL.spanish MANUAL.swedish MANUAL.turkish -ConfigureParams: --with-libintl-prefix=%p --enable-editor --enable-tools --enable-server --with-freetype-prefix=%p/lib/freetype219 --with-freetype-exec-prefix=%p/lib/freetype219 --disable-dependency-tracking --without-x --without-zipios --enable-campaign-server --disable-sdltest +ConfigureParams: --with-libintl-prefix=%p --enable-editor --enable-tools --enable-server --enable-campaign-server --with-freetype-prefix=%p/lib/freetype219 --with-freetype-exec-prefix=%p/lib/freetype219 --disable-dependency-tracking --without-x --without-zipios --disable-sdltest Patch: %n.patch PatchScript: << perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.in Index: wesnoth-devel.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.patch,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- wesnoth-devel.patch 6 Dec 2006 15:46:36 -0000 1.2 +++ wesnoth-devel.patch 20 Dec 2006 18:01:02 -0000 1.2.2.1 @@ -1,7 +1,159 @@ -diff -Nurd -x'*~' wesnoth-1.1.10.orig/configure wesnoth-1.1.10/configure ---- wesnoth-1.1.10.orig/configure 2006-09-19 02:15:51.000000000 -0400 -+++ wesnoth-1.1.10/configure 2006-09-28 19:17:54.000000000 -0400 -@@ -14527,6 +14527,7 @@ +diff -Naur --exclude='*~' wesnoth-1.1.14/configure wesnoth-1.1.14.fink/configure +--- wesnoth-1.1.14/configure 2006-12-15 07:56:44.000000000 -0800 ++++ wesnoth-1.1.14.fink/configure 2006-12-16 21:08:38.000000000 -0800 +@@ -2534,76 +2534,81 @@ + + { echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 + echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; } +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar plaintar pax cpio none' +-_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- { echo "$as_me:$LINENO: $_am_tar --version" >&5 +- ($_am_tar --version) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && break +- done +- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x ustar -w "$$tardir"' +- am__tar_='pax -L -x ustar -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H ustar -L' +- am__tar_='find "$tardir" -print | cpio -o -H ustar -L' +- am__untar='cpio -i -H ustar -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_ustar}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 +- (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- rm -rf conftest.dir +- if test -s conftest.tar; then +- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 +- ($am__untar <conftest.tar) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir ++# # Loop over all known methods to create a tar archive until one works. ++# _am_tools='gnutar plaintar pax cpio none' ++# _am_tools=${am_cv_prog_tar_ustar-$_am_tools} ++# # Do not fold the above two line into one, because Tru64 sh and ++# # Solaris sh will not grok spaces in the rhs of `-'. ++# for _am_tool in $_am_tools ++# do ++# case $_am_tool in ++# gnutar) ++# for _am_tar in tar gnutar gtar; ++# do ++# { echo "$as_me:$LINENO: $_am_tar --version" >&5 ++# ($_am_tar --version) >&5 2>&5 ++# ac_status=$? ++# echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++# (exit $ac_status); } && break ++# done ++# am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' ++# am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' ++# am__untar="$_am_tar -xf -" ++# ;; ++# plaintar) ++# # Must skip GNU tar: if it does not support --format= it doesn't create ++# # ustar tarball either. ++# (tar --version) >/dev/null 2>&1 && continue ++# am__tar='tar chf - "$$tardir"' ++# am__tar_='tar chf - "$tardir"' ++# am__untar='tar xf -' ++# ;; ++# pax) ++# am__tar='pax -L -x ustar -w "$$tardir"' ++# am__tar_='pax -L -x ustar -w "$tardir"' ++# am__untar='pax -r' ++# ;; ++# cpio) ++# am__tar='find "$$tardir" -print | cpio -o -H ustar -L' ++# am__tar_='find "$tardir" -print | cpio -o -H ustar -L' ++# am__untar='cpio -i -H ustar -d' ++# ;; ++# none) ++# am__tar=false ++# am__tar_=false ++# am__untar=false ++# ;; ++# esac ++ ++# # If the value was cached, stop now. We just wanted to have am__tar ++# # and am__untar set. ++# test -n "${am_cv_prog_tar_ustar}" && break ++ ++# # tar/untar a dummy directory, and stop if the command works ++# rm -rf conftest.dir ++# mkdir conftest.dir ++# echo GrepMe > conftest.dir/file ++# { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 ++# (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ++# ac_status=$? ++# echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++# (exit $ac_status); } ++# rm -rf conftest.dir ++# if test -s conftest.tar; then ++# { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 ++# ($am__untar <conftest.tar) >&5 2>&5 ++# ac_status=$? ++# echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++# (exit $ac_status); } ++# grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ++# fi ++# done ++# rm -rf conftest.dir ++# ++# We don't need to carry out all this work -- we know what tar to use already ++am__tar="tar --format=ustar -chf - "'"$$tardir"' ++am__tar_="tar --format=ustar -chf - "'"$tardir"' ++am__untar="tar -xf -" + + if test "${am_cv_prog_tar_ustar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13332,6 +13337,7 @@ { echo "$as_me:$LINENO: checking for PNG support in SDL_image" >&5 echo $ECHO_N "checking for PNG support in SDL_image... $ECHO_C" >&6; } @@ -9,15 +161,24 @@ OLD_CPPFLAGS=$CPPFLAGS OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS -@@ -14603,6 +14604,7 @@ +@@ -13340,6 +13346,7 @@ + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS $SDL_IMAGE_LIBS" + ++ + ac_link="$LDPREFIX $ac_link" + if test "$cross_compiling" = yes; then + { echo "$as_me:$LINENO: result: not tested in cross-compiling" >&5 +@@ -13408,7 +13415,7 @@ CPPFLAGS=$OLD_CPPFLAGS CFLAGS=$OLD_CFLAGS LIBS=$OLD_LIBS +- +fi - ####################################################################### -@@ -14620,6 +14622,7 @@ + # Check for OGG support in SDL_mixer # +@@ -13425,11 +13432,11 @@ { echo "$as_me:$LINENO: checking for OGG support in SDL_mixer" >&5 echo $ECHO_N "checking for OGG support in SDL_mixer... $ECHO_C" >&6; } @@ -25,11 +186,16 @@ OLD_CPPFLAGS=$CPPFLAGS OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS -@@ -14696,6 +14699,7 @@ + +- + CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS" +@@ -13501,6 +13508,7 @@ CPPFLAGS=$OLD_CPPFLAGS CFLAGS=$OLD_CFLAGS LIBS=$OLD_LIBS -+ fi ++ fi fi fi ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits