Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

6 files changed, 32 insertions, 15 deletions

diff --git a/audio-players/ncmpcpp/BUILD b/audio-players/ncmpcpp/BUILD
index f87bd7858a..db47218f41 100755
--- a/audio-players/ncmpcpp/BUILD
+++ b/audio-players/ncmpcpp/BUILD
@@ -1,11 +1,3 @@
-if [[ $NCMPCPP_UNICODE == "y" ]]; then
-    OPTS="$OPTS --enable-unicode"
-else
-    OPTS="$OPTS --disable-unicode"
-fi &&
-if [[ $NCMPCPP_CLOCK == "y" ]]; then
-    OPTS="$OPTS --enable-clock"
-else
-    OPTS="$OPTS --disable-clock"
-fi &&
+OPTS="$NCMPCPP_OPTS $OPTS" &&
+
 default_build
diff --git a/audio-players/ncmpcpp/CONFIGURE b/audio-players/ncmpcpp/CONFIGURE
new file mode 100755
index 0000000000..1bc039542e
--- /dev/null
+++ b/audio-players/ncmpcpp/CONFIGURE
@@ -0,0 +1,19 @@
+config_query_option NCMPCPP_OPTS \
+                    "Do you want support for unicode?" \
+                    ${NCMPCPP_UNICODE:-y} \
+                    "--enable-unicode" \
+                    "--disable-unicode" &&
+config_query_option NCMPCPP_OPTS \
+                    "Do you want ncmpcpp to display a clock?" \
+                    ${NCMPCPP_CLOCK:-n} \
+                    "--enable-clock" \
+                    "--disable-clock" &&
+config_query_option NCMPCPP_OPTS \
+                    "Do you want to enable the output screen?" \
+                    n \
+                    "--enable-outputs" \
+                    "--disable-outputs"
+
+# deprecation of old variables
+persistent_remove NCMPCPP_UNICODE
+persistent_remove NCMPCPP_CLOCK
diff --git a/audio-players/ncmpcpp/DEPENDS b/audio-players/ncmpcpp/DEPENDS
index 4454e8215c..bb5fb3fb91 100755
--- a/audio-players/ncmpcpp/DEPENDS
+++ b/audio-players/ncmpcpp/DEPENDS
@@ -6,4 +6,8 @@ optional_depends curl \
 optional_depends taglib \
                  "--with-taglib" \
                  "--without-taglib" \
-                 "enable tag editor" 
+                 "enable tag editor" &&
+optional_depends fftw \
+                 "--with-fftw --enable-visualizer" \
+                 "--without-fftw --disable-visualizer" \
+                 "enable music visualizer"
diff --git a/audio-players/ncmpcpp/DETAILS b/audio-players/ncmpcpp/DETAILS
index 6b94384dc8..013d505cee 100755
--- a/audio-players/ncmpcpp/DETAILS
+++ b/audio-players/ncmpcpp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ncmpcpp
-         VERSION=0.3.4
+         VERSION=0.4
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://unkart.ovh.org/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:73572055ce01fd08f2082ca8fb7b4bdc6ad96fba1aae803951f8ca83806a6ffd60d46178668168292b1e9167af9e5008b7c3ac2e796344d1bd11a30fc6b94fe6
+     SOURCE_HASH=sha512:dc9eb9b1ce799eefbf9a7bc3fe4e8fed768d9207a470ff975fc20b7d32fdf9916a3e5396b62e829dbcff6d4468d44373a1dde2d0775f6dc938426bb291f7cfe9
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://unkart.ovh.org/ncmpcpp/"
       LICENSE[0]=GPL
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index 69641fcef7..421cd19402 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,7 @@
+2009-09-27 Remko van der Vossen <wich@sourcemage.org>
+	* DETAILS: version 0.4
+	* PREPARE, CONFIGURE, BUILD: fixed abuse of PREPARE
+
 2009-05-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 0.3.4
 	* PREPARE, BUILD: query the user if he wants unicode and a clock
diff --git a/audio-players/ncmpcpp/PREPARE b/audio-players/ncmpcpp/PREPARE
deleted file mode 100755
index 76224e9221..0000000000
--- a/audio-players/ncmpcpp/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query NCMPCPP_UNICODE "Do you want support for unicode?" n &&
-config_query NCMPCPP_CLOCK "Do you want ncmpcpp to display a clock?" n