From owner-svn-ports-all@freebsd.org  Tue Jan 26 19:23:12 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 E5F0BA6ED27;
 Tue, 26 Jan 2016 19:23:12 +0000 (UTC)
 (envelope-from sbruno@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 B7A2CFEA;
 Tue, 26 Jan 2016 19:23:12 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QJNBLl034585;
 Tue, 26 Jan 2016 19:23:11 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QJNB5t034584;
 Tue, 26 Jan 2016 19:23:11 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201601261923.u0QJNB5t034584@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 26 Jan 2016 19:23:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407293 - head/emulators/qemu
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 19:23:13 -0000

Author: sbruno
Date: Tue Jan 26 19:23:11 2016
New Revision: 407293
URL: https://svnweb.freebsd.org/changeset/ports/407293

Log:
  Typo in CONFLICTS noted by brooks.
  
  Submitted by:	brooks

Modified:
  head/emulators/qemu/Makefile

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Tue Jan 26 19:20:50 2016	(r407292)
+++ head/emulators/qemu/Makefile	Tue Jan 26 19:23:11 2016	(r407293)
@@ -67,7 +67,7 @@ DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 
 .if !defined(QEMU_USER_STATIC)
-CONFLICTS_INSTALL=	qemu--devel-[0-9]* qemu-sbruno-[0-9]*
+CONFLICTS_INSTALL=	qemu-devel-[0-9]* qemu-sbruno-[0-9]*
 .endif
 
 PORTDOCS=	docs qemu-doc.html qemu-tech.html qmp-commands.txt