From owner-svn-ports-head@FreeBSD.ORG  Fri Jun  5 07:07:56 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC985133;
 Fri,  5 Jun 2015 07:07:56 +0000 (UTC)
 (envelope-from marino@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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA6121446;
 Fri,  5 Jun 2015 07:07:56 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5577u9W017376;
 Fri, 5 Jun 2015 07:07:56 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5577ur0017375;
 Fri, 5 Jun 2015 07:07:56 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201506050707.t5577ur0017375@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Fri, 5 Jun 2015 07:07:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388571 - head/lang/modula3
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.20
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: Fri, 05 Jun 2015 07:07:56 -0000

Author: marino
Date: Fri Jun  5 07:07:55 2015
New Revision: 388571
URL: https://svnweb.freebsd.org/changeset/ports/388571

Log:
  lang/modula3: Remove CONFLICTS definition
  
  When the base install moved from $LOCALBASE to $LOCALBASE/cm3, the
  conflict with cvsup disappeared.  The conflict wasn't current anyway,
  it should have been moved to net/cvsup-static as the original cvsup
  ports were removed within the last year.

Modified:
  head/lang/modula3/Makefile

Modified: head/lang/modula3/Makefile
==============================================================================
--- head/lang/modula3/Makefile	Fri Jun  5 05:49:38 2015	(r388570)
+++ head/lang/modula3/Makefile	Fri Jun  5 07:07:55 2015	(r388571)
@@ -23,7 +23,6 @@ DST1=		m3-bootstrap.AMD64.FREEBSD.92.tar
 DST2=		m3-bootstrap.x86_64.DRAGONFLY.36.tar.bz2:boot
 
 ONLY_FOR_ARCHS=		amd64
-CONFLICTS_INSTALL=	binary-cvsup-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	modula3