WHAT'S NEW with Wine-20031016: (see ChangeLog for details)

        - Support for the Xrandr extension.
        - Dll separation of kernel and ntdll is finished.
        - Many enhanced metafile improvements.
        - Lots of bug fixes.

6 files changed, 24 insertions, 26 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2f4d47e8011..3880f9065d0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2003/09/28 21:26:44 seb Exp $
+# $NetBSD: Makefile,v 1.53 2003/10/17 13:54:18 adam Exp $
 
-DISTNAME=		Wine-20030911
+DISTNAME=		Wine-20031016
 PKGNAME=		${DISTNAME:S/W/w/}
 WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
 CATEGORIES=		emulators
@@ -53,7 +53,7 @@ post-install:
 	${INSTALL_DATA} config ${EGDIR}/wine.conf &&			\
 	${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd &&		\
 	${INSTALL_DATA} system.ini ${EGDIR}/system.ini &&		\
-	${INSTALL_DATA} win.ini ${EGDIR}/win.ini
+#	${INSTALL_DATA} win.ini ${EGDIR}/win.ini
 	${RMDIR} ${PREFIX}/man/man3w
 
 .include "../../graphics/MesaLib/buildlink2.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index e3b08e373d4..2d7da743d15 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2003/09/25 13:25:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2003/10/17 13:54:18 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -229,11 +229,13 @@ include/wine/windows/strmif.idl
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/tlhelp32.h
+include/wine/windows/tmschema.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
 include/wine/windows/urlmon.idl
 include/wine/windows/uuids.h
+include/wine/windows/uxtheme.h
 include/wine/windows/ver.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
@@ -271,7 +273,6 @@ include/wine/windows/wsipx.h
 include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/zmouse.h
-lib/libntdll.dll.so
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
@@ -288,7 +289,6 @@ lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
-lib/wine/comm.dll.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
 lib/wine/control.exe.so
@@ -308,7 +308,6 @@ lib/wine/devenum.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
 lib/wine/dispdib.dll.so
-lib/wine/display.dll.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -335,7 +334,6 @@ lib/wine/imm32.dll.so
 lib/wine/iphlpapi.dll.so
 lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
-lib/wine/keyboard.dll.so
 lib/wine/krnl386.exe.so
 lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
@@ -422,6 +420,7 @@ lib/wine/libtwain_32.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwinedos.def
@@ -447,7 +446,6 @@ lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.drv.so
 lib/wine/mmsystem.dll.so
-lib/wine/mouse.dll.so
 lib/wine/mpr.dll.so
 lib/wine/msacm.dll.so
 lib/wine/msacm.drv.so
@@ -524,6 +522,7 @@ lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
+lib/wine/uxtheme.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
 lib/wine/w32skrnl.dll.so
@@ -579,7 +578,6 @@ man/man5/wine.conf.5
 share/aclocal/wine.m4
 share/examples/wine/generic.ppd
 share/examples/wine/system.ini
-share/examples/wine/win.ini
 share/examples/wine/wine.conf
 share/examples/wine/winedefault.reg
 @dirrm share/examples/wine
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index de68a7d8a01..cd3ef5ca69d 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2003/09/15 10:51:37 adam Exp $
+$NetBSD: distinfo,v 1.18 2003/10/17 13:54:18 adam Exp $
 
-SHA1 (Wine-20030911.tar.gz) = 3cd9ebbc2695504de51781dc3a1eeb9c7ebc9ff1
-Size (Wine-20030911.tar.gz) = 9411260 bytes
-SHA1 (patch-aa) = bbae0bb4b08ea271f86bf76a4a6b874b51cbcd90
-SHA1 (patch-ab) = 650075a531c22fbb9d608c6fec113de7d4fba335
-SHA1 (patch-ac) = 142b64525b7c4c027e4d8035ad55a347933befc9
+SHA1 (Wine-20031016.tar.gz) = 5ce9e4ee45adff54df1dc8b5a73b940ece96f96b
+Size (Wine-20031016.tar.gz) = 9452596 bytes
+SHA1 (patch-aa) = 27f2fa6bf9825ce17fb8723c7cf3fbc0dd0ac7b3
+SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
+SHA1 (patch-ac) = c69e31c356a47b31ab5c0fa877213956b24846da
 SHA1 (patch-ad) = 437b44a5682a24b8b9bcdcffedaa8266e79ee2b7
 SHA1 (patch-ae) = 00d8f780c51df22af7aac147e80979c258b01a3e
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 0bb215ac945..fdbe7bdfa6d 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/09/15 10:51:38 adam Exp $
+$NetBSD: patch-aa,v 1.10 2003/10/17 13:54:18 adam Exp $
 
---- Make.rules.in.orig	2003-08-23 02:45:21.000000000 +0200
+--- Make.rules.in.orig	2003-10-11 03:05:18.000000000 +0200
 +++ Make.rules.in
-@@ -102,7 +102,7 @@ conf_manext     = 5
+@@ -105,7 +105,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                    *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
  
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index 26a6d7bbb12..4cd5bad0e4c 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2003/09/15 10:51:38 adam Exp $
+$NetBSD: patch-ab,v 1.16 2003/10/17 13:54:18 adam Exp $
 
---- dlls/ntdll/cdrom.c.orig	2003-09-06 01:08:34.000000000 +0200
+--- dlls/ntdll/cdrom.c.orig	2003-10-08 04:59:22.000000000 +0200
 +++ dlls/ntdll/cdrom.c
-@@ -54,6 +54,16 @@
+@@ -61,6 +61,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index e7cd9ff4e2a..6bba2bf55fb 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2003/09/15 10:51:38 adam Exp $
+$NetBSD: patch-ac,v 1.8 2003/10/17 13:54:18 adam Exp $
 
---- configure.orig	2003-09-12 03:31:07.000000000 +0200
+--- configure.orig	2003-10-17 00:46:13.000000000 +0200
 +++ configure
-@@ -15417,7 +15417,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -15186,7 +15186,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2003/09/15 10:51:38 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16303,7 +16303,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -16072,7 +16072,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then