ports/151424: [patch] make gettext support optionnal in editors/vim and iconv dep fix

[Pierre Guinoiseau]

>Number:         151424
>Category:       ports
>Synopsis:       [patch] make gettext support optionnal in editors/vim and iconv dep fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 13 11:30:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Pierre Guinoiseau <geekounet at poildetroll.net>
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD alderaan.home.poildetroll.net 8.1-STABLE FreeBSD 8.1-STABLE #0 r212901: Mon Sep 27 01:28:33 CEST 2010 root at alderaan.home.poildetroll.net:/usr/obj/usr/src/sys/ALDERAAN amd64
>Description:

Starting with editors/vim update to 7.3, gettext support has become no longer
optionnal. This is annoying for people not wanting vim linked against gettext,
nor wanting gettext installed when it is of no use. I know that lang files are
installed by default, but that does not mean that gettext must be required.
These files can still be installed without linking vim against gettext. This
patch disables gettext dependancy when WITHOUT_NLS is defined, which is the
common usage.

Also, the libiconv dependancy condition is wrong. If someone want iconv support
but the libiconv package is not yet installed, it should be defined with the
proper knob, not by installing it apart before. This is also wrong when someone
has libiconv installed but does not want it to be linked with vim. So, this
patch add a WITH_ICONV knob to enable the libiconv dependancy, which is off by
default, assuming that the current default behaviour is to not link against it
when it not yet present (eg. on fresh install).

Finally, this patch fix the options file to remove the no longer used LANG
knob, add the new LUA one, and add the 2 ones defined above.

Thanks.

>How-To-Repeat:
	
>Fix:

	

--- vim-7-3-gettext-iconv.diff begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/vim.orig/Makefile /usr/ports/editors/vim/Makefile
--- /usr/ports/editors/vim.orig/Makefile	2010-10-12 03:03:57.277604000 +0200
+++ /usr/ports/editors/vim/Makefile	2010-10-13 11:59:11.385116787 +0200
@@ -104,7 +104,10 @@
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
-USE_GETTEXT=   	yes
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+.endif
 
 .if defined(NO_GUI)
 WITHOUT_X11=	yes
@@ -172,7 +175,7 @@
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp --disable-luainterp"
 .endif	# LITE
 
-.if exists(${LOCALBASE}/lib/libiconv.so)
+.if defined(WITH_ICONV)
 USE_ICONV=	yes
 .endif
 
diff -ruN --exclude=CVS /usr/ports/editors/vim.orig/options /usr/ports/editors/vim/options
--- /usr/ports/editors/vim.orig/options	2010-10-06 03:03:29.512250000 +0200
+++ /usr/ports/editors/vim/options	2010-10-13 11:46:21.504022157 +0200
@@ -2,7 +2,9 @@
 		PYTHON "Enable Python interpreter" off \
 		RUBY "Enable Ruby interpreter" off \
 		TCL "Enable TCL interpreter" off \
-		LANG "VIm Translations" off \
+		LUA "Enable Lua interpreter" off \
+		NLS "Native Language Support" off \
+		ICONV "Iconv support" off \
 		CSCOPE "Enable cscope" off \
 		EXUBERANT_CTAGS "Use exctags instead of ctags" off \
 		X11 "X11 support (required for options below)" off \
--- vim-7-3-gettext-iconv.diff ends here ---


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