Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26585/main/finkinfo/games
Modified Files:
wesnoth-devel.info wesnoth.info wesnoth.patch
Log Message:
Battle for Wesnoth updates from trackers 1624634 and 1630179
Index: wesnoth-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wesnoth-devel.info 20 Dec 2006 17:06:44 -0000 1.6
+++ wesnoth-devel.info 14 Jan 2007 19:27:30 -0000 1.7
@@ -6,7 +6,8 @@
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
-Conflicts: wesnoth
+Conflicts: wesnoth, wesnoth-campaign-server, wesnoth-editor, wesnoth-server
+Replaces: wesnoth, wesnoth-campaign-server, wesnoth-editor, wesnoth-server
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
@@ -25,7 +26,9 @@
Features
* Build a Hero, and lead your army.
+
* Different races, with distinctive abilities, weapons and spells.
+
* GNU/Linux, Windows, MacOSX, BeOS, Solaris, FreeBSD and
OpenBSD compatible.
Index: wesnoth.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wesnoth.patch 30 Mar 2006 02:13:02 -0000 1.1
+++ wesnoth.patch 14 Jan 2007 19:27:30 -0000 1.2
@@ -1,91 +1,118 @@
-diff -Nurd -x'*~' wesnoth-0.8.8.orig/configure wesnoth-0.8.8/configure
---- wesnoth-0.8.8.orig/configure 2004-12-05 05:53:41.000000000 -0500
-+++ wesnoth-0.8.8/configure 2006-03-29 20:38:30.000000000 -0500
-@@ -13497,10 +13497,7 @@
+diff -Naur --exclude='*~' wesnoth-1.2/configure wesnoth-1.2.fink/configure
+--- wesnoth-1.2/configure 2006-12-23 08:04:09.000000000 -0600
++++ wesnoth-1.2.fink/configure 2006-12-28 00:14:45.000000000 -0600
+@@ -2534,76 +2534,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.
+-_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
++am__tar="tar --format=ustar -chf - "'"$$tardir"'
++am__tar_="tar --format=ustar -chf - "'"$tardir"'
++am__untar="tar -xf -"
--if test -n "$LDPREFIX" -a -r /usr/lib/libSDL.la
--then SDL_LIBS=/usr/lib/libSDL.la
--else SDL_LIBS=`$SDL_CONFIG --libs`
--fi
-+SDL_LIBS=`$SDL_CONFIG --libs`
+ if test "${am_cv_prog_tar_ustar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13332,6 +13265,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; }
+
++if test "x$enable_sdltest" = "xyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
- LIBS="$LIBS $SDL_LIBS"
+@@ -13408,7 +13342,7 @@
+ CPPFLAGS=$OLD_CPPFLAGS
+ CFLAGS=$OLD_CFLAGS
+ LIBS=$OLD_LIBS
+-
++fi
-@@ -13573,10 +13570,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
- echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6
- if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
-- if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_image.la
--then SDL_IMAGE_LIBS=/usr/lib/libSDL_image.la
--else SDL_IMAGE_LIBS=-lSDL_image
--fi
-+SDL_IMAGE_LIBS=-lSDL_image
- else
- { { echo "$as_me:$LINENO: error: *** SDL_image lib not found! Get SDL_image
from
- http://www.libsdl.org/projects/SDL_image/index.html"; >&5
-@@ -13650,10 +13644,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5
- echo "${ECHO_T}$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6
- if test $ac_cv_lib_SDL_mixer_Mix_OpenAudio = yes; then
-- if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_mixer.la
--then SDL_MIXER_LIBS=/usr/lib/libSDL_mixer.la
--else SDL_MIXER_LIBS=-lSDL_mixer
--fi
-+SDL_MIXER_LIBS=-lSDL_mixer
- else
- { { echo "$as_me:$LINENO: error: *** SDL_mixer lib not found! Get SDL_mixer
from
- http://www.libsdl.org/projects/SDL_mixer/index.html"; >&5
-@@ -13727,10 +13718,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_net_SDLNet_Init" >&5
- echo "${ECHO_T}$ac_cv_lib_SDL_net_SDLNet_Init" >&6
- if test $ac_cv_lib_SDL_net_SDLNet_Init = yes; then
-- if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_net.la
--then SDL_NET_LIBS=/usr/lib/libSDL_net.la
--else SDL_NET_LIBS=-lSDL_net
--fi
-+SDL_NET_LIBS=-lSDL_net
- else
- { { echo "$as_me:$LINENO: error: *** SDL_net lib not found! Get SDL_net from
- http://www.libsdl.org/projects/SDL_net/index.html"; >&5
-@@ -13742,10 +13730,7 @@
+ #######################################################################
+ # Check for OGG support in SDL_mixer #
+@@ -13425,6 +13359,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; }
- #AC_CHECK_LIB([SDL_ttf],
- # [TTF_OpenFont],
--# [if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_ttf.la
--#then SDL_TTF_LIBS=/usr/lib/libSDL_ttf.la
--#else SDL_TTF_LIBS=-lSDL_ttf
--#fi],
-+# [SDL_TTF_LIBS=-lSDL_ttf],
- # [AC_MSG_ERROR([*** SDL_ttf lib not found! Get SDL_ttf from
- #http://www.libsdl.org/projects/SDL_ttf/index.html])])
++ if test "x$enable_sdltest" = "xyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ OLD_CFLAGS=$CFLAGS
+ OLD_LIBS=$LIBS
+@@ -13501,6 +13436,7 @@
+ CPPFLAGS=$OLD_CPPFLAGS
+ CFLAGS=$OLD_CFLAGS
+ LIBS=$OLD_LIBS
++ fi
+ fi
+ fi
-@@ -16176,12 +16161,7 @@
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); }; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -16257,12 +16237,7 @@
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); }; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
+
+
Index: wesnoth.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wesnoth.info 30 Mar 2006 02:13:02 -0000 1.2
+++ wesnoth.info 14 Jan 2007 19:27:30 -0000 1.3
@@ -1,22 +1,26 @@
Package: wesnoth
-Version: 0.8.8
-Revision: 1002
+Version: 1.2
+Revision: 11
GCC: 4.0
-Source-MD5: 54a580a721ea19b8006cedb2766fe6ba
-Source: http://www.wesnoth.org/files/%n-%v.tar.gz
-BuildDepends: sdl (>= 1.2.9-1001), sdl-mixer (>= 1.2.6-1012), sdl-image,
sdl-ttf, sdl-net, libgettext3-dev, gettext-tools, libiconv-dev, x11-dev, libpng3
-Depends: sdl-shlibs (>= 1.2.9-1001), sdl-mixer-shlibs (>= 1.2.6-1012),
sdl-image-shlibs, sdl-ttf-shlibs, sdl-net-shlibs, libgettext3-shlibs, libiconv,
x11, libpng3-shlibs
+Source-MD5: 722a459282abe6d04dbe228d031c088e
+Source: mirror:sourceforge:%n/%n-%v.tar.gz
+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
+Conflicts: wesnoth-devel
+Replaces: wesnoth-devel
+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 copyright
+ConfigureParams: --with-libintl-prefix=%p --enable-editor --enable-tools
--with-freetype-prefix=%p/lib/freetype219
--with-freetype-exec-prefix=%p/lib/freetype219 --disable-dependency-tracking
--disable-sdltest --enable-server --enable-campaign-server
--with-server-uid=admin --with-server-gid=admin --without-x
Patch: %n.patch
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-sdltest
-InstallScript: make install DESTDIR=%d
-DescPackaging: <<
- dmacks: Make sure we don't see any system libSDL* that may exist and
- don't try tests that require Aqua GUI (via running SDL programs)
-
- gnome and kde aren't enabled; the results of the checks for them
- aren't used, so don't care if they fail...no need for dependencies
+SetCXXFLAGS: -O3
+PatchScript: <<
+ perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.in
+<<
+InstallScript: <<
+ make install prefix=%i
+ mkdir %i/etc
+ touch %i/etc/wesnothd.conf
<<
-Description: Fantasy turn-based strategy game
DescDetail: <<
Battle for Wesnoth is a fantasy turn-based strategy game.
Battle for control of villages, using variety of units
@@ -25,12 +29,95 @@
gain experience and advance levels, and are carried over
from one scenario to the next.
-Features
-* Build a Hero, and lead your army.
-* Different races, with distinctive abilities, weapons and spells.
-* GNU/Linux, Windows, MacOSX, BeOS, Solaris, FreeBSD and
- OpenBSD compatible.
+Features:
+
+* Build a hero, and lead your army.
+
+* Characters have different races, each with distinctive abilities,
+ weapons and spells.
+
+* Compatible with GNU/Linux, Windows, MacOSX, BeOS, Solaris, FreeBSD
+ and OpenBSD.
+<<
+DescPackaging: <<
+ dmacks added --disable-sdltest and patched support for it in all
+ SDL_* tests so that can build on GUI-less machine.
+
+ dmacks hacked around under-use of libtool in Makefile in order to
+ assure that local convenince libs are used in preference to
+ installed ones of the same name.
<<
License: GPL
-Maintainer: Keith Conger <[EMAIL PROTECTED]>
+Maintainer: Jesse Alama <[EMAIL PROTECTED]>
Homepage: http://www.wesnoth.org/
+
+SplitOff: <<
+ Package: wesnoth-server
+ Description: Battle for Wesnoth multiplayer network daemon
+ Depends: %N, daemonic
+ Files: <<
+ bin/wesnothd:sbin/wesnothd
+ etc/wesnothd.conf
+ share/man/cs/man6/wesnothd.6
+ share/man/de/man6/wesnothd.6
+ share/man/en_GB/man6/wesnothd.6
+ share/man/fr/man6/wesnothd.6
+ share/man/ja/man6/wesnothd.6
+ share/man/man6/wesnothd.6
+ share/man/nl/man6/wesnothd.6
+ share/man/pt_BR/man6/wesnothd.6
+ share/man/sk/man6/wesnothd.6
+ share/man/sv/man6/wesnothd.6
+<<
+ ConfFiles: %p/etc/wesnothd.conf
+ DaemonicName: wesnothd
+ DaemonicFile: <<
+<service>
+ <description>
+ Battle for Wesnoth Multiplayer Server
+ </description>
+ <message>
+ Starting Battle for Wesnoth Multiplayer Server
+ </message>
+ <daemon name="wesnothd">
+ <executable background="true">%p/sbin/wesnothd</executable>
+ <parameters>-c %p/etc/wesnothd.conf -d</parameters>
+ <configfile>%p/etc/wesnothd.conf</configfile>
+ </daemon>
+</service>
+<<
+ PreRmScript: <<
+if [ $1 != "upgrade" ]; then
+ daemonic remove wesnothd
+fi
+<<
+ PostInstScript: <<
+ daemonic install wesnothd
+<<
+<<
+
+SplitOff2: <<
+ Package: wesnoth-editor
+ Description: Battle for Wesnoth map editor
+ Files: <<
+ bin/wesnoth_editor
+ share/man/cs/man6/wesnoth_editor.6
+ share/man/de/man6/wesnoth_editor.6
+ share/man/en_GB/man6/wesnoth_editor.6
+ share/man/fr/man6/wesnoth_editor.6
+ share/man/it/man6/wesnoth_editor.6
+ share/man/ja/man6/wesnoth_editor.6
+ share/man/man6/wesnoth_editor.6
+ share/man/nl/man6/wesnoth_editor.6
+ share/man/pt_BR/man6/wesnoth_editor.6
+ share/man/sk/man6/wesnoth_editor.6
+ share/man/sv/man6/wesnoth_editor.6
+<<
+<<
+
+SplitOff3: <<
+ Package: wesnoth-campaign-server
+ Description: Battle for Wesnoth campaign server
+ Files: bin/campaignd:sbin/campaignd
+<<
+
-------------------------------------------------------------------------
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
