diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-01 13:56:26 +0800 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-01 13:56:26 +0800 |
| commit | 0d44442a976a62359778f62920979913e1d55afa (patch) | |
| tree | dd16a015f16b4ff50b66d9cfc74475366dd7adc8 /editors | |
| parent | 4cb08bd677532c894c1f92d41f38159a98c85b10 (diff) | |
| download | freebsd-ports-gnome-0d44442a976a62359778f62920979913e1d55afa.tar.gz freebsd-ports-gnome-0d44442a976a62359778f62920979913e1d55afa.tar.zst freebsd-ports-gnome-0d44442a976a62359778f62920979913e1d55afa.zip | |
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.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 9ee4db3be550..19e0ed969833 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -43,19 +43,20 @@ COMMENT?= Vi "workalike", with many additional features 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) |