From owner-svn-ports-all@freebsd.org Mon Jul 20 18:36:44 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E4579A63C5; Mon, 20 Jul 2015 18:36:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com [IPv6:2607:f8b0:400e:c03::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B0F61092; Mon, 20 Jul 2015 18:36:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by pachj5 with SMTP id hj5so105317726pac.3; Mon, 20 Jul 2015 11:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=cdC6kigYc7YpGZ8NxDy6broyVT5x6d5y2mXVlpJVsME=; b=tjBrxBAsC2FqithnhTtZdO0036DZKdpB1h9FuWRA8x/ixkP9cBoocV2hmwoiKil7UP fgAxErbl99KQ/QGZuiyE9QF93TXNsyxzhNE5Xt1Qj1hirWb8iJU4+XlvPahnSjA34vVc YX7y9zkk3Nmqs0gXhCxGI9zneqhZHuoGTE3mqMd3Jf1roVqyVSovt3mda7riAJ6JVF1I zHrkXh6fkAG4EXW6QCmabuyT+w2LbdaviwlZFeyExFLpU9sq5HGOAlSCY52v+DXNHE// nxZnclXXYifMexltllaxJ5RK5QyFcCDWeEnpzbJ79ww0jYLnHaRnD15Hgr4KCu2Msep7 0Tkg== X-Received: by 10.70.53.1 with SMTP id x1mr63087911pdo.114.1437417403650; Mon, 20 Jul 2015 11:36:43 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::2? (2001-44b8-31ae-7b01-0000-0000-0000-0002.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::2]) by smtp.gmail.com with ESMTPSA id w3sm23102797pdl.45.2015.07.20.11.36.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 11:36:43 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r392566 - head/security/gnupg/files References: <201507201301.t6KD1YSU058665@repo.freebsd.org> To: Mathieu Arnold , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Kubilay Kocak Message-ID: <55AD3FAF.4020408@FreeBSD.org> Date: Tue, 21 Jul 2015 04:36:31 +1000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: <201507201301.t6KD1YSU058665@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2015 18:36:44 -0000 On 20/07/2015 11:01 PM, Mathieu Arnold wrote: > Author: mat > Date: Mon Jul 20 13:01:33 2015 > New Revision: 392566 > URL: https://svnweb.freebsd.org/changeset/ports/392566 > > Log: > Fix build WITHOUT=NLS. > > Sponsored by: Absolight > > Added: > head/security/gnupg/files/patch-agent_agent.h (contents, props changed) > > Added: head/security/gnupg/files/patch-agent_agent.h > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/security/gnupg/files/patch-agent_agent.h Mon Jul 20 13:01:33 2015 (r392566) > @@ -0,0 +1,41 @@ > +From b3286af36d452fc801be573a057b0838d53a2edd Mon Sep 17 00:00:00 2001 > +From: NIIBE Yutaka > +Date: Fri, 10 Jul 2015 09:21:32 +0900 > +Subject: [PATCH] agent: Support non-NLS build. > + > +* agent/agent.h: Use ENABLE_NLS and define L_() macro. > + > +-- > + > +GnuPG-bug-id: 2032 > + > +This is a fix for e76d4c05b24211f3981ab69cddb3fccc17d21e0e. > +--- > + agent/agent.h | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git agent/agent.h agent/agent.h > +index 2948bff..5a09254 100644 > +--- agent/agent.h > ++++ agent/agent.h > +@@ -300,6 +300,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); > + and uses that to translate a string according to the locale set for > + the connection. The macro LunderscoreIMPL is used by i18n to > + actually define the inline function when needed. */ > ++#ifdef ENABLE_NLS > + #define L_(a) agent_Lunderscore (ctrl, (a)) > + #define LunderscorePROTO \ > + static inline const char *agent_Lunderscore (ctrl_t ctrl, \ > +@@ -312,6 +313,9 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); > + return ctrl? i18n_localegettext (ctrl->lc_messages, string) \ > + /* */: gettext (string); \ > + } > ++#else > ++#define L_(a) (a) > ++#endif > + > + > + /*-- gpg-agent.c --*/ > +-- > +2.1.4 > + > Closes Differential Revision: https://reviews.freebsd.org/D3096