Here is an update to Bochs 2.6.
Tested on amd64.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 12 Jan 2012 17:01:47 -0000 1.55
+++ Makefile 5 Sep 2012 00:17:47 -0000
@@ -2,13 +2,13 @@
COMMENT= x86 machine simulator
-DISTNAME= bochs-2.5.1
+DISTNAME= bochs-2.6
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
HOMEPAGE= http://bochs.sourceforge.net/
-# LGPLv2.1+
+# LGPLv2.1+ and MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -16,14 +16,20 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++ termlib
+LIB_DEPENDS= devel/sdl
+
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-all-optimizations \
--enable-avx \
+ --enable-e1000 \
+ --enable-es1370 \
--enable-large-ramfile \
--enable-ne2000 \
--enable-pci \
+ --enable-pnic \
--enable-smp \
+ --enable-svm \
--enable-x86-64 \
--enable-usb \
--enable-usb-ohci \
@@ -44,8 +50,11 @@ WANTLIB+= curses readline
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS+=--with-nogui
.else
-CONFIGURE_ARGS+=--with-x11
-WANTLIB+= ICE SM X11 Xext Xpm Xrandr Xrender xcb
+MODULES= converters/libiconv
+CONFIGURE_ARGS+=--with-sdl \
+ --with-x11
+WANTLIB+= SDL X11 Xext Xpm Xrandr Xrender pthread sndio usbhid \
+ xcb
.endif
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 12 Jan 2012 17:01:47 -0000 1.17
+++ distinfo 5 Sep 2012 00:18:59 -0000
@@ -1,5 +1,2 @@
-MD5 (bochs-2.5.1.tar.gz) = T+UyXsQip/dNuwrbUsdrtg==
-RMD160 (bochs-2.5.1.tar.gz) = JbUV1GAyYmkhqM+ZUYMRbijrqeI=
-SHA1 (bochs-2.5.1.tar.gz) = 4QUulD67jjuE9Afg4/F2ByaCU7Y=
-SHA256 (bochs-2.5.1.tar.gz) = jT8szY/D3yr/fqNwr8Uhyt1KT1Rfr2sEIQE0U84+om4=
-SIZE (bochs-2.5.1.tar.gz) = 4126651
+SHA256 (bochs-2.6.tar.gz) = ZRI+RKbSwRSNdB2gJdFjEbnM1gDvJouRGrpzxn6vhuE=
+SIZE (bochs-2.6.tar.gz) = 4212828
Index: patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 29 Nov 2011 17:22:01 -0000 1.5
+++ patches/patch-Makefile_in 5 Sep 2012 00:19:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2011/11/29 17:22:01 giovanni Exp $
---- Makefile.in.orig Sun Nov 27 11:12:35 2011
-+++ Makefile.in Sun Nov 27 21:55:47 2011
-@@ -392,8 +392,8 @@ install_docbook: build_docbook
+--- Makefile.in.orig Sun Sep 2 07:30:15 2012
++++ Makefile.in Tue Sep 4 20:19:08 2012
+@@ -436,8 +436,8 @@ clean_docbook::
install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)
Index: patches/patch-_bochsrc
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-_bochsrc
--- patches/patch-_bochsrc 12 Jan 2012 17:01:47 -0000 1.8
+++ patches/patch-_bochsrc 26 Aug 2012 17:13:41 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-_bochsrc,v 1.8 2012/01/12 17:01:47 giovanni Exp $
---- .bochsrc.orig Fri Jan 6 13:51:12 2012
-+++ .bochsrc Sat Jan 7 13:22:57 2012
-@@ -384,13 +384,13 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
+--- .bochsrc.orig Mon Aug 20 05:05:45 2012
++++ .bochsrc Sun Aug 26 13:13:34 2012
+@@ -412,13 +412,13 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
# The optional parameter 'write_protected' can be used to control the media
# write protect switch. By default it is turned off.
#=======================================================================
@@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.8 2012/01/1
#=======================================================================
# FLOPPYB:
-@@ -529,7 +529,7 @@ boot: disk
+@@ -561,7 +561,7 @@ boot: disk
#
# Default value are sync=none, time0=local
#=======================================================================
@@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.8 2012/01/1
#=======================================================================
-@@ -553,8 +553,8 @@ floppy_bootsig_check: disabled=0
+@@ -585,8 +585,8 @@ floppy_bootsig_check: disabled=0
# log: ./bochs.out
# log: /dev/tty
#=======================================================================
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/bochs/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 29 Nov 2011 17:22:01 -0000 1.20
+++ pkg/PLIST 5 Sep 2012 00:35:56 -0000
@@ -34,7 +34,8 @@ share/bochs/keymaps/x11-pc-uk.map
share/bochs/keymaps/x11-pc-us.map
share/doc/bochs/
@comment share/doc/bochs/CHANGES
-@comment share/doc/bochs/COPYING
+share/doc/bochs/COPYING
+share/doc/bochs/LICENSE
share/doc/bochs/README
@comment share/doc/bochs/TODO
share/doc/bochs/bxdebugger.html
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
