pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
bochs: Drop, emulators/bochs is the same version
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Jun 11 17:51:31 2016 +0200
Changeset: fb79c9666b31c08fcf30a118b36e769035d7c318
Removed Files:
bochs/COMMIT_MSG
bochs/DESCR
bochs/MESSAGE
bochs/MESSAGE.Darwin
bochs/Makefile
bochs/PLIST
bochs/PLIST.Darwin
bochs/TODO
bochs/distinfo
bochs/patches/patch-.bochsrc
bochs/patches/patch-Makefile.in
bochs/patches/patch-iodev_network_slirp_compat_cc
bochs/patches/patch-iodev_sound_soundosx.cc
bochs/patches/patch-main.cc
Log Message:
bochs: Drop, emulators/bochs is the same version
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fb79c9666b31c08fcf30a118b36e769035d7c318
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bochs/COMMIT_MSG | 198 ----------------------
bochs/DESCR | 8 -
bochs/MESSAGE | 8 -
bochs/MESSAGE.Darwin | 16 --
bochs/Makefile | 151 -----------------
bochs/PLIST | 71 --------
bochs/PLIST.Darwin | 43 -----
bochs/TODO | 18 --
bochs/distinfo | 10 --
bochs/patches/patch-.bochsrc | 29 ----
bochs/patches/patch-Makefile.in | 28 ---
bochs/patches/patch-iodev_network_slirp_compat_cc | 19 ---
bochs/patches/patch-iodev_sound_soundosx.cc | 13 --
bochs/patches/patch-main.cc | 13 --
14 files changed, 625 deletions(-)
diffs:
diff --git a/bochs/COMMIT_MSG b/bochs/COMMIT_MSG
deleted file mode 100644
index dfc4e97..0000000
--- a/bochs/COMMIT_MSG
+++ /dev/null
@@ -1,198 +0,0 @@
-Update 2.6.2 to 2.6.8
----------------------
-Changes in 2.6.8 (May 3, 2015):
-
-- CPU / CPUDB
- - Bugfixes for CPU emulation correctness (critical bugfix for x86-64 emulation)
- - Memory type calculation support for Bochs debugger and instrumentation,
- to enable configure with --enable-memtype option.
- - CPUDB: Added Pentium (P54C) configuration to CPUDB
- - CPUDB: Added Broadwell ULT configuration to CPUDB
- - Updated definition of instrumentation callbacks, see description in
- instrumentation.txt / Fixed instrumentation examples
-
-- Configure and compile
- - Configure option --enable-fast-function-calls now also used for MSVC nmake.
- - Some configure fixes for the GTK debugger support.
-
-- GUI and display libraries
- - The VGA update timer mode now can be selected with the 'vga' option.
- - Release all pressed keys when the simwindow gets back the keyboard focus.
- - Win32 gui: Captured mouse cursor now really trapped in window.
- - SDL2: Implemented yes/no dialog (e.g. for VVFAT commit).
- - Some fixes for wxWidgets 3.0 and unicode version compatiblity.
- - Full save/restore support for enhanced gui debugger settings (window+font).
- - Added debugger support for the term gui using a pseudo-terminal.
-
-- I/O Devices
- - Hard drive
- - Added Oracle(tm) VM VirtualBox image support (VDI version 1.1)
- - Re-enable "bulk I/O" repeat speedups extension.
- - Some lowlevel cdrom code fixes for Windows and Linux.
- - Sound
- - SB16: Fixed OPL chip detection by implementing ISA bus delay.
- - SB16: Ported OPL3 emulation from DOSBox and partly removed legacy code.
- - ES1370: Added MIDI UART output support.
- - ES1370: Fixed critical bug that made Win9x drivers crash.
- - Major rewrite of the lowlevel sound code.
- - Added mixer thread support (required for all modules except 'sdl').
- - New mixer and SDL mixer are polling data from the PCM output buffers,
- the PC speaker beep generator and the OPL3 FM generator.
- - PCM format conversion to 16 bit signed little endian.
- - Added sound 'file' module for VOC, WAV, MID and raw data output
- and added dual output support (device+file) in midi/wave mode 3.
- - Added capability to set up the sound driver per service.
- - Floppy
- - Fixed "Read ID" command for single-sided media (patch by Ben Lunt).
-
-- ROM BIOS
- - Fixed keyboard scancode processing after keyboard intercept.
- - Fixed rombios32 code to avoid incorrect ACPI table detection.
-
--------------------------------------------------------------------------
-Changes in 2.6.7 (November 2, 2014):
-
-- CPU / CPUDB
- - Implemented AVX-512BW/AVX-512DQ/AVX-512VL extensions emulation.
- - implemented AVX512-IFMA532 instructions emulation.
- - implemented AVX512-VBMI instructions emulation.
- - Bugfixes for CPU emulation correctness (critical fixes for AVX-512, CMPXCHG16B and VMX)
- - Fixed Bochs segmentation fault crash with Handlers Chaining Speedups enabled when
- compiling with gcc, especially with low optimization levels.
- - Reverted removal of reporting Architectural Perfmon support in pre-defined CPUID modules.
- Windows 8 and Windows 10 require Performance Monitoring to be reported to boot.
- To workaround possible Windows 7 64-bit installation issues: use bx_generic CPUID module,
- which doesn't report Performance Monitoring in CPUID.
-
-- GUI and display libraries
- - The VGA update timer and the status LED timer now always use the realtime mode
- independent from the 'clock' option setting.
- - Added native SDL2 GUI support to Bochs. To enable configure with --with-sdl2.
- - Added new user shortcut "scrlck" (SDL/SDL2 using "Scroll Lock" for fullscreen toggle).
- - Write enhanced gui debugger settings to file on exit and restore on initialization.
-
-- I/O Devices
- - USB
- - xHCI model now emulates a NEC/Renesas uPD720202 device (patch by Ben Lunt).
- - Added USB port specific option 'size' for VVFAT disks (range 128M ... 128G).
- If the size is not specified or invalid, it defaults to 504M.
- - Hard drive / HD image
- - Fixed crash when using a "fixed" type VPC image.
-
-- ROM BIOS
- - Fixed int74_function() for 4-byte (wheel mouse) packets.
-
-- LGPL'd VGABIOS updated from CVS (fixed building VBE modes list)
-
-- Misc
- - Visual Studio workspace files updated to VS2013Ex format.
- - bximage_old/bxcommit: removed old obsolete image manipulation tools.
- - Documentation fixes and updates.
-
--------------------------------------------------------------------------
-Changes in 2.6.6 (June 15, 2014):
-
-- CPU / CPUDB
- - allow sandy bridge configuration even when AVX is not compiled in
-
-- Configure and compile
- - fixed compilation error when 3dnow support is enabled
- - speedup Visual Studio build by almost 20% by adding /Gr compiler option
-
-- Misc
- - fixed minimizing win32 gui window and resolution change while minimized
- - added compiled SeaBIOS 1.7.5 image into Bochs tree along with Bochs BIOS images
- - documentation fixes and updates
-
--------------------------------------------------------------------------
-Changes in 2.6.5 (June 1, 2014):
-
-Brief summary :
-- CPU: extra 5-10% emulation speedup with new trace linking optimization
-- CPU: implemented new instructions (e.g. AVX-512, SHA, XSAVEC)
-- CPUDB: added 2 new CPU models
-- Bugfixes for CPU emulation correctness (including some critical ones)
-- Gui debugger output window now can be used as a log viewer
-- Added built-in slirp (user-mode networking) support (ported from Qemu)
-- Added global sound config option and volume control support to the devices
-- Added new experimental gui 'vncsrv" using the LibVNCServer library
-- Rewrite of the bximage utility in C++ for image creation, conversion and resize
-
-Detailed change log :
-
-- CPU
- - Bugfixes for CPU emulation correctness (critical fixes for XSAVE, VMX, TBM/BMI and RDRAND instructions)
- - Implemented FCS/FDS Deprecation CPU feature
- - Implemented SHA instructions emulation
- - Implemented XSAVEC instruction emulation and XINUSE optimization in the XSAVEOPT instruction
- - Implemented AVX-512 instructions emulation (experimental)
- ! CPUDB: Added Intel(R) Core(TM) i7-4770 CPU (Haswell) configuration to CPUDB
- ! CPUDB: Added AMD A8-5600K APU (Trinity) configuration to CPUDB
-
- - Replace 'SSE' and 'AVX' .bochsrc option with single 'SIMD' option which controls presence
- of all CPU SIMD extensions from SSE to AVX-512
-
- - Extra 5-10% emulation speedup with new trace linking optimization. The optimization
- is enabled by default when configuring with --enable-all-optimizations option,
- to disable trace linking optimization configure with --disable-trace-linking.
- The optimization require to compile Bochs with at least -O2 optimization level on gcc.
-
-- Bochs Debugger and Instrumentation
- - Added disam for Bochs internal instruction representation, especially useful for instrumentation
- - Updated definition of instrumentation callbacks, see description in
- instrumentation.txt / Fixed instrumentation examples
- - added capability to use the gui debugger output window as a log viewer
-
-- General
- - Increased max. device log prefix size to 6 and added / modified prefixes
- - plugin version now uses the native DLL handling code for all Windows ports
- - critical bugfixes in save/restore functionality
-
-- Configure and compile
- - configure and compilation fixes for Cygwin and Visual Studio environment
- - configure option --enable-cdrom now only controls the presence of
- platform-specific code for device access
- - building plugin version with MSVC nmake now supported
-
-- Config interface
- - Added global sound control option for the driver and wave input/output
- - Added new bochsrc option to control the speaker output mode
- - Added support to specify the initial time for 'clock' option in ctime(3) string format
- - Added support for the LTDL_LIBRARY_PATH variable with MSVC plugins
- - All SB16 / ES1370 options are now changeable at runtime
- - textconfig: added menu item for saving configuration at runtime
- - Added bochsrc option for the Voodoo Graphics emulation (experimental)
-
-- I/O Devices
- - Hard drive / CD-ROM
- - seek latency implemented for ATA/ATAPI read commands
- - portable ISO image file access now available on all platforms
- - Networking
- - added built-in slirp (user-mode networking) support (ported from Qemu)
- - removed the "slirp backend" support (required external slirp binary)
- - slirp/vnet: all supported TFTP extension options implemented now
- - Sound
- - SB16 / ES1370: added volume control support for wave output
- - SB16: fixed audio distortion when playing stereo wave files
- - ES1370: added 'wavemode' support similar to the SB16
- - soundwin: added capability to specify the ID of the MIDI device to use
- - Serial
- - Serial mouse detection fixes
- - Busmouse
- - Non-functional device rewritten to make it work in DOS and Win95 guests
- (use --enable-busmouse to configure and "mouse: type=bus" at runtime)
-
-- ROM BIOS
- - PS/2 mouse function: allow setting mouse packet size to 4 for wheel support
-
-- GUI and display libraries
- - Added new experimental gui 'vncsrv" using the LibVNCServer library
- - RFB: set maximum resolution to 1280x1024 (same as vncsrv)
- - RFB: don't wait for client connection on startup if timeout is set to 0
- - Added mouse wheel support to the rfb, vncsrv and wx guis
- - wx: added viewer window for the Bochs log output
- - win32: fixes and improvements for the fullscreen mode
-
-- Tools
- - bximage utility rewritten in C++ for image creation, conversion, resize
- and redolog commit. Now vmware4 and vpc images can be created.
diff --git a/bochs/DESCR b/bochs/DESCR
deleted file mode 100644
index adcb693..0000000
--- a/bochs/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The program bochs is a highly portable open source x86 PC emulator
-written in C++, and runs on most popular platforms. It includes
-emulation of the Intel x86 CPU, common IO devices, and a custom
-BIOS. Currently, bochs can be compiled to emulate a 386, 486,
-Pentium, Pentium PRO or AMD64 CPU.
-
-Bochs is capable of running most operating systems inside the
-emulation including Linux, NetBSD, Windows 95, DOS, and Windows NT 4.
diff --git a/bochs/MESSAGE b/bochs/MESSAGE
deleted file mode 100644
index a91c83c..0000000
--- a/bochs/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2014/12/12 00:15:42 makoto Exp $
-
-You need to copy the ${PREFIX}/share/doc/bochs/bochsrc-sample.txt
-file to your home directory and name it .bochsrc. Then edit it to
-your tastes defining the hard drives and floppies as needed.
-
-===========================================================================
diff --git a/bochs/MESSAGE.Darwin b/bochs/MESSAGE.Darwin
deleted file mode 100644
index 2928982..0000000
--- a/bochs/MESSAGE.Darwin
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Darwin,v 1.1 2014/12/12 00:15:42 makoto Exp $
-
-Bochs has been installed as ${PREFIX}/libexec/bochs.app.
-That directory (bochs.app) is an application bundle that you can copy to
-/Applications if you want to.
-
-There is a sample configuration file in ${PREFIX}/share/bochs.
-Note that you can use the $BXSHARE variable in your own configuration files
-to specify the location of the system BIOSes. This variable will be
-automatically set to the appropriate location by Bochs when executed.
-
-For your convenience, a 'bochs' helper script has also been installed and
-should be available through your PATH as a regular command-line utility.
-
-===========================================================================
diff --git a/bochs/Makefile b/bochs/Makefile
deleted file mode 100644
index 0e0f2c5..0000000
--- a/bochs/Makefile
+++ /dev/null
@@ -1,151 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2015/07/01 13:37:00 ryo-on Exp $
-
-DISTNAME= bochs-2.6.8
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://bochs.sourceforge.net/
-COMMENT= IA32 and AMD64 PC emulator
-LICENSE= gnu-lgpl-v2.1
-
-MAKE_JOBS_SAFE= no
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake gunzip gzip
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-ONLY_FOR_COMPILER= gcc
-CXXFLAGS+= -DPARANOID
-
-CONFIGURE_ARGS+= --enable-cdrom
-CONFIGURE_ARGS+= --enable-ne2000
-
-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
-
-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-disasm
-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
-CONFIGURE_ARGS+= --enable-x86-64
-CONFIGURE_ARGS+= --enable-smp
-CONFIGURE_ARGS+= --enable-long-phy-address
-CONFIGURE_ARGS+= --enable-cpu-level=6
-CONFIGURE_ARGS+= --enable-pci
-CONFIGURE_ARGS+= --enable-usb
-CONFIGURE_ARGS+= --enable-usb-ohci
-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-fpu
-CONFIGURE_ARGS+= --enable-vmx=2
-#CONFIGURE_ARGS+= --enable-3dnow
-CONFIGURE_ARGS+= --enable-alignment-check
-#CONFIGURE_ARGS+= --enable-gdb-stub
-CONFIGURE_ARGS+= --enable-gameport
-
-. if empty(PKG_OPTIONS:Mdebug)
-PLIST.plugins= yes
-CONFIGURE_ARGS+= --enable-plugins
-. endif
-
-. if !empty(MACHINE_PLATFORM:M*-*-i386)
-CONFIGURE_ARGS+= --enable-fast-function-calls
-. endif
-
-. if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --enable-sb16=osx
-. elif ${OPSYS} == "FreeBSD"
-CONFIGURE_ARGS+= --enable-sb16=freebsd
-. elif ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-sb16=linux
-CONFIGURE_ARGS+= --enable-pcidev
-. else
-CONFIGURE_ARGS+= --enable-sb16=dummy
-. endif
-.endif
-
-.if empty(PKG_OPTIONS:Mx11)
-PLIST.nox11= yes
-CONFIGURE_ARGS+= --without-x
-CONFIGURE_ARGS+= --without-x11
-CONFIGURE_ARGS+= --with-term
-.else
-PLIST.x11= yes
-.endif
-
-.if ${OPSYS} == "Linux"
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,'
-.elif ${OPSYS} == "Darwin"
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
-.else
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
-.endif
-
-.if ${OPSYS} == "Darwin"
-MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin
-PLIST_SRC= ${.CURDIR}/PLIST.Darwin
-
-post-build:
- { ${ECHO} '#! ${SH}'; \
- ${ECHO} 'exec ${PREFIX}/libexec/bochs.app/Contents/MacOS/bochs'\
- '"$$@"'; } >${WRKDIR}/bochs.sh
-
-post-install:
- /Developer/Tools/CpMac -r -p ${WRKSRC}/bochs.app ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKSRC}/bxcommit ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
- ${RM} -rf ${PREFIX}/libexec/bochs.app/.build
- ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
-.else
-
-.if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-. if empty(PKG_OPTIONS:Mx11)
-. include "../../mk/curses.buildlink3.mk"
-. 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
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/bochs/PLIST b/bochs/PLIST
deleted file mode 100644
index ce08e72..0000000
--- a/bochs/PLIST
+++ /dev/null
@@ -1,71 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2015/07/01 13:37:00 ryo-on Exp $
-bin/bochs
-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_cmos.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_dma.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_hdimage.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_netmod.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_serial.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundmod.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}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_ohci.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_uhci.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}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
-man/man1/bochs-dlx.1
-man/man1/bochs.1
-man/man1/bximage.1
-man/man5/bochsrc.5
-share/bochs/BIOS-bochs-latest
-share/bochs/BIOS-bochs-legacy
-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-cirrus
-share/bochs/VGABIOS-lgpl-latest-cirrus-debug
-share/bochs/VGABIOS-lgpl-latest-debug
-share/bochs/keymaps/sdl-pc-de.map
-share/bochs/keymaps/sdl-pc-us.map
-share/bochs/keymaps/x11-pc-be.map
-share/bochs/keymaps/x11-pc-da.map
-share/bochs/keymaps/x11-pc-de.map
-share/bochs/keymaps/x11-pc-es.map
-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-si.map
-share/bochs/keymaps/x11-pc-uk.map
-share/bochs/keymaps/x11-pc-us.map
-share/doc/bochs/CHANGES
-share/doc/bochs/COPYING
-share/doc/bochs/LICENSE
-share/doc/bochs/README
-share/doc/bochs/TODO
-share/doc/bochs/bochsrc-sample.txt
-share/doc/bochs/slirp.conf
-share/bochs/SeaBIOS-README
-share/bochs/bios.bin-1.7.5
-share/bochs/keymaps/sdl2-pc-de.map
-share/bochs/keymaps/sdl2-pc-us.map
diff --git a/bochs/PLIST.Darwin b/bochs/PLIST.Darwin
deleted file mode 100644
index 10bc2de..0000000
--- a/bochs/PLIST.Darwin
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2014/12/12 00:15:42 makoto Exp $
-bin/bochs
-bin/bxcommit
-bin/bximage
-libexec/bochs.app/Contents/Info.plist
-libexec/bochs.app/Contents/MacOS/bochs
-libexec/bochs.app/Contents/PkgInfo
-libexec/bochs.app/Contents/Resources/bochs-icn.icns
-libexec/bochs.app/Contents/Resources/bochs.rsrc
-libexec/bochs.app/Contents/pbdevelopment.plist
-man/man1/bochs-dlx.1
-man/man1/bochs.1
-man/man1/bxcommit.1
-man/man1/bximage.1
-man/man5/bochsrc.5
-share/bochs/BIOS-bochs-latest
-share/bochs/BIOS-bochs-legacy
-share/bochs/CHANGES
-share/bochs/COPYING
-share/bochs/README
-share/bochs/TODO
-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-cirrus
-share/bochs/VGABIOS-lgpl-latest-cirrus-debug
-share/bochs/VGABIOS-lgpl-latest-debug
-share/bochs/bochs.scpt
-share/bochs/bochsrc-sample.txt
-share/bochs/keymaps/sdl-pc-de.map
-share/bochs/keymaps/sdl-pc-us.map
-share/bochs/keymaps/x11-pc-be.map
-share/bochs/keymaps/x11-pc-da.map
-share/bochs/keymaps/x11-pc-de.map
-share/bochs/keymaps/x11-pc-es.map
-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-si.map
-share/bochs/keymaps/x11-pc-uk.map
-share/bochs/keymaps/x11-pc-us.map
diff --git a/bochs/TODO b/bochs/TODO
deleted file mode 100644
index 525c053..0000000
--- a/bochs/TODO
+++ /dev/null
@@ -1,18 +0,0 @@
-Following part is not confirmed other than NetBSD :-)
----------
-$NetBSD: TODO,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
-(At least NetBSD/amd64 7.99.1 has following problem)
-slirp/compat.cc:141:40: error: 'WIFEXITED' was not declared in this scope
-slirp/compat.cc:144:35: error: 'WEXITSTATUS' was not declared in this scope
-
---- iodev/network/slirp/compat.cc~ 2014-04-19 02:14:32.000000000 +0900
-+++ iodev/network/slirp/compat.cc 2014-12-12 01:01:35.000000000 +0900
-@@ -27,6 +27,10 @@
-
- #include "slirp.h"
-
-+#ifdef __NetBSD__
-+# include "sys/wait.h"
-+#endif
-+
diff --git a/bochs/distinfo b/bochs/distinfo
deleted file mode 100644
index f7884d4..0000000
--- a/bochs/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2015/07/01 13:37:00 ryo-on Exp $
-
-SHA1 (bochs-2.6.8.tar.gz) = 561dc622033facb321fd9ac2e56589ae724cfdb2
-RMD160 (bochs-2.6.8.tar.gz) = cf6f9a427559c79e18c208a89e7146b6e9798ea5
-Size (bochs-2.6.8.tar.gz) = 5075617 bytes
-SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d
-SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb
-SHA1 (patch-iodev_network_slirp_compat_cc) = 76786b51ca1e95402ff1b2a543b00f0750bb349e
-SHA1 (patch-iodev_sound_soundosx.cc) = 60ba51ac619b8149710d5ae7940ed6e4a68b36c2
-SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b
diff --git a/bochs/patches/patch-.bochsrc b/bochs/patches/patch-.bochsrc
deleted file mode 100644
index 495270a..0000000
--- a/bochs/patches/patch-.bochsrc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-.bochsrc,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
---- .bochsrc.orig 2011-02-12 14:00:34.000000000 +0000
-+++ .bochsrc
-@@ -295,13 +295,14 @@ vga: extension=vbe
- # The optional parameter 'write_protected' can be used to control the media
- # write protect switch. By default it is turned off.
- #=======================================================================
--floppya: 1_44=/dev/fd0, status=inserted
-+@FLOPPY_LINUX@floppya: 1_44=/dev/fd0, status=inserted
- #floppya: image=../1.44, status=inserted
- #floppya: 1_44=/dev/fd0H1440, status=inserted
- #floppya: 1_2=../1_2, status=inserted
- #floppya: 1_44=a:, status=inserted
- #floppya: 1_44=a.img, status=inserted, write_protected=1
- #floppya: 1_44=/dev/rfd0a, status=inserted
-+@FLOPPY_BSD@floppya: 1_44=/dev/rfd0a, status=inserted
-
- #=======================================================================
- # FLOPPYB:
-@@ -382,7 +383,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
- # ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
- # ata3-slave: type=cdrom, path=iso.sample, status=inserted
- #=======================================================================
--ata0-master: type=disk, mode=flat, path="30M.sample"
-+#ata0-master: type=disk, mode=flat, path="30M.sample"
- #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
- #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
- #ata0-slave: type=disk, mode=vvfat, path=/bochs/images/vvfat, journal=vvfat.redolog
diff --git a/bochs/patches/patch-Makefile.in b/bochs/patches/patch-Makefile.in
deleted file mode 100644
index 2e36ea9..0000000
--- a/bochs/patches/patch-Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
---- Makefile.in.orig 2011-02-10 23:00:56.000000000 +0000
-+++ Makefile.in
-@@ -66,8 +66,8 @@ RMDIR=rmdir
- TAR=tar
- CHMOD=chmod
- # the GZIP variable is reserved by gzip program
--GZIP_BIN=gzip -9
--GUNZIP=gunzip
-+GZIP_BIN=${GZIP_CMD} -9
-+GUNZIP=${GUNZIP_CMD}
- ZIP=zip
- UNIX2DOS=unix2dos
- LIBTOOL=@LIBTOOL@
-@@ -644,12 +644,9 @@ install_macosx: all download_dlx install
- $(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt
- -mkdir $(DESTDIR)$(sharedir)/keymaps
- $(CPMAC) $(srcdir)/gui/keymaps/*.map $(DESTDIR)$(sharedir)/keymaps
-- cat $(DLXLINUX_TAR) | (cd $(DESTDIR)$(sharedir) && tar xzvf -)
-- dlxrc=$(DESTDIR)$(sharedir)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig"
- mv $(srcdir)/README $(srcdir)/README.orig
- cat $(srcdir)/build/macosx/README.macosx-binary $(srcdir)/README.orig > $(DESTDIR)$(sharedir)/README
- rm -f $(DESTDIR)$(sharedir)/README.orig
-- $(CPMAC) $(SCRIPT_EXEC) $(DESTDIR)$(sharedir)/dlxlinux
- # for i in $(TEXT_FILE_LIST); do mv $(srcdir)/$$i $(DESTDIR)$(sharedir)/$$i.txt; done
-
- ###########################################
diff --git a/bochs/patches/patch-iodev_network_slirp_compat_cc b/bochs/patches/patch-iodev_network_slirp_compat_cc
deleted file mode 100644
index 5299488..0000000
--- a/bochs/patches/patch-iodev_network_slirp_compat_cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-iodev_network_slirp_compat_cc,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
-(At least NetBSD/amd64 7.99.1 has following problem)
-slirp/compat.cc:141:40: error: 'WIFEXITED' was not declared in this scope
-slirp/compat.cc:144:35: error: 'WEXITSTATUS' was not declared in this scope
-
---- iodev/network/slirp/compat.cc~ 2014-04-19 02:14:32.000000000 +0900
-+++ iodev/network/slirp/compat.cc 2014-12-12 01:01:35.000000000 +0900
-@@ -27,6 +27,10 @@
-
- #include "slirp.h"
-
-+#ifdef __NetBSD__
-+# include "sys/wait.h"
-+#endif
-+
- #if BX_NETWORKING && BX_NETMOD_SLIRP
-
- void pstrcpy(char *buf, int buf_size, const char *str)
diff --git a/bochs/patches/patch-iodev_sound_soundosx.cc b/bochs/patches/patch-iodev_sound_soundosx.cc
deleted file mode 100644
index efb8411..0000000
--- a/bochs/patches/patch-iodev_sound_soundosx.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-iodev_sound_soundosx.cc,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
---- iodev/sound/soundosx.cc.orig 2012-09-02 11:30:10.000000000 +0000
-+++ iodev/sound/soundosx.cc
-@@ -21,7 +21,7 @@
- // This file (SOUNDOSX.CC) written and donated by Brian Huffman
-
- #ifdef PARANOID
--#include <MacTypes.h>
-+#include <CoreServices/CoreServices.h>
- #endif
-
- #include "iodev.h"
diff --git a/bochs/patches/patch-main.cc b/bochs/patches/patch-main.cc
deleted file mode 100644
index 639d7a0..0000000
--- a/bochs/patches/patch-main.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-main.cc,v 1.1 2014/12/12 00:15:43 makoto Exp $
-
---- main.cc.orig 2010-11-21 12:02:12.000000000 +0000
-+++ main.cc
-@@ -622,7 +622,7 @@ int bx_init_main(int argc, char *argv[])
- }
- arg++;
- }
--#if BX_WITH_CARBON
-+#if BROKEN_BX_WITH_CARBON
- if(!getenv("BXSHARE"))
- {
- CFBundleRef mainBundle;
Home |
Main Index |
Thread Index |
Old Index