[Lunar-commits] <moonbase> qt4: cleanup and de-confuse

[Paul Bredbury]

commit 75a717b399bb57671f49bc49cce6e1240f5983c0
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Wed Feb 2 13:11:49 2011 +0700

    qt4: cleanup and de-confuse
    
    "Do you not want to build this?" is a bad way to ask the question.
    
    This default option breaks PyQt4 for those of us not installing
    kdebase4-runtime :(
---
 qt4-apps/qt4/BUILD     |   14 +++++++-------
 qt4-apps/qt4/CONFIGURE |   10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index ac903b5..16588de 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -1,17 +1,17 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 0 $$
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
-  if [ -d /opt/lunar/qt ] ; then 
+  if [ -d /opt/lunar/qt ] ; then
     ld_remove /opt/lunar/qt/lib
   fi &&
-  
+
   if [ -d /usr/lib/qt4 ] ; then
     ld_remove /usr/lib/qt4
   fi &&
 
   export QTDIR=$SOURCE_DIRECTORY &&
-  export PATH=$MODULE_PREFIX::$PATH   &&
+  export PATH=$MODULE_PREFIX::$PATH  &&
   export LD_LIBRARY_PATH=$QTDIR/lib &&
 
   if [ $LICENSE_TYPE == "y" ] ; then
@@ -59,13 +59,13 @@
   if [ "$MAKE_QDOC3" == "y" ]; then
      cd tools/qdoc3 &&
      qmake -o Makefile qdoc3.pro &&
-     make    &&
+     make &&
      install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
      cd $SOURCE_DIRECTORY
   fi &&
 
-  echo export QTDIR=\"/usr\" > $SOURCE_DIRECTORY/qt4.rc  &&
-  echo export PATH=\"'${PATH}':'${QTDIR}'/bin\" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo export QTDIR=\"/usr\" > $SOURCE_DIRECTORY/qt4.rc &&
+  echo export PATH=\"'${PATH}':'${QTDIR}'/bin\" >> $SOURCE_DIRECTORY/qt4.rc &&
   echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS:-/usr/share}':/usr/share/qt4\" >> $SOURCE_DIRECTORY/qt4.rc &&
   echo export PKG_CONFIG_PATH=\"'${PKG_CONFIG_PATH}':/usr/lib/qt4/pkgconfig\" >> $SOURCE_DIRECTORY/qt4.rc &&
 
diff --git a/qt4-apps/qt4/CONFIGURE b/qt4-apps/qt4/CONFIGURE
index 5050a71..3f13eb4 100644
--- a/qt4-apps/qt4/CONFIGURE
+++ b/qt4-apps/qt4/CONFIGURE
@@ -1,7 +1,7 @@
-mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
+mquery MAKE_DOCS "Build the QT4 documentation?" n "" "-nomake docs"
 mquery MAKE_EXAMPLE_DEMOS "Build examples and demos?" n "" "-nomake examples -nomake demos"
-mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
-mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
+mquery XML_PATTERNS "Build xml patterns? ${PROBLEM_COLOR}Needed by qtscriptgenerator${DEFAULT_COLOR}" y "-exceptions" "-no-exceptions"
+mquery MAKE_QDOC3 "BUILD QDOC3 docs? ${PROBLEM_COLOR}Needed by qt-creator${DEFAULT_COLOR}" n
 mquery MAKE_WEBKIT "Build the webkit plugin? ${PROBLEM_COLOR}Needed by kdelibs4${DEFAULT_COLOR}" y "-webkit" "-no-webkit"
-mquery LICENSE_TYPE "Build Qt using open source license? (N=commercial)" y
-mquery NO_PHONON "Skip building old phonon? ${PROBLEM_COLOR}Needed by kdebase4-runtime${DEFAULT_COLOR}" y "-no-phonon" "-phonon"
+mquery LICENSE_TYPE "Build Qt using open-source license? (n=commercial)" y
+mquery MAKE_PHONON "Build qt4's (old) phonon? ${PROBLEM_COLOR}say y if without kdebase4-runtime${DEFAULT_COLOR}" n "-phonon" "-no-phonon"