From owner-svn-ports-head@FreeBSD.ORG  Fri Aug 31 08:04:00 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADC80106566B;
	Fri, 31 Aug 2012 08:04:00 +0000 (UTC)
	(envelope-from avilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 987E78FC17;
	Fri, 31 Aug 2012 08:04:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7V8406e093689;
	Fri, 31 Aug 2012 08:04:00 GMT (envelope-from avilla@svn.freebsd.org)
Received: (from avilla@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7V840JC093687;
	Fri, 31 Aug 2012 08:04:00 GMT (envelope-from avilla@svn.freebsd.org)
Message-Id: <201208310804.q7V840JC093687@svn.freebsd.org>
From: Alberto Villa <avilla@FreeBSD.org>
Date: Fri, 31 Aug 2012 08:04:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303399 - head/devel/subversion
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 31 Aug 2012 08:04:00 -0000

Author: avilla
Date: Fri Aug 31 08:03:59 2012
New Revision: 303399
URL: http://svn.freebsd.org/changeset/ports/303399

Log:
  - Fix build when WITHOUT_NLS and WITH_KDE_KWALLET are defined together.
  
  PR:		170669
  Submitted by:	avilla (me)
  Approved by:	lev (maintainer timeout: 2 weeks)

Modified:
  head/devel/subversion/Makefile.common   (contents, props changed)

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Fri Aug 31 06:09:26 2012	(r303398)
+++ head/devel/subversion/Makefile.common	Fri Aug 31 08:03:59 2012	(r303399)
@@ -130,7 +130,8 @@ PLIST_SUB+=	SERF="@comment "
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
 .endif
 
-.if !defined(WITHOUT_NLS)
+# KWallet requires NLS to be enabled.
+.if !defined(WITHOUT_NLS) || defined(WITH_KDE_KWALLET)
 USE_GETTEXT=	yes
 PLIST_SUB+=	WITHOUT_GETTEXT=""
 .else