[SM-Commit] GIT changes to master games grimoire by Jaka Kranjc (f3eacdf278b5df12a8d1b6817ee3e6a6815b5610)

Jaka Kranjc scm at mail.sourcemage.org
Tue Aug 1 10:25:55 EDT 2006


GIT changes to master games grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 dev/null                                            |binary
 games-strategy-tbs/wesnoth/CONFIGURE                |   29 +++++++++++---------
 games-strategy-tbs/wesnoth/DETAILS                  |    2 -
 games-strategy-tbs/wesnoth/HISTORY                  |    4 ++
 games-strategy-tbs/wesnoth/wesnoth-1.1.7.tar.gz.sig |    0 
 5 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit f3eacdf278b5df12a8d1b6817ee3e6a6815b5610
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    wesnoth: 1.1.8; use less vars in CONFIGURE, don't export. Includes nice previous option saving.

diff --git a/games-strategy-tbs/wesnoth/CONFIGURE b/games-strategy-tbs/wesnoth/CONFIGURE
index e6c9fb1..f620997 100755
--- a/games-strategy-tbs/wesnoth/CONFIGURE
+++ b/games-strategy-tbs/wesnoth/CONFIGURE
@@ -1,36 +1,39 @@
-config_query_option WESNOTH_STATIC                                           \
+if [[ ! -z $WESNOTH_STATIC ]]; then
+  persistent_add WESNOTH_OPTS &&
+  WESNOTH_OPTS="$WESNOTH_STATIC $WESNOTH_LITE $WESNOTH_SERVER \
+    $WESNOTH_CAMPAIGN $WESNOTH_EDITOR $WESNOTH_TOOLS" &&
+  persistent_remove WESNOTH_STATIC WESNOTH_LITE WESNOTH_SERVER \
+    WESNOTH_CAMPAIGN WESNOTH_EDITOR WESNOTH_TOOLS &&
+  return 0
+fi &&
+
+config_query_option WESNOTH_OPTS                                             \
            "Enable static building of wesnoth?"                              \
              n                                                               \
              "--enable-static"                                               \
              "--disable-static"                                              &&
-config_query_option WESNOTH_LITE                                             \
+config_query_option WESNOTH_OPTS                                             \
            "Enable lite version of wesnoth (without music or large images)?" \
              n                                                               \
              "--enable-lite"                                                 \
              "--disable-lite"                                                &&
-config_query_option WESNOTH_SERVER                                           \
+config_query_option WESNOTH_OPTS                                             \
            "Enable compilation of server?"                                   \
              n                                                               \
             "--enable-server"                                                \
             "--disable-server"                                               &&
-config_query_option WESNOTH_CAMPAIGN                                         \
+config_query_option WESNOTH_OPTS                                             \
            "Enable compilation of campaign server?"                          \
              n                                                               \
              "--enable-campaign-server"                                      \
              "--disable-campaign-server"                                     &&
-config_query_option WESNOTH_EDITOR                                           \
+config_query_option WESNOTH_OPTS                                             \
           "Enable compilation of map editor?"                                \
              n                                                               \
              "--enable-editor"                                               \
              "--disable-editor"                                              &&
-config_query_option WESNOTH_TOOLS                                            \
+config_query_option WESNOTH_OPTS                                             \
           "Enable compilation of tools for translators and artists?"         \
              n                                                               \
              "--enable-tools"                                                \
-             "--disable-tools"                                               &&
-export WESNOTH_OPTS="$WESNOTH_STATIC \
-$WESNOTH_LITE \
-$WESNOTH_SERVER \
-$WESNOTH_CAMPAIGN \
-$WESNOTH_EDITOR \
-$WESNOTH_TOOLS"
+             "--disable-tools"
diff --git a/games-strategy-tbs/wesnoth/DETAILS b/games-strategy-tbs/wesnoth/DETAILS
index 09f39ee..32b61f8 100755
--- a/games-strategy-tbs/wesnoth/DETAILS
+++ b/games-strategy-tbs/wesnoth/DETAILS
@@ -4,7 +4,7 @@
           SOURCE=${SPELL}-${VERSION}.tar.gz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
   else
-         VERSION=1.1.7
+         VERSION=1.1.8
           SOURCE=${SPELL}-${VERSION}.tar.gz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
   fi
diff --git a/games-strategy-tbs/wesnoth/HISTORY b/games-strategy-tbs/wesnoth/HISTORY
index 96c028e..e231982 100644
--- a/games-strategy-tbs/wesnoth/HISTORY
+++ b/games-strategy-tbs/wesnoth/HISTORY
@@ -1,3 +1,7 @@
+2006-08-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated devel to 1.1.8
+	* CONFIGURE: just use WESNOTH_OPTS, no exporting
+
 2006-07-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS; updated devel to 1.1.7
 
diff --git a/games-strategy-tbs/wesnoth/wesnoth-1.1.7.tar.gz.sig b/games-strategy-tbs/wesnoth/wesnoth-1.1.7.tar.gz.sig
deleted file mode 100644
index af79190..0000000
Binary files a/games-strategy-tbs/wesnoth/wesnoth-1.1.7.tar.gz.sig and /dev/null differ



More information about the SM-Commit mailing list