ports/133949: vim options don't work as expected.

[Justin Hibbits]

>Number:         133949
>Category:       ports
>Synopsis:       vim options don't work as expected.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 23 13:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Justin Hibbits
>Release:        8-CURRENT
>Organization:
>Environment:
FreeBSD narn.knownspace 8.0-CURRENT FreeBSD 8.0-CURRENT #16 r191380M: Wed Apr 22 16:53:04 EDT 2009     root at narn.knownspace:/usr/obj/usr/src/sys/NARN  powerpc

>Description:
Two parts:

The Vim port breaks ports convention with OPTIONS by requiring WITH_OPTIONS and/or WITH_VIM_OPTIONS, which breaks users' expectations of ports.

Also, even when WITH_OPTIONS/WITH_VIM_OPTIONS are enabled configured options don't work at all.
>How-To-Repeat:
attempt to build the vim port without setting WITH_OPTIONS/WITH_VIM_OPTIONS, and again with.
>Fix:
Apply attached patch.

Patch attached with submission follows:

--- Makefile.orig	2009-02-03 14:44:08.000000000 -0500
+++ Makefile	2009-02-03 15:16:49.000000000 -0500
@@ -32,9 +32,7 @@
 
 SLAVEDIRS=	editors/vim-lite
 
-.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS)
 .include "${.CURDIR}/../vim/options"
-.endif
 
 CONFLICTS=	vim6* vim*-lite
 USE_BZIP2=	yes
@@ -57,6 +55,10 @@
 .endif
 MANLANG=	"" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
 		fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
+WANT_PERL=	yes
+WANT_GNOME=	yes
+
+.include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 WITH_TCL=	yes
@@ -82,16 +84,6 @@
 USE_TCL_NO_THREADS=	yes
 .endif
 
-.if defined(WITH_PERL)
-WANT_PERL=	yes
-.endif
-
-.if !defined(WITHOUT_X11)
-WANT_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
@@ -122,7 +114,7 @@
 #	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)
-WITH_GNOME=	gtk12
+USE_GNOME=	gtk12
 .endif
 
 .if defined(WITH_ATHENA)


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