Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2099/10.3/unstable/main/finkinfo/games

Modified Files:
        wesnoth.info 
Added Files:
        wesnoth.patch 
Log Message:
backport dep-fixes and headless-build tweak


--- NEW FILE: wesnoth.patch ---
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 @@
 
 #
 
-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`
 OLD_LIBS=$LIBS
 LIBS="$LIBS $SDL_LIBS"
 
@@ -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 @@
 
 #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])])
 
@@ -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.3/unstable/main/finkinfo/games/wesnoth.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wesnoth.info        30 Mar 2006 00:54:40 -0000      1.9
+++ wesnoth.info        30 Mar 2006 02:17:32 -0000      1.10
@@ -1,11 +1,21 @@
 Package: wesnoth
 Version: 0.8.8
-Revision: 2
+Revision: 3
 GCC: 3.3
 Source-MD5: 54a580a721ea19b8006cedb2766fe6ba
 Source: http://www.wesnoth.org/files/%n-%v.tar.gz
-BuildDepends: sdl (>= 1.2.7-1), sdl-mixer, sdl-image, sdl-ttf, sdl-net
-Depends: sdl-mixer-shlibs, sdl-shlibs (>= 1.2.7-1), sdl-image-shlibs, 
sdl-ttf-shlibs, sdl-net-shlibs
+BuildDepends: sdl (>= 1.2.7-1), sdl-mixer, sdl-image, sdl-ttf, sdl-net, 
libgettext3-dev, gettext-tools, libiconv-dev, x11-dev, libpng3
+Depends: sdl-shlibs (>= 1.2.7-1), sdl-mixer-shlibs, sdl-image-shlibs, 
sdl-ttf-shlibs, sdl-net-shlibs, libgettext3-shlibs, libiconv, x11, 
libpng3-shlibs
+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
+<<
 Description: Fantasy turn-based strategy game
 DescDetail: <<
 Battle for Wesnoth is a fantasy turn-based strategy game.



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to