diff options
-rw-r--r-- | emulators/dosbox/Makefile | 4 | ||||
-rw-r--r-- | emulators/dosbox/distinfo | 13 | ||||
-rw-r--r-- | emulators/dosbox/patches/patch-ac | 24 | ||||
-rw-r--r-- | emulators/dosbox/patches/patch-ae | 26 | ||||
-rw-r--r-- | emulators/dosbox/patches/patch-af | 13 | ||||
-rw-r--r-- | emulators/dosbox/patches/patch-ag | 13 |
6 files changed, 22 insertions, 71 deletions
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index 4ed1960fde8..4ca43a09c2c 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2007/03/26 06:31:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/31 14:27:28 xtraeme Exp $ -DISTNAME= dosbox-0.70 +DISTNAME= dosbox-0.71 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/} diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo index e0ee5422b97..d90f1bd766c 100644 --- a/emulators/dosbox/distinfo +++ b/emulators/dosbox/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.12 2007/03/26 06:31:55 xtraeme Exp $ +$NetBSD: distinfo,v 1.13 2007/07/31 14:27:28 xtraeme Exp $ -SHA1 (dosbox-0.70.tar.gz) = de2f63b7246c0e1f7a473b0d4571c4da391a340e -RMD160 (dosbox-0.70.tar.gz) = 85654a664d66d7c1d1d51370d429f503029cb924 -Size (dosbox-0.70.tar.gz) = 934649 bytes +SHA1 (dosbox-0.71.tar.gz) = dab2efbbc95eadbd34839abac3cbdd950deb0671 +RMD160 (dosbox-0.71.tar.gz) = 921b6e954f484911127f6da175eef9503b12e8c2 +Size (dosbox-0.71.tar.gz) = 989672 bytes SHA1 (patch-aa) = 3393501f0d438e53a55481dc0e237c2bb2a75d3e SHA1 (patch-ab) = c4555ed9e6337380f52f271025d8f55ed7602aa6 -SHA1 (patch-ac) = 84c2a3173a483ccb62917da0b48fd2083963a13b SHA1 (patch-ad) = 3c0c0eabceb4cefa07918ae1d558e553ff18d592 -SHA1 (patch-ae) = f25206fbe82e10443bde2dae49da14441af9ad70 -SHA1 (patch-af) = e9984dd18682cacec0985bc354568277bfc1b7cd -SHA1 (patch-ag) = daada4d1c8e9cf35d2d47c8561c0788251ada536 +SHA1 (patch-ae) = 678dace83454c9a0285692740d19d2b597c8f4e1 diff --git a/emulators/dosbox/patches/patch-ac b/emulators/dosbox/patches/patch-ac deleted file mode 100644 index 1735fd7fcfa..00000000000 --- a/emulators/dosbox/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/01/16 11:42:02 rillig Exp $ - ---- src/ints/xms.cpp.orig 2006-02-09 13:32:57.000000000 +0100 -+++ src/ints/xms.cpp 2007-01-10 01:41:09.543795112 +0100 -@@ -75,7 +75,9 @@ struct XMS_Block { - bool free; - }; - -+#if !defined(__SUNPRO_CC) - #pragma pack (push,1) -+#endif - struct XMS_MemMove{ - Bit32u length; - Bit16u src_handle; -@@ -90,7 +92,9 @@ struct XMS_MemMove{ - } dest; - - } GCC_ATTRIBUTE(packed); -+#if !defined(__SUNPRO_CC) - #pragma pack (pop) -+#endif - - Bitu XMS_EnableA20(bool enable) - { diff --git a/emulators/dosbox/patches/patch-ae b/emulators/dosbox/patches/patch-ae index d10d739cba3..4c1a52719cd 100644 --- a/emulators/dosbox/patches/patch-ae +++ b/emulators/dosbox/patches/patch-ae @@ -1,15 +1,19 @@ -$NetBSD: patch-ae,v 1.1 2007/03/26 06:31:55 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2007/07/31 14:27:28 xtraeme Exp $ ---- configure.in.orig 2007-02-28 20:56:16.000000000 +0100 -+++ configure.in 2007-03-26 08:17:48.000000000 +0200 -@@ -331,6 +331,10 @@ - AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux]) - AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) +--- configure.in.orig 2007-07-30 09:42:16.000000000 +0200 ++++ configure.in 2007-07-31 16:23:18.000000000 +0200 +@@ -406,8 +406,12 @@ + AC_DEFINE(MACOSX, 1, [Compiling on Mac OS X]) + LIBS="$LIBS -framework AudioUnit" ;; +- *-*-freebsd* | *-*-linux* | *-*-dragonfly* | *-*-netbsd* | *-*-openbsd*) +- AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux or *BSD]) ++ *-*-linux*) ++ AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux]) ++ AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix ++ and OS/2).]) ++ ;; + *-*-freebsd* | *-*-dragonfly* | *-*-netbsd* | *-*-openbsd*) -+ AC_DEFINE(BSD, 1, [Compiling on BSD]) -+ AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support.]) -+ ;; - *-*-os2-emx*) - AC_DEFINE(OS2, 1, [Compiling on OS/2 EMX]) AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) + ;; + *-*-os2-emx*) diff --git a/emulators/dosbox/patches/patch-af b/emulators/dosbox/patches/patch-af deleted file mode 100644 index 6456d92f522..00000000000 --- a/emulators/dosbox/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/03/26 06:31:55 xtraeme Exp $ - ---- src/hardware/serialport/misc_util.h.orig 2007-03-26 08:21:57.000000000 +0200 -+++ src/hardware/serialport/misc_util.h 2007-03-26 08:22:08.000000000 +0200 -@@ -6,7 +6,7 @@ - #include "SDL_net.h" - #include "support.h" - --#if defined LINUX || defined OS2 -+#if defined LINUX || defined OS2 || defined BSD - #define NATIVESOCKETS - - #elif defined WIN32 diff --git a/emulators/dosbox/patches/patch-ag b/emulators/dosbox/patches/patch-ag deleted file mode 100644 index 53af4fb2604..00000000000 --- a/emulators/dosbox/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2007/03/26 06:31:55 xtraeme Exp $ - ---- src/hardware/serialport/misc_util.cpp.orig 2007-03-26 08:23:25.000000000 +0200 -+++ src/hardware/serialport/misc_util.cpp 2007-03-26 08:23:49.000000000 +0200 -@@ -6,7 +6,7 @@ - // C++ SDLnet wrapper - - // Socket inheritance --#if defined LINUX || defined OS2 -+#if defined LINUX || defined OS2 || defined BSD - #define CAPWORD (NETWRAPPER_TCP|NETWRAPPER_TCP_NATIVESOCKET) - #ifdef OS2 - typedef int socklen_t; |