Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sc8-pr-cvs17:/tmp/cvs-serv20526/games
Modified Files:
wesnoth-devel.info wesnoth-devel.patch
Log Message:
Update from tracker
http://sourceforge.net/tracker/index.php?func=detail&aid=1772438&group_id=17203&atid=414256
Index: wesnoth-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wesnoth-devel.info 30 Jun 2007 02:40:42 -0000 1.10
+++ wesnoth-devel.info 27 Aug 2007 13:34:57 -0000 1.11
@@ -1,10 +1,10 @@
Package: wesnoth-devel
-Version: 1.3.4
+Version: 1.3.6
Revision: 11
Description: Fantasy turn-based strategy game
GCC: 4.0
-Source-MD5: fa81876feb6dfb9f18b931670a0fdc07
-Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.bz2
+Source-MD5: 55a553fa263a306f29ed8455dd2c91bc
+Source: mirror:sourceforge:wesnoth/wesnoth-%va.tar.bz2
SourceDirectory: wesnoth-%v
BuildDepends: <<
sdl,
@@ -12,6 +12,7 @@
sdl-image,
sdl-ttf (>= 2.0.6-1017),
sdl-net,
+ sdl-sound,
fribidi-dev,
fribidi,
libpng3,
@@ -19,7 +20,7 @@
libiconv-dev,
libgettext3-dev,
gettext-tools,
- python24 | python25
+ python24
<<
Conflicts: wesnoth, wesnoth-campaign-server, wesnoth-editor, wesnoth-server
Replaces: wesnoth, wesnoth-campaign-server, wesnoth-editor, wesnoth-server
@@ -29,11 +30,13 @@
sdl-image-shlibs,
sdl-ttf-shlibs (>= 2.0.6-1017),
sdl-net-shlibs,
+ sdl-sound-shlibs,
fribidi-shlibs,
libpng3-shlibs,
freetype219-shlibs,
libiconv,
- libgettext3-shlibs
+ libgettext3-shlibs,
+ python24 | python25
<<
DocFiles: <<
ABOUT-NLS
@@ -80,7 +83,7 @@
perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.in
<<
InstallScript: <<
- make install prefix=%i
+ make install DESTDIR=%d
mkdir %i/etc
touch %i/etc/wesnothd.conf
<<
Index: wesnoth-devel.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wesnoth-devel.patch 30 Jun 2007 02:40:43 -0000 1.6
+++ wesnoth-devel.patch 27 Aug 2007 13:34:58 -0000 1.7
@@ -1,11 +1,10 @@
-diff -Naur --exclude='*~' wesnoth-1.3.4/configure wesnoth-1.3.4.fink/configure
---- wesnoth-1.3.4/configure 2007-06-23 10:50:55.000000000 -0700
-+++ wesnoth-1.3.4.fink/configure 2007-06-29 10:30:24.000000000 -0700
-@@ -2527,76 +2527,10 @@
-
+diff -Naur --exclude='*~' wesnoth-1.3.6/configure wesnoth-1.3.6.fink/configure
+--- wesnoth-1.3.6/configure 2007-07-21 14:43:13.000000000 -0700
++++ wesnoth-1.3.6.fink/configure 2007-07-26 16:38:12.000000000 -0700
+@@ -2528,75 +2528,9 @@
{ 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.
+ # 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
@@ -74,14 +73,14 @@
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
- rm -rf conftest.dir
+-rm -rf conftest.dir
+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
-@@ -13019,6 +12953,7 @@
+@@ -13021,6 +12955,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; }
@@ -89,15 +88,16 @@
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-@@ -13097,6 +13032,7 @@
+@@ -13099,7 +13034,7 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
+-
+fi
-
#######################################################################
-@@ -13114,6 +13050,7 @@
+ # Check for OGG support in SDL_mixer #
+@@ -13116,6 +13051,7 @@
{ 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; }
@@ -105,7 +105,7 @@
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-@@ -13190,6 +13127,7 @@
+@@ -13192,6 +13128,7 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
