[Lunar-commits] <moonbase> vim: cleaned BUILD and DEPENDS

[Duncan Gibson]

commit e2ccfe202e45675f5b99d13090885dfc76b4bd6c
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Mon Apr 25 22:53:35 2011 +0200

    vim: cleaned BUILD and DEPENDS
    
    improved style of DEPENDS
    better concise use of mquery
    added some missing dependencies
    made disabling more explicit
    
    NOTE: this is a resubmission after sofar's review script appeared to
          throw an error. This was traced to me using vi(m) to review the
          text of the submission, and the Subject: vim: line looks like
          a vim modeline. No easy way to avoid this minor annoyance.
          http://vimdoc.sourceforge.net/htmldoc/usr_21.html#21.6
          Despite this glitch, the submission is fine - engelsman
---
 editors/vim/BUILD     |    4 ----
 editors/vim/CONFIGURE |    2 +-
 editors/vim/DEPENDS   |   13 ++++++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/editors/vim/BUILD b/editors/vim/BUILD
index 175d024..29f1c0a 100644
--- a/editors/vim/BUILD
+++ b/editors/vim/BUILD
@@ -1,8 +1,4 @@
 (
-  # Enable multibyte support if this is the user's wish
-  if [[ "$MULTIBYTE" == "y" ]]; then
-    OPTS+=" --enable-multibyte"
-  fi
 
   cd src           &&
   default_config   &&
diff --git a/editors/vim/CONFIGURE b/editors/vim/CONFIGURE
index 27c2994..2bd10b1 100644
--- a/editors/vim/CONFIGURE
+++ b/editors/vim/CONFIGURE
@@ -1 +1 @@
-mquery MULTIBYTE "Enable multibyte/unicode support" y
+mquery MULTIBYTE "Enable multibyte/unicode support" y "--enable-multibyte" "--disable-multibyte"
diff --git a/editors/vim/DEPENDS b/editors/vim/DEPENDS
index 277b4fd..d82b718 100644
--- a/editors/vim/DEPENDS
+++ b/editors/vim/DEPENDS
@@ -1,7 +1,10 @@
 depends ncurses
 
-optional_depends "%X"   "--enable-gui=auto"     "--enable-gui=no --without-x" "to enable a gui"
-optional_depends Python "--enable-pythoninterp" "" "to enable Python interpreter support"
-optional_depends perl   "--enable-perlinterp"   "" "to enable Perl interpreter support"
-optional_depends tcl    "--enable-tclinterp"    "" "to enable Tcl interpreter support"
-optional_depends ruby   "--enable-rubyinterp"   "" "to enable Ruby interpreter support"
+optional_depends "acl"    "--enable-acl"               "--disable-acl"               "for Access Control List support"
+optional_depends "gpm"    "--enable-gpm"               "--disable-gpm"               "for GPM mouse support"
+optional_depends "libX11" "--enable-gui=auto --with-x" "--enable-gui=no --without-x" "for Graphical User Interface support"
+optional_depends "Python" "--enable-pythoninterp"      "--disable-pythoninterp"      "for Python interpreter support"
+optional_depends "perl"   "--enable-perlinterp"        "--disable-perlinterp"        "for Perl interpreter support"
+optional_depends "tcl"    "--enable-tclinterp"         "--disable-tclinterp"         "for Tcl interpreter support"
+optional_depends "ruby"   "--enable-rubyinterp"        "--disable-rubyinterp"        "for Ruby interpreter support"
+optional_depends "lua"    "--enable-luainterp"         "--disable-luainterp"         "for Lua interpreter support"