Date: Thu, 3 Jan 2013 14:38:15 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> 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 Message-ID: <201301031438.r03EcF6N024625@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301031438.r03EcF6N024625>