diff options
Diffstat (limited to 'editors/vim')
| -rw-r--r-- | editors/vim/Makefile | 35 | ||||
| -rw-r--r-- | editors/vim/options | 6 |
2 files changed, 22 insertions, 19 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 37a49452f2c4..f5390e7dd24a 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -90,7 +90,7 @@ USE_TCL_NO_THREADS= yes WANT_PERL= yes .endif -.if !defined(WITHOUT_X11) +.if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) WANT_GNOME= yes .endif @@ -124,37 +124,38 @@ MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE .if !defined(WITHOUT_X11) # for now default the GUI to the GTK+ one -# will be reviewed when the GTK+ 1.{3,4} behemoth is released -.if !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK2) -USE_GNOME= gtk12 -.endif +. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK) && !defined(WITH_GTK2) +WITH_GTK= yes +. endif -.if defined(WITH_ATHENA) +. if defined(WITH_ATHENA) MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} -.elif defined(WITH_GTK2) +. elif defined(WITH_GTK) +USE_GNOME= gtk12 +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt +. elif defined(WITH_GTK2) USE_GNOME= gtk20 PKGNAMESUFFIX= -gtk2 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt -.elif defined(WITH_GNOME) -.if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \ +. elif defined(WITH_GNOME) +. if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \ ${WITH_GNOME}=="1" USE_GNOME= gnomelibs gnomeprefix PKGNAMESUFFIX= -gnome MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt -.else -USE_GNOME= gtk12 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" -USE_XORG+= xt -.endif -.elif defined(WITH_MOTIF) +. endif +. elif defined(WITH_MOTIF) USE_MOTIF= yes MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N} -.endif +. elif defined(WITH_X11_ONLY) +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --with-x" ${I18N} +. endif .else # WITHOUT_X11 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N} .endif # WITHOUT_X11 diff --git a/editors/vim/options b/editors/vim/options index 9602cf885665..e3251fb2f5a1 100644 --- a/editors/vim/options +++ b/editors/vim/options @@ -5,9 +5,11 @@ OPTIONS= PERL "Enable Perl interpreter" off \ LANG "VIm Translations" off \ CSCOPE "Enable cscope" off \ EXUBERANT_CTAGS "Use exctags instead of ctags" off \ - X11 "X11 GUI (must enable if things below are)" off \ + X11 "X11 support (required for options below)" off \ + X11_ONLY "CLI-only Vim, but with basic X11 support" off \ + XTERM_SAVE "Restore xterm screen after exit" off \ ATHENA "Athena GUI" off \ + GTK "GTK+ 1.2 GUI" off \ GTK2 "GTK2 GUI" off \ GNOME "Gnome1 GUI" off \ MOTIF "Motif GUI" off \ - XTERM_SAVE "" off |