ports/125765: Change for the editors/vim OPTIONS support

[Christoph Mallon]

>Number:         125765
>Category:       ports
>Synopsis:       Change for the editors/vim OPTIONS support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 19 07:50:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Mallon
>Release:        
>Organization:
>Environment:
>Description:
I ask to apply this small change for the Makefile of editors/vim regarding the OPTIONS framework to make it work a bit more as the OPTIONS framework is described and resolve one bug:

* Move the OPTIONS from the file options into Makefile
Rationale: The standard way is to place the OPTIONS in the Makefile.
Note: Please remember to remove the file "options".

* Remove the apocryphal "WITH_OPTIONS" flag which hides the OPTIONS
Rationale: Hiding the OPTIONS is not the standard way for the OPTIONS framework. If this effect is desired, it can be achieved by the standard flag BATCH.

* Remove the apocryphal switch NO_GUI
Rationale: The prefix is incompatible with the OPTIONS framework and the flag is per construction equivalent to WITHOUT_X11.

* Change the default setting of the "X11" switch to "on"
Rationale: Building with X11 support is the default already, because the Makefile tests WITHOUT_X11 (not WITH_X11).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/vim/Makefile,v
retrieving revision 1.329
diff -u -r1.329 Makefile
--- Makefile	17 Jul 2008 17:32:32 -0000	1.329
+++ Makefile	19 Jul 2008 07:21:57 -0000
@@ -33,9 +33,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
@@ -97,10 +107,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"


>Release-Note:
>Audit-Trail:
>Unformatted: