From owner-svn-ports-head@FreeBSD.ORG  Mon Sep 23 21:15:45 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5121C696;
 Mon, 23 Sep 2013 21:15:45 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
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 3D65E2A41;
 Mon, 23 Sep 2013 21:15:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NLFjHc072154;
 Mon, 23 Sep 2013 21:15:45 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NLFiUC072152;
 Mon, 23 Sep 2013 21:15:44 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201309232115.r8NLFiUC072152@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 23 Sep 2013 21:15:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328052 - in head/astro: boinc-setiathome-enhanced
 boinc-setiathome-v7
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Sep 2013 21:15:45 -0000

Author: rene
Date: Mon Sep 23 21:15:44 2013
New Revision: 328052
URL: http://svnweb.freebsd.org/changeset/ports/328052

Log:
  Register mutual conflicts

Modified:
  head/astro/boinc-setiathome-enhanced/Makefile
  head/astro/boinc-setiathome-v7/Makefile

Modified: head/astro/boinc-setiathome-enhanced/Makefile
==============================================================================
--- head/astro/boinc-setiathome-enhanced/Makefile	Mon Sep 23 21:04:56 2013	(r328051)
+++ head/astro/boinc-setiathome-enhanced/Makefile	Mon Sep 23 21:15:44 2013	(r328052)
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	Project is switching, use astro/boinc-setiathome-v7 instead
 
+CONFLICTS=	boinc-setiathome-v7-[0-9]*
+
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
 LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float

Modified: head/astro/boinc-setiathome-v7/Makefile
==============================================================================
--- head/astro/boinc-setiathome-v7/Makefile	Mon Sep 23 21:04:56 2013	(r328051)
+++ head/astro/boinc-setiathome-v7/Makefile	Mon Sep 23 21:15:44 2013	(r328052)
@@ -14,6 +14,8 @@ COMMENT=	Setiathome Enhanced for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS=	boinc-setiathome-enhanced-[0-9]*
+
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
 LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float