summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/wine-devel/Makefile4
-rw-r--r--emulators/wine-devel/PLIST.common10
-rw-r--r--emulators/wine-devel/distinfo15
-rw-r--r--emulators/wine-devel/patches/patch-ac6
-rw-r--r--emulators/wine-devel/patches/patch-af6
-rw-r--r--emulators/wine-devel/patches/patch-ah13
-rw-r--r--emulators/wine-devel/patches/patch-ba6
7 files changed, 26 insertions, 34 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 0c7362351de..25560164c85 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/21 17:40:29 adam Exp $
+# $NetBSD: Makefile,v 1.2 2008/11/21 18:54:56 adam Exp $
-DISTNAME= wine-1.1.8
+DISTNAME= wine-1.1.9
CATEGORIES= emulators
MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \
${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common
index a4e9a771fb3..e09462b7c0e 100644
--- a/emulators/wine-devel/PLIST.common
+++ b/emulators/wine-devel/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2008/11/21 18:54:56 adam Exp $
bin/fnt2bdf
bin/function_grep.pl
bin/msiexec
@@ -25,7 +25,6 @@ bin/winemine
bin/winepath
bin/wineprefixcreate
bin/wineserver
-bin/wineshelllink
bin/wmc
bin/wrc
include/wine/debug.h
@@ -594,6 +593,7 @@ lib/wine/ctl3d.dll16
lib/wine/ctl3d32.dll.so
lib/wine/ctl3dv2.dll16
lib/wine/d3d10.dll.so
+lib/wine/d3d10core.dll.so
lib/wine/d3d8.dll.so
lib/wine/d3d9.dll.so
lib/wine/d3dim.dll.so
@@ -709,6 +709,7 @@ lib/wine/libcryptnet.def
lib/wine/libcryptui.def
lib/wine/libctl3d32.def
lib/wine/libd3d10.def
+lib/wine/libd3d10core.def
lib/wine/libd3d8.def
lib/wine/libd3d9.def
lib/wine/libd3dim.def
@@ -829,6 +830,7 @@ lib/wine/libwow32.def
lib/wine/libws2_32.def
lib/wine/libwsock32.def
lib/wine/libwtsapi32.def
+lib/wine/libxinput.def
lib/wine/localspl.dll.so
lib/wine/localui.dll.so
lib/wine/lz32.dll.so
@@ -1055,6 +1057,10 @@ lib/wine/ws2_32.dll.so
lib/wine/wsock32.dll.so
lib/wine/wtsapi32.dll.so
lib/wine/xcopy.exe.so
+lib/wine/xinput1_1.dll.so
+lib/wine/xinput1_2.dll.so
+lib/wine/xinput1_3.dll.so
+lib/wine/xinput9_1_0.dll.so
man/de.UTF-8/man1/wine.1
man/fr.UTF-8/man1/wine.1
man/fr.UTF-8/man1/wineserver.1
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index fce3f6921ea..d8821d7f072 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/21 17:40:29 adam Exp $
+$NetBSD: distinfo,v 1.2 2008/11/21 18:54:56 adam Exp $
-SHA1 (wine-1.1.8.tar.bz2) = a01bea15352e4c9026109f8ba0cfe66e7167c3d6
-RMD160 (wine-1.1.8.tar.bz2) = 13501a94f3eeeb8e75be25e4dc5c178414d473c3
-Size (wine-1.1.8.tar.bz2) = 14665390 bytes
+SHA1 (wine-1.1.9.tar.bz2) = a9d5938b76198d244f0950e843dd4347661f4e74
+RMD160 (wine-1.1.9.tar.bz2) = 3a366c6b5c8f07d61d67b278000bbe0131fa7d99
+Size (wine-1.1.9.tar.bz2) = 14731804 bytes
SHA1 (patch-aa) = 0d8512f767119d7b258e32e04c78e919879e0ba6
SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
-SHA1 (patch-ac) = 5c9ddce81a3d7cc6d42136ad8f5f73d4ad47aefe
+SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
SHA1 (patch-ad) = 140e86db716cd1b1ab256bff0c7edec9423f9384
SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
-SHA1 (patch-af) = 91407e84abd72e9951704fd3f7f090fdad9b87fb
+SHA1 (patch-af) = 666706ccfbd87f1b9acec5974b19c0004db78827
SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
-SHA1 (patch-ah) = 29053353a24d28a5b5d30a8bfe9387116b6255d3
SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = 60f4683c26a9c975cb8e779d28205aaf1134c0de
+SHA1 (patch-ba) = d7ce37854f75d6dd02025c00957f4ae692ea1422
SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b
SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
diff --git a/emulators/wine-devel/patches/patch-ac b/emulators/wine-devel/patches/patch-ac
index adc615da831..34ed551c18f 100644
--- a/emulators/wine-devel/patches/patch-ac
+++ b/emulators/wine-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-ac,v 1.2 2008/11/21 18:54:56 adam Exp $
---- dlls/ntdll/directory.c.orig 2008-06-27 16:24:42.000000000 +0200
+--- dlls/ntdll/directory.c.orig 2008-11-21 17:20:28.000000000 +0100
+++ dlls/ntdll/directory.c
-@@ -127,6 +127,20 @@ static inline int getdents64( int fd, ch
+@@ -130,6 +130,20 @@ static inline int getdents64( int fd, ch
#endif /* linux */
#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
diff --git a/emulators/wine-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af
index 785114cb1de..f6346af5a31 100644
--- a/emulators/wine-devel/patches/patch-af
+++ b/emulators/wine-devel/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-af,v 1.2 2008/11/21 18:54:56 adam Exp $
---- dlls/ntdll/signal_i386.c.orig 2008-07-11 17:55:55.000000000 +0200
+--- dlls/ntdll/signal_i386.c.orig 2008-11-21 17:20:28.000000000 +0100
+++ dlls/ntdll/signal_i386.c
@@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT;
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
#else
TRAP_x86_DIVIDE = 0, /* Division by zero exception */
TRAP_x86_TRCTRAP = 1, /* Single-step exception */
-@@ -1604,7 +1642,11 @@ void signal_init_process(void)
+@@ -1600,7 +1638,11 @@ void signal_init_process(void)
struct sigaction sig_act;
sig_act.sa_mask = server_block_set;
diff --git a/emulators/wine-devel/patches/patch-ah b/emulators/wine-devel/patches/patch-ah
deleted file mode 100644
index 454240012d6..00000000000
--- a/emulators/wine-devel/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
-
---- dlls/jscript/parser.y.orig 2008-11-08 10:20:41.000000000 +0100
-+++ dlls/jscript/parser.y
-@@ -317,7 +317,7 @@ StatementList_opt
- /* ECMA-262 3rd Edition 12.1 */
- Block
- : '{' StatementList '}' { $$ = new_block_statement(ctx, $2); }
-- | '{' '}' { $$ = new_block_statement(ctx, NULL) }
-+ | '{' '}' { $$ = new_block_statement(ctx, NULL); }
-
- /* ECMA-262 3rd Edition 12.2 */
- VariableStatement
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index f5bc4fae282..8c03aceabaf 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-ba,v 1.2 2008/11/21 18:54:56 adam Exp $
---- configure.orig 2008-07-11 17:55:55.000000000 +0200
+--- configure.orig 2008-11-21 17:20:28.000000000 +0100
+++ configure
-@@ -16726,6 +16726,11 @@ MAIN_BINARY="wine-pthread"
+@@ -17827,6 +17827,11 @@ MAIN_BINARY="wine-pthread"
EXTRA_BINARIES="wine-pthread"
;;