diff options
| author | wiz <wiz> | 2006-10-08 01:05:55 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2006-10-08 01:05:55 +0000 |
| commit | 063071f18ffcd21669872bba7273a36ccfd3c3ea (patch) | |
| tree | d701057cd307ef538dfea1a8ce0f1267c0384318 /emulators | |
| parent | 59ff316981063a4166936bce1ff9e6b8547f260b (diff) | |
| download | pkgsrc-063071f18ffcd21669872bba7273a36ccfd3c3ea.tar.gz | |
Fix signal handling problem in wine.
From David Holland in PR 32800.
Bump PKGREVISION.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/Makefile | 4 | ||||
| -rw-r--r-- | emulators/wine/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-af | 16 |
3 files changed, 18 insertions, 6 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index b2a08decac5..b0062a75e20 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.113 2006/08/23 09:49:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.114 2006/10/08 01:05:55 wiz Exp $ DISTNAME= wine-0.9.18 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 8ba66a4b6f1..04046bd5f8c 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2006/07/28 13:04:35 adam Exp $ +$NetBSD: distinfo,v 1.51 2006/10/08 01:05:55 wiz Exp $ SHA1 (wine-0.9.18.tar.bz2) = 2b4386e5687c5c5b9a5ec44483dbf5068f74ad0a RMD160 (wine-0.9.18.tar.bz2) = 2a40ab811c2fe20889b89da20503466d8781655e @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91 SHA1 (patch-ac) = c0a99356a4e7fb66f41f49c8fa85f8779a419287 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c -SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce +SHA1 (patch-af) = 680106cf9e8d96f7c30309cab99d40f1e3ad554a SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0 diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af index 19dbefb9bad..861058422e8 100644 --- a/emulators/wine/patches/patch-af +++ b/emulators/wine/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.17 2006/03/06 13:46:01 adam Exp $ +$NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $ ---- dlls/ntdll/signal_i386.c.orig 2006-03-02 18:16:51.000000000 +0100 +--- dlls/ntdll/signal_i386.c.orig 2006-07-27 14:55:50.000000000 +0000 +++ dlls/ntdll/signal_i386.c @@ -215,7 +215,7 @@ typedef struct trapframe SIGCONTEXT; @@ -59,3 +59,15 @@ $NetBSD: patch-af,v 1.17 2006/03/06 13:46:01 adam Exp $ #define EAX_sig(context) ((context)->sc_eax) #define EBX_sig(context) ((context)->sc_ebx) +@@ -1440,9 +1477,9 @@ static int set_handler( int sig, int hav + sigaddset( &sig_act.sa_mask, SIGUSR1 ); + sigaddset( &sig_act.sa_mask, SIGUSR2 ); + +-#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ++#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) + sig_act.sa_flags = SA_RESTART; +-#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) ++#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)) + sig_act.sa_flags = SA_SIGINFO | SA_RESTART; + #else + sig_act.sa_flags = 0; |