Received: by mail.netbsd.org (Postfix, from userid 605) id 0B65484D69; Sun, 11 Feb 2024 23:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1707694243; bh=vyQL0t45beZ7VNyvLGE+liVCf066h0Rm98kxUrKLSJQ=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=qDYrXcPzDa4MkXwysQqqb3A4QT/7aeDDbaqjxZulK18eLaIv/Cph/2dwLt1ge2nZ0 KJP/8aq1rdUbD2FlMtQ52uzV5Ervx4q/Swp5G4QDiAx3TiwP/63BjVuCOfSYeEBSfK LfZKgvCmAX8/IROn9L/+0f7YCUOHM78phQzo5We4= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E956C84D5B for ; Sun, 11 Feb 2024 23:30:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hxSZhLK5-hzh for ; Sun, 11 Feb 2024 23:30:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 525CA84CD9 for ; Sun, 11 Feb 2024 23:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1707694240; bh=vyQL0t45beZ7VNyvLGE+liVCf066h0Rm98kxUrKLSJQ=; h=Date:From:Subject:To:Reply-To; b=NdlBXYqFk40WX8wNnfL8ckax+D91QWHea3bqkI8R9jCi2hGrjmShUNRndDEbjzijl Et8ewep13AEufk/kOiDUxzCF/UFHi9lA3NzyGyF9szvGInLxJ8vtOtd9JHtl4FA1P3 IDE5zKgEMrZcUvoA7namJCjIVk7pkW64SJMZYsK0= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 42663F9A8; Sun, 11 Feb 2024 23:30:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1707694240138680" MIME-Version: 1.0 Date: Sun, 11 Feb 2024 23:30:40 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/emulators/bochs To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20240211233040.42663F9A8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1707694240138680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sun Feb 11 23:30:40 UTC 2024 Modified Files: pkgsrc/emulators/bochs: Makefile PLIST distinfo pkgsrc/emulators/bochs/patches: patch-configure patch-iodev_network_eth__socket.cc patch-iodev_sound_soundosx.cc Added Files: pkgsrc/emulators/bochs/patches: patch-gui_Makefile.in patch-gui_textconfig.cc Removed Files: pkgsrc/emulators/bochs/patches: patch-iodev_network_slirp_slirp.h Log Message: emulators/bochs: Update to 2.7 Changelog: Brief summary of changes in 2.7: - Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support Windows Hyper-V as guest in Bochs) - Improvements for the plugin handling to simplify Bochs extensions - Added "multiple NICs" support to the NE2000 and E1000 devices - Added experimental FTP service for networking modules 'vnet' and 'socket' - Fixes and improvements for all supported Voodoo graphics adapters - Added USB keyboard emulation with most of the keys supported - GUI "cmdmode": create a headerbar event with key combo starting with F7 - LGPL'd VGABIOS updated to version 0.8a (new VGABIOS for Voodoo Banshee) To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/emulators/bochs/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/bochs/PLIST cvs rdiff -u -r1.36 -r1.37 pkgsrc/emulators/bochs/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/bochs/patches/patch-configure cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/bochs/patches/patch-gui_Makefile.in \ pkgsrc/emulators/bochs/patches/patch-gui_textconfig.cc cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc cvs rdiff -u -r1.1 -r0 \ pkgsrc/emulators/bochs/patches/patch-iodev_network_slirp_slirp.h cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1707694240138680 Content-Disposition: inline Content-Length: 16461 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/bochs/Makefile diff -u pkgsrc/emulators/bochs/Makefile:1.108 pkgsrc/emulators/bochs/Makefile:1.109 --- pkgsrc/emulators/bochs/Makefile:1.108 Tue Nov 14 14:01:46 2023 +++ pkgsrc/emulators/bochs/Makefile Sun Feb 11 23:30:39 2024 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.108 2023/11/14 14:01:46 wiz Exp $ +# $NetBSD: Makefile,v 1.109 2024/02/11 23:30:39 ryoon Exp $ -DISTNAME= bochs-2.6.9 -PKGREVISION= 10 +DISTNAME= bochs-2.7 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} @@ -15,10 +14,13 @@ MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= gmake gunzip gzip USE_LANGUAGES= c c++ +FORCE_CXX_STD= c++11 USE_LIBTOOL= yes CXXFLAGS+= -DPARANOID +LIBS+= -lX11 +CONFIGURE_ARGS+= --disable-docbook CONFIGURE_ARGS+= --enable-cdrom CONFIGURE_ARGS+= --enable-ne2000 @@ -26,7 +28,7 @@ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q} MAKE_ENV+= WGET=${FETCH_CMD:Q} -PLIST_VARS+= debug notiny nox11 plugins x11 +PLIST_VARS+= notiny nox11 plugins x11 PKG_OPTIONS_VAR= PKG_OPTIONS.bochs PKG_SUPPORTED_OPTIONS+= debug tiny x11 @@ -40,7 +42,6 @@ PKG_SUGGESTED_OPTIONS+= x11 .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --disable-plugins CONFIGURE_ARGS+= --enable-debugger -CONFIGURE_ARGS+= --enable-disasm CONFIGURE_ARGS+= --enable-iodebug CONFIGURE_ARGS+= --enable-x86-debugger .endif @@ -57,18 +58,25 @@ CONFIGURE_ARGS+= --enable-cpu-level=6 CONFIGURE_ARGS+= --enable-pci CONFIGURE_ARGS+= --enable-usb CONFIGURE_ARGS+= --enable-usb-ohci +CONFIGURE_ARGS+= --enable-usb-ehci +CONFIGURE_ARGS+= --enable-usb-xhci CONFIGURE_ARGS+= --enable-pnic CONFIGURE_ARGS+= --enable-repeat-speedups CONFIGURE_ARGS+= --enable-configurable-msrs CONFIGURE_ARGS+= --enable-all-optimizations #CONFIGURE_ARGS+= --enable-instrumentation CONFIGURE_ARGS+= --enable-clgd54xx +CONFIGURE_ARGS+= --enable-voodoo CONFIGURE_ARGS+= --enable-fpu CONFIGURE_ARGS+= --enable-vmx=2 -#CONFIGURE_ARGS+= --enable-3dnow +CONFIGURE_ARGS+= --enable-svm +CONFIGURE_ARGS+= --enable-3dnow +CONFIGURE_ARGS+= --enable-avx +CONFIGURE_ARGS+= --enable-evex CONFIGURE_ARGS+= --enable-alignment-check #CONFIGURE_ARGS+= --enable-gdb-stub CONFIGURE_ARGS+= --enable-gameport +CONFIGURE_ARGS+= --enable-busmouse . if empty(PKG_OPTIONS:Mdebug) PLIST.plugins= yes @@ -79,11 +87,9 @@ CONFIGURE_ARGS+= --enable-plugins CONFIGURE_ARGS+= --enable-fast-function-calls . endif -CONFIGURE_ARGS.Darwin+= --enable-sb16=osx -CONFIGURE_ARGS.FreeBSD+= --enable-sb16=freebsd -CONFIGURE_ARGS.Linux+= --enable-sb16=linux CONFIGURE_ARGS.Linux+= --enable-pcidev -CONFIGURE_ARGS.*+= --enable-sb16=dummy +CONFIGURE_ARGS+= --enable-sb16 +CONFIGURE_ARGS+= --enable-es1370 .endif .if empty(PKG_OPTIONS:Mx11) @@ -91,6 +97,7 @@ PLIST.nox11= yes CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-x11 CONFIGURE_ARGS+= --with-term +CONFIGURE_ARGS+= --with-sdl .else PLIST.x11= yes .endif @@ -111,6 +118,9 @@ BOCHSRC_SUBST.Darwin+= -e 's,@FLOPPY_LIN BOCHSRC_SUBST.*+= -e 's,@FLOPPY_BSD@,,' BOCHSRC_SUBST.*+= -e 's,@FLOPPY_LINUX@,\#,' +PRINT_PLIST_AWK+= /\/plugins\// { $$0 = "$${PLIST.plugins}" $$0 } +PRINT_PLIST_AWK+= /libbx_/ { $$0 = "$${PLIST.notiny}" $$0 } + .if ${OPSYS} == "Darwin" MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin PLIST_SRC= ${.CURDIR}/PLIST.Darwin @@ -129,10 +139,15 @@ post-install: .else . if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11) -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" . endif . if empty(PKG_OPTIONS:Mx11) . include "../../mk/curses.buildlink3.mk" +. if ${OPSYS} == "NetBSD" +. if ${CURSES_TYPE} == "curses" +GUI_LINK_OPTS_TERM= -lcurses +. endif +. endif . else BUILDLINK_DEPMETHOD.libXt?= build Index: pkgsrc/emulators/bochs/PLIST diff -u pkgsrc/emulators/bochs/PLIST:1.20 pkgsrc/emulators/bochs/PLIST:1.21 --- pkgsrc/emulators/bochs/PLIST:1.20 Sun Jan 13 11:59:38 2019 +++ pkgsrc/emulators/bochs/PLIST Sun Feb 11 23:30:39 2024 @@ -1,16 +1,17 @@ -@comment $NetBSD: PLIST,v 1.20 2019/01/13 11:59:38 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.21 2024/02/11 23:30:39 ryoon Exp $ bin/bochs bin/bxhub bin/bximage ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_acpi.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_biosdev.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_busmouse.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_cmos.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_dma.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_es1370.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_fbsd.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_null.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_slirp.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_socket.la -${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_tap.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_tuntap.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vde.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vnet.la @@ -18,7 +19,7 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_floppy.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_gameport.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_harddrv.la -${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_hdimage.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_hpet.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ioapic.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_keyboard.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ne2k.la @@ -29,18 +30,32 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pic.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pit.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_sb16.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_serial.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_sounddummy.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundfile.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_svga_cirrus.la -${PLIST.notiny}${PLIST.plugins}${PLIST.nox11}lib/bochs/plugins/libbx_term.la +${PLIST.nox11}${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_term_gui.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_textconfig.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_unmapped.la -${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_common.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_ehci.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_floppy.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_hid.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_hub.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_msd.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_ohci.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_printer.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_uhci.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_xhci.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vbox_img.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vga.la -${PLIST.notiny}${PLIST.plugins}${PLIST.x11}lib/bochs/plugins/libbx_x.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vmware3_img.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vmware4_img.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_voodoo.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vpc_img.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vvfat_img.la +${PLIST.x11}${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_x_gui.la man/man1/bochs-dlx.1 man/man1/bochs.1 man/man1/bximage.1 @@ -48,14 +63,16 @@ man/man5/bochsrc.5 share/bochs/BIOS-bochs-latest share/bochs/BIOS-bochs-legacy share/bochs/SeaBIOS-README +share/bochs/SeaVGABIOS-README share/bochs/VGABIOS-elpin-2.40 share/bochs/VGABIOS-elpin-LICENSE share/bochs/VGABIOS-lgpl-README share/bochs/VGABIOS-lgpl-latest +share/bochs/VGABIOS-lgpl-latest-banshee share/bochs/VGABIOS-lgpl-latest-cirrus share/bochs/VGABIOS-lgpl-latest-cirrus-debug share/bochs/VGABIOS-lgpl-latest-debug -share/bochs/bios.bin-1.7.5 +share/bochs/bios.bin-1.13.0 share/bochs/keymaps/sdl-pc-de.map share/bochs/keymaps/sdl-pc-us.map share/bochs/keymaps/sdl2-pc-de.map @@ -68,9 +85,11 @@ share/bochs/keymaps/x11-pc-fr.map share/bochs/keymaps/x11-pc-it.map share/bochs/keymaps/x11-pc-ru.map share/bochs/keymaps/x11-pc-se.map +share/bochs/keymaps/x11-pc-sg.map share/bochs/keymaps/x11-pc-si.map share/bochs/keymaps/x11-pc-uk.map share/bochs/keymaps/x11-pc-us.map +share/bochs/vgabios-cirrus.bin-1.13.0 share/doc/bochs/CHANGES share/doc/bochs/COPYING share/doc/bochs/LICENSE @@ -78,3 +97,4 @@ share/doc/bochs/README share/doc/bochs/TODO share/doc/bochs/bochsrc-sample.txt share/doc/bochs/slirp.conf +share/doc/bochs/vnet.conf Index: pkgsrc/emulators/bochs/distinfo diff -u pkgsrc/emulators/bochs/distinfo:1.36 pkgsrc/emulators/bochs/distinfo:1.37 --- pkgsrc/emulators/bochs/distinfo:1.36 Tue Oct 26 10:23:47 2021 +++ pkgsrc/emulators/bochs/distinfo Sun Feb 11 23:30:39 2024 @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.36 2021/10/26 10:23:47 nia Exp $ +$NetBSD: distinfo,v 1.37 2024/02/11 23:30:39 ryoon Exp $ -BLAKE2s (bochs-2.6.9.tar.gz) = 6e781732cd23e7ae27d155a6be4aaf91c998226640468356b6f48e94123da4ef -SHA512 (bochs-2.6.9.tar.gz) = dfecf3a1bad07f06c2f7bb989d146e4a8eaeca493b598d415f5a4aec2a85eb5524ba417422157608c8b0828832611df487c6923c8f4ad98a147ac089fc514c46 -Size (bochs-2.6.9.tar.gz) = 5169187 bytes +BLAKE2s (bochs-2.7.tar.gz) = f1681035d10c7f8f2d2b40c43c27b6af00ba6a3f0db3c29c38af7a6092673814 +SHA512 (bochs-2.7.tar.gz) = d43bd557316dc370ba1c317f5c3292f724460515db01316614b2d585b2760120cadd1d27a286083ac3e6f57466ed889959abd7fe960c219c149dab9a053c6967 +Size (bochs-2.7.tar.gz) = 5298413 bytes SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb -SHA1 (patch-configure) = 47774947feb4ddbdeb9f3df68f345cd42ab76a7b -SHA1 (patch-iodev_network_eth__socket.cc) = 37c4ab50da3f646ffc541001e8a8b7c93a7995c4 +SHA1 (patch-configure) = bdbdc3c0a5bdc8e63d81aa1ecb9018c5ba687f3a +SHA1 (patch-gui_Makefile.in) = fb5e2ba02533c39169ea95101b9acaa6e33f6392 +SHA1 (patch-gui_textconfig.cc) = 8bbb1d4019d985bea8216175ad0d3dee6ff4e7e0 +SHA1 (patch-iodev_network_eth__socket.cc) = a90c4cacd38daa403379568f0a5bc8aae6d5f4a5 SHA1 (patch-iodev_network_slirp_compat_cc) = a48d112daac6049c0ee8076eb012ab2f44740889 -SHA1 (patch-iodev_network_slirp_slirp.h) = c0920978ca5f004be603950240e4a988bee6d4f9 -SHA1 (patch-iodev_sound_soundosx.cc) = 7dacc7df74e64d3df72a241a291f434f72722cec +SHA1 (patch-iodev_sound_soundosx.cc) = 285cdfc87803082847e6492031df7e33a389c2fa SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b Index: pkgsrc/emulators/bochs/patches/patch-configure diff -u pkgsrc/emulators/bochs/patches/patch-configure:1.7 pkgsrc/emulators/bochs/patches/patch-configure:1.8 --- pkgsrc/emulators/bochs/patches/patch-configure:1.7 Sun Dec 22 22:09:53 2019 +++ pkgsrc/emulators/bochs/patches/patch-configure Sun Feb 11 23:30:39 2024 @@ -1,15 +1,13 @@ -$NetBSD: patch-configure,v 1.7 2019/12/22 22:09:53 markd Exp $ +$NetBSD: patch-configure,v 1.8 2024/02/11 23:30:39 ryoon Exp $ -Deal with Linux 4.x and 5.x - ---- configure.orig 2015-05-03 06:37:18.754341000 +0000 +--- configure.orig 2024-01-30 08:02:56.289870360 +0000 +++ configure -@@ -23311,7 +23311,7 @@ $as_echo "$as_me: Linux detected as host - PCIDEV_MODULE_MAKE_ALL="all-kernel24" - KERNEL_MODULE_SUFFIX="o" - ;; -- 2.6*|3.*) -+ 2.6*|3.*|4.*|5.*) - PCIDEV_MODULE_MAKE_ALL="all-kernel26" - KERNEL_MODULE_SUFFIX="ko" - ;; +@@ -25354,7 +25354,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_mvaddch" >&5 + $as_echo "$ac_cv_lib_curses_mvaddch" >&6; } + if test "x$ac_cv_lib_curses_mvaddch" = xyes; then : +- GUI_LINK_OPTS_TERM="`pkg-config --libs curses`" ++ GUI_LINK_OPTS_TERM="-lcurses" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mvaddch in -lncurses" >&5 Index: pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc diff -u pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.1 pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.2 --- pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.1 Sun Jan 13 11:59:38 2019 +++ pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc Sun Feb 11 23:30:39 2024 @@ -1,22 +1,16 @@ -$NetBSD: patch-iodev_network_eth__socket.cc,v 1.1 2019/01/13 11:59:38 ryoon Exp $ +$NetBSD: patch-iodev_network_eth__socket.cc,v 1.2 2024/02/11 23:30:39 ryoon Exp $ ---- iodev/network/eth_socket.cc.orig 2017-03-30 18:08:15.000000000 +0000 +--- iodev/network/eth_socket.cc.orig 2021-03-12 21:31:51.747171000 +0000 +++ iodev/network/eth_socket.cc -@@ -83,12 +83,14 @@ extern "C" { - #include +@@ -93,10 +93,10 @@ extern "C" { #include #include --#include #include -#include #include --#include - #include -+#if defined(__linux__) -+#include + #ifdef __linux__ + #include +#include -+#include -+#endif + #endif + #include #define closesocket(s) close(s) - typedef int SOCKET; - #ifndef INVALID_SOCKET Index: pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc diff -u pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc:1.2 pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc:1.3 --- pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc:1.2 Sun Jan 13 11:59:38 2019 +++ pkgsrc/emulators/bochs/patches/patch-iodev_sound_soundosx.cc Sun Feb 11 23:30:40 2024 @@ -1,6 +1,6 @@ -$NetBSD: patch-iodev_sound_soundosx.cc,v 1.2 2019/01/13 11:59:38 ryoon Exp $ +$NetBSD: patch-iodev_sound_soundosx.cc,v 1.3 2024/02/11 23:30:40 ryoon Exp $ ---- iodev/sound/soundosx.cc.orig 2017-03-14 18:21:05.000000000 +0000 +--- iodev/sound/soundosx.cc.orig 2021-03-11 21:46:25.040844000 +0000 +++ iodev/sound/soundosx.cc @@ -26,7 +26,7 @@ #define BX_PLUGGABLE @@ -10,4 +10,4 @@ $NetBSD: patch-iodev_sound_soundosx.cc,v +#include #endif - #include "iodev.h" + #include "bochs.h" Added files: Index: pkgsrc/emulators/bochs/patches/patch-gui_Makefile.in diff -u /dev/null pkgsrc/emulators/bochs/patches/patch-gui_Makefile.in:1.1 --- /dev/null Sun Feb 11 23:30:40 2024 +++ pkgsrc/emulators/bochs/patches/patch-gui_Makefile.in Sun Feb 11 23:30:39 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-gui_Makefile.in,v 1.1 2024/02/11 23:30:39 ryoon Exp $ + +* Generate dynamic library. + +--- gui/Makefile.in.orig 2024-02-11 23:20:05.511825621 +0000 ++++ gui/Makefile.in +@@ -126,7 +126,7 @@ libbx_%_gui.la: %.lo + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) + + libbx_x_gui.la: x.lo +- $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_X) ++ $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) -L$(PLUGIN_PATH) $(GUI_LINK_OPTS_X) + + libbx_sdl_gui.la: sdl.lo + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL) Index: pkgsrc/emulators/bochs/patches/patch-gui_textconfig.cc diff -u /dev/null pkgsrc/emulators/bochs/patches/patch-gui_textconfig.cc:1.1 --- /dev/null Sun Feb 11 23:30:40 2024 +++ pkgsrc/emulators/bochs/patches/patch-gui_textconfig.cc Sun Feb 11 23:30:39 2024 @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_textconfig.cc,v 1.1 2024/02/11 23:30:39 ryoon Exp $ + +--- gui/textconfig.cc.orig 2021-03-27 17:23:31.183698000 +0000 ++++ gui/textconfig.cc +@@ -45,6 +45,7 @@ extern "C" { + #endif + + #include ++#include + #include + #include + #include --_----------=_1707694240138680--