update: emulators/bochs

[Alexander Yurchenko <grange_(_at_)_rt_(_dot_)_mipt_(_dot_)_ru>]

I've attached an update for bochs port to version 1.4.

-- 
   Alexander Yurchenko (aka grange)

Index: ports/emulators/bochs/Makefile
===================================================================
RCS file: /home/ftp/cvsup/OpenBSD/ports/emulators/bochs/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ports/emulators/bochs/Makefile	19 Sep 2001 20:44:53 -0000	1.22
+++ ports/emulators/bochs/Makefile	5 May 2002 20:09:51 -0000
@@ -2,10 +2,11 @@
 # $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
 
 COMMENT=	"x86 machine simulator"
-DISTNAME=	bochs-1.2.1
+DISTNAME=	bochs-1.4
 CATEGORIES=	emulators
-NEED_VERSION=	1.413
-MASTER_SITES=	http://prdownloads.sourceforge.net/bochs/
+NEED_VERSION=	1.525
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	bochs
 
 HOMEPAGE=	http://bochs.sourceforge.net/
 
@@ -16,11 +17,11 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--enable-vga \
 		--enable-fpu --enable-cdrom
 
-FLAVORS=	debug i386 i486 i686 pci smp net no_x11 term
+FLAVORS=	debug i386 i486 i686 pci smp net no_x11 term sdl
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdebug}
@@ -32,6 +33,9 @@
 CONFIGURE_ARGS+= --with-nogui
 .elif ${FLAVOR:L:Mterm}
 CONFIGURE_ARGS+= --with-term
+.elif ${FLAVOR:L:Msdl}
+CONFIGURE_ARGS+= --with-sdl
+LIB_DEPENDS+= SDL::devel/sdl
 .else
 CONFIGURE_ARGS+= --with-x11
 .endif
Index: ports/emulators/bochs/distinfo
===================================================================
RCS file: /home/ftp/cvsup/OpenBSD/ports/emulators/bochs/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- ports/emulators/bochs/distinfo	21 Mar 2002 20:20:45 -0000	1.1
+++ ports/emulators/bochs/distinfo	5 May 2002 20:11:11 -0000
@@ -1,3 +1,3 @@
-MD5 (bochs-1.2.1.tar.gz) = 306b58465eb289cfe23921678a41ee93
-RMD160 (bochs-1.2.1.tar.gz) = 5e3df4ffbcd81e18b022815455913eb9aa99e71e
-SHA1 (bochs-1.2.1.tar.gz) = 39780ae55ee92c2b11b95ef1edd3931caeac7c22
+MD5 (bochs-1.4.tar.gz) = e8a6ad67f78c63423545806886f8c66a
+RMD160 (bochs-1.4.tar.gz) = 1050ef791c4a5b41c3359150d50e4490f61173df
+SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8
Index: ports/emulators/bochs/patches/patch-configure
===================================================================
RCS file: ports/emulators/bochs/patches/patch-configure
diff -N ports/emulators/bochs/patches/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/emulators/bochs/patches/patch-configure	5 May 2002 20:09:51 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- configure.orig	Sat Apr 27 17:00:14 2002
++++ configure	Sat Apr 27 17:00:31 2002
+@@ -6169,6 +6169,7 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 6170 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <sys/socket.h>
+ 
+ int
Index: ports/emulators/bochs/patches/patch-configure_in
===================================================================
RCS file: ports/emulators/bochs/patches/patch-configure_in
diff -N ports/emulators/bochs/patches/patch-configure_in
--- ports/emulators/bochs/patches/patch-configure_in	19 Sep 2001 20:44:53 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2001/09/19 20:44:53 todd Exp $
---- configure.in.orig	Wed Sep 19 15:27:16 2001
-+++ configure.in	Wed Sep 19 15:26:41 2001
-@@ -450,7 +450,7 @@ if test "$want_readline" = yes; then
-       if test "$bx_debugger" = 1; then
- 	# only add readline library if debugger is on
- 	AC_DEFINE(HAVE_LIBREADLINE, 1)
--	READLINE_LIB='-lreadline'
-+	READLINE_LIB='-lreadline -lcurses'
-       fi
-     ]
-   )
Index: ports/emulators/bochs/patches/patch-gui_Makefile_in
===================================================================
RCS file: ports/emulators/bochs/patches/patch-gui_Makefile_in
diff -N ports/emulators/bochs/patches/patch-gui_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/emulators/bochs/patches/patch-gui_Makefile_in	5 May 2002 20:09:51 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- gui/Makefile.in.orig	Sun Mar 17 19:56:26 2002
++++ gui/Makefile.in	Sat Apr 27 17:58:05 2002
+@@ -40,7 +40,7 @@ LIBS = @LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ BEOS_CFLAGS = -Wno-multichar
+ RFB_CFLAGS =
+-SDL_CFLAGS =
++SDL_CFLAGS = `sdl-config --cflags`
+ RANLIB = @RANLIB@
+ 
+ GUI_OBJS_X11  = x.o
+@@ -68,7 +68,7 @@ BX_GUI_OBJS = $(GUI_OBJS)
+ BX_INCLUDES = ../iodev/iodev.h control.h siminterface.h
+ 
+ _(_dot_)__(_at_)_CPP_SUFFIX@.o:
+-	$(CXX) @DASH_(_at_)_c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) @CXXFP_(_at_)_$< @OFP_(_at_)_$@
++	$(CXX) @DASH_(_at_)_c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) @CXXFP_(_at_)_$< @OFP_(_at_)_$@
+ 
+ 
+ 
Index: ports/emulators/bochs/pkg/DESCR
===================================================================
RCS file: /home/ftp/cvsup/OpenBSD/ports/emulators/bochs/pkg/DESCR,v
retrieving revision 1.6
diff -u -r1.6 DESCR
--- ports/emulators/bochs/pkg/DESCR	26 May 2001 05:52:56 -0000	1.6
+++ ports/emulators/bochs/pkg/DESCR	5 May 2002 20:09:51 -0000
@@ -13,5 +13,6 @@
 	net    - build with support for NE2000 NIC chipset
 	no_x11 - do not build with X support
 	term   - build with support for textmode terminal environment
+	sdl    - build with SDL libraries
 
 WWW: ${HOMEPAGE}