svn commit: r322114 - head/editors/vim

[Baptiste Daroussin]

Author: bapt
Date: Mon Jul  1 05:56:26 2013
New Revision: 322114
URL: http://svnweb.freebsd.org/changeset/ports/322114

Log:
  Make vim-lite sane again by default
  Always include bsd.port.options.mk which is necessary for properly handling of DOCS/NLS _even_ without options
  Remove specific default for PACKAGE_BUILDING settings which are not needed
  Keep maintianer preference for not having options at all by default.

Modified:
  head/editors/vim/Makefile

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Mon Jul  1 02:59:20 2013	(r322113)
+++ head/editors/vim/Makefile	Mon Jul  1 05:56:26 2013	(r322114)
@@ -43,19 +43,20 @@ COMMENT?=	Vi "workalike", with many addi
 
 SLAVEDIRS=	editors/vim-lite
 
-.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS) || !defined(LITE) && defined(PACKAGE_BUILDING)
+.if !defined(LITE)
+.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS)
 .include "${.CURDIR}/../vim/options"
-. if !defined(LITE) && defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \
 			TCL LUA X11 GTK2
-. endif
-.include <bsd.port.options.mk>
 .else
 VIM_PORT_SCRIPT_LANGS?=	LUA PERL PYTHON RUBY TCL
 VIM_PORT_OPTIONS=	CSCOPE DOCS EXAMPLES EXUBERANT_CTAGS \
 			${VIM_PORT_SCRIPT_LANGS}
 PORT_OPTIONS?=	${VIM_PORT_OPTIONS}
 .endif
+.endif
+
+.include <bsd.port.options.mk>
 
 CONFLICTS=	vim6* vim*-gnome libsysinfo
 .if defined(LITE)