[Lunar-commits] <moonbase> ncurses: some improvements ...

[Christian Krause]

commit a08ae64da7902fe8681b1905d68379e974edd03e
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Tue May 31 22:29:20 2011 +0200

    ncurses: some improvements ...
    
    - more concise use of mquery
    - removed trailing whitespace in BUILD
    - better message for opt dep gpm
---
 libs/ncurses/BUILD     |   20 ++++----------------
 libs/ncurses/CONFIGURE |    4 ++--
 libs/ncurses/DEPENDS   |    3 +--
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/libs/ncurses/BUILD b/libs/ncurses/BUILD
index 7f474a5..5f6a266 100644
--- a/libs/ncurses/BUILD
+++ b/libs/ncurses/BUILD
@@ -1,17 +1,5 @@
 (
 
-  if [ $WITH_DEBUG == "y" ]; then
-    OPTS+=" --with-debug"
-  else
-    OPTS+=" --without-debug"
-  fi;
-
-  if [ $WITH_PROFILING == "y" ]; then
-    OPTS+=" --with-profile"
-  else
-    OPTS+=" --without-profile"
-  fi;
-
 # Seems that ncurses-5.5 has problems with garbage in /usr/share/terminfo
 # Note: ncurses-5.5 also has all the "screen" files for terminfo, so no recompile is needed
   rm -rf /usr/share/terminfo  &&
@@ -19,10 +7,10 @@
 # ************************ WARNING *************************
 # DO NOT MESS WITH THE CONFIGURE STUFF here unless you
 # really know what you're doing! We chose the lib location
-# specifically so we could link ncurses to bash which is 
-# needed at init time! If you move it you could break your 
+# specifically so we could link ncurses to bash which is
+# needed at init time! If you move it you could break your
 # system!
-unset CC CXX 
+unset CC CXX
 
 set -x
   ./configure  --build=$BUILD                            \
@@ -61,7 +49,7 @@ set -x
                --enable-widec                            \
                $OPTS                                    &&
 
-set +x &&               
+set +x &&
   default_make &&
   gather_docs ANNOUNCE TODO
 
diff --git a/libs/ncurses/CONFIGURE b/libs/ncurses/CONFIGURE
index 42b044b..eb2a69e 100644
--- a/libs/ncurses/CONFIGURE
+++ b/libs/ncurses/CONFIGURE
@@ -1,2 +1,2 @@
-mquery WITH_DEBUG "Do you want to install debug libraries ?" n
-mquery WITH_PROFILING "Do you want to install profiling libraries ?" n
+mquery PROFILING "Do you want to install profiling libraries ?" n "--with-profile" "--without-profile"
+mquery DEBUG     "Do you want to install debug libraries ?"     n "--with-debug"   "--without-debug"
diff --git a/libs/ncurses/DEPENDS b/libs/ncurses/DEPENDS
index 90433a4..e6d74f4 100644
--- a/libs/ncurses/DEPENDS
+++ b/libs/ncurses/DEPENDS
@@ -1,5 +1,4 @@
 depends gawk
 depends sed
 
-optional_depends "gpm" "--with-gpm" "--without-gpm" "To link against gpm"
-
+optional_depends "gpm" "--with-gpm" "--without-gpm" "for General Purpose Mouse support"