From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  2 16:44:12 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 5A90C440;
 Sun,  2 Feb 2014 16:44:12 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 469531A23;
 Sun,  2 Feb 2014 16:44:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12GiCRq033221;
 Sun, 2 Feb 2014 16:44:12 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12GiCfS033220;
 Sun, 2 Feb 2014 16:44:12 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201402021644.s12GiCfS033220@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 2 Feb 2014 16:44:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342335 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
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: Sun, 02 Feb 2014 16:44:12 -0000

Author: ohauer
Date: Sun Feb  2 16:44:11 2014
New Revision: 342335
URL: http://svnweb.freebsd.org/changeset/ports/342335
QAT: https://qat.redports.org/buildarchive/r342335/

Log:
  - fix conflict

Modified:
  head/devel/subversion/Makefile

Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Sun Feb  2 16:40:08 2014	(r342334)
+++ head/devel/subversion/Makefile	Sun Feb  2 16:44:11 2014	(r342335)
@@ -4,7 +4,7 @@
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
-_CONFLICTS_INSTALL=	subversion-1.[^8].[0-9]* \
+CONFLICTS_INSTALL=	subversion-1.[^8].[0-9]* \
 			subversion1[^8]-1.[^8].[0-9]*
 
 USE_RC_SUBR=	svnserve