sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (5fa5baafb4dcf697743923e5cabc9429faeac779)

From: Andra?? Levstik <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (5fa5baafb4dcf697743923e5cabc9429faeac779)
Date: Thu, 28 Sep 2006 17:44:00 -0500

GIT changes to master games grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

games-puzzles/fillets-ng/BUILD | 4
games-puzzles/fillets-ng/DETAILS | 2
games-puzzles/fillets-ng/HISTORY | 12
++
games-puzzles/fillets-ng/INSTALL | 2
games-puzzles/fillets-ng/PRE_BUILD | 4
games-puzzles/fillets-ng/fish-fillets-0.7.3-use-lua-pkg-config.patch | 43
++++++++++
6 files changed, 61 insertions(+), 6 deletions(-)

New commits:
commit 5fa5baafb4dcf697743923e5cabc9429faeac779
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

fillets-ng: make install verbose

commit a3f0f896d7fecea7b5a455aadd886ef87d94a0b3
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

fillets-ng: make it work with lua 5.1foo

diff --git a/games-puzzles/fillets-ng/BUILD b/games-puzzles/fillets-ng/BUILD
index 6b5e764..f2438e5 100755
--- a/games-puzzles/fillets-ng/BUILD
+++ b/games-puzzles/fillets-ng/BUILD
@@ -1,3 +1 @@
-OPTS="$OPTS --with-lua=/usr"
-
-default_build
+default_games_build
diff --git a/games-puzzles/fillets-ng/DETAILS
b/games-puzzles/fillets-ng/DETAILS
index 3139623..9f1b5b1 100755
--- a/games-puzzles/fillets-ng/DETAILS
+++ b/games-puzzles/fillets-ng/DETAILS
@@ -5,7 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/fillets/$SPELL-$VERSION.tar.gz
WEB_SITE=http://fillets.sf.net
ENTERED=20040822
- UPDATED=20051216
+ PATCHLEVEL=1

SOURCE_HASH=sha512:a5aad4cdd15ff0a847beb3ff99ee9b14205affc672ff6b6b559716c754939fd8741019eea5d063ce9a4941a50e9ed3373892d118f952bb10708c9b9bc5032cc2:UPSTREAM_HASH
LICENSE[0]=GPL
SHORT='Puzzle game with great graphics and difficulty'
diff --git a/games-puzzles/fillets-ng/HISTORY
b/games-puzzles/fillets-ng/HISTORY
index 0f740d7..9073ac8 100644
--- a/games-puzzles/fillets-ng/HISTORY
+++ b/games-puzzles/fillets-ng/HISTORY
@@ -1,3 +1,13 @@
+2006-09-29 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * fish-fillets-0.7.3-use-lua-pkg-config.patch: addde from:
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-use-lua-pkg-config.patch?view=markup
+ * PRE_BUILD: added to apply patch
+ * DETAILS: patchlevel++
+ * INSTALL: make it verbose
+
+2006-09-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: use default_games_build
+
2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

@@ -24,5 +34,5 @@
2004-08-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* Added to the grimoire

-2004-08-22 Vladim?r Marek <vlmarke AT volny.cz>
+2004-08-22 Vladim?r Marek <vlmarke AT volny.cz>
* created this spell
diff --git a/games-puzzles/fillets-ng/INSTALL
b/games-puzzles/fillets-ng/INSTALL
index f9e15f1..2e77471 100755
--- a/games-puzzles/fillets-ng/INSTALL
+++ b/games-puzzles/fillets-ng/INSTALL
@@ -1 +1 @@
-cp src/game/fillets ${INSTALL_ROOT}/usr/games
+cp -v src/game/fillets ${INSTALL_ROOT}/usr/games
diff --git a/games-puzzles/fillets-ng/PRE_BUILD
b/games-puzzles/fillets-ng/PRE_BUILD
new file mode 100755
index 0000000..4d3b24d
--- /dev/null
+++ b/games-puzzles/fillets-ng/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/fish-fillets-0.7.3-use-lua-pkg-config.patch &&
+autoconf
diff --git
a/games-puzzles/fillets-ng/fish-fillets-0.7.3-use-lua-pkg-config.patch
b/games-puzzles/fillets-ng/fish-fillets-0.7.3-use-lua-pkg-config.patch
new file mode 100644
index 0000000..3740458
--- /dev/null
+++ b/games-puzzles/fillets-ng/fish-fillets-0.7.3-use-lua-pkg-config.patch
@@ -0,0 +1,43 @@
+--- configure.in
++++ configure.in
+@@ -36,22 +36,24 @@ dnl Debian, and possibly other systems,
+ LUA_CFLAGS="`[$LUACONFIG --include]`"
+ LUA_LIBS="`[$LUACONFIG --static]`"
+ else dnl ...otherwise, attempt to guess
+- LUA_CFLAGS=""
+- LUA_LIBS=""
+- AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
+- [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
+- [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
+- [AC_MSG_ERROR([*** Lua5 is required.
+- Try --with-lua=PREFIX
+- You can download lua from http://www.lua.org])],
+- $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
+-
+- AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
+- [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS
-llualib50",
+- [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS
-llualib5.0",
+- [AC_MSG_ERROR([*** Lualib5 is required.
+- You can download lua from http://www.lua.org])],
+- $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++ PKG_CHECK_MODULES(LUA, lua, [], [
++ LUA_CFLAGS=""
++ LUA_LIBS=""
++ AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
++ [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
++ [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS
-llua5.0",
++ [AC_MSG_ERROR([*** Lua5 is required.
++ Try --with-lua=PREFIX
++ You can download lua from http://www.lua.org])],
++ $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++
++ AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS
-llualib",
++ [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS
-llualib50",
++ [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS
-llualib5.0",
++ [AC_MSG_ERROR([*** Lualib5 is required.
++ You can download lua from http://www.lua.org])],
++ $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++ ])
+ fi
+ fi
+ AC_SUBST(LUA_CFLAGS)

[SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (5fa5baafb4dcf697743923e5cabc9429faeac779), Andra?? Levstik, 09/28/2006