emulators/qemu-devel: Update to snapshot 20230630

- Sanitize some of the pkg-message
- Remove some unnecessary dependency

3 files changed, 40 insertions, 35 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index e7f1b8f5e023..626e11cc7a78 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qemu
-DISTVERSION=	8.2.0.20230531
+DISTVERSION=	8.2.0.20230630
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -16,26 +16,26 @@ BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 		bash:shells/bash
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
-		libnettle.so:security/nettle \
-		libpcre2-8.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
 
 USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t ninja perl5 \
-		pkgconfig python:build tar:xz xorg
+		pkgconfig python:build shebangfix tar:xz xorg
 USE_GITLAB=	yes
 USE_GNOME=	cairo glib20 libxml2
 USE_PERL5=	build
 USE_PYTHON=	distutils noflavors
 USE_XORG=	pixman
 
+SHEBANG_FILES=	scripts/xml-preprocess.py
+
 GL_ACCOUNT=	qemu-project
-GL_TAGNAME=	9824490dede64c1398b6a52095e5d22040529250
+GL_TAGNAME=	d39a84b7348faa5cd6b09921b57969482ca4c543
 GL_TUPLE=	qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \
 		qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \
 		qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \
-		qemu-project:meson:cb0b6352b5b3fe548f2148999b4072eac76ff465:meson/meson \
-		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \
-		qemu-project:berkeley-testfloat-3:40619cbb3bf32872df8c53cc457039229428a263:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
+		qemu-project:meson:9067139acb5f133e08ed15eba8a6d41246200b5b:meson/meson \
+		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \
+		qemu-project:berkeley-testfloat-3:40619cbb3bf32872df8c53cc457039229428a263:berkeleytestfloat3/subprojects/berkeley-testfloat-3
 
 HAS_CONFIGURE=	yes
 
@@ -142,6 +142,12 @@ CONFIGURE_ARGS+=	--sparc_cpu=v9
 
 PLIST_SUB+=	LINUXBOOT_DMA=""
 
+post-extract:
+	${CP} ${WRKSRC}/subprojects/packagefiles/berkeley-softfloat-3/* \
+		${WRKSRC}/subprojects/berkeley-softfloat-3/
+	${CP} ${WRKSRC}/subprojects/packagefiles/berkeley-testfloat-3/* \
+		${WRKSRC}/subprojects/berkeley-testfloat-3/
+
 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 95af03e8d869..b98e45fd1e7d 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1695495134
-SHA256 (qemu/8.2.0.20230531/qemu-project-qemu-9824490dede64c1398b6a52095e5d22040529250_GL0.tar.gz) = 90ca97eefb00b0b26226ceb18d23c81d540a6de0a377dbcf73de4854863499ed
-SIZE (qemu/8.2.0.20230531/qemu-project-qemu-9824490dede64c1398b6a52095e5d22040529250_GL0.tar.gz) = 36800088
-SHA256 (qemu/8.2.0.20230531/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
-SIZE (qemu/8.2.0.20230531/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
-SHA256 (qemu/8.2.0.20230531/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
-SIZE (qemu/8.2.0.20230531/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
-SHA256 (qemu/8.2.0.20230531/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
-SIZE (qemu/8.2.0.20230531/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
-SHA256 (qemu/8.2.0.20230531/qemu-project-meson-cb0b6352b5b3fe548f2148999b4072eac76ff465_GL0.tar.gz) = e133564389ddffa531d04e48b84c8d5f9e00a88b9c001c710a3a851b74ed1779
-SIZE (qemu/8.2.0.20230531/qemu-project-meson-cb0b6352b5b3fe548f2148999b4072eac76ff465_GL0.tar.gz) = 4656019
-SHA256 (qemu/8.2.0.20230531/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/8.2.0.20230531/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/8.2.0.20230531/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = e1374054bc43d75436f1454f92a2e4208046858ee03086d1f2dc5de6d09a3d66
-SIZE (qemu/8.2.0.20230531/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = 139281
+TIMESTAMP = 1695554498
+SHA256 (qemu/8.2.0.20230630/qemu-project-qemu-d39a84b7348faa5cd6b09921b57969482ca4c543_GL0.tar.gz) = bbc7f03c310462b91523bf1a4313a296cee60cbfa7ccdb7d3d5c6d85e17be5ad
+SIZE (qemu/8.2.0.20230630/qemu-project-qemu-d39a84b7348faa5cd6b09921b57969482ca4c543_GL0.tar.gz) = 36907702
+SHA256 (qemu/8.2.0.20230630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
+SIZE (qemu/8.2.0.20230630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
+SHA256 (qemu/8.2.0.20230630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
+SIZE (qemu/8.2.0.20230630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
+SHA256 (qemu/8.2.0.20230630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
+SIZE (qemu/8.2.0.20230630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
+SHA256 (qemu/8.2.0.20230630/qemu-project-meson-9067139acb5f133e08ed15eba8a6d41246200b5b_GL0.tar.gz) = 0ba61decdf3c5678e3f79896b0c5b3c8f8341b326836ef5592842dd048201a33
+SIZE (qemu/8.2.0.20230630/qemu-project-meson-9067139acb5f133e08ed15eba8a6d41246200b5b_GL0.tar.gz) = 4694698
+SHA256 (qemu/8.2.0.20230630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/8.2.0.20230630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/8.2.0.20230630/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = e1374054bc43d75436f1454f92a2e4208046858ee03086d1f2dc5de6d09a3d66
+SIZE (qemu/8.2.0.20230630/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = 139281
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index 505d43c65f2a..42b5a63da5e4 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -5,18 +5,17 @@ FreeBSD host notes
 ==================
 
 - Needs to set net.link.tap.user_open sysctl in order to use /dev/tap*
-  networking as non-root.  Don't forget to adjust device node permissions in
-  /etc/devfs.rules.
+  networking as non-root.  Don't forget to adjust device node
+  permissions in /etc/devfs.rules.
 
-- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests you
-  still have to manually do: echo nameserver 10.0.2.3 >/etc/resolv.conf but
-  i've been told that that's normal.  (fixed on FreeSBIE 1.1.) And you have
-  to wait a bit for dhclient to do its thing; traffic to address 10.0.2.2 is
-  routed to 127.1 on the host.
+- slirp (usermode networking) is fixed now, you still have to manually
+  do: echo nameserver 10.0.2.3 >/etc/resolv.conf but that is normal. And
+  you have to wait a bit for dhclient to do its thing; traffic to
+  address 10.0.2.2 is routed to 127.1 on the host.
 
-- The -smb option (smb-export local dir to guest using the default
-  slirp networking) needs the samba port/package installed
-  in addition to qemu. (SAMBA knob.)
+- The -smb option (smb-export local dir to guest using the default slirp
+  networking) needs the samba port/package installed in addition to
+  qemu. (SAMBA knob.)
 
 - If you want to use usb devices connected to the host in the guest
   yot need either recent 10-current (not tested yet much) or you can
@@ -33,8 +32,8 @@ FreeBSD host notes
 
 	devfs_system_ruleset="ugen_ruleset"
 
-- If you want to test the new (in 0.15.0) usb network redirection (USBREDIR
-  option) see this thread by Hans de Goede <hdegoede <at> redhat.com>:
+- If you want to test the new usb network redirection (USBREDIR option)
+  see this thread by Hans de Goede <hdegoede <at> redhat.com>:
 
 	http://thread.gmane.org/gmane.comp.emulators.qemu/110176/focus=110183