From owner-svn-ports-head@freebsd.org  Mon Jul 20 13:01:34 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 5197E9A661B;
 Mon, 20 Jul 2015 13:01:34 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D1231153;
 Mon, 20 Jul 2015 13:01:34 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KD1Y7J058674;
 Mon, 20 Jul 2015 13:01:34 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KD1YSU058665;
 Mon, 20 Jul 2015 13:01:34 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201507201301.t6KD1YSU058665@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 20 Jul 2015 13:01:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392566 - head/security/gnupg/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2015 13:01:34 -0000

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 <gniibe@fsij.org>
+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
+