From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 17 15:40:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5D4E51065670 for ; Sat, 17 Mar 2012 15:40:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 34A198FC16 for ; Sat, 17 Mar 2012 15:40:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2HFeCYf043900 for ; Sat, 17 Mar 2012 15:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2HFeC4n043899; Sat, 17 Mar 2012 15:40:12 GMT (envelope-from gnats) Resent-Date: Sat, 17 Mar 2012 15:40:12 GMT Resent-Message-Id: <201203171540.q2HFeC4n043899@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mel Flynn Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F23B1065675; Sat, 17 Mar 2012 15:35:30 +0000 (UTC) (envelope-from mel@datakitty.lan.rachie.is-a-geek.net) Received: from datakitty.lan.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27]) by mx1.freebsd.org (Postfix) with ESMTP id C69DB8FC14; Sat, 17 Mar 2012 15:35:29 +0000 (UTC) Received: from datakitty.lan.rachie.is-a-geek.net (localhost [127.0.0.1]) by datakitty.lan.rachie.is-a-geek.net (8.14.5/8.14.5) with ESMTP id q2HFZSGP072666; Sat, 17 Mar 2012 07:35:28 -0800 (AKDT) (envelope-from mel@datakitty.lan.rachie.is-a-geek.net) Received: (from mel@localhost) by datakitty.lan.rachie.is-a-geek.net (8.14.5/8.14.5/Submit) id q2HFZSxT072665; Sat, 17 Mar 2012 07:35:28 -0800 (AKDT) (envelope-from mel) Message-Id: <201203171535.q2HFZSxT072665@datakitty.lan.rachie.is-a-geek.net> Date: Sat, 17 Mar 2012 07:35:28 -0800 (AKDT) From: Mel Flynn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: MAINTAINER Subject: ports/166202: [patch] editors/vim: respect WITHOUT_NLS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mel Flynn List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2012 15:40:12 -0000 >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: