From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  3 14:38:16 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 6172C3B3;
 Thu,  3 Jan 2013 14:38:16 +0000 (UTC)
 (envelope-from crees@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 53A48B4F;
 Thu,  3 Jan 2013 14:38:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r03EcGsX024627;
 Thu, 3 Jan 2013 14:38:16 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r03EcF6N024625;
 Thu, 3 Jan 2013 14:38:15 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201301031438.r03EcF6N024625@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Thu, 3 Jan 2013 14:38:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309883 - in head: japanese/ack textproc/p5-ack
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: Thu, 03 Jan 2013 14:38:16 -0000

Author: crees
Date: Thu Jan  3 14:38:15 2013
New Revision: 309883
URL: http://svnweb.freebsd.org/changeset/ports/309883

Log:
  Register mutual conflict
  
  PR:		ports/174943
  PR:		ports/174941
  Submitted by:	Sebastien Santoro <dereckson@gmail.com>

Modified:
  head/japanese/ack/Makefile
  head/textproc/p5-ack/Makefile

Modified: head/japanese/ack/Makefile
==============================================================================
--- head/japanese/ack/Makefile	Thu Jan  3 14:09:13 2013	(r309882)
+++ head/japanese/ack/Makefile	Thu Jan  3 14:38:15 2013	(r309883)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	ack
-# Date created:		21 Jul 1998
-# Whom:			Masanori Kiriake <seiken@nbs.co.jp>
-#
+# Created by: Masanori Kiriake <seiken@nbs.co.jp>
 # $FreeBSD$
 
 PORTNAME=	ack
@@ -15,6 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kanji code converter
 
+CONFLICTS_INSTALL=	p5-ack-[0-9]*
+
 ALL_TARGET=	ack
 
 MANLANG=	ja

Modified: head/textproc/p5-ack/Makefile
==============================================================================
--- head/textproc/p5-ack/Makefile	Thu Jan  3 14:09:13 2013	(r309882)
+++ head/textproc/p5-ack/Makefile	Thu Jan  3 14:38:15 2013	(r309883)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    p5-ack
-# Date created:				2006/08/15
-# Whom:	      				chinsan <chinsan.tw@gmail.com>
-#
+# Created by: chinsan <chinsan.tw@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ack
 PORTVERSION=	1.96
@@ -21,6 +17,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	ja-ack-[0-9]*
+
 MAN1=		ack.1
 
 OPTIONS_DEFINE=	BASH_COMPLETE