Date: Sat, 17 Mar 2012 07:35:28 -0800 (AKDT) From: Mel Flynn <rflynn@acsalaska.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: MAINTAINER <obrien@FreeBSD.org> Subject: ports/166202: [patch] editors/vim: respect WITHOUT_NLS Message-ID: <201203171535.q2HFZSxT072665@datakitty.lan.rachie.is-a-geek.net> Resent-Message-ID: <201203171540.q2HFeC4n043899@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166202
>Category: ports
>Synopsis: [patch] editors/vim: respect WITHOUT_NLS
>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: Sat Mar 17 15:40:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Mel Flynn
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD datakitty.lan.rachie.is-a-geek.net 8.2-STABLE FreeBSD 8.2-STABLE #6 r230977: Sun Feb 5 06:20:11 AKST 2012 mel@datakitty.lan.rachie.is-a-geek.net:/data/obj/data/RELENG_8/src/sys/GENERIC amd64
>Description:
When gettext is installed but WITHOUT_NLS flag is set, vim will link with
libintl. Upstream configure however does have the ability to disable NLS
support when requested.
>How-To-Repeat:
Set WITHOUT_NLS on command line or through environment, /etc/make.conf and
install vim, while gettext is installed.
Expected: vim does not link with libintl
Actual: vim links with libintl
>Fix:
Side effect of disabling NLS support is that no internationalized manual pages
will be generated.
--- vim-nls.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/vim/Makefile,v
retrieving revision 1.386
diff -u -r1.386 Makefile
--- Makefile 20 Jun 2011 17:40:31 -0000 1.386
+++ Makefile 17 Mar 2012 15:00:45 -0000
@@ -58,8 +58,10 @@
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
@@ -109,7 +111,6 @@
.else # !LITE
MAKE_ARGS+= CONF_OPT_FEAT="--with-features=big"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
-USE_GETTEXT= yes
. if defined(NO_GUI) || defined(WITHOUT_GUI)
WITHOUT_X11= yes
@@ -169,8 +170,10 @@
.if exists(${LOCALBASE}/lib/libiconv.so)
USE_ICONV= yes
.endif
-.if exists(${LOCALBASE}/lib/libintl.so)
+.if exists(${LOCALBASE}/lib/libintl.so) && !defined(WITHOUT_NLS)
USE_GETTEXT= yes
+.else
+MAKE_ARGS+= CONF_OPT_NLS="--disable-nls"
.endif
.if defined(WITH_EXUBERANT_CTAGS)
--- vim-nls.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203171535.q2HFZSxT072665>