diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index ce6214978f0..69f2459a72b 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2007/03/15 09:05:20 jsg Exp $ +# $OpenBSD: Makefile,v 1.8 2007/08/31 23:42:08 jsg Exp $ COMMENT= "x86 with DOS emulator targeted at playing games" -DISTNAME= dosbox-0.70 -PKGNAME= ${DISTNAME} +DISTNAME= dosbox-0.72 CATEGORIES= games x11 emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/} diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo index 62958f69324..00cf55e9831 100644 --- a/emulators/dosbox/distinfo +++ b/emulators/dosbox/distinfo @@ -1,5 +1,5 @@ -MD5 (dosbox-0.70.tar.gz) = 6gqTbojrKUA45n7rDXEpxA== -RMD160 (dosbox-0.70.tar.gz) = hWVKZk1m18HR1RNw1Cn1AwKcuSQ= -SHA1 (dosbox-0.70.tar.gz) = 3i9jtyRsDh96RzsNRXHE2jkaNA4= -SHA256 (dosbox-0.70.tar.gz) = Bf39Vh7uM94S2Xh5W38SM4Mnxtoc5llxRjtY8ukLSOQ= -SIZE (dosbox-0.70.tar.gz) = 934649 +MD5 (dosbox-0.72.tar.gz) = Jik5zCiWbB+bB8K8Rytpnw== +RMD160 (dosbox-0.72.tar.gz) = IIjpvWM3Gd7c0qp0MeRbPIHqouo= +SHA1 (dosbox-0.72.tar.gz) = xJ+6ABh82HH/3LzYergqI+otXn0= +SHA256 (dosbox-0.72.tar.gz) = F0fX2fHlwGNbXS0+Zkjo3DYxaxvIizdVv5a3/eSZrHk= +SIZE (dosbox-0.72.tar.gz) = 1046475 diff --git a/emulators/dosbox/patches/patch-include_cross_h b/emulators/dosbox/patches/patch-include_cross_h deleted file mode 100644 index c7181020386..00000000000 --- a/emulators/dosbox/patches/patch-include_cross_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-include_cross_h,v 1.3 2007/03/15 09:05:21 jsg Exp $ ---- include/cross.h.orig Wed Jan 10 21:17:33 2007 -+++ include/cross.h Mon Mar 12 15:09:52 2007 -@@ -38,10 +38,11 @@ - #else /* LINUX / GCC */ - #include - #include -+#include - #define LONGTYPE(a) a##LL - #endif - --#define CROSS_LEN 512 /* Maximum filename size */ -+#define CROSS_LEN MAXPATHLEN /* Maximum filename size */ - - - #if defined (WIN32) || defined (OS2) /* Win 32 & OS/2*/ diff --git a/emulators/dosbox/patches/patch-src_dos_cdrom_image_cpp b/emulators/dosbox/patches/patch-src_dos_cdrom_image_cpp deleted file mode 100644 index d89c21b1cef..00000000000 --- a/emulators/dosbox/patches/patch-src_dos_cdrom_image_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_dos_cdrom_image_cpp,v 1.4 2006/03/31 13:56:51 jsg Exp $ ---- src/dos/cdrom_image.cpp.orig Thu Feb 9 23:32:52 2006 -+++ src/dos/cdrom_image.cpp Fri Mar 31 21:36:23 2006 -@@ -118,7 +118,7 @@ int CDROM_Interface_Image::AudioFile::ge - shift += time >> 1; - time = 1; - } else { -- if (time > ((numeric_limits::max() - shift) / 2)) return -1; -+ if (time > ((INT_MAX - shift) / 2)) return -1; - time = time << 1; - } - } diff --git a/emulators/dosbox/patches/patch-src_dosbox_cpp b/emulators/dosbox/patches/patch-src_dosbox_cpp deleted file mode 100644 index 753b00dbd31..00000000000 --- a/emulators/dosbox/patches/patch-src_dosbox_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_dosbox_cpp,v 1.2 2007/03/15 09:05:21 jsg Exp $ ---- src/dosbox.cpp.orig Thu Feb 22 19:44:06 2007 -+++ src/dosbox.cpp Mon Mar 12 15:09:52 2007 -@@ -335,7 +335,7 @@ void DOSBOX_Init(void) { - secprop->Add_bool("nosound",false); - secprop->Add_int("rate",22050); - secprop->Add_int("blocksize",2048); -- secprop->Add_int("prebuffer",10); -+ secprop->Add_int("prebuffer",30); - - MSG_Add("MIXER_CONFIGFILE_HELP", - "nosound -- Enable silent mode, sound is still emulated though.\n" diff --git a/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_cpp b/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_cpp deleted file mode 100644 index 8b98732fc6b..00000000000 --- a/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_hardware_serialport_misc_util_cpp,v 1.1 2007/03/15 09:05:21 jsg Exp $ ---- src/hardware/serialport/misc_util.cpp.orig Mon Mar 12 15:20:39 2007 -+++ src/hardware/serialport/misc_util.cpp Mon Mar 12 15:31:19 2007 -@@ -21,7 +21,7 @@ typedef int socklen_t; - #include - typedef int socklen_t; - --#elif defined __APPLE__ -+#elif defined __unix__ - #define CAPWORD (NETWRAPPER_TCP|NETWRAPPER_TCP_NATIVESOCKET) - #include - #include diff --git a/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_h b/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_h deleted file mode 100644 index d9e1c6b8971..00000000000 --- a/emulators/dosbox/patches/patch-src_hardware_serialport_misc_util_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_hardware_serialport_misc_util_h,v 1.1 2007/03/15 09:05:21 jsg Exp $ ---- src/hardware/serialport/misc_util.h.orig Mon Mar 12 15:35:42 2007 -+++ src/hardware/serialport/misc_util.h Mon Mar 12 15:36:13 2007 -@@ -6,10 +6,7 @@ - #include "SDL_net.h" - #include "support.h" - --#if defined LINUX || defined OS2 --#define NATIVESOCKETS -- --#elif defined WIN32 -+#if defined LINUX || defined OS2 | defined WIN32 || defined __unix__ - #define NATIVESOCKETS - - #else