diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2008-06-26 19:46:56 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2008-06-26 19:46:56 +0000 |
| commit | af5d4471f0b123dd337ff3c91fffff085de958ff (patch) | |
| tree | 970ef5fc5b827d936fc222a20cf7ce6e3c757dd6 /emulators | |
| parent | 5e16c8b8e6a3b0b976a7a13ace014bc705e7a354 (diff) | |
| download | pkgsrc-af5d4471f0b123dd337ff3c91fffff085de958ff.tar.gz | |
Enable kthread loader as the default on NetBSD; this package now works on
a 4.99.66/i386 kernel.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/PLIST.NetBSD | 2 | ||||
| -rw-r--r-- | emulators/wine/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-ba | 16 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-bb | 17 |
4 files changed, 38 insertions, 1 deletions
diff --git a/emulators/wine/PLIST.NetBSD b/emulators/wine/PLIST.NetBSD new file mode 100644 index 00000000000..fad2a0c017f --- /dev/null +++ b/emulators/wine/PLIST.NetBSD @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.NetBSD,v 1.1 2008/06/26 19:46:56 jmcneill Exp $ +bin/wine-pthread diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 5068037dcb9..84ba1d34288 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.76 2008/06/22 23:38:18 dholland Exp $ +$NetBSD: distinfo,v 1.77 2008/06/26 19:46:56 jmcneill Exp $ SHA1 (wine-1.0.tar.bz2) = 84150abdda18bc34b187335c6862718a6e08d255 RMD160 (wine-1.0.tar.bz2) = 1dbfa38e54e7d6269ad4110f22b2791393fd3b59 @@ -13,3 +13,5 @@ SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09 SHA1 (patch-ak) = 5f9836d5b6c957a2a6828b1979c1beeb4e900b31 +SHA1 (patch-ba) = c549da1e8afe50e51fc032a1d6da36e1cca1758f +SHA1 (patch-bb) = 42fd1c1c0bea76f56ded83b5e839f7899e93b810 diff --git a/emulators/wine/patches/patch-ba b/emulators/wine/patches/patch-ba new file mode 100644 index 00000000000..5e9e02be79d --- /dev/null +++ b/emulators/wine/patches/patch-ba @@ -0,0 +1,16 @@ +$NetBSD: patch-ba,v 1.1 2008/06/26 19:46:56 jmcneill Exp $ + +--- configure.orig 2008-06-26 15:39:25.000000000 -0400 ++++ configure 2008-06-26 15:39:53.000000000 -0400 +@@ -16819,6 +16819,11 @@ + + EXTRA_BINARIES="wine-pthread" + ;; ++ netbsd*) ++ MAIN_BINARY="wine-kthread" ++ ++ EXTRA_BINARIES="wine-pthread" ++ ;; + esac + ;; + esac diff --git a/emulators/wine/patches/patch-bb b/emulators/wine/patches/patch-bb new file mode 100644 index 00000000000..c56ab5bfeaa --- /dev/null +++ b/emulators/wine/patches/patch-bb @@ -0,0 +1,17 @@ +$NetBSD: patch-bb,v 1.1 2008/06/26 19:46:56 jmcneill Exp $ + +--- loader/kthread.c.orig 2008-06-26 15:40:21.000000000 -0400 ++++ loader/kthread.c 2008-06-26 15:40:35.000000000 -0400 +@@ -115,10 +115,12 @@ + pthread_descr descr = __pthread_thread_self(); + return &descr->thread_errno; + } ++#ifndef __NetBSD__ + int *__error(void) { return __errno_location(); } /* FreeBSD */ + int *__errno(void) { return __errno_location(); } /* NetBSD */ + int *___errno(void) { return __errno_location(); } /* Solaris */ + int *__thr_errno(void) { return __errno_location(); } /* UnixWare */ ++#endif + + /*********************************************************************** + * __h_errno_location |