Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/vim/Makefile,v
retrieving revision 1.337
diff -u -r1.337 Makefile
--- Makefile	11 Feb 2009 17:29:11 -0000	1.337
+++ Makefile	21 Feb 2009 09:45:32 -0000
@@ -32,9 +32,19 @@
 
 SLAVEDIRS=	editors/vim-lite
 
-.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS)
-.include "${.CURDIR}/../vim/options"
-.endif
+OPTIONS=	PERL "Enable Perl interpreter" off \
+		PYTHON "Enable Python interpreter" off \
+		RUBY "Enable Ruby interpreter" off \
+		TCL "Enable TCL 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)" on \
+		ATHENA "Athena GUI" off \
+		GTK2 "GTK2 GUI" off \
+		GNOME "Gnome1 GUI" off \
+		MOTIF "Motif GUI" off \
+		XTERM_SAVE "" off
 
 CONFLICTS=	vim6* vim*-lite
 USE_BZIP2=	yes
@@ -96,10 +106,6 @@
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
-.if defined(NO_GUI)
-WITHOUT_X11=	yes
-.endif
-
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
 MAKE_ARGS+=	CONF_OPT_CSCOPE="--enable-cscope"