[Midnightbsd-cvs] mports: emulators/bochs: bochs 2.3.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 1 12:11:06 EST 2009
Log Message:
-----------
bochs 2.3.7
Modified Files:
--------------
mports/emulators/bochs:
Makefile (r1.4 -> r1.5)
distinfo (r1.1 -> r1.2)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/emulators/bochs/files:
pkg-message.in (r1.1 -> r1.2)
Removed Files:
-------------
mports/emulators/bochs/files:
bochs.sh
patch-aa
patch-ae
patch-iodev-eth_vde.cc
-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/emulators/bochs/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L emulators/bochs/pkg-descr -L emulators/bochs/pkg-descr -u -r1.1 -r1.2
--- emulators/bochs/pkg-descr
+++ emulators/bochs/pkg-descr
@@ -5,7 +5,7 @@
including optional MMX, SSE, SSE2 and 3DNow instructions.
Bochs is capable of running most Operating Systems inside the emulation
-including Linux, Windows 95, DOS, and Windows NT 4.
+including Linux, DOS, Windows 95/98 and Windows NT/2000/XP.
Bochs was written by Kevin Lawton and is currently maintained by the Bochs
project.
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/emulators/bochs/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L emulators/bochs/pkg-plist -L emulators/bochs/pkg-plist -u -r1.1 -r1.2
--- emulators/bochs/pkg-plist
+++ emulators/bochs/pkg-plist
@@ -1,15 +1,15 @@
- at comment $FreeBSD: ports/emulators/bochs/pkg-plist,v 1.26 2006/03/16 19:44:01 pav Exp $
bin/bochs
bin/bxcommit
bin/bximage
%%DATADIR%%/BIOS-bochs-latest
+%%DATADIR%%/BIOS-bochs-legacy
%%DATADIR%%/VGABIOS-elpin-2.40
%%DATADIR%%/VGABIOS-elpin-LICENSE
%%DATADIR%%/VGABIOS-lgpl-README
%%DATADIR%%/VGABIOS-lgpl-latest
-%%DATADIR%%/VGABIOS-lgpl-latest-debug
%%DATADIR%%/VGABIOS-lgpl-latest-cirrus
%%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug
+%%DATADIR%%/VGABIOS-lgpl-latest-debug
%%DATADIR%%/keymaps/sdl-pc-de.map
%%DATADIR%%/keymaps/sdl-pc-us.map
%%DATADIR%%/keymaps/x11-pc-be.map
@@ -23,19 +23,18 @@
%%DATADIR%%/keymaps/x11-pc-si.map
%%DATADIR%%/keymaps/x11-pc-uk.map
%%DATADIR%%/keymaps/x11-pc-us.map
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/bochsrc-sample.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/biossums.txt
+%%PORTDOCS%%%%DOCSDIR%%/bochsrc-sample.txt
%%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt
%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html
+%%PORTDOCS%%%%DOCSDIR%%/memory.txt
%%PORTDOCS%%%%DOCSDIR%%/random.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/keymaps
@dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/emulators/bochs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L emulators/bochs/Makefile -L emulators/bochs/Makefile -u -r1.4 -r1.5
--- emulators/bochs/Makefile
+++ emulators/bochs/Makefile
@@ -1,39 +1,63 @@
-# ex:ts=8
-# Ports collection makefile for: bochs
-# Date created: 16 December 1997
-# Whom: alex
-#
-# $FreeBSD: ports/emulators/bochs/Makefile,v 1.74 2006/05/17 13:08:24 vs Exp $
-#
+# $MidnightBSD$
PORTNAME= bochs
-PORTVERSION= 2.2.6
+PORTVERSION= 2.3.7
PORTEPOCH= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= ports at MidnightBSD.org
COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
LICENSE= lgpl
-BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
-RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-USE_XLIB= yes
+USE_GNOME= gnometarget
USE_GMAKE= yes
-
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
-CONFIGURE_ARGS= --disable-split-hd \
- --enable-all-optimizations \
- --with-x11 \
- --enable-pci \
- --enable-sb16=freebsd \
- --enable-ne2000 \
- --enable-vbe
+USE_AUTOTOOLS= libtool:15
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --disable-docbook
+
+OPTIONS= ACPI "Enable ACPI emulation" off \
+ AES "Enable support of AES CPU extensions" off \
+ CDROM "Enable CDROM support" on \
+ CLGD54XX "Enable Cirrus Logic GD54xx video card" off \
+ DEBUGGER "Enable debugger and disassembler support" off \
+ DEBUGGER_X86 "Enable x86 hardware debugger" off \
+ FPU "Enable FPU emulator" on \
+ IDLE_HACK "Keep Bochs from using all CPU time" off \
+ IGNORE_BAD_MSR "Ignore unknown MSR references (don't panic)" off \
+ MTRR "Enable MTRR emulation (CPU level >= 6)" off \
+ MWAIT "Enable experimental MONITOR/MWAIT support" off \
+ NE2000 "Enable limited ne2000 support" on \
+ NEW_PIT "Enable use of the new PIT model" on \
+ OPTIMIZATIONS "Enable all safe speeed optimizations" on \
+ PCI "Enable limited i440FX PCI support" on \
+ PLUGINS "Enable building dynamic loadable plugins" off \
+ PNIC "Enable PCI pseudo NIC (network card) support" off \
+ PORT_E9_HACK "Writes to port e9 go to console" on \
+ READLINE "Enable readline support in debugger" off \
+ RFB "Enable VNC server support in display" off \
+ SB16 "Enable Sound Blaster 16 emulation" on \
+ SDL "Enable SDL display interface" off \
+ SHOW_IPS "Enable logging of measured IPS" off \
+ SMP "Enable SMP simulation support (CPU level 6)" off \
+ SSE4 "Enable emulation of SSE4.2 instruction set" off \
+ SVGA "Enable SVGAlib support" off \
+ TCACHE "Enable trace cache" on \
+ TERM "Use text only, console based interface" off \
+ USB "Enable limited i440FX PCI USB support" off \
+ VBE "Enable VGA BIOS Extensions" on \
+ WX "Use WxWidgets display interface" off \
+ X11 "Use X11 display interface" on \
+ X86_64 "Enable AMD x86-64 support" off \
+ XPM "Enable XPM library support" off \
+ XSAVE "Enable support of XSAVE/XRSTOR CPU extensions" off
CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
MANCOMPRESSED= yes
MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
@@ -41,110 +65,230 @@
SUB_FILES= pkg-message
-.if defined(WITH_BOCHS_SMP)
-CONFIGURE_ARGS+= --enable-smp
-WITH_BOCHS_CPU_LEVEL= 6
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_TERM) && defined(WITHOUT_WX) && defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--with-nogui
+.endif
+
+.if defined(WITH_ACPI)
+CONFIGURE_ARGS+=--enable-acpi
+.endif
+
+.if defined(WITH_AES)
+CONFIGURE_ARGS+=--enable-aes
+.endif
+
+.if defined(WITHOUT_CDROM)
+CONFIGURE_ARGS+=--disable-cdrom
+.endif
+
+.if defined(WITH_CLGD54XX)
+CONFIGURE_ARGS+=--enable-clgd54xx
+.endif
+
+.if defined(WITH_DEBUGGER)
+CONFIGURE_ARGS+=--enable-debugger --enable-disasm
+.endif
+
+.if defined(WITH_DEBUGGER_X86)
+CONFIGURE_ARGS+=--enable-x86-debugger
+.endif
+
+.if defined(WITH_FPU)
+CONFIGURE_ARGS+=--enable-fpu
+.endif
+
+.if defined(WITH_IDLE_HACK)
+CONFIGURE_ARGS+=--enable-idle-hack
+.endif
+
+.if defined(WITH_IGNORE_BAD_MSR)
+CONFIGURE_ARGS+=--enable-ignore-bad-msr
+.endif
+
+.if defined(WITH_MTRR)
+CONFIGURE_ARGS+=--enable-mtrr
+.endif
+
+.if defined(WITH_MWAIT)
+CONFIGURE_ARGS+=--enable-monitor-mwait
+.endif
+
+.if defined(WITH_NE2000)
+CONFIGURE_ARGS+=--enable-ne2000
+.endif
+
+.if defined(WITHOUT_NEW_PIT)
+CONFIGURE_ARGS+=--disable-new-pit
+.endif
+
+.if defined(WITH_OPTIMIZATIONS)
+CONFIGURE_ARGS+=--enable-all-optimizations
.endif
-.if defined(WITH_BOCHS_CPU_LEVEL)
-.if ${WITH_BOCHS_CPU_LEVEL} < 3 || ${WITH_BOCHS_CPU_LEVEL} > 6
-IGNORE= cannot install: WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6
+.if defined(WITH_PCI)
+CONFIGURE_ARGS+=--enable-pci
.endif
-CONFIGURE_ARGS+= --enable-cpu-level=${WITH_BOCHS_CPU_LEVEL}
-.if ${WITH_BOCHS_CPU_LEVEL} < 5
-CONFIGURE_ARGS+= --disable-mmx
+
+.if defined(WITH_PLUGINS)
+CONFIGURE_ARGS+=--enable-plugins
.endif
+
+.if defined(WITH_PNIC)
+CONFIGURE_ARGS+=--enable-pnic
.endif
-.if defined(WITH_BOCHS_GUI_TERM)
-CONFIGURE_ARGS+= --with-term
+.if defined(WITHOUT_PORT_E9_HACK)
+CONFIGURE_ARGS+=--disable-port-e9-hack
.endif
-.if defined(WITH_BOCHS_GUI_NOGUI)
-CONFIGURE_ARGS+= --with-nogui
+.if defined(WITH_READLINE)
+CONFIGURE_ARGS+=--enable-readline
+.else
+CONFIGURE_ARGS+=--disable-readline
.endif
-.if defined(WITH_BOCHS_AMD64)
-CONFIGURE_ARGS+= --enable-x86-64
+.if defined(WITH_RFB)
+CONFIGURE_ARGS+=--with-rfb
.endif
-.if defined(WITH_BOCHS_DEBUGGER)
-CONFIGURE_ARGS+= --enable-debugger --enable-disasm
+.if defined(WITH_SB16)
+CONFIGURE_ARGS+=--enable-sb16=freebsd
.endif
-.if defined(WITH_BOCHS_X86_DEBUGGER)
-CONFIGURE_ARGS+= --enable-x86-debugger
+.if defined(WITH_SMP)
+CONFIGURE_ARGS+=--enable-smp
+WITH_CPU_LEVEL= 6
.endif
-.if defined(WITH_BOCHS_PORT_E9_HACK)
-CONFIGURE_ARGS+= --enable-port-e9-hack
+.if defined(WITH_SDL)
+USE_SDL= sdl
+CONFIGURE_ARGS+=--with-sdl
.endif
-pre-patch::
- @${ECHO_MSG}
-.if !defined(WITH_BOCHS_CPU_LEVEL)
- @${ECHO_MSG} "If you want to change the processor level to emulate (default is 5, aka Pentium)"
- @${ECHO_MSG} "Choices are 3,4,5,6 which mean target 386, 486, Pentium or Pentium Pro emulation"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_CPU_LEVEL=<cpu level>\""
- @${ECHO_MSG}
+.if defined(WITH_SHOW_IPS)
+CONFIGURE_ARGS+=--enable-show-ips
.endif
-.if !defined(WITH_BOCHS_GUI_TERM)
- @${ECHO_MSG} "If you want to enable the plain text, console-based bochs interface"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_TERM=yes\""
- @${ECHO_MSG}
+
+.if defined(WITH_SSE4) || defined(WITH_AES) || defined(WITH_XSAVE)
+CONFIGURE_ARGS+=--enable-sse=4 --enable-sse-extension
+WITH_CPU_LEVEL= 6
.endif
-.if !defined(WITH_BOCHS_GUI_NOGUI)
- @${ECHO_MSG} "If you want the bochs display"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_NOGUI=yes\""
- @${ECHO_MSG}
+
+.if defined(WITH_SVGA)
+LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
+CONFIGURE_ARGS+=--with-svga
.endif
-.if !defined(WITH_BOCHS_SMP)
- @${ECHO_MSG} "If you want to compile with SMP support (implies WITH_BOCHS_CPU_LEVEL=6),"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_SMP\""
- @${ECHO_MSG}
+
+.if defined(WITH_TERM)
+CONFIGURE_ARGS+=--with-term
.endif
-.if !defined(WITH_BOCHS_DEBUGGER)
- @${ECHO_MSG} "If you want to compile with builtin debugger and disassembler support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_DEBUGGER=yes\""
- @${ECHO_MSG}
+
+.if defined(WITHOUT_TCACHE)
+CONFIGURE_ARGS+=--disable-trace-cache
+.else
+CONFIGURE_ARGS+=--enable-trace-cache
.endif
-.if !defined(WITH_BOCHS_X86_DEBUGGER)
- @${ECHO_MSG} "If you want to compile with x86 hardware debugger support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_X86_DEBUGGER=yes\""
- @${ECHO_MSG}
+
+.if defined(WITH_USB)
+CONFIGURE_ARGS+=--enable-usb
.endif
-.if !defined(WITH_BOCHS_AMD64)
- @${ECHO_MSG} "If you want to compile with AMD x86-64 support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_AMD64=yes\""
- @${ECHO_MSG}
+
+.if defined(WITH_VBE)
+CONFIGURE_ARGS+=--enable-vbe
+.endif
+
+.if defined(WITH_WX)
+USE_WX= 2.4-2.6
+CONFIGURE_ARGS+=--with-wx
.endif
-.if !defined(WITH_BOCHS_PORT_E9_HACK)
- @${ECHO_MSG} "If you want to compile with port e9 hack support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_PORT_E9_HACK=yes\""
- @${ECHO_MSG}
+
+.if defined(WITH_X11)
+USE_XORG= xext xt
+CONFIGURE_ARGS+=--with-x11
.endif
+.if defined(WITH_X86_64)
+CONFIGURE_ARGS+=--enable-x86-64
+.endif
+
+.if defined(WITH_XPM)
+USE_XORG= xpm
+.else
+CONFIGURE_ARGS+=--disable-xpm
+.endif
+
+.if defined(WITH_XSAVE)
+CONFIGURE_ARGS+=--enable-xsave
+.endif
+
+.if defined(WITH_CPU_LEVEL)
+.if ${WITH_CPU_LEVEL} < 3 || ${WITH_CPU_LEVEL} > 6
+IGNORE= can not install: WITH_CPU_LEVEL must be an integer value between 3 and 6
+.endif
+CONFIGURE_ARGS+=--enable-cpu-level=${WITH_CPU_LEVEL}
+.if ${WITH_CPU_LEVEL} < 5
+CONFIGURE_ARGS+=--disable-mmx
+.endif
+.endif
+
+.if defined(WITH_SSE_LEVEL)
+.if ${WITH_SSE_LEVEL} >= 1 && ${WITH_SSE_LEVEL} <= 3
+CONFIGURE_ARGS+=--enable-sse=${WITH_SSE_LEVEL}
+.else
+IGNORE= can not install: WITH_SSE_LEVEL must be an integer value between 1 and 3
+.endif
+.endif
+
+pre-everything::
+ @${ECHO_CMD}
+.if !defined(WITH_CPU_LEVEL)
+ @${ECHO_CMD} "If you want to change the processor level to emulate (default is 5, aka Pentium), set WITH_CPU_LEVEL to the desired value. Choices are 3, 4, 5 and 6 which mean target 386, 486, Pentium or Pentium Pro emulation." | ${FMT}
+.endif
+.if !defined(WITH_SSE_LEVEL)
+ @${ECHO_CMD} "If you want to enable SSE you have to set WITH_SSE_LEVEL to 1, 2 or 3." | ${FMT}
+.endif
+ @${ECHO_CMD}
+
post-patch:
- @${REINPLACE_CMD} -E ' \
- s|file=bios/|file=${DATADIR}/|; \
- s|bios/VGABIOS|${DATADIR}/VGABIOS|; \
- ' ${WRKSRC}/.bochsrc
- @${REINPLACE_CMD} -E ' \
- s|(^sharedir.+=).+|\1 ${DATADIR}|; \
- s|(^docdir.+=).+|\1 ${DOCSDIR}|; \
- ' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e ' \
- s|/usr/local/share/bochs|${DATADIR}|; \
- s|/usr/local/share/doc/bochs|${DOCSDIR}|; \
- ' ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.1 \
- ${WRKSRC}/doc/man/*.5
+ @${REINPLACE_CMD} -Ee \
+ 's|$$BXSHARE/|${DATADIR}/|; \
+ s|^#clock: sync=none|clock: sync=realtime|; \
+ s|^log: .+|log: /dev/null|; \
+ s|^panic: .+|panic: action=ask|; \
+ s|^parport1: .+|#&|' \
+ ${WRKSRC}/.bochsrc
+ @${REINPLACE_CMD} -Ee \
+ 's|install_share install_doc|install_share|; \
+ s|(^sharedir.+=).+|\1 ${DATADIR}|; \
+ s|(^docdir.+=).+|\1 ${DOCSDIR}|' \
+ ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|/usr/local/share/bochs|${DATADIR}|; \
+ s|/usr/local/share/doc/bochs|${DOCSDIR}|' \
+ ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.[15]
+ @${REINPLACE_CMD} -Ee 's|/usr/(include/vga\.h)|${LOCALBASE}/\1|' \
+ ${WRKSRC}/gui/svga.cc
+ @${REINPLACE_CMD} -Ee 's|(^LOCAL_CXXFLAGS.+=)|\1 @CPPFLAGS@|' \
+ ${WRKSRC}/gui/Makefile.in
post-install:
+.if defined(WITH_PLUGINS)
+ @${FIND} ${PREFIX}/lib/bochs ! -type d | \
+ ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+ @${FIND} ${PREFIX}/lib/bochs -type d | ${SORT} -r | \
+ ${SED} 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/CHANGES
+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+ @${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}/TODO
+ @${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DOCSDIR}/bochsrc-sample.txt
@${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}
@${MKDIR} ${DOCSDIR}/html
@${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/emulators/bochs/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L emulators/bochs/distinfo -L emulators/bochs/distinfo -u -r1.1 -r1.2
--- emulators/bochs/distinfo
+++ emulators/bochs/distinfo
@@ -1,3 +1,3 @@
-MD5 (bochs-2.2.6.tar.gz) = 961482eb78b55fe3e0e0639e34b4c2c1
-SHA256 (bochs-2.2.6.tar.gz) = 25447ca196794bb2e00d314038f75ad8aeead87dcf34e9501598b900dea639ee
-SIZE (bochs-2.2.6.tar.gz) = 3765867
+MD5 (bochs-2.3.7.tar.gz) = a2e5f922505bf16cabd36bb9d571a2c4
+SHA256 (bochs-2.3.7.tar.gz) = 77f27fedadc6431df0a06ee226259a80443524ae9d221c97c5986e3f7927bb04
+SIZE (bochs-2.3.7.tar.gz) = 3989982
--- emulators/bochs/files/bochs.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/emulators/bochs/files/bochs.sh,v 1.1 2001/10/20 09:48:57 kevlo Exp $
-#
-# Bochs wrapper
-#
-
-bin_dir=%%PREFIX%%/libexec
-xbin_dir=%%X11BASE%%/bin
-font_dir=%%FONT_DIR%%
-
-${xbin_dir}/xset -q | grep -q ${font_dir}
-rc=$?
-
-if [ $rc != 0 ]; then
- ${xbin_dir}/xset fp+ ${font_dir}
- ${xbin_dir}/xset fp rehash
-fi
-
-${bin_dir}/bochs.bin ${1+"$@"}
-
-if [ $rc != 0 ]; then
- ${xbin_dir}/xset fp- ${font_dir}
- ${xbin_dir}/xset fp rehash
-fi
Index: pkg-message.in
===================================================================
RCS file: /home/cvs/mports/emulators/bochs/files/pkg-message.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L emulators/bochs/files/pkg-message.in -L emulators/bochs/files/pkg-message.in -u -r1.1 -r1.2
--- emulators/bochs/files/pkg-message.in
+++ emulators/bochs/files/pkg-message.in
@@ -1,7 +1,3 @@
-===========================================================================
-
Bochs requires a .bochsrc file to be present in either your current
-directory or your home directory before starting. A sample .bochsrc
+directory or your home directory before starting. A sample .bochsrc
file can be found in %%DOCSDIR%%/bochsrc-sample.txt
-
-===========================================================================
--- emulators/bochs/files/patch-iodev-eth_vde.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- iodev/eth_vde.cc.orig Sat Dec 10 16:37:35 2005
-+++ iodev/eth_vde.cc Sat Mar 18 00:25:18 2006
-@@ -41,18 +41,22 @@
- #include <sys/poll.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--#include <asm/types.h>
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/un.h>
-+#if defined(__linux__)
-+#include <asm/types.h>
- #include <linux/netlink.h>
- #include <linux/if.h>
-+#elif BX_HAVE_NET_IF_H
-+#include <net/if.h>
-+#endif
- #include <assert.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
--#include <stdint.h>
-+#include <inttypes.h>
-
- #define SWITCH_MAGIC 0xfeedface
-
--- emulators/bochs/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD: ports/emulators/bochs/files/patch-ae,v 1.3 2004/01/17 23:22:07 anholt Exp $
---- bx_debug/lexer.l.orig Tue Apr 10 03:57:02 2001
-+++ bx_debug/lexer.l Sun May 20 13:25:29 2001
-@@ -105,7 +105,7 @@
- \/[0-9]+ { bxlval.sval = strdup(bxtext); return(BX_TOKEN_XFORMAT); }
- 0x[0-9a-fA-F]+ { bxlval.uval = strtoul(bxtext+2, NULL, 16); return(BX_TOKEN_NUMERIC); }
- 0[0-7]+ { bxlval.uval = strtoul(bxtext+1, NULL, 8); return(BX_TOKEN_NUMERIC); }
--[0-9]+L { bxlval.ulval = strtoull(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
-+[0-9]+L { bxlval.ulval = strtouq(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
- [0-9]+ { bxlval.uval = strtoul(bxtext, NULL, 10); return(BX_TOKEN_NUMERIC); }
- $[a-zA-Z_][a-zA-Z0-9_]* { bxlval.sval = strdup(bxtext); return(BX_TOKEN_SYMBOLNAME); }
- \n { return('\n'); }
--- emulators/bochs/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- .bochsrc.orig Sun Jan 29 07:56:01 2006
-+++ .bochsrc Mon Feb 20 21:10:38 2006
-@@ -74,7 +74,7 @@
- # now supported, but we still recommend to use the BIOS distributed with
- # Bochs. Now the start address can be calculated from image size.
- #=======================================================================
--romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
-+romimage: file=/usr/local/share/bochs/BIOS-bochs-latest, address=0xf0000
- #romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top
- #romimage: file=mybios.bin # calculate start address from image size
-
-@@ -147,9 +147,9 @@
- # VGAROMIMAGE
- # You now need to load a VGA ROM BIOS into C0000.
- #=======================================================================
--#vgaromimage: file=bios/VGABIOS-elpin-2.40
--vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
--#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus
-+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-elpin-2.40
-+vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest
-+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest-cirrus
-
- #=======================================================================
- # VGA:
-@@ -319,7 +319,7 @@
- #
- # Default value are sync=none, time0=local
- #=======================================================================
--#clock: sync=none, time0=local
-+clock: sync=realtime, time0=local
-
-
- #=======================================================================
-@@ -344,8 +344,8 @@
- # log: ./bochs.out
- # log: /dev/tty
- #=======================================================================
--#log: /dev/null
--log: bochsout.txt
-+log: /dev/null
-+#log: bochsout.txt
-
- #=======================================================================
- # LOGPREFIX:
-@@ -385,7 +385,7 @@
- # cause bochs to become unstable. The panic is a "graceful exit," so
- # if you disable it you may get a spectacular disaster instead.
- #=======================================================================
--panic: action=ask
-+panic: action=fatal
- error: action=report
- info: action=report
- debug: action=ignore
-@@ -442,7 +442,7 @@
- # parport2: enabled=1, file="/dev/lp0"
- # parport1: enabled=0
- #=======================================================================
--parport1: enabled=1, file="parport.out"
-+#parport1: enabled=1, file="parport.out"
-
- #=======================================================================
- # SB16:
More information about the Midnightbsd-cvs
mailing list