Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (0f7b25940f3b2add4c1c029abd3db97a2e695d44)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (0f7b25940f3b2add4c1c029abd3db97a2e695d44)
  • Date: Wed, 17 Oct 2007 12:43:13 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 4
dev/null |binary
games-data/freeciv-freeland-big/DETAILS | 2
games-data/freeciv-freeland-big/HISTORY | 3
games-data/freeciv-freeland-big/freeland-big-1.0.3.tar.gz.sig | 0
games-data/freeciv-freeland-big/freeland-big-2.0.0.tar.gz.sig |binary
games-data/freeciv-freeland-medium/BUILD | 1
games-data/freeciv-freeland-medium/DEPENDS | 1
games-data/freeciv-freeland-medium/DETAILS | 16 ++
games-data/freeciv-freeland-medium/HISTORY | 3
games-data/freeciv-freeland-medium/INSTALL | 1
games-data/freeciv-freeland-medium/PRE_BUILD | 3
games-data/freeciv-freeland-medium/freeland-medium-2.0.0.tar.gz.sig |binary
games-data/freeciv-freeland-normal/DETAILS | 2
games-data/freeciv-freeland-normal/HISTORY | 3
games-data/freeciv-freeland-normal/freeland-normal-1.0.3.tar.gz.sig | 0
games-data/freeciv-freeland-normal/freeland-normal-2.0.0.tar.gz.sig |binary
games-strategy-tbs/freeciv/BUILD | 11 -
games-strategy-tbs/freeciv/CONFIGURE | 9 -
games-strategy-tbs/freeciv/DEPENDS | 65
+++++-----
games-strategy-tbs/freeciv/DETAILS | 8 -
games-strategy-tbs/freeciv/FINAL | 1
games-strategy-tbs/freeciv/HISTORY | 19 ++
games-strategy-tbs/freeciv/INSTALL | 2
games-strategy-tbs/freeciv/PRE_BUILD | 4
games-strategy-tbs/freeciv/freeciv-2.0.9.tar.bz2.sig | 0
games-strategy-tbs/freeciv/freeciv-2.1.0-rc1.tar.bz2.sig |binary
27 files changed, 103 insertions(+), 55 deletions(-)

New commits:
commit 0f7b25940f3b2add4c1c029abd3db97a2e695d44
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

freeciv-freeland-medium: Added medium freeciv 2.1 tileset

commit d8cd90ca79f107f0a14dbf24345a39ed2be87a2f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

freeciv-freeland-big: Updated to 2.0.0 (for freeciv 2.1)

commit 7ca1fb02b100daeb5aac48a0cb6a7890dcd504bc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

freeciv-freeland-normal: Updated to 2.0.0 (for freeciv 2.1)

commit 28e9db253919ef9e43be8693881b26ac3f592924
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

freeciv: Updated to 2.1.0-rc1 (very nice)

diff --git a/ChangeLog b/ChangeLog
index 9078672..a7c2f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * games-data/freeciv-freeland-medium: Added medium freeciv freeland
+ tileset
+
2007-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* is_depends_enabled.function: added.

diff --git a/games-data/freeciv-freeland-big/DETAILS
b/games-data/freeciv-freeland-big/DETAILS
index 3454543..4a559b1 100755
--- a/games-data/freeciv-freeland-big/DETAILS
+++ b/games-data/freeciv-freeland-big/DETAILS
@@ -1,5 +1,5 @@
SPELL=freeciv-freeland-big
- VERSION=1.0.3
+ VERSION=2.0.0
SOURCE=${SPELL/freeciv-/}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/$SOURCE
diff --git a/games-data/freeciv-freeland-big/HISTORY
b/games-data/freeciv-freeland-big/HISTORY
index aec0560..8fee25c 100644
--- a/games-data/freeciv-freeland-big/HISTORY
+++ b/games-data/freeciv-freeland-big/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.0.0 (for freeciv 2.1)
+
2007-02-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS,DEPENDS,PRE_BUILD,BUILD,INSTALL: Created

diff --git a/games-data/freeciv-freeland-big/freeland-big-1.0.3.tar.gz.sig
b/games-data/freeciv-freeland-big/freeland-big-1.0.3.tar.gz.sig
deleted file mode 100644
index a776d46..0000000
Binary files a/games-data/freeciv-freeland-big/freeland-big-1.0.3.tar.gz.sig
and /dev/null differ
diff --git a/games-data/freeciv-freeland-big/freeland-big-2.0.0.tar.gz.sig
b/games-data/freeciv-freeland-big/freeland-big-2.0.0.tar.gz.sig
new file mode 100644
index 0000000..33c70e0
Binary files /dev/null and
b/games-data/freeciv-freeland-big/freeland-big-2.0.0.tar.gz.sig differ
diff --git a/games-data/freeciv-freeland-medium/BUILD
b/games-data/freeciv-freeland-medium/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/BUILD
@@ -0,0 +1 @@
+true
diff --git a/games-data/freeciv-freeland-medium/DEPENDS
b/games-data/freeciv-freeland-medium/DEPENDS
new file mode 100755
index 0000000..4af2f0c
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/DEPENDS
@@ -0,0 +1 @@
+depends freeciv
diff --git a/games-data/freeciv-freeland-medium/DETAILS
b/games-data/freeciv-freeland-medium/DETAILS
new file mode 100755
index 0000000..a859568
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=freeciv-freeland-medium
+ VERSION=2.0.0
+ SOURCE=${SPELL/freeciv-/}-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://freeciv.wikia.com/wiki/Tilesets
+ ENTERED=20070221
+ SHORT="High quality medium isometric graphics tileset for freeciv"
+cat << EOF
+Freeland is an isometric Graphics Tileset for Freeciv game with high quality
+graphic, using the more complex graphics system offered by Freeciv client
with
+more than thousand tile for base terrains (arctic, desert, grassland, plains,
+sea and tundra).
+EOF
diff --git a/games-data/freeciv-freeland-medium/HISTORY
b/games-data/freeciv-freeland-medium/HISTORY
new file mode 100644
index 0000000..6501d04
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/HISTORY
@@ -0,0 +1,3 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS,DEPENDS,PRE_BUILD,BUILD,INSTALL: Created
+
diff --git a/games-data/freeciv-freeland-medium/INSTALL
b/games-data/freeciv-freeland-medium/INSTALL
new file mode 100755
index 0000000..dae994c
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/INSTALL
@@ -0,0 +1 @@
+cp -vr $SOURCE_DIRECTORY/* $INSTALL_ROOT/usr/share/games/freeciv
diff --git a/games-data/freeciv-freeland-medium/PRE_BUILD
b/games-data/freeciv-freeland-medium/PRE_BUILD
new file mode 100755
index 0000000..97868b1
--- /dev/null
+++ b/games-data/freeciv-freeland-medium/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file ''
diff --git
a/games-data/freeciv-freeland-medium/freeland-medium-2.0.0.tar.gz.sig
b/games-data/freeciv-freeland-medium/freeland-medium-2.0.0.tar.gz.sig
new file mode 100644
index 0000000..a941048
Binary files /dev/null and
b/games-data/freeciv-freeland-medium/freeland-medium-2.0.0.tar.gz.sig differ
diff --git a/games-data/freeciv-freeland-normal/DETAILS
b/games-data/freeciv-freeland-normal/DETAILS
index 9929227..977d9d0 100755
--- a/games-data/freeciv-freeland-normal/DETAILS
+++ b/games-data/freeciv-freeland-normal/DETAILS
@@ -1,5 +1,5 @@
SPELL=freeciv-freeland-normal
- VERSION=1.0.3
+ VERSION=2.0.0
SOURCE=${SPELL/freeciv-/}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/$SOURCE
diff --git a/games-data/freeciv-freeland-normal/HISTORY
b/games-data/freeciv-freeland-normal/HISTORY
index aec0560..8fee25c 100644
--- a/games-data/freeciv-freeland-normal/HISTORY
+++ b/games-data/freeciv-freeland-normal/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.0.0 (for freeciv 2.1)
+
2007-02-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS,DEPENDS,PRE_BUILD,BUILD,INSTALL: Created

diff --git
a/games-data/freeciv-freeland-normal/freeland-normal-1.0.3.tar.gz.sig
b/games-data/freeciv-freeland-normal/freeland-normal-1.0.3.tar.gz.sig
deleted file mode 100644
index 5da423c..0000000
Binary files
a/games-data/freeciv-freeland-normal/freeland-normal-1.0.3.tar.gz.sig and
/dev/null differ
diff --git
a/games-data/freeciv-freeland-normal/freeland-normal-2.0.0.tar.gz.sig
b/games-data/freeciv-freeland-normal/freeland-normal-2.0.0.tar.gz.sig
new file mode 100644
index 0000000..57a6633
Binary files /dev/null and
b/games-data/freeciv-freeland-normal/freeland-normal-2.0.0.tar.gz.sig differ
diff --git a/games-strategy-tbs/freeciv/BUILD
b/games-strategy-tbs/freeciv/BUILD
index e064329..47a01f9 100755
--- a/games-strategy-tbs/freeciv/BUILD
+++ b/games-strategy-tbs/freeciv/BUILD
@@ -1,7 +1,8 @@
if [[ $FREECIV_CLIENT == "xaw" ]]; then
-OPTS="--with-xaw3d $OPTS"
-fi &&
-OPTS="--enable-client=$FREECIV_CLIENT \
- $FREECIV_OPTS \
- $OPTS" &&
+ OPTS="--enable-client=xaw --with-xaw3d $OPTS"
+fi &&
+
+OPTS="--disable-dependency-tracking \
+ $FREECIV_OPTS \
+ $OPTS" &&
default_games_build
diff --git a/games-strategy-tbs/freeciv/CONFIGURE
b/games-strategy-tbs/freeciv/CONFIGURE
index 5938b5d..d025aea 100755
--- a/games-strategy-tbs/freeciv/CONFIGURE
+++ b/games-strategy-tbs/freeciv/CONFIGURE
@@ -1,7 +1,6 @@
config_query_list FREECIV_CLIENT \
"Use which graphical client(if no don't build it)?" \
- gtk2 gtk xaw3d xaw no &&
-config_query_option FREECIV_OPTS "Build server?" y \
- "--enable-server" "--disable-server" &&
-config_query_option FREECIV_OPTS "Compile in authentication?" n \
- "--enable-auth" "--disable-auth"
+ gtk2 xaw3d xaw sdl no &&
+
+config_query_option FREECIV_SERVER "Build server?" y \
+ "--enable-server" "--disable-server"
diff --git a/games-strategy-tbs/freeciv/DEPENDS
b/games-strategy-tbs/freeciv/DEPENDS
index 535eefa..3f6d8df 100755
--- a/games-strategy-tbs/freeciv/DEPENDS
+++ b/games-strategy-tbs/freeciv/DEPENDS
@@ -1,34 +1,37 @@
-optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
- "Do you want multilanguage support" &&
-optional_depends esound \
- "" \
- "--disable-esd" \
- "for sound support through esound" &&
-optional_depends sdl_mixer \
- "" \
- "--disable-sdl-mixer" \
- "for sound support through SDL" &&
-optional_depends alsa-lib \
- "" \
- "--disable-alsa" \
- "for sound support through ALSA" &&
-optional_depends readline \
- "--with-readline" \
- "--without-readline" \
- "support fancy command line editing" &&
-depends zlib &&
-depends X11-LIBS &&
-depends freetype2 &&
+depends zlib &&
+depends X11-LIBS &&
+depends freetype2 &&

if [[ $FREECIV_CLIENT == "xaw3d" ]]; then
- depends xaw3d "--with-xaw3d"
-elif [[ $FREECIV_CLIENT == "gtk" ]]; then
- depends glib &&
- depends gtk+ &&
- depends imlib
+ depends xaw3d '--enable-client=xaw3d --with-xaw3d'
+elif [[ $FREECIV_CLIENT == "sdl" ]]; then
+ depends sdl '--enable-client=sdl'
elif [[ $FREECIV_CLIENT == "gtk2" ]]; then
- depends glib2 &&
- depends gtk+2
-fi
+ depends glib2 &&
+ depends gtk+2 '--enable-client=gtk'
+fi &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'Do you want multilanguage support' &&
+
+optional_depends sdl_mixer \
+ '' \
+ '--disable-sdl-mixer' \
+ 'for sound support (only via SDL)' &&
+
+optional_depends readline \
+ '--with-readline' \
+ '--without-readline' \
+ 'support fancy command line editing' &&
+
+optional_depends ggz-server \
+ '--with-ggz-server' \
+ '--without-ggz-server' \
+ 'for GGZ Gaming Zone server support' &&
+
+optional_depends mysql \
+ '--enable-auth' \
+ '--disable-auth' \
+ 'for authentication support'
diff --git a/games-strategy-tbs/freeciv/DETAILS
b/games-strategy-tbs/freeciv/DETAILS
index 56df896..62971af 100755
--- a/games-strategy-tbs/freeciv/DETAILS
+++ b/games-strategy-tbs/freeciv/DETAILS
@@ -1,16 +1,12 @@
SPELL=freeciv
- VERSION=2.0.9
+ VERSION=2.1.0-rc1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=stdsounds3.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=http://www.freeciv.org/ftp/contrib/sounds/sets/$SOURCE2
+ SOURCE_URL[0]=ftp://ftp.freeciv.org/freeciv/beta/freeciv-2.1.0-rc1.tar.bz2
#
SOURCE_HASH=sha512:b9049273dc8758d8c575b877cf712e1a5b5e73556a3fcd1e2692d22b86eaa5befa616149659133d9664fe13f083a1c6f8c85ea22587d2a697bfac57312988cd9
SECURITY_PATCH=1
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
LICENSE[0]=GPL
- LICENSE[1]=GPL
WEB_SITE=http://www.freeciv.org/
ENTERED=20010922
SHORT="Reimplementation of Civilization I/II/III"
diff --git a/games-strategy-tbs/freeciv/FINAL
b/games-strategy-tbs/freeciv/FINAL
new file mode 100755
index 0000000..b9af9b5
--- /dev/null
+++ b/games-strategy-tbs/freeciv/FINAL
@@ -0,0 +1 @@
+message "${MESSAGE_COLOR}You may want to remove
HOME/.civclientrc${DEFAULT_COLOR}"
diff --git a/games-strategy-tbs/freeciv/HISTORY
b/games-strategy-tbs/freeciv/HISTORY
index 30faa4b..573abe0 100644
--- a/games-strategy-tbs/freeciv/HISTORY
+++ b/games-strategy-tbs/freeciv/HISTORY
@@ -1,3 +1,22 @@
+2007-10-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.1.0-rc1
+ stdsounds3 no longer distributed separately, remove SOURCE2
+ * CONFIGURE: gtk+1 GUI removed, SDL now works
+ Removed auth query, now depends on mysql (in DEPENDS)
+ * DEPENDS: Pass OPTS flags via depends
+ List non-optional dependencies before optional
+ Removed esound and alsa-libs, no longer options
+ Added optional dependency on mysql for auth (moved from CONFIGURE)
+ Sound is now only available via sdl_mixer
+ Added optional dependency on ggz-server (ggz-client support is
+ currently broken)
+ * PRE_BUILD: Removed, sounds are now included
+ * BUILD: Pass --enable-client=xaw for xaw as the rest are done via
+ DEPENDS
+ Pass --disable-dependency-tracking to speed up builds
+ * INSTALL: Removed, default_install works fine now
+ * FINAL: User may want to remove $HOME/.civclientrc
+
2007-02-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.0.9
Removed UPDATED
diff --git a/games-strategy-tbs/freeciv/INSTALL
b/games-strategy-tbs/freeciv/INSTALL
deleted file mode 100755
index b608c43..0000000
--- a/games-strategy-tbs/freeciv/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-default_install &&
-cp -vr freeciv-media/data/* $INSTALL_ROOT/usr/share/games/${SPELL}
diff --git a/games-strategy-tbs/freeciv/PRE_BUILD
b/games-strategy-tbs/freeciv/PRE_BUILD
deleted file mode 100755
index 9cda43b..0000000
--- a/games-strategy-tbs/freeciv/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-mkdir $SOURCE_DIRECTORY/freeciv-media &&
-cd $SOURCE_DIRECTORY/freeciv-media &&
-unpack_file 2
diff --git a/games-strategy-tbs/freeciv/freeciv-2.0.9.tar.bz2.sig
b/games-strategy-tbs/freeciv/freeciv-2.0.9.tar.bz2.sig
deleted file mode 100644
index f2a20de..0000000
Binary files a/games-strategy-tbs/freeciv/freeciv-2.0.9.tar.bz2.sig and
/dev/null differ
diff --git a/games-strategy-tbs/freeciv/freeciv-2.1.0-rc1.tar.bz2.sig
b/games-strategy-tbs/freeciv/freeciv-2.1.0-rc1.tar.bz2.sig
new file mode 100644
index 0000000..d033ce3
Binary files /dev/null and
b/games-strategy-tbs/freeciv/freeciv-2.1.0-rc1.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (0f7b25940f3b2add4c1c029abd3db97a2e695d44), Eric Sandall, 10/17/2007

Archive powered by MHonArc 2.6.24.

Top of Page