Stefan Paletta:

package/rene/vim/config.hlp

@@ -24,7 +24,18 @@ MENU_PKG_VIM
   Here you will find options for everyone's favorite editor, vim :-)
 
 ROCKCFG_PKG_VIM_TWO_BINARIES
-  Please check here if you want to separate the CLI and the Gtk+ bitary.
+  Please check here if you want separate CLI and GUI binaries.
+
+ROCKCFG_PKG_VIM_FEATURES
+ +tiny                almost no features enabled, not even multiple windows.
+ +small               few features enabled, as basic as possible.
+ +normal              a default selection of features enabled.
+ +big                 many features enabled, as rich as possible.
+ +huge                all possible featues enabled.
   
+ When +small is used, +tiny is also included.  +normal implies +small, etc.
+ Support for editing text in multibyte encodings (e.g. UTF-8) is enabled
+ beginning with the 'big' featureset.
+
 ROCKCFG_PKG_VIM_IS_VI_REPLACEMENT
   Please check here if you want to create a vi -> vim symlink.

package/rene/vim/config.in

@@ -23,10 +23,35 @@
 if pkgcheck vim X
 then
 	menu_begin MENU_PKG_VIM 'VIM (Vi IMproved) Options'
-		bool 'Build seperate CML and GTK+ binary' \
-			ROCKCFG_PKG_VIM_TWO_BINARIES 1
+		choice ROCKCFG_PKG_VIM_FEATURES huge \
+			tiny almost_no_features_enabled,_not_even_multiple_windows \
+			small few_features_enabled,_as_basic_as_possible \
+			normal a_default_selection_of_features_enabled \
+			big many_features_enabled,_as_rich_as_possible \
+			huge all_possible_featues_enabled
+		choice ROCKCFG_PKG_VIM_GUI auto \
+			no GUI_style:_No_GUI auto GUI_style:_Autoselect \
+			gtk GUI_style:_GTK gtk2 GUI_style:_GTK-2 \
+			gnome GUI_style:_Gnome gnome2 GUI_style:_Gnome_2 \
+			motif GUI_style:_Motif_/_Lesstif
+		if [ "$ROCKCFG_PKG_VIM_GUI" != "no" ] ; then
+			bool 'Build seperate CLI and GUI binaries' \
+				ROCKCFG_PKG_VIM_TWO_BINARIES 1
+		fi
 		bool 'Create VI replacement sym-link' \
 			ROCKCFG_PKG_VIM_IS_VI_REPLACEMENT 1
+		pkgcheck perl5 X && \
+			bool 'Include Perl interpreter in vim' \
+			ROCKCFG_PKG_VIM_PERLINTERP 1
+		pkgcheck python X && \
+			bool 'Include Python interpreter in vim' \
+			ROCKCFG_PKG_VIM_PYTHONINTERP 1
+		pkgcheck ruby X && \
+			bool 'Include Ruby interpreter in vim' \
+			ROCKCFG_PKG_VIM_RUBYINTERP 1
+		pkgcheck tcltk X && \
+			bool 'Include TCL interpreter in vim' \
+			ROCKCFG_PKG_VIM_TCLINTERP 1
 	menu_end
 fi
 

package/rene/vim/vim.conf

@@ -28,7 +28,7 @@ vim_postmake() {
 	  ln -sf $bindir/gvim $bindir/evim
 	  ln -sf $bindir/gvim $bindir/rgvim
 
-	  confopt="$confopt --enable-gui=no --without-x"
+	  var_append confopt ' ' "--enable-gui=no --without-x"
 
 	  echo "Running ./configure $confopt ..."
 	  eval ./configure $confopt
@@ -39,7 +39,7 @@ vim_postmake() {
 
 	if [ "$ROCKCFG_PKG_VIM_IS_VI_REPLACEMENT" = 1 ] ; then
           rm -f $bindir/vi
-	  ln -sf $bindir/vim $bindir/vi
+	  ln -sf vim $bindir/vi
 	fi
 
 	# now hopefully all are happy ;-)
@@ -47,6 +47,15 @@ vim_postmake() {
 	cp -fv $confdir/vimrc* $root/$prefix/share/
 }
 
-var_append extraconfopt ' ' "--enable-max-features --enable-perlinterp --enable-pythoninterp"
+var_append extraconfopt ' ' "--with-features=$ROCKCFG_PKG_VIM_FEATURES"
+var_append extraconfopt ' ' "--enable-gui=$ROCKCFG_PKG_VIM_GUI"
+[ "$ROCKCFG_PKG_VIM_PERLINTERP" = 1 ] && \
+	var_append extraconfopt ' ' "--enable-perlinterp"
+[ "$ROCKCFG_PKG_VIM_PYTHONINTERP" = 1 ] && \
+	var_append extraconfopt ' ' "--enable-pythoninterp"
+[ "$ROCKCFG_PKG_VIM_RUBYINTERP" = 1 ] && \
+	var_append extraconfopt ' ' "--enable-rubyinterp"
+[ "$ROCKCFG_PKG_VIM_TCLINTERP" = 1 ] && \
+	var_append extraconfopt ' ' "--enable-tclinterp --with-tclsh=tclsh"
 postmake="vim_postmake"