From owner-svn-ports-all@FreeBSD.ORG  Thu Mar  6 10:08:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D220AC76;
 Thu,  6 Mar 2014 10:08:06 +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 BE7D4B7B;
 Thu,  6 Mar 2014 10:08:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26A86HH020934;
 Thu, 6 Mar 2014 10:08:06 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26A86Ws020933;
 Thu, 6 Mar 2014 10:08:06 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201403061008.s26A86Ws020933@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 6 Mar 2014 10:08:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347179 - head/textproc/xerces-c3
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.17
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: Thu, 06 Mar 2014 10:08:06 -0000

Author: gahr
Date: Thu Mar  6 10:08:06 2014
New Revision: 347179
URL: http://svnweb.freebsd.org/changeset/ports/347179
QAT: https://qat.redports.org/buildarchive/r347179/

Log:
  - Fix CONFLICTS line
  
  Suggested by:	thierry

Modified:
  head/textproc/xerces-c3/Makefile

Modified: head/textproc/xerces-c3/Makefile
==============================================================================
--- head/textproc/xerces-c3/Makefile	Thu Mar  6 09:55:40 2014	(r347178)
+++ head/textproc/xerces-c3/Makefile	Thu Mar  6 10:08:06 2014	(r347179)
@@ -12,7 +12,7 @@ DISTNAME=	xerces-c-${PORTVERSION}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Validating XML parser from the Apache XML Project
 
-CONFLICTS=	xerces_c-[0-9]* xerces-c2-[0-9]*
+CONFLICTS=	xerces-c2-[0-9]* xerces-c2-devel-[0-9]*
 
 USES=		gmake pathfix
 USE_LDCONFIG=	yes