diff options
author | nia <nia@pkgsrc.org> | 2019-07-30 08:08:22 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-07-30 08:08:22 +0000 |
commit | b4ca7f10977f60a3efa6bb601bcc14b1056b177d (patch) | |
tree | a59c40b38e0e4ae8235cb567b88ca3850b71336c /emulators | |
parent | 115853038c5b8c1a5d266fcd6d5523bdd5bbc15c (diff) | |
download | pkgsrc-b4ca7f10977f60a3efa6bb601bcc14b1056b177d.tar.gz |
BasiliskII: Update to git snapshot 20190405
Use GTK2 instead of GTK1.
Brings the package around 13 years forward.
Should hopefully allow this to build again.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/BasiliskII/Makefile | 42 | ||||
-rw-r--r-- | emulators/BasiliskII/distinfo | 24 | ||||
-rw-r--r-- | emulators/BasiliskII/options.mk | 25 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aa | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ab | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ac | 12 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ad | 77 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ae | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-af | 169 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ag | 71 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ah | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ai | 22 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aj | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ak | 13 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-src-slirp-misc.c | 22 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-src-slirp-slirp.h | 15 |
16 files changed, 51 insertions, 506 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index 3a8fcfd97c8..123a3362545 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,32 +1,46 @@ -# $NetBSD: Makefile,v 1.39 2018/07/18 00:06:14 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2019/07/30 08:08:22 nia Exp $ -DISTNAME= BasiliskII_src_01052006 -PKGNAME= BasiliskII-1.0.20060501 -PKGREVISION= 5 +DISTNAME= BasiliskII-20190405 CATEGORIES= emulators -#MASTER_SITES= http://gwenole.beauchesne.info/projects/basilisk2/files/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=cebix/} +GITHUB_PROJECT= macemu +GITHUB_TAG= 01052ca89d22882c870b84c5498cd0ee9a843b6b MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://gwenole.beauchesne.info/projects/basilisk2/ +HOMEPAGE= https://basilisk.cebix.net/ COMMENT= Open Source 68k Macintosh emulator +LICENSE= gnu-gpl-v2 + +WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/BasiliskII +CONFIGURE_DIRS= src/Unix +BUILD_DIRS= src/Unix + +USE_LANGUAGES= c c++03 +USE_TOOLS+= aclocal autoheader autoconf automake +USE_TOOLS+= msgfmt msgmerge xgettext +USE_TOOLS+= pkg-config gmake -WRKSRC= ${WRKDIR}/BasiliskII-1.0 -USE_LANGUAGES= c c++03 -USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_DIRS= src/Unix CONFIGURE_ARGS+= --disable-fbdev-dga +CONFIGURE_ARGS+= --disable-xf86-dga +CONFIGURE_ARGS+= --disable-xf86-vidmode + CONFIGURE_ARGS+= --enable-addressing=banks CONFIGURE_ARGS+= --without-mon -BUILD_DIRS= ${CONFIGURE_DIRS} + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --enable-macosx-gui +CONFIGURE_ARGS+= --enable-macosx-sound +.endif .include "options.mk" INSTALLATION_DIRS= share/doc/BasiliskII -post-extract: - ${MKDIR} ${WRKSRC}/src/Unix/obj +pre-configure: + cd ${WRKSRC}/src/Unix && NO_CONFIGURE=x ./autogen.sh post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/BasiliskII/ diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index c6765bfa418..61880f61fcb 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -1,19 +1,7 @@ -$NetBSD: distinfo,v 1.19 2015/11/03 20:30:54 agc Exp $ +$NetBSD: distinfo,v 1.20 2019/07/30 08:08:22 nia Exp $ -SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb -RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d -SHA512 (BasiliskII_src_01052006.tar.bz2) = cbe78f525e729aedafc98d8f469b4eaddc93e1088f2341fe4eef612d5ba1d076d7a9e3c7547392a1ddb80280a5bd48dbbcee6ff80d405954c60bd52f2cb28171 -Size (BasiliskII_src_01052006.tar.bz2) = 1310908 bytes -SHA1 (patch-aa) = 387f7a3f6edac21b99d81ba88a0eeed4591c75ef -SHA1 (patch-ab) = 4ada93db64772e70e95c58b6a324019c1da6a72d -SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15 -SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6 -SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887 -SHA1 (patch-af) = 285b46cc6e1b761e12498603579424b4f49689c1 -SHA1 (patch-ag) = 962620071eec777d22c49a35795b819432aa8974 -SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760 -SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1 -SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f -SHA1 (patch-ak) = 1dad263b22ae3257a6e34b90972ba264ada7b287 -SHA1 (patch-src-slirp-misc.c) = c9209ae4f3b142a506d42d296ed854974ec47117 -SHA1 (patch-src-slirp-slirp.h) = c0c93d01e5b8d5182ddeed87b1434a7b113175e0 +SHA1 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = b83f76e9b37318b6bc4e43e73db0d2ed00fc2981 +RMD160 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 1c16c477fd1e2980ceb4e172d896fb2da4d9580b +SHA512 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 82a7720c369489d8a27f175550973a72fa77c76553e38734fb2efef6ecf29a2a1c195797d4d487b1e6cca0f21f778a640d69c2686af6ae1687e3e8234dbf7245 +Size (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 2198906 bytes +SHA1 (patch-ad) = 1d8bc61f6386855c6d83ff4e5a13f55d5e22325a diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk index d436263588a..b62167c6ff7 100644 --- a/emulators/BasiliskII/options.mk +++ b/emulators/BasiliskII/options.mk @@ -1,9 +1,15 @@ -# $NetBSD: options.mk,v 1.6 2012/10/23 10:24:03 wiz Exp $ +# $NetBSD: options.mk,v 1.7 2019/07/30 08:08:22 nia Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.BasiliskII -PKG_SUPPORTED_OPTIONS= esound gtk sdl +PKG_OPTIONS_VAR= PKG_OPTIONS.BasiliskII +PKG_SUPPORTED_OPTIONS= esound gtk2 sdl PKG_OPTIONS_LEGACY_OPTS+= esd:esound +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} != "Darwin" +PKG_SUGGESTED_OPTIONS+= gtk2 sdl +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mesound) @@ -13,9 +19,9 @@ CONFIGURE_ARGS+= --with-esd CONFIGURE_ARGS+= --without-esd .endif -.if !empty(PKG_OPTIONS:Mgtk) +.if !empty(PKG_OPTIONS:Mgtk2) CONFIGURE_ARGS+= --with-gtk -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --without-gtk .endif @@ -24,13 +30,4 @@ CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --enable-sdl-audio CONFIGURE_ARGS+= --enable-sdl-video .include "../../devel/SDL/buildlink3.mk" -.else -BUILDLINK_DEPMETHOD.libXt?= build - -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/libXxf86dga/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" .endif diff --git a/emulators/BasiliskII/patches/patch-aa b/emulators/BasiliskII/patches/patch-aa deleted file mode 100644 index 79c920ea81f..00000000000 --- a/emulators/BasiliskII/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2005/11/23 12:17:56 adam Exp $ - ---- src/dummy/ether_dummy.cpp.orig 2005-05-14 10:10:09.000000000 +0200 -+++ src/dummy/ether_dummy.cpp -@@ -174,7 +174,7 @@ void EtherInterrupt(void) - length = recvfrom(fd, Mac2HostAddr(packet), 1514, 0, (struct sockaddr *)&from, &from_len); - if (length < 14) - break; -- ether_udp_read(packet, length, &from); -+ ether_udp_read((uint32)packet, length, &from); - } - } - #endif diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab deleted file mode 100644 index e001cf353a5..00000000000 --- a/emulators/BasiliskII/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2006/05/13 20:52:35 adam Exp $ - ---- src/Unix/video_x.cpp.orig 2006-01-03 23:03:27.000000000 +0100 -+++ src/Unix/video_x.cpp -@@ -2326,7 +2326,7 @@ static void update_display_dynamic(int t - static void update_display_static(driver_window *drv) - { - // Incremental update code -- unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j; -+ int wide = 0, high = 0, x1, x2, y1, y2, i, j; - const video_mode &mode = drv->monitor.get_current_mode(); - int bytes_per_row = mode.bytes_per_row; - int bytes_per_pixel = mode.bytes_per_row / mode.x; diff --git a/emulators/BasiliskII/patches/patch-ac b/emulators/BasiliskII/patches/patch-ac deleted file mode 100644 index 925c149343b..00000000000 --- a/emulators/BasiliskII/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2005/11/03 21:34:23 rillig Exp $ - ---- src/Unix/vm_alloc.cpp.orig 2005-01-30 21:42:14.000000000 +0000 -+++ src/Unix/vm_alloc.cpp -@@ -39,6 +39,7 @@ - #include "vm_alloc.h" - - #ifdef HAVE_MACH_VM -+#include <mach/mach.h> - #ifndef HAVE_MACH_TASK_SELF - #ifdef HAVE_TASK_SELF - #define mach_task_self task_self diff --git a/emulators/BasiliskII/patches/patch-ad b/emulators/BasiliskII/patches/patch-ad index 99e517f7fd8..1fd6e765d13 100644 --- a/emulators/BasiliskII/patches/patch-ad +++ b/emulators/BasiliskII/patches/patch-ad @@ -1,80 +1,15 @@ -$NetBSD: patch-ad,v 1.4 2005/11/03 21:34:23 rillig Exp $ +$NetBSD: patch-ad,v 1.5 2019/07/30 08:08:22 nia Exp $ ---- src/Unix/sshpty.c.orig 2003-08-17 10:20:22.000000000 +0000 +NetBSD does not have this pts ioctl. + +--- src/Unix/sshpty.c.orig 2019-04-05 05:12:49.000000000 +0000 +++ src/Unix/sshpty.c -@@ -18,6 +18,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/ - /* Selections from openssh's "includes.h" */ - #include "config.h" - -+#include <signal.h> - #include <stdio.h> - #include <ctype.h> - #include <errno.h> -@@ -145,19 +146,30 @@ pty_allocate(int *ptyfd, int *ttyfd, cha - */ - int ptm; - char *pts; -+#ifdef __sunos__ - mysig_t old_signal; -- -+#else -+ sig_t old_signal; -+#endif - ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY); - if (ptm < 0) { - error("/dev/ptmx: %.100s", strerror(errno)); - return 0; - } -+#ifdef __sunos__ - old_signal = mysignal(SIGCHLD, SIG_DFL); -+#else -+ old_signal = signal(SIGCHLD, SIG_DFL); -+#endif - if (grantpt(ptm) < 0) { - error("grantpt: %.100s", strerror(errno)); - return 0; - } -+#ifdef __sunos__ - mysignal(SIGCHLD, old_signal); -+#else -+ signal(SIGCHLD, old_signal); -+#endif - if (unlockpt(ptm) < 0) { - error("unlockpt: %.100s", strerror(errno)); - return 0; -@@ -175,7 +187,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha +@@ -182,7 +182,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha close(*ptyfd); return 0; } -#ifndef HAVE_CYGWIN -+#if !defined(__NetBSD__) ++#if !defined(HAVE_CYGWIN) && !defined(__NetBSD__) /* * Push the appropriate streams modules, as described in Solaris pts(7). * HP-UX pts(7) doesn't have ttcompat module. -@@ -184,7 +196,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha - error("ioctl I_PUSH ptem: %.100s", strerror(errno)); - if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0) - error("ioctl I_PUSH ldterm: %.100s", strerror(errno)); --#ifndef __hpux -+#if !defined(__NetBSD__) - if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0) - error("ioctl I_PUSH ttcompat: %.100s", strerror(errno)); - #endif -@@ -277,7 +289,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha - } - /* set tty modes to a sane state for broken clients */ - if (tcgetattr(*ptyfd, &tio) < 0) -- log("Getting tty modes for pty failed: %.100s", strerror(errno)); -+ error("Getting tty modes for pty failed: %.100s", strerror(errno)); - else { - tio.c_lflag |= (ECHO | ISIG | ICANON); - tio.c_oflag |= (OPOST | ONLCR); -@@ -285,7 +297,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha - - /* Set the new modes for the terminal. */ - if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0) -- log("Setting tty modes for pty failed: %.100s", strerror(errno)); -+ error("Setting tty modes for pty failed: %.100s", strerror(errno)); - } - - return 1; diff --git a/emulators/BasiliskII/patches/patch-ae b/emulators/BasiliskII/patches/patch-ae deleted file mode 100644 index 9f24cecc6c5..00000000000 --- a/emulators/BasiliskII/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/11/17 16:56:39 joerg Exp $ - ---- src/Unix/timer_unix.cpp.orig 2005-11-17 14:22:31.000000000 +0000 -+++ src/Unix/timer_unix.cpp -@@ -228,7 +228,7 @@ uint64 GetTicks_usec(void) - // Linux select() changes its timeout parameter upon return to contain - // the remaining time. Most other unixen leave it unchanged or undefined. - #define SELECT_SETS_REMAINING --#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__)) -+#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__)) || defined(__DragonFly__) - #define USE_NANOSLEEP - #elif defined(HAVE_PTHREADS) && defined(sgi) - // SGI pthreads has a bug when using pthreads+signals+nanosleep, diff --git a/emulators/BasiliskII/patches/patch-af b/emulators/BasiliskII/patches/patch-af deleted file mode 100644 index 30cfd2e0ac9..00000000000 --- a/emulators/BasiliskII/patches/patch-af +++ /dev/null @@ -1,169 +0,0 @@ -$NetBSD: patch-af,v 1.4 2012/05/14 07:35:02 dholland Exp $ - -- need limits.h, or since this is C++, <climits> for INT_MAX, fails on linux -- add dragonfly to the ifdef circus - ---- src/Unix/sys_unix.cpp.orig 2005-11-24 17:23:43.000000000 +0000 -+++ src/Unix/sys_unix.cpp -@@ -18,6 +18,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <climits> -+ - #include "sysdeps.h" - - #include <sys/ioctl.h> -@@ -37,7 +39,7 @@ - #include <dirent.h> - #endif - --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #include <sys/cdio.h> - #endif - -@@ -64,7 +66,7 @@ struct file_handle { - - #if defined(__linux__) - int cdrom_cap; // CD-ROM capability flags (only valid if is_cdrom is true) --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - struct ioc_capability cdrom_cap; - #elif defined(__APPLE__) && defined(__MACH__) - char *ioctl_name; // For CDs on OS X - a device for special ioctls -@@ -220,7 +222,7 @@ void SysAddCDROMPrefs(void) - // Until I can convince the other guys that my Darwin code is useful, - // we just do nothing (it is safe to have no cdrom device) - #endif --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - PrefsAddString("cdrom", "/dev/cd0c"); - #endif - } -@@ -240,7 +242,7 @@ void SysAddSerialPrefs(void) - PrefsAddString("seriala", "/dev/tts/0"); - PrefsAddString("serialb", "/dev/tts/1"); - } --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - PrefsAddString("seriala", "/dev/cuaa0"); - PrefsAddString("serialb", "/dev/cuaa1"); - #elif defined(__NetBSD__) -@@ -302,7 +304,7 @@ static bool is_drive_mounted(const char - void *Sys_open(const char *name, bool read_only) - { - bool is_file = strncmp(name, "/dev/", 5) != 0; --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - // SCSI IDE - bool is_cdrom = strncmp(name, "/dev/cd", 7) == 0 || strncmp(name, "/dev/acd", 8) == 0; - #else -@@ -351,7 +353,7 @@ void *Sys_open(const char *name, bool re - } - - // Open file/device --#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - int fd = open(name, (read_only ? O_RDONLY : O_RDWR) | (is_cdrom ? O_NONBLOCK : 0)); - #else - int fd = open(name, read_only ? O_RDONLY : O_RDWR); -@@ -394,7 +396,7 @@ void *Sys_open(const char *name, bool re - #else - fh->cdrom_cap = 0; - #endif --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - fh->is_floppy = ((st.st_rdev >> 16) == 2); - #ifdef CDIOCCAPABILITY - if (is_cdrom) { -@@ -557,7 +559,7 @@ void SysEject(void *arg) - close(fh->fd); // Close and reopen so the driver will see the media change - fh->fd = open(fh->name, O_RDONLY | O_NONBLOCK); - } --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - if (fh->is_floppy) { - fsync(fh->fd); - } else if (fh->is_cdrom) { -@@ -697,7 +699,7 @@ bool SysIsDiskInserted(void *arg) - #endif - cdrom_tochdr header; - return ioctl(fh->fd, CDROMREADTOCHDR, &header) == 0; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - } else if (fh->is_floppy) { - return false; //!! - } else if (fh->is_cdrom) { -@@ -805,7 +807,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc) - extern bool DarwinCDReadTOC(char *name, uint8 *toc); - - return DarwinCDReadTOC(fh->name, toc); --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - uint8 *p = toc + 2; - - // Header -@@ -916,7 +918,7 @@ bool SysCDGetPosition(void *arg, uint8 * - *pos++ = chan.cdsc_reladdr.msf.second; - *pos++ = chan.cdsc_reladdr.msf.frame; - return true; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_read_subchannel chan; - chan.data_format = CD_MSF_FORMAT; - chan.address_format = CD_MSF_FORMAT; -@@ -968,7 +970,7 @@ bool SysCDPlay(void *arg, uint8 start_m, - play.cdmsf_sec1 = end_s; - play.cdmsf_frame1 = end_f; - return ioctl(fh->fd, CDROMPLAYMSF, &play) == 0; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_play_msf play; - play.start_m = start_m; - play.start_s = start_s; -@@ -998,7 +1000,7 @@ bool SysCDPause(void *arg) - if (fh->is_cdrom) { - #if defined(__linux__) - return ioctl(fh->fd, CDROMPAUSE) == 0; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - return ioctl(fh->fd, CDIOCPAUSE) == 0; - #else - return false; -@@ -1021,7 +1023,7 @@ bool SysCDResume(void *arg) - if (fh->is_cdrom) { - #if defined(__linux__) - return ioctl(fh->fd, CDROMRESUME) == 0; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - return ioctl(fh->fd, CDIOCRESUME) == 0; - #else - return false; -@@ -1044,7 +1046,7 @@ bool SysCDStop(void *arg, uint8 lead_out - if (fh->is_cdrom) { - #if defined(__linux__) - return ioctl(fh->fd, CDROMSTOP) == 0; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - return ioctl(fh->fd, CDIOCSTOP) == 0; - #else - return false; -@@ -1085,7 +1087,7 @@ void SysCDSetVolume(void *arg, uint8 lef - vol.channel0 = vol.channel2 = left; - vol.channel1 = vol.channel3 = right; - ioctl(fh->fd, CDROMVOLCTRL, &vol); --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_vol vol; - vol.vol[0] = vol.vol[2] = left; - vol.vol[1] = vol.vol[3] = right; -@@ -1112,7 +1114,7 @@ void SysCDGetVolume(void *arg, uint8 &le - ioctl(fh->fd, CDROMVOLREAD, &vol); - left = vol.channel0; - right = vol.channel1; --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_vol vol; - ioctl(fh->fd, CDIOCGETVOL, &vol); - left = vol.vol[0]; diff --git a/emulators/BasiliskII/patches/patch-ag b/emulators/BasiliskII/patches/patch-ag deleted file mode 100644 index d2e3e466e85..00000000000 --- a/emulators/BasiliskII/patches/patch-ag +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2015/02/28 23:43:32 joerg Exp $ - ---- src/Unix/sigsegv.cpp.orig 2006-03-30 22:45:49.000000000 +0000 -+++ src/Unix/sigsegv.cpp -@@ -226,7 +226,7 @@ static void powerpc_decode_instruction(i - - #if HAVE_SIGINFO_T - // Generic extended signal handler --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS) - #else - #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) -@@ -264,7 +264,7 @@ static void powerpc_decode_instruction(i - #define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction - #endif - #endif --#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #if (defined(i386) || defined(__i386__)) - #define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_eip) - #define SIGSEGV_REGISTER_FILE ((unsigned long *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */ -@@ -286,6 +286,13 @@ static void powerpc_decode_instruction(i - #define SIGSEGV_REGISTER_FILE (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_PC], (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_R0] - #define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction - #endif -+#if (defined(arm) || defined(__arm__)) -+#include <sys/ucontext.h> -+#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.__gregs) -+#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[_REG_PC] -+#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS -+#define SIGSEGV_SKIP_INSTRUCTION arm_skip_instruction -+#endif - #endif - #if defined(__linux__) - #if (defined(i386) || defined(__i386__)) -@@ -451,7 +458,7 @@ static sigsegv_address_t get_fault_addre - #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) - #endif - #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #if (defined(i386) || defined(__i386__)) - #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS) - #define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp, char *addr -@@ -721,10 +728,14 @@ enum { - #endif - }; - #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - enum { - #if (defined(i386) || defined(__i386__)) -+# if (defined(__FreeBSD__) && __FreeBSD_version >= 500000) - X86_REG_EIP = 10, -+#else -+ X86_REG_EIP = 11, -+#endif - X86_REG_EAX = 7, - X86_REG_ECX = 6, - X86_REG_EDX = 5, -@@ -1450,6 +1461,9 @@ enum { - #if (defined(__linux__)) - ARM_REG_PC = 15, - ARM_REG_CPSR = 16 -+#elif defined(__NetBSD__) -+ ARM_REG_PC = _REG_PC, -+ ARM_REG_CPSR = _REG_CPSR - #endif - }; - static bool arm_skip_instruction(unsigned long * regs) diff --git a/emulators/BasiliskII/patches/patch-ah b/emulators/BasiliskII/patches/patch-ah deleted file mode 100644 index 7187523367d..00000000000 --- a/emulators/BasiliskII/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2006/05/13 20:52:35 adam Exp $ - ---- src/Unix/serial_unix.cpp.orig 2005-12-04 16:03:11.000000000 +0100 -+++ src/Unix/serial_unix.cpp -@@ -212,7 +212,7 @@ int16 XSERDPort::open(uint16 config) - if (fstat(fd, &st) == 0) - if (S_ISCHR(st.st_mode)) - protocol = ((MAJOR(st.st_rdev) == LP_MAJOR) ? parallel : serial); --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - // Parallel port? - struct stat st; - if (fstat(fd, &st) == 0) diff --git a/emulators/BasiliskII/patches/patch-ai b/emulators/BasiliskII/patches/patch-ai deleted file mode 100644 index 4906191bddb..00000000000 --- a/emulators/BasiliskII/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2006/05/13 20:52:35 adam Exp $ - ---- src/Unix/prefs_editor_gtk.cpp.orig 2006-04-30 23:16:48.000000000 +0200 -+++ src/Unix/prefs_editor_gtk.cpp -@@ -1283,7 +1283,7 @@ static GList *add_serial_names(void) - while ((de = readdir(d)) != NULL) { - #if defined(__linux__) - if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name, "lp", 2) == 0) { --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - if (strncmp(de->d_name, "cuaa", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { - #elif defined(__NetBSD__) - if (strncmp(de->d_name, "tty0", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { -@@ -1322,7 +1322,7 @@ static GList *add_ether_names(void) - struct ifreq req, *ifr = ifc.ifc_req; - for (int i=0; i<ifc.ifc_len; i+=sizeof(ifreq), ifr++) { - req = *ifr; --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(sgi) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(sgi) || defined(__DragonFly__) - if (ioctl(s, SIOCGIFADDR, &req) == 0 && (req.ifr_addr.sa_family == ARPHRD_ETHER || req.ifr_addr.sa_family == ARPHRD_ETHER+1)) { - #elif defined(__linux__) - if (ioctl(s, SIOCGIFHWADDR, &req) == 0 && req.ifr_hwaddr.sa_family == ARPHRD_ETHER) { diff --git a/emulators/BasiliskII/patches/patch-aj b/emulators/BasiliskII/patches/patch-aj deleted file mode 100644 index e6c8a47136f..00000000000 --- a/emulators/BasiliskII/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2006/05/13 20:52:35 adam Exp $ - ---- src/Unix/ether_unix.cpp.orig 2006-04-02 23:06:50.000000000 +0200 -+++ src/Unix/ether_unix.cpp -@@ -49,7 +49,7 @@ - #include <stdio.h> - #include <map> - --#if defined(__FreeBSD__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__)) - #include <net/if.h> - #endif - diff --git a/emulators/BasiliskII/patches/patch-ak b/emulators/BasiliskII/patches/patch-ak deleted file mode 100644 index 70e6ef93b85..00000000000 --- a/emulators/BasiliskII/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2005/12/15 02:56:58 dogcow Exp $ - ---- src/Unix/audio_oss_esd.cpp.orig 2005-11-17 14:30:41.000000000 +0000 -+++ src/Unix/audio_oss_esd.cpp -@@ -30,7 +30,7 @@ - #include <linux/soundcard.h> - #endif - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #include <sys/soundcard.h> - #endif - diff --git a/emulators/BasiliskII/patches/patch-src-slirp-misc.c b/emulators/BasiliskII/patches/patch-src-slirp-misc.c deleted file mode 100644 index c23785b090c..00000000000 --- a/emulators/BasiliskII/patches/patch-src-slirp-misc.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src-slirp-misc.c,v 1.1 2011/08/20 15:30:36 joerg Exp $ - ---- src/slirp/misc.c.orig 2011-08-20 13:13:50.000000000 +0000 -+++ src/slirp/misc.c -@@ -106,7 +106,7 @@ struct quehead_32 { - u_int32_t qh_rlink; - }; - --inline void -+void - insque_32(a, b) - void *a; - void *b; -@@ -120,7 +120,7 @@ insque_32(a, b) - = (u_int32_t)element; - } - --inline void -+void - remque_32(a) - void *a; - { diff --git a/emulators/BasiliskII/patches/patch-src-slirp-slirp.h b/emulators/BasiliskII/patches/patch-src-slirp-slirp.h deleted file mode 100644 index e3218dcfc74..00000000000 --- a/emulators/BasiliskII/patches/patch-src-slirp-slirp.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src-slirp-slirp.h,v 1.1 2011/08/20 15:30:36 joerg Exp $ - ---- src/slirp/slirp.h.orig 2011-08-20 13:13:12.000000000 +0000 -+++ src/slirp/slirp.h -@@ -288,8 +288,8 @@ extern int do_echo; - # define insque_32 insque - # define remque_32 remque - #else -- inline void insque_32 _P((void *, void *)); -- inline void remque_32 _P((void *)); -+ void insque_32 _P((void *, void *)); -+ void remque_32 _P((void *)); - #endif - - #ifndef _WIN32 |