From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 30 14:24:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 82E3FEC;
 Mon, 30 Jun 2014 14:24:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 704542D00;
 Mon, 30 Jun 2014 14:24:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UEO5Up024661;
 Mon, 30 Jun 2014 14:24:05 GMT (envelope-from lev@svn.freebsd.org)
Received: (from lev@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UEO5Co024658;
 Mon, 30 Jun 2014 14:24:05 GMT (envelope-from lev@svn.freebsd.org)
Message-Id: <201406301424.s5UEO5Co024658@svn.freebsd.org>
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Mon, 30 Jun 2014 14:24:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359849 - head/devel/subversion
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jun 2014 14:24:05 -0000

Author: lev
Date: Mon Jun 30 14:24:04 2014
New Revision: 359849
URL: http://svnweb.freebsd.org/changeset/ports/359849
QAT: https://qat.redports.org/buildarchive/r359849/

Log:
   Fix KWallet / GNOMe Keyring integration: eanble code in "main" libraries
   as it doesn't call any functions from KWallet/Keyring directly but
   should be enabled to load plugins dynamically.
  
  PR:	191463
  Submitted by:	Raphael Kubo da Costa

Modified:
  head/devel/subversion/Makefile

Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Mon Jun 30 14:18:17 2014	(r359848)
+++ head/devel/subversion/Makefile	Mon Jun 30 14:24:04 2014	(r359849)
@@ -1,6 +1,7 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
+PORTREVISION=	6
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
@@ -145,6 +146,8 @@ pre-configure:
 .endif
 
 post-configure:
+# Enable GNOME Keyring / KWallet support in main code, as it is harmless
+	@${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h
 # ugly hack: save tools directory so we don't have to cleanup before installing
 	@${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples
 	@${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples