head 1.5; access; symbols pkgsrc-2019Q2:1.4.0.60 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.58 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.56 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.54 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.52 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.50 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.48 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.46 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.42 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.40 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.38 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.36 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.34 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.32 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.30 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.28 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.26 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.24 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.22 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.20 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.18 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.16 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.14 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.12 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.8 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.52 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.48 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2; locks; strict; comment @# @; 1.5 date 2019.07.30.08.08.22; author nia; state dead; branches; next 1.4; commitid nGq48QDKhndIF2xB; 1.4 date 2012.05.14.07.35.02; author dholland; state Exp; branches; next 1.3; 1.3 date 2006.05.13.20.52.35; author adam; state Exp; branches; next 1.2; 1.2 date 2005.11.23.12.17.56; author adam; state Exp; branches; next 1.1; 1.1 date 2005.11.17.16.56.39; author joerg; state Exp; branches; next ; desc @@ 1.5 log @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. @ text @$NetBSD: patch-af,v 1.4 2012/05/14 07:35:02 dholland Exp $ - need limits.h, or since this is C++, 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 + #include "sysdeps.h" #include @@@@ -37,7 +39,7 @@@@ #include #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include #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]; @ 1.4 log @add limits.h to fix the linux build @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2006/05/13 20:52:35 adam Exp $ @ 1.3 log @Changes 1.0-20060501: * Handle up to 1 GB of Mac memory * Handle MacOS idle wait (idlewait prefs item) * Fix a crash with the AppleShare extension * Improve SLiRP network emulation performance * Portability fixes to IRIX/mips, Solaris/SPARC Mac OS X: * Port to Mac OS X for Intel, including the JIT * Add a primitive graphical preferences editor * Fix clipboard (copy/paste of text from/to the host OS) * Fix external filesystem * Fix SLiRP network emulation (workaround MacOS X bugs) Windows: * Add SLiRP network emulation (ether slirp) * Add TAP-Win32 network emulation (ether tap) * Fix CD-ROM auto-detection (pollmedia now works) * Improve GUI for network configuration @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- src/Unix/sys_unix.cpp.orig 2005-11-24 18:23:43.000000000 +0100 d8 10 a17 1 @@@@ -37,7 +37,7 @@@@ d26 1 a26 1 @@@@ -64,7 +64,7 @@@@ struct file_handle { d35 1 a35 1 @@@@ -220,7 +220,7 @@@@ void SysAddCDROMPrefs(void) d44 1 a44 1 @@@@ -240,7 +240,7 @@@@ void SysAddSerialPrefs(void) d53 1 a53 1 @@@@ -302,7 +302,7 @@@@ static bool is_drive_mounted(const char d62 1 a62 1 @@@@ -351,7 +351,7 @@@@ void *Sys_open(const char *name, bool re d71 1 a71 1 @@@@ -394,7 +394,7 @@@@ void *Sys_open(const char *name, bool re d80 1 a80 1 @@@@ -557,7 +557,7 @@@@ void SysEject(void *arg) d89 1 a89 1 @@@@ -697,7 +697,7 @@@@ bool SysIsDiskInserted(void *arg) d98 1 a98 1 @@@@ -805,7 +805,7 @@@@ bool SysCDReadTOC(void *arg, uint8 *toc) d107 1 a107 1 @@@@ -916,7 +916,7 @@@@ bool SysCDGetPosition(void *arg, uint8 * d116 1 a116 1 @@@@ -968,7 +968,7 @@@@ bool SysCDPlay(void *arg, uint8 start_m, d125 1 a125 1 @@@@ -998,7 +998,7 @@@@ bool SysCDPause(void *arg) d134 1 a134 1 @@@@ -1021,7 +1021,7 @@@@ bool SysCDResume(void *arg) d143 1 a143 1 @@@@ -1044,7 +1044,7 @@@@ bool SysCDStop(void *arg, uint8 lead_out d152 1 a152 1 @@@@ -1085,7 +1085,7 @@@@ void SysCDSetVolume(void *arg, uint8 lef d161 1 a161 1 @@@@ -1112,7 +1112,7 @@@@ void SysCDGetVolume(void *arg, uint8 &le @ 1.2 log @Changes 20051122: * Bug fixes and improvements @ text @d3 1 a3 1 --- src/Unix/sys_unix.cpp.orig 2005-08-01 07:23:02.000000000 +0200 d23 1 a23 1 @@@@ -222,7 +222,7 @@@@ void SysAddCDROMPrefs(void) d32 1 a32 1 @@@@ -242,7 +242,7 @@@@ void SysAddSerialPrefs(void) d41 1 a41 1 @@@@ -304,7 +304,7 @@@@ static bool is_drive_mounted(const char d50 1 a50 1 @@@@ -352,7 +352,7 @@@@ void *Sys_open(const char *name, bool re d59 1 a59 1 @@@@ -395,7 +395,7 @@@@ void *Sys_open(const char *name, bool re d68 1 a68 1 @@@@ -555,7 +555,7 @@@@ void SysEject(void *arg) d77 1 a77 1 @@@@ -692,7 +692,7 @@@@ bool SysIsDiskInserted(void *arg) d86 1 a86 1 @@@@ -800,7 +800,7 @@@@ bool SysCDReadTOC(void *arg, uint8 *toc) d95 1 a95 1 @@@@ -911,7 +911,7 @@@@ bool SysCDGetPosition(void *arg, uint8 * d104 1 a104 1 @@@@ -963,7 +963,7 @@@@ bool SysCDPlay(void *arg, uint8 start_m, d113 1 a113 1 @@@@ -993,7 +993,7 @@@@ bool SysCDPause(void *arg) d122 1 a122 1 @@@@ -1016,7 +1016,7 @@@@ bool SysCDResume(void *arg) d131 1 a131 1 @@@@ -1039,7 +1039,7 @@@@ bool SysCDStop(void *arg, uint8 lead_out d140 1 a140 1 @@@@ -1080,7 +1080,7 @@@@ void SysCDSetVolume(void *arg, uint8 lef d149 1 a149 1 @@@@ -1107,7 +1107,7 @@@@ void SysCDGetVolume(void *arg, uint8 &le @ 1.1 log @Add DragonFly support. @ text @d3 1 a3 1 --- src/Unix/sys_unix.cpp.orig 2005-11-17 14:25:16.000000000 +0000 d5 2 a6 2 @@@@ -52,7 +52,7 @@@@ static int _llseek(unsigned int fd, unsi #endif d14 1 a14 1 @@@@ -79,7 +79,7 @@@@ struct file_handle { d23 1 a23 1 @@@@ -237,7 +237,7 @@@@ void SysAddCDROMPrefs(void) d32 1 a32 1 @@@@ -257,7 +257,7 @@@@ void SysAddSerialPrefs(void) d41 1 a41 1 @@@@ -319,7 +319,7 @@@@ static bool is_drive_mounted(const char d50 1 a50 1 @@@@ -367,7 +367,7 @@@@ void *Sys_open(const char *name, bool re d59 1 a59 1 @@@@ -414,7 +414,7 @@@@ void *Sys_open(const char *name, bool re d68 1 a68 1 @@@@ -586,7 +586,7 @@@@ void SysEject(void *arg) d77 1 a77 1 @@@@ -723,7 +723,7 @@@@ bool SysIsDiskInserted(void *arg) d86 1 a86 1 @@@@ -831,7 +831,7 @@@@ bool SysCDReadTOC(void *arg, uint8 *toc) d95 1 a95 1 @@@@ -942,7 +942,7 @@@@ bool SysCDGetPosition(void *arg, uint8 * d104 1 a104 1 @@@@ -994,7 +994,7 @@@@ bool SysCDPlay(void *arg, uint8 start_m, d113 1 a113 1 @@@@ -1024,7 +1024,7 @@@@ bool SysCDPause(void *arg) d122 1 a122 1 @@@@ -1047,7 +1047,7 @@@@ bool SysCDResume(void *arg) d131 1 a131 1 @@@@ -1070,7 +1070,7 @@@@ bool SysCDStop(void *arg, uint8 lead_out d140 1 a140 1 @@@@ -1111,7 +1111,7 @@@@ void SysCDSetVolume(void *arg, uint8 lef d149 1 a149 1 @@@@ -1138,7 +1138,7 @@@@ void SysCDGetVolume(void *arg, uint8 &le @