pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/emulators/bochs



Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Feb 20 22:42:14 UTC 2025

Modified Files:
        pkgsrc/emulators/bochs: Makefile PLIST PLIST.Linux distinfo
        pkgsrc/emulators/bochs/patches: patch-configure
            patch-iodev_network_eth__socket.cc
Added Files:
        pkgsrc/emulators/bochs: PLIST.FreeBSD PLIST.NetBSD options.mk

Log Message:
bochs: Various fixes and cleanups.

- Move options to options.mk.
- Make the -x11 option work by not unconditionally linking
  -lX11 in the Makefile.
- Fix the PLIST on non-NetBSD OSes.
- Add SDL support for audio output on various platforms.
- Document some patches and otherwise delint.

XXX: the "debug" option is broken. The debug interface these
days requires wxGTK, but I couldn't get that to work anyhow.

Verified to build on NetBSD and Linux (more testing and reports
welcome); via drecklypkg


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/emulators/bochs/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/bochs/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/bochs/PLIST.FreeBSD \
    pkgsrc/emulators/bochs/PLIST.NetBSD pkgsrc/emulators/bochs/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/bochs/PLIST.Linux
cvs rdiff -u -r1.37 -r1.38 pkgsrc/emulators/bochs/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/bochs/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc

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

Modified files:

Index: pkgsrc/emulators/bochs/Makefile
diff -u pkgsrc/emulators/bochs/Makefile:1.114 pkgsrc/emulators/bochs/Makefile:1.115
--- pkgsrc/emulators/bochs/Makefile:1.114       Fri Dec 27 08:19:42 2024
+++ pkgsrc/emulators/bochs/Makefile     Thu Feb 20 22:42:14 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2024/12/27 08:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2025/02/20 22:42:14 nia Exp $
 
 DISTNAME=              bochs-2.7
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -19,7 +19,6 @@ FORCE_CXX_STD=                c++11
 USE_LIBTOOL=           yes
 
 CXXFLAGS+=             -DPARANOID
-LIBS+=                 -lX11
 
 CONFIGURE_ARGS+=       --disable-docbook
 CONFIGURE_ARGS+=       --enable-cdrom
@@ -29,26 +28,7 @@ MAKE_ENV+=           GZIP_CMD=${GZIP_CMD:Q}
 MAKE_ENV+=             GUNZIP_CMD=${GUNZIP_CMD:Q}
 MAKE_ENV+=             WGET=${FETCH_CMD:Q}
 
-PLIST_VARS+=           notiny nox11 plugins x11
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bochs
-PKG_SUPPORTED_OPTIONS+=        debug tiny x11
-PKG_SUGGESTED_OPTIONS+=        x11
-
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-# Debugging features for the client operating systems. These options are
-# not enabled by default because they can adversely impact performance.
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --disable-plugins
-CONFIGURE_ARGS+=       --enable-debugger
-CONFIGURE_ARGS+=       --enable-iodebug
-CONFIGURE_ARGS+=       --enable-x86-debugger
-.endif
-
-.if empty(PKG_OPTIONS:Mtiny)
-PLIST.notiny=          yes
 
 CONFIGURE_ARGS+=       --enable-idle-hack
 CONFIGURE_ARGS+=       --enable-a20-pin
@@ -79,29 +59,13 @@ CONFIGURE_ARGS+=    --enable-alignment-chec
 CONFIGURE_ARGS+=       --enable-gameport
 CONFIGURE_ARGS+=       --enable-busmouse
 
-.  if empty(PKG_OPTIONS:Mdebug)
-PLIST.plugins=         yes
-CONFIGURE_ARGS+=       --enable-plugins
-.  endif
-
-.  if !empty(MACHINE_PLATFORM:M*-*-i386)
+.if !empty(MACHINE_PLATFORM:M*-*-i386)
 CONFIGURE_ARGS+=       --enable-fast-function-calls
-.  endif
+.endif
 
 CONFIGURE_ARGS.Linux+=         --enable-pcidev
 CONFIGURE_ARGS+=               --enable-sb16
 CONFIGURE_ARGS+=               --enable-es1370
-.endif
-
-.if empty(PKG_OPTIONS:Mx11)
-PLIST.nox11=           yes
-CONFIGURE_ARGS+=       --without-x
-CONFIGURE_ARGS+=       --without-x11
-CONFIGURE_ARGS+=       --with-term
-CONFIGURE_ARGS+=       --with-sdl
-.else
-PLIST.x11=             yes
-.endif
 
 .if ${OPSYS} == "Linux"
 SUBST_CLASSES+=                nobpf
@@ -139,29 +103,10 @@ post-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
 .else
 
-.  if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11)
-.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
-
-.    include "../../x11/libSM/buildlink3.mk"
-.    include "../../x11/libX11/buildlink3.mk"
-.    include "../../x11/libXpm/buildlink3.mk"
-.    include "../../x11/libXrandr/buildlink3.mk"
-.    include "../../x11/libXt/buildlink3.mk"
-.  endif
-.endif
-
 pre-configure:
        ${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new
        mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
+.endif
 
+.include "options.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/bochs/PLIST
diff -u pkgsrc/emulators/bochs/PLIST:1.21 pkgsrc/emulators/bochs/PLIST:1.22
--- pkgsrc/emulators/bochs/PLIST:1.21   Sun Feb 11 23:30:39 2024
+++ pkgsrc/emulators/bochs/PLIST        Thu Feb 20 22:42:14 2025
@@ -1,61 +1,62 @@
-@comment $NetBSD: PLIST,v 1.21 2024/02/11 23:30:39 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.22 2025/02/20 22:42:14 nia 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_tuntap.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vde.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_eth_vnet.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_extfpuirq.la
-${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_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
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_parallel.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci2isa.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci_ide.la
-${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.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_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}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
+${PLIST.plugins}lib/bochs/plugins/libbx_acpi.la
+${PLIST.plugins}lib/bochs/plugins/libbx_biosdev.la
+${PLIST.plugins}lib/bochs/plugins/libbx_busmouse.la
+${PLIST.plugins}lib/bochs/plugins/libbx_cmos.la
+${PLIST.plugins}lib/bochs/plugins/libbx_dma.la
+${PLIST.plugins}lib/bochs/plugins/libbx_es1370.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_null.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_slirp.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_socket.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_tuntap.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_vde.la
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_vnet.la
+${PLIST.plugins}lib/bochs/plugins/libbx_extfpuirq.la
+${PLIST.plugins}lib/bochs/plugins/libbx_floppy.la
+${PLIST.plugins}lib/bochs/plugins/libbx_gameport.la
+${PLIST.plugins}lib/bochs/plugins/libbx_harddrv.la
+${PLIST.plugins}lib/bochs/plugins/libbx_hpet.la
+${PLIST.plugins}lib/bochs/plugins/libbx_ioapic.la
+${PLIST.plugins}lib/bochs/plugins/libbx_keyboard.la
+${PLIST.plugins}lib/bochs/plugins/libbx_ne2k.la
+${PLIST.plugins}lib/bochs/plugins/libbx_parallel.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pci.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pci2isa.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pci_ide.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pic.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pit.la
+${PLIST.plugins}lib/bochs/plugins/libbx_sb16.la
+${PLIST.sdl}${PLIST.plugins}lib/bochs/plugins/libbx_sdl_gui.la
+${PLIST.plugins}lib/bochs/plugins/libbx_serial.la
+${PLIST.plugins}lib/bochs/plugins/libbx_sounddummy.la
+${PLIST.plugins}lib/bochs/plugins/libbx_soundfile.la
+${PLIST.sdl}${PLIST.plugins}lib/bochs/plugins/libbx_soundsdl.la
+${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la
+${PLIST.plugins}lib/bochs/plugins/libbx_svga_cirrus.la
+${PLIST.nox11}${PLIST.plugins}lib/bochs/plugins/libbx_term_gui.la
+${PLIST.plugins}lib/bochs/plugins/libbx_textconfig.la
+${PLIST.plugins}lib/bochs/plugins/libbx_unmapped.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_ehci.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_floppy.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_hid.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_hub.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_msd.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_ohci.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_printer.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_uhci.la
+${PLIST.plugins}lib/bochs/plugins/libbx_usb_xhci.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vbox_img.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vga.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vmware3_img.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vmware4_img.la
+${PLIST.plugins}lib/bochs/plugins/libbx_voodoo.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vpc_img.la
+${PLIST.plugins}lib/bochs/plugins/libbx_vvfat_img.la
+${PLIST.x11}${PLIST.plugins}lib/bochs/plugins/libbx_x_gui.la
 man/man1/bochs-dlx.1
 man/man1/bochs.1
 man/man1/bximage.1

Index: pkgsrc/emulators/bochs/PLIST.Linux
diff -u pkgsrc/emulators/bochs/PLIST.Linux:1.1 pkgsrc/emulators/bochs/PLIST.Linux:1.2
--- pkgsrc/emulators/bochs/PLIST.Linux:1.1      Mon Jan 21 10:04:45 2019
+++ pkgsrc/emulators/bochs/PLIST.Linux  Thu Feb 20 22:42:14 2025
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2019/01/21 10:04:45 markd Exp $
-lib/bochs/plugins/libbx_eth_linux.la
-lib/bochs/plugins/libbx_pcidev.la
+@comment $NetBSD: PLIST.Linux,v 1.2 2025/02/20 22:42:14 nia Exp $
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_linux.la
+${PLIST.plugins}lib/bochs/plugins/libbx_pcidev.la
+${PLIST.plugins}lib/bochs/plugins/libbx_soundoss.la

Index: pkgsrc/emulators/bochs/distinfo
diff -u pkgsrc/emulators/bochs/distinfo:1.37 pkgsrc/emulators/bochs/distinfo:1.38
--- pkgsrc/emulators/bochs/distinfo:1.37        Sun Feb 11 23:30:39 2024
+++ pkgsrc/emulators/bochs/distinfo     Thu Feb 20 22:42:14 2025
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.37 2024/02/11 23:30:39 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2025/02/20 22:42:14 nia Exp $
 
 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) = bdbdc3c0a5bdc8e63d81aa1ecb9018c5ba687f3a
+SHA1 (patch-configure) = aff62a847311bf2afad27445813656ff081bb93b
 SHA1 (patch-gui_Makefile.in) = fb5e2ba02533c39169ea95101b9acaa6e33f6392
 SHA1 (patch-gui_textconfig.cc) = 8bbb1d4019d985bea8216175ad0d3dee6ff4e7e0
-SHA1 (patch-iodev_network_eth__socket.cc) = a90c4cacd38daa403379568f0a5bc8aae6d5f4a5
+SHA1 (patch-iodev_network_eth__socket.cc) = 4baa4cd0c7c004e6e48d57327ab2eff550efb924
 SHA1 (patch-iodev_network_slirp_compat_cc) = a48d112daac6049c0ee8076eb012ab2f44740889
 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.8 pkgsrc/emulators/bochs/patches/patch-configure:1.9
--- pkgsrc/emulators/bochs/patches/patch-configure:1.8  Sun Feb 11 23:30:39 2024
+++ pkgsrc/emulators/bochs/patches/patch-configure      Thu Feb 20 22:42:14 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.8 2024/02/11 23:30:39 ryoon Exp $
+$NetBSD: patch-configure,v 1.9 2025/02/20 22:42:14 nia Exp $
+
+NetBSD curses cannot be found with pkg-config.
 
 --- configure.orig     2024-01-30 08:02:56.289870360 +0000
 +++ configure

Index: pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc
diff -u pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.2 pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.3
--- pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc:1.2       Sun Feb 11 23:30:39 2024
+++ pkgsrc/emulators/bochs/patches/patch-iodev_network_eth__socket.cc   Thu Feb 20 22:42:14 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-iodev_network_eth__socket.cc,v 1.2 2024/02/11 23:30:39 ryoon Exp $
+$NetBSD: patch-iodev_network_eth__socket.cc,v 1.3 2025/02/20 22:42:14 nia Exp $
+
+Move linux-only header to the #ifdef __linux__ block.
 
 --- iodev/network/eth_socket.cc.orig   2021-03-12 21:31:51.747171000 +0000
 +++ iodev/network/eth_socket.cc

Added files:

Index: pkgsrc/emulators/bochs/PLIST.FreeBSD
diff -u /dev/null pkgsrc/emulators/bochs/PLIST.FreeBSD:1.1
--- /dev/null   Thu Feb 20 22:42:14 2025
+++ pkgsrc/emulators/bochs/PLIST.FreeBSD        Thu Feb 20 22:42:14 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1 2025/02/20 22:42:14 nia Exp $
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_fbsd.la
Index: pkgsrc/emulators/bochs/PLIST.NetBSD
diff -u /dev/null pkgsrc/emulators/bochs/PLIST.NetBSD:1.1
--- /dev/null   Thu Feb 20 22:42:14 2025
+++ pkgsrc/emulators/bochs/PLIST.NetBSD Thu Feb 20 22:42:14 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2025/02/20 22:42:14 nia Exp $
+${PLIST.plugins}lib/bochs/plugins/libbx_eth_fbsd.la
Index: pkgsrc/emulators/bochs/options.mk
diff -u /dev/null pkgsrc/emulators/bochs/options.mk:1.1
--- /dev/null   Thu Feb 20 22:42:14 2025
+++ pkgsrc/emulators/bochs/options.mk   Thu Feb 20 22:42:14 2025
@@ -0,0 +1,64 @@
+# $NetBSD: options.mk,v 1.1 2025/02/20 22:42:14 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bochs
+PKG_SUPPORTED_OPTIONS+=        debug sdl x11
+
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS= sdl x11
+.else
+PKG_SUGGESTED_OPTIONS= sdl
+.endif
+
+PLIST_VARS+=           nox11 plugins x11 sdl
+
+.include "../../mk/bsd.options.mk"
+
+# Debugging features for the client operating systems. These options are
+# not enabled by default because they can adversely impact performance.
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --disable-plugins
+CONFIGURE_ARGS+=       --enable-debugger
+CONFIGURE_ARGS+=       --enable-iodebug
+CONFIGURE_ARGS+=       --enable-x86-debugger
+.else
+PLIST.plugins=         yes
+CONFIGURE_ARGS+=       --enable-plugins
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/gtk3/buildlink3.mk"
+.endif
+
+# want SDL for sound and portable graphics
+.if !empty(PKG_OPTIONS:Msdl)
+PLIST.sdl=             yes
+CONFIGURE_ARGS+=       --with-sdl
+.  include "../../devel/SDL/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-sdl
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=                     yes
+LIBS+=                         -lX11
+CONFIGURE_ARGS+=               --with-x
+CONFIGURE_ARGS+=               --with-x11
+BUILDLINK_DEPMETHOD.libXt?=    build
+.  include "../../x11/libSM/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXpm/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.  include "../../x11/libXt/buildlink3.mk"
+.else
+PLIST.nox11=           yes
+.  include "../../mk/curses.buildlink3.mk"
+.  if ${OPSYS} == "NetBSD"
+.    if ${CURSES_TYPE} == "curses"
+GUI_LINK_OPTS_TERM=    -lcurses
+.    endif
+.  endif
+CONFIGURE_ARGS+=       --without-x
+CONFIGURE_ARGS+=       --without-x11
+CONFIGURE_ARGS+=       --with-term
+.endif



Home | Main Index | Thread Index | Old Index