From owner-svn-ports-head@freebsd.org  Mon Jan 22 21:12:28 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
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 2BAA7ED61E9;
 Mon, 22 Jan 2018 21:12:28 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0627F6F4C1;
 Mon, 22 Jan 2018 21:12:28 +0000 (UTC)
 (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4456B1F927;
 Mon, 22 Jan 2018 21:12:27 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0MLCRW4050576;
 Mon, 22 Jan 2018 21:12:27 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0MLCRib050575;
 Mon, 22 Jan 2018 21:12:27 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201801222112.w0MLCRib050575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 22 Jan 2018 21:12:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r459702 - head/sysutils/beadm-devel
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/sysutils/beadm-devel
X-SVN-Commit-Revision: 459702
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2018 21:12:28 -0000

Author: bdrewery
Date: Mon Jan 22 21:12:26 2018
New Revision: 459702
URL: https://svnweb.freebsd.org/changeset/ports/459702

Log:
  Fix conflict line

Modified:
  head/sysutils/beadm-devel/Makefile

Modified: head/sysutils/beadm-devel/Makefile
==============================================================================
--- head/sysutils/beadm-devel/Makefile	Mon Jan 22 21:11:59 2018	(r459701)
+++ head/sysutils/beadm-devel/Makefile	Mon Jan 22 21:12:26 2018	(r459702)
@@ -19,7 +19,7 @@ GH_TAGNAME=	e55f535b589fb2df4e65e51482e29337b564b756
 
 NO_BUILD=	YES
 
-CONFLICTS_INSTALL=	beadm-[0-9]-*
+CONFLICTS_INSTALL=	beadm-[0-9]*
 
 PLIST_FILES=	sbin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz