[Lunar-commits] <moonbase> vorbis-tools: Adjusting the BUILD to reflect the recent changes in build.lunar.

[Dennis `stumbles` Veatch]

commit 18d1c0bf1bfbc22b875d612830b6ea0f053ce47b
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Jun 16 09:26:23 2011 -0400

    vorbis-tools: Adjusting the BUILD to reflect the recent changes in build.lunar.
    
    Adding a CONFIGURE to allow for vorbis-tools to use flac.
---
 audio/vorbis-tools/BUILD     |   10 +++++-----
 audio/vorbis-tools/CONFIGURE |    3 +++
 audio/vorbis-tools/DEPENDS   |   20 +++++---------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/audio/vorbis-tools/BUILD b/audio/vorbis-tools/BUILD
index c3cac25..396d826 100644
--- a/audio/vorbis-tools/BUILD
+++ b/audio/vorbis-tools/BUILD
@@ -2,14 +2,14 @@
 
   # This fixes the BUILD with curl-7.16.1. See https://trac.xiph.org/ticket/1136
   # This IMV is the easy way out instead of fiddling with uploading a patch, blah.
-  sedit "s:curl_easy_setopt(handle, CURLOPT_MUTE, 1);::" ogg123/http_transport.c  &&
+  sedit "s:curl_easy_setopt(handle, CURLOPT_MUTE, 1);::" ogg123/http_transport.c
 
   # Fix docdir
-  sedit "s:/doc/\${PACKAGE}:/doc/\${PACKAGE_NAME}:" configure  &&
-  sedit "s:/doc/\$(PACKAGE)-\$(VERSION):/doc/\$(PACKAGE):" ogg123/Makefile.in  &&
+  sedit "s:/doc/\${PACKAGE}:/doc/\${PACKAGE_NAME}:" configure
+  sedit "s:/doc/\$(PACKAGE)-\$(VERSION):/doc/\$(PACKAGE):" ogg123/Makefile.in
   # Wouldn't it be nice if --with-docdir is respected?
-  OPTS+=" --with-docdir=/usr/share/doc/$MODULE"  &&
+  OPTS+=" --with-docdir=/usr/share/doc/$MODULE"
 
   default_build
 
-) > $C_FIFO 2>&1
+)
diff --git a/audio/vorbis-tools/CONFIGURE b/audio/vorbis-tools/CONFIGURE
new file mode 100644
index 0000000..75f3802
--- /dev/null
+++ b/audio/vorbis-tools/CONFIGURE
@@ -0,0 +1,3 @@
+if module_installed flac; then
+  mquery WITH_FLAC "Build Vorbis Tools with Flac support?" y "--with-flac" "--without-flac"
+fi
diff --git a/audio/vorbis-tools/DEPENDS b/audio/vorbis-tools/DEPENDS
index 6f7c93f..52d4e5b 100644
--- a/audio/vorbis-tools/DEPENDS
+++ b/audio/vorbis-tools/DEPENDS
@@ -1,16 +1,6 @@
-depends  libvorbis
-depends  libao
-depends  curl
+depends alsa-utils
+depends libvorbis
+depends libao
+depends curl
 
-optional_depends "alsa-utils" "" "" "for ALSA sound drivers and utils"
-
-optional_depends "speex"                  \
-                 "--with-speex"           \
-                 "--without-speex"        \
-                 "for voice manipulation"
-
-# circular dependency:
-#optional_depends "flac"             \
-#                 "--with-flac"      \
-#                 "--without-flac"   \
-#                 "for flac support"
+optional_depends "speex" "--with-speex" "--without-speex" "for voice manipulation"