[Lunar-commits] <moonbase-other> oolite: cleanup module logic

[v4hn]

commit f85873b1a7dc00cf6d9f6a3390a5e9932d4f6494
Author: v4hn <me at v4hn.de>
Date: Thu, 07 Nov 2013 16:05:36 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/f85873b1a7dc00cf6d9f6a3390a5e9932d4f6494

oolite: cleanup module logic
---
  games/oolite/BUILD     | +1/-8     
  games/oolite/DEPENDS   | +1/-1     
  games/oolite/PRE_BUILD | +3/-1     
  3 files changed, 5 insertions(+), 10 deletions(-)

--- a/games/oolite/BUILD
+++ b/games/oolite/BUILD
@@ -1,13 +1,6 @@
-sedit "/NO_RETURN_FUNC/ d" src/Core/Materials/OOPNGTextureLoader.m &&
-if in_depends $MODULE espeak; then
- sedit "s:ESPEAK *=.*$:ESPEAK = yes:" config.make
-else
- sedit "s:ESPEAK *=.*$:ESPEAK = no:" config.make
-fi &&
-
 . /usr/share/GNUstep/Makefiles/GNUstep.sh &&
 
-make -f Makefile release &&
+make -f Makefile release $OPTS &&
 
 prepare_install &&
 
--- a/games/oolite/DEPENDS
+++ b/games/oolite/DEPENDS
@@ -3,4 +3,4 @@ depends gnustep-base
 depends mesa-lib
 depends SDL_mixer
 
-optional_depends espeak "-foo" "-bar" "for spoken notifications"
+optional_depends espeak "ESPEAK=yes" "ESPEAK=no" "for spoken notifications"
--- a/games/oolite/PRE_BUILD
+++ b/games/oolite/PRE_BUILD
@@ -6,4 +6,6 @@ tar xf $SOURCE_CACHE/$SOURCE2 &&
 mv mozilla-2.0 mozilla &&
 echo 'http://jens.ayton.se/oolite/deps/firefox-4.0.source.js-only.tbz' > mozilla/current.url &&
 
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+
+sedit "/NO_RETURN_FUNC/ d" src/Core/Materials/OOPNGTextureLoader.m