ports/152040: [patch] editors/vim remove gettext autodetection, respect WITHOUT_NLS instead

[Alex Kozlov]

>Number:         152040
>Category:       ports
>Synopsis:       [patch] editors/vim remove gettext autodetection, respect WITHOUT_NLS instead
>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:   Mon Nov 08 09:10:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kozlov
>Release:        RELENG_8
>Organization:
private
>Environment:
>Description:
Remove gettext autodetection, respect WITHOUT_NLS instead.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: editors/vim/Makefile
@@ -57,8 +57,11 @@
 MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
 		vim.1 rgvim.1	vim.1 rgview.1	evim.1 eview.1
 .endif
+
+.if !defined(WITHOUT_NLS)
 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
+.endif
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 WITH_CSCOPE=	yes
@@ -104,7 +107,12 @@
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=   	yes
+.else
+MAKE_ARGS+=	CONF_OPT_NLS="--disable-nls"
+.endif
 
 .if defined(NO_GUI) || defined(WITHOUT_GUI)
 WITHOUT_X11=	yes
@@ -175,9 +183,6 @@
 .if exists(${LOCALBASE}/lib/libiconv.so)
 USE_ICONV=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libintl.so)
-USE_GETTEXT=	yes
-.endif
 
 .if defined(WITH_EXUBERANT_CTAGS)
 CTAGS_CMD=	exctags -R .


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