From owner-svn-ports-all@FreeBSD.ORG  Mon May  6 13:27:41 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 8322BA65;
 Mon,  6 May 2013 13:27:41 +0000 (UTC) (envelope-from az@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7501F3E4;
 Mon,  6 May 2013 13:27:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46DRfUN001956;
 Mon, 6 May 2013 13:27:41 GMT (envelope-from az@svn.freebsd.org)
Received: (from az@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46DRfDY001955;
 Mon, 6 May 2013 13:27:41 GMT (envelope-from az@svn.freebsd.org)
Message-Id: <201305061327.r46DRfDY001955@svn.freebsd.org>
From: Andrej Zverev <az@FreeBSD.org>
Date: Mon, 6 May 2013 13:27:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317512 - head/lang/perl5.14
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.14
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, 06 May 2013 13:27:41 -0000

Author: az
Date: Mon May  6 13:27:40 2013
New Revision: 317512
URL: http://svnweb.freebsd.org/changeset/ports/317512

Log:
  - Fix CONFLICTS

Modified:
  head/lang/perl5.14/Makefile

Modified: head/lang/perl5.14/Makefile
==============================================================================
--- head/lang/perl5.14/Makefile	Mon May  6 13:09:20 2013	(r317511)
+++ head/lang/perl5.14/Makefile	Mon May  6 13:27:40 2013	(r317512)
@@ -20,7 +20,7 @@ COMMENT=	Practical Extraction and Report
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-CONFLICTS=	perl-5.10.* perl-threaded-5.10.* \
+CONFLICTS=	perl-5.16.* perl-threaded-5.16.* \
 		perl-5.12.* perl-threaded-5.12.*
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \