5 files changed, 138 insertions, 47 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 4d94d10a2cad..0c4e38e6a9ae 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-DISTVERSION=	5.1.0.20200909
+DISTVERSION=	5.1.0.20201019
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -15,23 +15,25 @@ LICENSE=	GPLv2
 ONLY_FOR_ARCHS=	amd64 powerpc powerpc64
 IGNORE_FreeBSD_11=	Unable to produce Position Independent Code
 
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 LIB_DEPENDS=	libnettle.so:security/nettle \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libepoxy.so:graphics/libepoxy \
 		libpcre2-8.so:devel/pcre2
 
-USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \
+USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t ninja perl5 \
 		pkgconfig python:build tar:xz xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo glib20 libxml2
 USE_PERL5=	build
+USE_PYTHON=	distutils noflavors
 USE_XORG=	pixman
 
-GH_TUPLE=	qemu:qemu:9435a8b \
+GH_TUPLE=	qemu:qemu:22d30b3 \
 		qemu:keycodemapdb:6b3d716:keycodemapdb/ui/keycodemapdb \
 		qemu:dtc:85e5d83:dtc/dtc \
-		mesonbuild:meson:68ed748:meson/meson \
+		mesonbuild:meson:776acd2:meson/meson \
 		cota:berkeley-softfloat-3:b64af41:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \
 		cota:berkeley-testfloat-3:5a59dce:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
 #BROKEN_powerpc64=	fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault
@@ -67,8 +69,6 @@ CAPSTONE_CONFIGURE_OFF=	--disable-capstone
 CAPSTONE_LIB_DEPENDS=	libcapstone.so:devel/capstone4
 CURL_CONFIGURE_OFF=	--disable-curl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
-			sphinx-build:textproc/py-sphinx
 DOCS_CONFIGURE_ENABLE=	docs
 DOCS_USES=		makeinfo
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
@@ -111,7 +111,7 @@ WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS=	--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
 		--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
-		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
+		--prefix=${PREFIX} --cc=${CC} --enable-netmap --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}\\\"\"
@@ -141,11 +141,6 @@ CONFIGURE_ARGS+=	--sparc_cpu=v9
 
 PLIST_SUB+=	LINUXBOOT_DMA=""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/qemu-ifup|${PREFIX}/etc/qemu-ifup|' \
-		-e 's|/etc/qemu-ifdown|${PREFIX}/etc/qemu-ifdown|' \
-		${WRKSRC}/include/net/net.h
-
 post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h
 
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 7bf46537b018..19632a907c84 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1599741546
-SHA256 (qemu/5.1.0.20200909/qemu-qemu-5.1.0.20200909-9435a8b_GH0.tar.gz) = c1a6fef66638e4c691e340e56fac64b43088020c02578931a540931ba00b3746
-SIZE (qemu/5.1.0.20200909/qemu-qemu-5.1.0.20200909-9435a8b_GH0.tar.gz) = 29466042
-SHA256 (qemu/5.1.0.20200909/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
-SIZE (qemu/5.1.0.20200909/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905
-SHA256 (qemu/5.1.0.20200909/qemu-dtc-85e5d83_GH0.tar.gz) = 3507d8e96d1942493128591b518c522cfd56d7779ce53283b2cf33661b809479
-SIZE (qemu/5.1.0.20200909/qemu-dtc-85e5d83_GH0.tar.gz) = 200566
-SHA256 (qemu/5.1.0.20200909/mesonbuild-meson-68ed748_GH0.tar.gz) = 4e49eae5684774dbe5503c4fccb8b3e8744d2c9dc4ad5ae489a5d8f21cedc7ac
-SIZE (qemu/5.1.0.20200909/mesonbuild-meson-68ed748_GH0.tar.gz) = 2309591
-SHA256 (qemu/5.1.0.20200909/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = f22bf52cc980b122c663f2e22f8098fa60d8e468e0095f1da58231235a6b324e
-SIZE (qemu/5.1.0.20200909/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = 148768
-SHA256 (qemu/5.1.0.20200909/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 3bfd602c8563bc05b540aa4d50e3231b283bf4fddc67e9edb80bf9bcb617df4a
-SIZE (qemu/5.1.0.20200909/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 138950
+TIMESTAMP = 1603111978
+SHA256 (qemu/5.1.0.20201019/qemu-qemu-5.1.0.20201019-22d30b3_GH0.tar.gz) = 9cbcb93fb7e85f6ce127e1a33eaf2fa3f4d7e87c0bc114fc7b1d5f867cb27ef1
+SIZE (qemu/5.1.0.20201019/qemu-qemu-5.1.0.20201019-22d30b3_GH0.tar.gz) = 30079609
+SHA256 (qemu/5.1.0.20201019/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
+SIZE (qemu/5.1.0.20201019/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905
+SHA256 (qemu/5.1.0.20201019/qemu-dtc-85e5d83_GH0.tar.gz) = 3507d8e96d1942493128591b518c522cfd56d7779ce53283b2cf33661b809479
+SIZE (qemu/5.1.0.20201019/qemu-dtc-85e5d83_GH0.tar.gz) = 200566
+SHA256 (qemu/5.1.0.20201019/mesonbuild-meson-776acd2_GH0.tar.gz) = ee215c525f388753237680fdaba51d4e8730482722061e1946176cd7fa980ac8
+SIZE (qemu/5.1.0.20201019/mesonbuild-meson-776acd2_GH0.tar.gz) = 2310127
+SHA256 (qemu/5.1.0.20201019/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = f22bf52cc980b122c663f2e22f8098fa60d8e468e0095f1da58231235a6b324e
+SIZE (qemu/5.1.0.20201019/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = 148768
+SHA256 (qemu/5.1.0.20201019/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 3bfd602c8563bc05b540aa4d50e3231b283bf4fddc67e9edb80bf9bcb617df4a
+SIZE (qemu/5.1.0.20201019/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 138950
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index 1345fda4a379..e637e548f6c1 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2020-09-08 20:21:13 UTC
+--- configure.orig	2020-10-19 09:52:57 UTC
 +++ configure
-@@ -1640,7 +1647,7 @@ if test "$mingw32" = "yes" ; then
+@@ -1534,7 +1534,7 @@ if test "$mingw32" = "yes" ; then
      sysconfdir="$prefix"
      local_statedir=
  else
@@ -9,7 +9,7 @@
      datadir="${datadir:-$prefix/share}"
      docdir="${docdir:-$prefix/share/doc}"
      bindir="${bindir:-$prefix/bin}"
-@@ -3279,6 +3286,14 @@ if check_include "sys/signal.h" ; then
+@@ -3112,6 +3112,14 @@ if check_include "sys/signal.h" ; then
  fi
  
  ##########################################
@@ -24,22 +24,7 @@
  # VTE probe
  
  if test "$vte" != "no"; then
-@@ -4870,14 +4885,6 @@ if test "$docs" != "no" ; then
-   fi
-   if has makeinfo && has pod2man && test "$sphinx_ok" = "yes"; then
-     docs=yes
--  else
--    if test "$docs" = "yes" ; then
--      if has $sphinx_build && test "$sphinx_ok" != "yes"; then
--        echo "Warning: $sphinx_build exists but it is either too old or uses too old a Python version" >&2
--      fi
--      feature_not_found "docs" "Install texinfo, Perl/perl-podlators and a Python 3 version of python-sphinx"
--    fi
--    docs=no
-   fi
- fi
- 
-@@ -4993,7 +5000,7 @@ fi
+@@ -4522,7 +4530,7 @@ fi
  
  # check for libusb
  if test "$libusb" != "no" ; then
@@ -48,7 +33,7 @@
          libusb="yes"
          libusb_cflags=$($pkg_config --cflags libusb-1.0)
          libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -6864,6 +6927,9 @@ fi
+@@ -6226,6 +6234,9 @@ fi
  # if this macro is set.
  if test "$have_fsxattr" = "yes" ; then
      echo "HAVE_FSXATTR=y" >> $config_host_mak
diff --git a/emulators/qemu-devel/files/patch-docs_meson.build b/emulators/qemu-devel/files/patch-docs_meson.build
new file mode 100644
index 000000000000..981e0eab746f
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-docs_meson.build
@@ -0,0 +1,79 @@
+--- docs/meson.build.orig	2020-10-19 13:41:20 UTC
++++ docs/meson.build
+@@ -1,9 +1,9 @@
+ if get_option('sphinx_build') == ''
+   sphinx_build = find_program(['sphinx-build-3', 'sphinx-build'],
+-                              required: get_option('docs'))
++                              required: true)
+ else
+   sphinx_build = find_program(get_option('sphinx_build'),
+-                              required: get_option('docs'))
++                              required: true)
+ endif
+ 
+ # Check if tools are available to build documentation.
+@@ -26,12 +26,6 @@ if sphinx_build.found()
+     tmpdir / 'sphinx/out'])
+   build_docs = (sphinx_build_test_out.returncode() == 0)
+ 
+-  if not build_docs
+-    warning('@0@ exists but it is either too old or uses too old a Python version'.format(get_option('sphinx_build')))
+-    if get_option('docs').enabled()
+-      error('Install a Python 3 version of python-sphinx')
+-    endif
+-  endif
+ endif
+ 
+ if build_docs
+@@ -111,5 +105,51 @@ if build_docs
+   endforeach
+   alias_target('sphinxdocs', sphinxdocs)
+   alias_target('html', sphinxdocs)
++  alias_target('man', sphinxmans)
++else
++  manuals = [ 'interop', 'tools', 'system' ]
++  man_pages = {
++    'interop' : {
++        'qemu-ga.8': (have_tools ? 'man8' : ''),
++        'qemu-ga-ref.7': 'man7',
++        'qemu-qmp-ref.7': 'man7',
++    },
++    'tools': {
++        'qemu-img.1': (have_tools ? 'man1' : ''),
++        'qemu-nbd.8': (have_tools ? 'man8' : ''),
++        'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
++        'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
++        'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
++    },
++    'system': {
++        'qemu.1': 'man1',
++        'qemu-block-drivers.7': 'man7',
++        'qemu-cpu-models.7': 'man7'
++    },
++  }
++
++  sphinxmans = []
++  foreach manual : manuals
++    private_dir = meson.current_build_dir() / (manual + '.p')
++    output_dir = meson.current_build_dir() / manual
++    input_dir = meson.current_source_dir() / manual
++
++    these_man_pages = []
++    install_dirs = []
++    foreach page, section : man_pages.get(manual, {})
++      these_man_pages += page
++      install_dirs += section == '' ? false : get_option('mandir') / section
++    endforeach
++    if these_man_pages.length() > 0
++      sphinxmans += custom_target(manual + ' man pages',
++                         build_by_default: build_docs,
++                         output: these_man_pages,
++                         input: this_manual,
++                         install: build_docs,
++                         install_dir: install_dirs,
++                         command: [SPHINX_ARGS, '-b', 'man', '-d', private_dir,
++                                   input_dir, meson.current_build_dir()])
++    endif
++  endforeach
+   alias_target('man', sphinxmans)
+ endif
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index dac716b355a0..c9617a4014d3 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -16,7 +16,6 @@ bin/qemu-storage-daemon
 %%NO_X86_TARGETS%%bin/qemu-system-cris
 %%NO_X86_TARGETS%%bin/qemu-system-hppa
 bin/qemu-system-i386
-%%NO_X86_TARGETS%%bin/qemu-system-lm32
 %%NO_X86_TARGETS%%bin/qemu-system-m68k
 %%NO_X86_TARGETS%%bin/qemu-system-microblaze
 %%NO_X86_TARGETS%%bin/qemu-system-microblazeel
@@ -38,7 +37,6 @@ bin/qemu-system-i386
 %%NO_X86_TARGETS%%bin/qemu-system-sparc
 %%NO_X86_TARGETS%%bin/qemu-system-sparc64
 %%NO_X86_TARGETS%%bin/qemu-system-tricore
-%%NO_X86_TARGETS%%bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 %%NO_X86_TARGETS%%bin/qemu-system-xtensa
 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
@@ -83,11 +81,44 @@ man/man8/qemu-nbd.8.gz
 %%DATADIR%%/firmware/60-edk2-i386.json
 %%DATADIR%%/firmware/60-edk2-x86_64.json
 %%DATADIR%%/hppa-firmware.img
+%%DATADIR%%/keymaps/ar
+%%DATADIR%%/keymaps/bepo
+%%DATADIR%%/keymaps/cz
+%%DATADIR%%/keymaps/da
+%%DATADIR%%/keymaps/de
+%%DATADIR%%/keymaps/de-ch
+%%DATADIR%%/keymaps/en-gb
+%%DATADIR%%/keymaps/en-us
+%%DATADIR%%/keymaps/es
+%%DATADIR%%/keymaps/et
+%%DATADIR%%/keymaps/fi
+%%DATADIR%%/keymaps/fo
+%%DATADIR%%/keymaps/fr
+%%DATADIR%%/keymaps/fr-be
+%%DATADIR%%/keymaps/fr-ca
+%%DATADIR%%/keymaps/fr-ch
+%%DATADIR%%/keymaps/hr
+%%DATADIR%%/keymaps/hu
+%%DATADIR%%/keymaps/is
+%%DATADIR%%/keymaps/it
+%%DATADIR%%/keymaps/ja
+%%DATADIR%%/keymaps/lt
+%%DATADIR%%/keymaps/lv
+%%DATADIR%%/keymaps/mk
+%%DATADIR%%/keymaps/nl
+%%DATADIR%%/keymaps/no
+%%DATADIR%%/keymaps/pl
+%%DATADIR%%/keymaps/pt
+%%DATADIR%%/keymaps/pt-br
+%%DATADIR%%/keymaps/ru
 %%DATADIR%%/keymaps/sl
 %%DATADIR%%/keymaps/sv
+%%DATADIR%%/keymaps/th
+%%DATADIR%%/keymaps/tr
 %%DATADIR%%/linuxboot.bin
 %%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
 %%DATADIR%%/multiboot.bin
+%%DATADIR%%/npcm7xx_bootrom.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
@@ -103,6 +134,7 @@ man/man8/qemu-nbd.8.gz
 %%DATADIR%%/pxe-rtl8139.rom
 %%DATADIR%%/pxe-pcnet.rom
 %%DATADIR%%/pxe-virtio.rom
+%%DATADIR%%/qboot.rom
 %%DATADIR%%/qemu-nsis.bmp
 %%DATADIR%%/qemu_vga.ndrv
 %%DATADIR%%/s390-ccw.img