To version 0.132. Index: Makefile =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/Makefile,v retrieving revision 1.4 diff -N -p -u Makefile --- Makefile 24 Apr 2009 14:47:16 -0000 1.4 +++ Makefile 12 Jun 2009 11:09:16 -0000 @@ -5,9 +5,9 @@ ONLY_FOR_ARCHS = amd64 i386 COMMENT = emulates game consoles and old home computers -V = 0.130 +V = 0.132 DISTNAME = sdlmess${V:S/.//} -PKGNAME = sdlmess-${V}p1 +PKGNAME = sdlmess-${V} CATEGORIES = emulators games Index: distinfo =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/distinfo,v retrieving revision 1.1.1.1 diff -N -p -u distinfo --- distinfo 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ distinfo 25 Jun 2009 07:38:49 -0000 @@ -1,5 +1,5 @@ -MD5 (sdlmess0130.zip) = MXZ8BN07HunoyP/mA5KOeg== -RMD160 (sdlmess0130.zip) = KzhPo0n9saYFBlg3ZoIcVzbOuhE= -SHA1 (sdlmess0130.zip) = cwsaPq78y3hSBeXSXnoigbQoItc= -SHA256 (sdlmess0130.zip) = +Lr6FV2qbMQ1EY5EypFY890VVbfAww6WcZCAFPx2GS8= -SIZE (sdlmess0130.zip) = 31636461 +MD5 (sdlmess0132.zip) = ABXPQvJ541tYzyupTX8XAA== +RMD160 (sdlmess0132.zip) = WeCFCbhUeyt0HszgZZFEG7Gg2yo= +SHA1 (sdlmess0132.zip) = 53QFsVF87ZAyt5OyQcckBlQTIAg= +SHA256 (sdlmess0132.zip) = umyIowESy2kV33DYXOvkJ6COvfENDjTkW9FrQXMl3oc= +SIZE (sdlmess0132.zip) = 32310226 Index: patches/patch-src_osd_sdl_sdl_mak =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdl_mak,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdl_mak --- patches/patch-src_osd_sdl_sdl_mak 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdl.mak.orig Fri Jan 2 21:59:12 2009 -+++ src/osd/sdl/sdl.mak Sun Jan 11 13:12:01 2009 -@@ -130,6 +130,11 @@ TARGETOS = unix - DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER - endif - -+ifeq ($(TARGETOS),openbsd) -+TARGETOS = unix -+DEFS += -DNO_THREAD_COOPERATIVE -+endif -+ - ifeq ($(TARGETOS),unix) - DEFS += -DSDLMAME_UNIX - ifndef NO_X11 Index: patches/patch-src_osd_sdl_sdldir_c =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdldir_c,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdldir_c --- patches/patch-src_osd_sdl_sdldir_c 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,57 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdldir_c,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdldir.c.orig Sun Mar 15 15:49:29 2009 -+++ src/osd/sdl/sdldir.c Sun Mar 15 15:50:38 2009 -@@ -13,7 +13,7 @@ - #ifdef SDLMAME_LINUX - #define __USE_LARGEFILE64 - #endif --#ifndef SDLMAME_FREEBSD -+#ifndef SDLMAME_BSD - #define _XOPEN_SOURCE 500 - #endif - -@@ -43,7 +43,7 @@ - struct _osd_directory - { - osd_directory_entry ent; --#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - struct dirent *data; - #else - struct dirent64 *data; -@@ -52,7 +52,7 @@ struct _osd_directory - }; - - --#if defined (SDLMAME_LINUX) || defined (SDLMAME_FREEBSD) || defined(SDLMAME_DARWIN) -+#if defined (SDLMAME_LINUX) || defined (SDLMAME_BSD) || defined(SDLMAME_DARWIN) - static osd_dir_entry_type get_attributes_enttype(int attributes) - { - if (attributes == DT_DIR) -@@ -85,7 +85,7 @@ static osd_dir_entry_type get_attributes_stat(const ch - - static UINT64 osd_get_file_size(const char *file) - { --#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - struct stat st; - if(stat(file, &st)) - return 0; -@@ -171,7 +171,7 @@ osd_directory *osd_opendir(const char *dirname) - - const osd_directory_entry *osd_readdir(osd_directory *dir) - { -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - dir->data = readdir(dir->fd); - #else - dir->data = readdir64(dir->fd); -@@ -181,7 +181,7 @@ const osd_directory_entry *osd_readdir(osd_directory * - return NULL; - - dir->ent.name = dir->data->d_name; -- #if defined (SDLMAME_LINUX) || defined (SDLMAME_FREEBSD) || defined(SDLMAME_DARWIN) -+ #if defined (SDLMAME_LINUX) || defined (SDLMAME_BSD) || defined(SDLMAME_DARWIN) - dir->ent.type = get_attributes_enttype(dir->data->d_type); - #else - dir->ent.type = get_attributes_stat(dir->data->d_name); Index: patches/patch-src_osd_sdl_sdlfile_c =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdlfile_c,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdlfile_c --- patches/patch-src_osd_sdl_sdlfile_c 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,82 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdlfile_c,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdlfile.c.orig Sun Mar 15 15:49:29 2009 -+++ src/osd/sdl/sdlfile.c Sun Mar 15 15:50:38 2009 -@@ -13,7 +13,7 @@ - #ifdef SDLMAME_LINUX - #define __USE_LARGEFILE64 - #endif --#ifndef SDLMAME_FREEBSD -+#ifndef SDLMAME_BSD - #define _XOPEN_SOURCE 500 - #endif - -@@ -96,7 +96,7 @@ file_error osd_open(const char *path, UINT32 openflags - UINT32 access; - const char *src; - char *dst; -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - struct stat st; - #else - struct stat64 st; -@@ -180,7 +180,7 @@ file_error osd_open(const char *path, UINT32 openflags - #endif - - // attempt to open the file -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - (*file)->handle = open(tmpstr, access, 0666); - #else - (*file)->handle = open64(tmpstr, access, 0666); -@@ -203,7 +203,7 @@ file_error osd_open(const char *path, UINT32 openflags - // attempt to reopen the file - if (error == NO_ERROR) - { -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - (*file)->handle = open(tmpstr, access, 0666); - #else - (*file)->handle = open64(tmpstr, access, 0666); -@@ -223,7 +223,7 @@ file_error osd_open(const char *path, UINT32 openflags - } - - // get the file size -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - fstat((*file)->handle, &st); - #else - fstat64((*file)->handle, &st); -@@ -253,7 +253,7 @@ file_error osd_read(osd_file *file, void *buffer, UINT - { - ssize_t result; - --#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) -+#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) - result = pread(file->handle, buffer, count, offset); - if (result < 0) - #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) -@@ -281,7 +281,7 @@ file_error osd_write(osd_file *file, const void *buffe - { - UINT32 result; - --#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) -+#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) - result = pwrite(file->handle, buffer, count, offset); - if (!result) - #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) -@@ -465,13 +465,13 @@ osd_directory_entry *osd_stat(const char *path) - { - int err; - osd_directory_entry *result = NULL; -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - struct stat st; - #else - struct stat64 st; - #endif - -- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_FREEBSD) || defined(SDLMAME_OS2) -+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) - err = stat(path, &st); - #else - err = stat64(path, &st); Index: patches/patch-src_osd_sdl_sdlmain_c =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdlmain_c,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdlmain_c --- patches/patch-src_osd_sdl_sdlmain_c 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdlmain_c,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdlmain.c.orig Sun Mar 15 15:49:29 2009 -+++ src/osd/sdl/sdlmain.c Sun Mar 15 15:50:38 2009 -@@ -455,7 +455,7 @@ static void defines_verbose(void) - MACRO_VERBOSE(SDLMAME_LINUX); - MACRO_VERBOSE(SDLMAME_SOLARIS); - MACRO_VERBOSE(SDLMAME_IRIX); -- MACRO_VERBOSE(SDLMAME_FREEBSD); -+ MACRO_VERBOSE(SDLMAME_BSD); - MACRO_VERBOSE(LSB_FIRST); - MACRO_VERBOSE(PTR64); - MACRO_VERBOSE(MAME_DEBUG); Index: patches/patch-src_osd_sdl_sdlmisc_c =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdlmisc_c,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdlmisc_c --- patches/patch-src_osd_sdl_sdlmisc_c 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdlmisc_c,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdlmisc.c.orig Sun Mar 15 15:49:29 2009 -+++ src/osd/sdl/sdlmisc.c Sun Mar 15 15:50:38 2009 -@@ -50,7 +50,7 @@ void *osd_alloc_executable(size_t size) - { - #if defined(SDLMAME_DARWIN) - return (void *)malloc(size); --#elif defined(SDLMAME_FREEBSD) -+#elif defined(SDLMAME_BSD) - return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); - #elif defined(SDLMAME_UNIX) - return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, 0, 0); Index: patches/patch-src_osd_sdl_sdlprefix_h =================================================================== RCS file: /home/priteau/cvs/ports/emulators/sdlmess/patches/patch-src_osd_sdl_sdlprefix_h,v retrieving revision 1.1.1.1 diff -N -p -u patches/patch-src_osd_sdl_sdlprefix_h --- patches/patch-src_osd_sdl_sdlprefix_h 17 Mar 2009 19:58:21 -0000 1.1.1.1 +++ /dev/null 26 Jun 2009 19:10:55 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_osd_sdl_sdlprefix_h,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ ---- src/osd/sdl/sdlprefix.h.orig Sun Mar 15 15:49:29 2009 -+++ src/osd/sdl/sdlprefix.h Sun Mar 15 15:50:39 2009 -@@ -30,8 +30,8 @@ - #elif defined(__linux__) - #define SDLMAME_LINUX 1 - --#elif defined(__FreeBSD__) || defined(__DragonFly__) --#define SDLMAME_FREEBSD 1 -+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) -+#define SDLMAME_BSD 1 - #endif - - // fix for Ubuntu 8.10