CVS commit: pkgsrc/emulators/qemu

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Jul 10 06:52:48 UTC 2024

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
        pkgsrc/emulators/qemu/patches: patch-target_i386_nvmm_nvmm-all.c
Added Files:
        pkgsrc/emulators/qemu/patches: patch-qemu-options.hx

Log Message:
qemu: Fix paths in manpage

pkgsrc changes:
---------------
  * Fix paths of files mentioned in manpages that are in PKG_SYSCONFDIR.
  * Cosmetics on Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.218 -r1.219 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/emulators/qemu/patches/patch-qemu-options.hx
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.345 pkgsrc/emulators/qemu/Makefile:1.346
--- pkgsrc/emulators/qemu/Makefile:1.345        Tue Jun 11 06:51:18 2024
+++ pkgsrc/emulators/qemu/Makefile      Wed Jul 10 06:52:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.345 2024/06/11 06:51:18 adam Exp $
+# $NetBSD: Makefile,v 1.346 2024/07/10 06:52:48 triaxx Exp $
 
 DISTNAME=      qemu-9.0.1
 CATEGORIES=    emulators
@@ -101,6 +101,12 @@ SUBST_FILES.oss+=  audio/ossaudio.c
 SUBST_SED.oss+=                -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 .endif
 
+SUBST_CLASSES+=                man
+SUBST_STAGE.man=       pre-configure
+SUBST_MESSAGE.man=     Fixing paths in manpages.
+SUBST_FILES.man+=      qemu-options.hx
+SUBST_VARS.man+=       PKG_SYSCONFDIR
+
 UE_ARCHS+=             aarch64 aarch64_be
 UE_ARCHS+=             alpha arm armeb cris
 UE_ARCHS+=             hexagon hppa
@@ -115,40 +121,40 @@ UE_ARCHS+=                s390x sh4 sh4eb sparc sparc3
 UE_ARCHS+=             x86_64 xtensa xtensaeb
 
 .if ${OPSYS} == "NetBSD"
-PLIST.ga=                      yes
-PLIST.nbd=                     yes
+PLIST.ga=              yes
+PLIST.nbd=             yes
 .  if !exists(/usr/include/machine/trap.h)     \
        || "1"=="1"     # XXX usermode emulation is broken
-CONFIGURE_ARGS+=               --disable-bsd-user
+CONFIGURE_ARGS+=       --disable-bsd-user
 .  else
-CONFIGURE_ARGS+=               --enable-bsd-user
-USER_EMUL=                     i386 x86_64
+CONFIGURE_ARGS+=       --enable-bsd-user
+USER_EMUL=             i386 x86_64
 .  endif
 .elif ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
-USER_EMUL=                     i386 x86_64
-PLIST.ga=                      yes
-PLIST.nbd=                     yes
+USER_EMUL=             i386 x86_64
+PLIST.ga=              yes
+PLIST.nbd=             yes
 .elif ${OPSYS} == "Darwin"
 USER_EMUL=
-CONFIGURE_ARGS+=               --disable-bsd-user
-PLIST.nbd=                     yes
+CONFIGURE_ARGS+=       --disable-bsd-user
+PLIST.nbd=             yes
 .elif ${OPSYS} == "Linux"
 # Help this package to build on systems too old for user-mode code.
 HAVE_LINUX_USER!=      ${CPP} ${CPPFLAGS} ${FILESDIR}/linux-user-test.h \
-  >/dev/null 2>&1 && echo yes || echo no
+                       >/dev/null 2>&1 && echo yes || echo no
 .  if ${HAVE_LINUX_USER} != "yes"
-CONFIGURE_ARGS+=               --disable-linux-user
+CONFIGURE_ARGS+=       --disable-linux-user
 .  else
-USER_EMUL=                     ${UE_ARCHS}
+USER_EMUL=             ${UE_ARCHS}
 .  endif
-PLIST.bridge-helper=           yes
-PLIST.ga=                      yes
-PLIST.nbd=                     yes
-PLIST.pr-helper=               yes
+PLIST.bridge-helper=   yes
+PLIST.ga=              yes
+PLIST.nbd=             yes
+PLIST.pr-helper=       yes
 .elif ${MACHINE_PLATFORM:MSunOS-5.11-*}
-PLIST.ga=                      yes
-PLIST.nbd=                     yes
-CONFIGURE_ARGS+=               --disable-coroutine-pool
+PLIST.ga=              yes
+PLIST.nbd=             yes
+CONFIGURE_ARGS+=       --disable-coroutine-pool
 .endif
 
 PLIST_VARS+=           plugins

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.218 pkgsrc/emulators/qemu/distinfo:1.219
--- pkgsrc/emulators/qemu/distinfo:1.218        Tue Jun 11 06:51:18 2024
+++ pkgsrc/emulators/qemu/distinfo      Wed Jul 10 06:52:48 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.218 2024/06/11 06:51:18 adam Exp $
+$NetBSD: distinfo,v 1.219 2024/07/10 06:52:48 triaxx Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -17,10 +17,11 @@ SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
 SHA1 (patch-meson.build) = 6b0607903b84c84d26bd5c54f3f0b9e4b256d787
+SHA1 (patch-qemu-options.hx) = 6cf811ae421db1e8d45f7098bd36733c6dc7d9cf
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = f55795305c385784caee00c2a767a1cafa42ed91
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
-SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f
+SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 9c0b6158bd28b5a5a9da98bd211e19494857076d
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.6 pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.7
--- pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.6 Tue Feb 20 14:16:58 2024
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c     Wed Jul 10 06:52:48 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.6 2024/02/20 14:16:58 imil Exp $
+$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.7 2024/07/10 06:52:48 triaxx Exp $
 
 Permit using older nvmm version.
 
---- target/i386/nvmm/nvmm-all.c.orig   2024-01-29 19:13:22.000000000 +0000
+--- target/i386/nvmm/nvmm-all.c.orig   2024-06-10 18:35:25.000000000 +0000
 +++ target/i386/nvmm/nvmm-all.c
-@@ -1171,14 +1171,10 @@ nvmm_accel_init(MachineState *ms)
+@@ -1169,14 +1169,10 @@ nvmm_accel_init(MachineState *ms)
          error_report("NVMM: Unable to fetch capability, error=%d", errno);
          return -err;
      }
@@ -17,6 +17,6 @@ Permit using older nvmm version.
 -        error_report("NVMM: Wrong state size %u", qemu_mach.cap.state_size);
 -        return -EPROGMISMATCH;
 -    }
-
+ 
      ret = nvmm_machine_create(&qemu_mach.mach);
      if (ret == -1) {

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-qemu-options.hx
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-qemu-options.hx:1.7
--- /dev/null   Wed Jul 10 06:52:48 2024
+++ pkgsrc/emulators/qemu/patches/patch-qemu-options.hx Wed Jul 10 06:52:48 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-qemu-options.hx,v 1.7 2024/07/10 06:52:48 triaxx Exp $
+
+Fix paths of files mentioned in manpages that are in PKG_SYSCONFDIR.
+
+--- qemu-options.hx.orig       2024-07-10 04:10:09.968279517 +0000
++++ qemu-options.hx
+@@ -3219,8 +3219,8 @@ SRST
+     Use the network script file to configure it and the network script
+     dfile to deconfigure it. If name is not provided, the OS
+     automatically provides one. The default network configure script is
+-    ``/etc/qemu-ifup`` and the default network deconfigure script is
+-    ``/etc/qemu-ifdown``. Use ``script=no`` or ``downscript=no`` to
++    ``@PKG_SYSCONFDIR@/qemu-ifup`` and the default network deconfigure script is
++    ``@PKG_SYSCONFDIR@/qemu-ifdown``. Use ``script=no`` or ``downscript=no`` to
+     disable script execution.
+ 
+     If running QEMU as an unprivileged user, use the network helper