head 1.6; access; symbols pkgsrc-2019Q2:1.5.0.38 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.36 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.34 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.32 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.30 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.28 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.26 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.24 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.20 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.18 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.16 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.14 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.12 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.10 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.8 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.6 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.4 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.2 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.4.0.66 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.64 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.62 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.60 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.58 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.56 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.54 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.52 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.50 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.48 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.46 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.44 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.42 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.40 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.36 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.34 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.32 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.30 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.28 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.26 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.24 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.22 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.20 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.18 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.16 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.14 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.12 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.10 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 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.6 date 2019.07.30.08.08.22; author nia; state dead; branches; next 1.5; commitid nGq48QDKhndIF2xB; 1.5 date 2015.02.28.23.43.32; author joerg; state Exp; branches; next 1.4; commitid bbHadE148etoHPby; 1.4 date 2007.06.12.12.51.08; author joerg; 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.6 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-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 +#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) @ 1.5 log @Fix segfault handling on ARM to fix segfault handling on ARM. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.4 2007/06/12 12:51:08 joerg Exp $ @ 1.4 log @Fix infinite loop in configure on DragonFly and FreeBSD 4. Fix dependencies for modular Xorg by adding Xxf86vm and Xxf86dga. Bump revision. @ text @d1 1 a1 1 $NetBSD$ d23 15 a37 1 @@@@ -451,7 +451,7 @@@@ static sigsegv_address_t get_fault_addre d46 1 a46 1 @@@@ -721,10 +721,14 @@@@ enum { d62 10 @ 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 @d3 1 a3 1 --- src/Unix/sigsegv.cpp.orig 2006-03-31 00:45:49.000000000 +0200 d32 1 a32 1 @@@@ -721,7 +721,7 @@@@ enum { d40 1 d42 6 @ 1.2 log @Changes 20051122: * Bug fixes and improvements @ text @d3 1 a3 1 --- src/Unix/sigsegv.cpp.orig 2005-06-12 23:47:46.000000000 +0200 d32 1 a32 1 @@@@ -714,7 +714,7 @@@@ enum { @ 1.1 log @Add DragonFly support. @ text @d3 1 a3 1 --- src/Unix/sigsegv.cpp.orig 2005-11-17 14:27:36.000000000 +0000 d14 2 a15 2 @@@@ -257,7 +257,7 @@@@ static void powerpc_decode_instruction(i #define SIGSEGV_SKIP_INSTRUCTION sparc_skip_instruction d18 2 a19 2 -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) d23 1 a23 1 @@@@ -444,7 +444,7 @@@@ static sigsegv_address_t get_fault_addre d32 1 a32 1 @@@@ -715,7 +715,7 @@@@ enum { @