Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Jan 2014 07:05:11 -0800 (PST)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        ohauer@FreeBSD.org, lev@FreeBSD.org
Subject:   ports/185493: [PATCH] devel/subversion: Do not tie the KDE_KWALLET option to NLS
Message-ID:  <52c974a7.eb2e700a.3eca.ffff9ef5@mx.google.com>
Resent-Message-ID: <201401051510.s05FA0Mc043902@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185493
>Category:       ports
>Synopsis:       [PATCH] devel/subversion: Do not tie the KDE_KWALLET option to 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:   Sun Jan 05 15:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Raphael Kubo da Costa
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD orwell 11.0-CURRENT FreeBSD 11.0-CURRENT #5 r259799: Tue Dec 24 03:24:18 EET
>Description:
Ever since Subversion's r1466445 https://svn.apache.org/viewvc?view=revision&revision=1466445, which has been present for the whole 1.8 series, KWallet detection does not depend on NLS support anymore. The attached patch removes the KDE_KWALLET+NLS check from Makefile.common.

Port maintainer (lev@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- subversion-1.8.5.patch begins here ---
diff -ruN /usr/ports/devel/subversion/Makefile.common ./Makefile.common
--- /usr/ports/devel/subversion/Makefile.common	2013-12-30 22:55:18.000000000 +0200
+++ ./Makefile.common	2014-01-05 17:01:03.000000000 +0200
@@ -1,5 +1,5 @@
 # Created by: rooneg@electricjellyfish.net
-# $FreeBSD: devel/subversion/Makefile.common 338168 2013-12-30 20:55:18Z ohauer $
+# $FreeBSD: head/devel/subversion/Makefile.common 338168 2013-12-30 20:55:18Z ohauer $
 
 PORTNAME=	subversion
 PORTVERSION=	1.8.5
@@ -74,10 +74,6 @@
 IGNORE=	to build mod_dontdothat OPTION mod_dav_svn is required
 .endif
 
-.if ${PORT_OPTIONS:MKDE_KWALLET} && !${PORT_OPTIONS:MNLS}
-IGNORE= KWallet requires OPTION NLS set to ON
-.endif
-
 APR_CONFIG=	${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=	${LOCALBASE}/bin/apu-1-config
 
--- subversion-1.8.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52c974a7.eb2e700a.3eca.ffff9ef5>