Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Feb 2018 17:08:09 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r460828 - head/emulators/qemu-sbruno
Message-ID:  <201802031708.w13H89pn007073@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802031708.w13H89pn007073>