svn commit: r492812 - in head/emulators/qemu: . files

[Muhammad Moinur Rahman]

Author: bofh
Date: Tue Feb 12 21:48:12 2019
New Revision: 492812
URL: https://svnweb.freebsd.org/changeset/ports/492812

Log:
  emulators/qemu: Add NETMAP support
  
  - Build qemu-guest-agent without unused libs [1]
  - Fix build with DOCS disabled [2]
  
  PR:		232949 [1] 230204 [2]
  Submitted by:	zhecka at gmail.com [1] dewayne at heuristicsystems.com.au [2]
  Reported by:	vmaffione

Modified:
  head/emulators/qemu/Makefile
  head/emulators/qemu/files/patch-Makefile

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Tue Feb 12 21:40:13 2019	(r492811)
+++ head/emulators/qemu/Makefile	Tue Feb 12 21:48:12 2019	(r492812)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -19,16 +19,18 @@ LIB_DEPENDS?=	libnettle.so:security/nettle \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-HAS_CONFIGURE=	yes
-USES?=		cpe gmake pkgconfig bison perl5 python:2.7,build tar:xz
-USE_PERL5=	build
-MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
-.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils"
+.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
+ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
 USE_XORG=	pixman
 USE_GNOME+=	cairo glib20 libxml2
-ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
 .endif
 
+USES?=		cpe gl gmake gnome pkgconfig bison perl5 python:2.7,build tar:xz
+USE_PERL5=	build
+
+HAS_CONFIGURE=	yes
+MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
+
 OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
 		VDE CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
 		STATIC_LINK DOCS NCURSES
@@ -61,7 +63,7 @@ PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_OFF=	--disable-vnc-png
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
-OPENGL_USE=	GL=yes
+OPENGL_USE=	GL=glu
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:net/usbredir
 USBREDIR_RUN_DEPENDS=	usbredir>=0.6:net/usbredir
@@ -88,7 +90,7 @@ WITHOUT_CPU_CFLAGS=yes	#to avoid problems with registe
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
 		--extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh2 --enable-debug \
-		--prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \
+		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--enable-debug-info --python=${PYTHON_CMD} \
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"

Modified: head/emulators/qemu/files/patch-Makefile
==============================================================================
--- head/emulators/qemu/files/patch-Makefile	Tue Feb 12 21:40:13 2019	(r492811)
+++ head/emulators/qemu/files/patch-Makefile	Tue Feb 12 21:48:12 2019	(r492812)
@@ -6,13 +6,13 @@
  ifdef BUILD_DOCS
 +ifdef NOPORTDOCS
 +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
-+DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7
++DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7
 +else
  DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
  DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
  DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
- DOCS+=docs/qemu-block-drivers.7
 +endif
+ DOCS+=docs/qemu-block-drivers.7
  ifdef CONFIG_VIRTFS
  DOCS+=fsdev/virtfs-proxy-helper.1
  endif