From owner-svn-ports-all@freebsd.org  Sat Feb  3 17:08:10 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 126A5EDC18E;
 Sat,  3 Feb 2018 17:08:10 +0000 (UTC)
 (envelope-from amdmi3@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 B395572131;
 Sat,  3 Feb 2018 17:08:09 +0000 (UTC)
 (envelope-from amdmi3@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 AD9065E0B;
 Sat,  3 Feb 2018 17:08:09 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w13H899b007075;
 Sat, 3 Feb 2018 17:08:09 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w13H89pn007073;
 Sat, 3 Feb 2018 17:08:09 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201802031708.w13H89pn007073@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 3 Feb 2018 17:08:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r460828 - head/emulators/qemu-sbruno
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/emulators/qemu-sbruno
X-SVN-Commit-Revision: 460828
X-SVN-Commit-Repository: ports
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.25
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: Sat, 03 Feb 2018 17:08:10 -0000

Author: amdmi3
Date: Sat Feb  3 17:08:09 2018
New Revision: 460828
URL: https://svnweb.freebsd.org/changeset/ports/460828

Log:
  - Fix plist
  - Check OPSYS along with OSVERSION
  
  Approved by:	portmgr blanket

Modified:
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu-sbruno/pkg-plist

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Sat Feb  3 17:06:46 2018	(r460827)
+++ head/emulators/qemu-sbruno/Makefile	Sat Feb  3 17:08:09 2018	(r460828)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.11.50.g20171215
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	GH
 PKGNAMESUFFIX?=	-sbruno
@@ -245,7 +245,7 @@ CONFIGURE_ARGS+=	--sparc_cpu=v9
 CONFIGURE_ARGS+=	--python=${PYTHON_CMD}
 
 # clang in freebsd 10 is unable to assemble linuxboot_dma.bin
-.if (${OSVERSION} < 1100000)
+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000)
 PLIST_SUB+=	LINUXBOOT_DMA="@comment "
 .else
 PLIST_SUB+=	LINUXBOOT_DMA=""
@@ -254,7 +254,7 @@ PLIST_SUB+=	LINUXBOOT_DMA=""
 post-patch:
 	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 # clang in freebsd 10 is unable to assemble linuxboot_dma.bin
-.if (${OSVERSION} < 1100000)
+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000)
 	@${REINPLACE_CMD} -E \
 		-e 's|linuxboot_dma.bin||' \
 		${WRKSRC}/pc-bios/optionrom/Makefile

Modified: head/emulators/qemu-sbruno/pkg-plist
==============================================================================
--- head/emulators/qemu-sbruno/pkg-plist	Sat Feb  3 17:06:46 2018	(r460827)
+++ head/emulators/qemu-sbruno/pkg-plist	Sat Feb  3 17:08:09 2018	(r460828)
@@ -47,6 +47,7 @@
 %%SOFTMMU%%@sample etc/qemu-ifdown.sample
 %%SOFTMMU%%man/man1/qemu.1.gz
 %%SOFTMMU%%man/man1/qemu-img.1.gz
+%%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-block-drivers.7.gz
 %%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-ga-ref.7.gz
 %%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-qmp-ref.7.gz
 %%SOFTMMU%%man/man8/qemu-ga.8.gz