From owner-svn-ports-all@freebsd.org Tue Jun 21 12:08:11 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A52D6A7BDF0; Tue, 21 Jun 2016 12:08:11 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 769681B8B; Tue, 21 Jun 2016 12:08:11 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5LC8ADK043505; Tue, 21 Jun 2016 12:08:10 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5LC8A28043504; Tue, 21 Jun 2016 12:08:10 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201606211208.u5LC8A28043504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Tue, 21 Jun 2016 12:08:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417203 - head/www/calamaris 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2016 12:08:11 -0000 Author: demon Date: Tue Jun 21 12:08:10 2016 New Revision: 417203 URL: https://svnweb.freebsd.org/changeset/ports/417203 Log: Register conflict with calamaris-devel port. Modified: head/www/calamaris/Makefile Modified: head/www/calamaris/Makefile ============================================================================== --- head/www/calamaris/Makefile Tue Jun 21 12:05:39 2016 (r417202) +++ head/www/calamaris/Makefile Tue Jun 21 12:08:10 2016 (r417203) @@ -12,6 +12,8 @@ COMMENT= Perl script to produce statisti LICENSE= GPLv2 +CONFLICTS_INSTALL= calamaris-devel-[0-9]* + USES= shebangfix perl5 NO_BUILD= yes SHEBANG_FILES= calamaris