From owner-svn-ports-head@freebsd.org Wed Nov 30 15:23:25 2016 Return-Path: Delivered-To: svn-ports-head@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 B6EE1C5C6F3; Wed, 30 Nov 2016 15:23:25 +0000 (UTC) (envelope-from feld@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 868711BEC; Wed, 30 Nov 2016 15:23:25 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAUFNOfv095878; Wed, 30 Nov 2016 15:23:24 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAUFNOmg095877; Wed, 30 Nov 2016 15:23:24 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201611301523.uAUFNOmg095877@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 30 Nov 2016 15:23:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427430 - head/net-mgmt/rancid3 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2016 15:23:25 -0000 Author: feld Date: Wed Nov 30 15:23:24 2016 New Revision: 427430 URL: https://svnweb.freebsd.org/changeset/ports/427430 Log: net-mgmt/rancid3: Remove obsolete CONFLICTS Reported by: mcl Modified: head/net-mgmt/rancid3/Makefile Modified: head/net-mgmt/rancid3/Makefile ============================================================================== --- head/net-mgmt/rancid3/Makefile Wed Nov 30 14:59:06 2016 (r427429) +++ head/net-mgmt/rancid3/Makefile Wed Nov 30 15:23:24 2016 (r427430) @@ -40,8 +40,6 @@ OPTIONS_DEFAULT= COMWARE_DESC= Add experimental support for Comware devices SVN_DESC= Use Subversion instead of CVS -CONFLICTS= rancid-[0-9]* - .include .if ${PORT_OPTIONS:MCOMWARE}