Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22221/main/finkinfo/games
Modified Files:
Tag: pangocairo-branch
wesnoth-devel.info wesnoth-devel.patch wesnoth.info
wesnoth.patch
Added Files:
Tag: pangocairo-branch
fortunes-b5.info
Log Message:
merge from head
Index: wesnoth-devel.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- wesnoth-devel.patch 20 Dec 2006 18:01:02 -0000 1.2.2.1
+++ wesnoth-devel.patch 30 Apr 2007 02:48:24 -0000 1.2.2.2
@@ -1,7 +1,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 @@
+diff -Naur --exclude='*~' wesnoth-1.3.1/configure wesnoth-1.3.1.fink/configure
+--- wesnoth-1.3.1/configure 2007-02-25 10:03:02.000000000 -0800
++++ wesnoth-1.3.1.fink/configure 2007-02-27 22:04:06.000000000 -0800
+@@ -2532,76 +2532,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; }
@@ -75,85 +75,13 @@
- 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 @@
+@@ -13308,6 +13241,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; }
@@ -161,43 +89,27 @@
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-@@ -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 @@
+@@ -13384,6 +13318,7 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
--
+fi
+
#######################################################################
- # Check for OGG support in SDL_mixer #
-@@ -13425,11 +13432,11 @@
+@@ -13401,6 +13336,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; }
-+ if test "x$enable_sdltest" = "xyes" ; then
++if test "x$enable_sdltest" = "xyes" ; then
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-
--
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
-@@ -13501,6 +13508,7 @@
+@@ -13477,6 +13413,7 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
-+ fi
++ fi
fi
fi
-
-
--- NEW FILE: fortunes-b5.info ---
Package: fortunes-b5
Version: 20060905
Revision: 1
Description: Babylon 5 quotes for fortune-mod
Homepage: http://www.cs.tut.fi/~albert/Quotes/B5-quotes.html
Maintainer: Brian Gernhardt <[EMAIL PROTECTED]>
License: OSI-Approved
Depends: fortune-mod
Source: http://www.cs.tut.fi/~albert/Quotes/B5-quotes
Source-MD5: 5ca0733d0a8b4469c103c11669cc50e7
NoSourceDirectory: true
CompileScript: <<
sed -e "s/^%%%%$/%%/" B5-quotes > babylon5
strfile babylon5 babylon5.dat
ln -s babylon5 babylon5.u8
<<
InstallScript: <<
mkdir -p %i/share/fortunes
cp -R babylon5 babylon5.dat babylon5.u8 %i/share/fortunes
<<
Index: wesnoth.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- wesnoth.patch 2 Mar 2007 15:31:15 -0000 1.1.2.2
+++ wesnoth.patch 30 Apr 2007 02:48:24 -0000 1.1.2.3
@@ -1,6 +1,6 @@
-diff -Naur --exclude='*~' wesnoth-1.2.2/configure wesnoth-1.2.2.fink/configure
---- wesnoth-1.2.2/configure 2007-02-20 13:26:22.000000000 -0800
-+++ wesnoth-1.2.2.fink/configure 2007-02-22 21:06:04.000000000 -0800
+diff -Naur --exclude='*~' wesnoth-1.2.3/configure wesnoth-1.2.3.fink/configure
+--- wesnoth-1.2.3/configure 2007-03-14 14:13:55.000000000 -0700
++++ wesnoth-1.2.3.fink/configure 2007-03-17 21:28:55.000000000 -0700
@@ -2534,76 +2534,9 @@
{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
@@ -81,24 +81,24 @@
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
+@@ -13336,6 +13269,7 @@
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-@@ -13409,6 +13343,8 @@
+
++if test "x$enable_sdltest" = "xyes" ; then
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS $SDL_IMAGE_LIBS"
+@@ -13408,7 +13342,7 @@
+ CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
-
+-
+fi
-+
#######################################################################
# Check for OGG support in SDL_mixer #
-@@ -13425,6 +13361,7 @@
+@@ -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; }
@@ -106,7 +106,7 @@
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-@@ -13501,6 +13438,7 @@
+@@ -13501,6 +13436,7 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
Index: wesnoth.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.info,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- wesnoth.info 2 Mar 2007 15:31:15 -0000 1.2.2.3
+++ wesnoth.info 30 Apr 2007 02:48:24 -0000 1.2.2.4
@@ -1,8 +1,8 @@
Package: wesnoth
-Version: 1.2.2
+Version: 1.2.3
Revision: 11
GCC: 4.0
-Source-MD5: f7cc14661edabeeae36a6e9dc5472015
+Source-MD5: 94e051a82be080e7f69040b42c46ba2c
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
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
@@ -54,6 +54,8 @@
SplitOff: <<
Package: wesnoth-server
Description: Battle for Wesnoth multiplayer network daemon
+ Conflicts: wesnoth-devel-server (>= 1.3.1)
+ Replaces: wesnoth-devel-server (>= 1.3.1)
Depends: %N, daemonic
Files: <<
bin/wesnothd:sbin/wesnothd
@@ -105,6 +107,8 @@
SplitOff2: <<
Package: wesnoth-editor
Description: Battle for Wesnoth map editor
+ Conflicts: wesnoth-devel-editor (>= 1.3.1)
+ Replaces: wesnoth-devel-editor (>= 1.3.1)
Files: <<
bin/wesnoth_editor
share/man/cs/man6/wesnoth_editor.6
@@ -123,6 +127,8 @@
SplitOff3: <<
Package: wesnoth-campaign-server
+ Conflicts: wesnoth-devel-campaign-server (>= 1.3.1)
+ Replaces: wesnoth-devel-campaign-server (>= 1.3.1)
Description: Battle for Wesnoth campaign server
Files: bin/campaignd:sbin/campaignd
<<
Index: wesnoth-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth-devel.info,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- wesnoth-devel.info 16 Jan 2007 16:02:20 -0000 1.5.2.2
+++ wesnoth-devel.info 30 Apr 2007 02:48:24 -0000 1.5.2.3
@@ -1,21 +1,27 @@
Package: wesnoth-devel
-Version: 1.1.14
+Version: 1.3.1
Revision: 11
GCC: 4.0
-Source-MD5: 9b7238f37faccf1c7be71de9475dc02b
-Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.gz
+Source-MD5: 726a20c6edb46f4a0c98480aa6691106
+Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.bz2
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, wesnoth-campaign-server, wesnoth-editor, wesnoth-server
+BuildConflicts: python
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
-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
+DocFiles: ABOUT-NLS COPYING copyright 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 --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 --with-server-gid=admin
--with-server-uid=admin
Patch: %n.patch
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
+<<
DescDetail: <<
Battle for Wesnoth is a fantasy turn-based strategy game.
Battle for control of villages, using variety of units
@@ -46,5 +52,82 @@
License: GPL
Maintainer: Jesse Alama <[EMAIL PROTECTED]>
Homepage: http://www.wesnoth.org/
+SplitOff: <<
+ Package: wesnoth-devel-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
+<<
+DescUsage: <<
+To create a startupitem that starts the wesnoth daemon after restart,
+just run, as root, the command 'daemonic enable wesnothd'. To remove
+the wesnothd startupitem just run, again as root, the command
+'daemonic disable wesnothd'.
+<<
+<<
-
+SplitOff2: <<
+ Package: wesnoth-devel-editor
+ Replaces: wesnoth-editor (>= 1.2.3)
+ Conflicts: wesnoth-editor (>= 1.2.3)
+ 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-devel-campaign-server
+ Conflicts: wesnoth-campaign-server (>= 1.2.3)
+ Replaces: wesnoth-campaign-server (>= 1.2.3)
+ Description: Battle for Wesnoth campaign server
+ Files: bin/campaignd:sbin/campaignd
+<<
\ No newline at end of file
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
