8 files changed, 24 insertions, 118 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6909d2627c4b..3e9ae783ae22 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20031016
+PORTVERSION=	20031118
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 89197d0d7142..346f29d9b3ba 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20031016.tar.gz) = 67eed2fb7a86d805ec8fc4bcf7a04254
+MD5 (Wine-20031118.tar.gz) = 5787e6b3205b54f2230b4c4c0d422c3c
diff --git a/emulators/wine-devel/files/patch-dlls::ntdll::cdrom.c b/emulators/wine-devel/files/patch-dlls::ntdll::cdrom.c
deleted file mode 100644
index cf161e0b4485..000000000000
--- a/emulators/wine-devel/files/patch-dlls::ntdll::cdrom.c
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: dlls/ntdll/cdrom.c
-===================================================================
-RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
-retrieving revision 1.38
-diff -u -3 -p -r1.38 cdrom.c
---- cdrom.c	8 Oct 2003 02:59:22 -0000	1.38
-+++ cdrom.c	31 Oct 2003 14:24:08 -0000
-@@ -1350,10 +1350,8 @@ static NTSTATUS CDROM_RawRead(int dev, c
-             return ret;
-         }
-     }
--#elif defined(__FreeBSD__)
-+#else
-     {
--        struct ioc_read_audio   ira;
--
-         switch (raw->TrackMode)
-         {
-         case YellowMode2:
-@@ -1363,33 +1361,12 @@ static NTSTATUS CDROM_RawRead(int dev, c
-             FIXME("XAForm2: NIY\n");
-             return ret;
-         case CDDA:
--            /* 2048 = 2 ** 11 */
--            if (raw->DiskOffset.s.HighPart & ~2047) FIXME("Unsupported value\n");
--            ira.address.lba = ((raw->DiskOffset.s.LowPart >> 11) |
--                raw->DiskOffset.s.HighPart << (32 - 11)) - 1;
--            ira.address_format = CD_LBA_FORMAT;
--            ira.nframes = raw->SectorCount;
--            ira.buffer = buffer;
--            io = ioctl(cdrom_cache[dev].fd, CDIOCREADAUDIO, &ira);
--            break;
--        }
--    }
--#elif defined(__NetBSD__)
--    {
--        switch (raw->TrackMode)
--        {
--        case YellowMode2:
--            FIXME("YellowMode2: NIY\n");
--            return ret;
--        case XAForm2:
--            FIXME("XAForm2: NIY\n");
-+            FIXME("CDDA: NIY\n");
-             return ret;
--        case CDDA:
--	    FIXME("CDDA: NIY\n");
--	    return ret;
--	}
-+        }
-     }
- #endif
-+
-     *sz = sectSize * raw->SectorCount;
-     ret = CDROM_GetStatusCode(io);
-     return ret;
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 73b966565eac..3448d93ca68c 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -70,7 +70,10 @@ include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
+include/wine/windows/amvideo.h
+include/wine/windows/amvideo.idl
 include/wine/windows/audevcod.h
+include/wine/windows/aviriff.h
 include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
@@ -139,7 +142,6 @@ include/wine/windows/icmpapi.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
 include/wine/windows/initguid.h
-include/wine/windows/instance.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
@@ -211,6 +213,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/sddl.h
 include/wine/windows/servprov.h
 include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
@@ -288,7 +291,9 @@ lib/wine/avifile.dll.so
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/bug_report.pl
+lib/wine/capi2032.dll.so
 lib/wine/cabinet.dll.so
+lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
@@ -345,6 +350,8 @@ lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
+lib/wine/libcapi2032.def
+lib/wine/libcfgmgr32.def
 lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
@@ -429,6 +436,7 @@ lib/wine/libuser32.def
 lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
+lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwineps.def
 lib/wine/libwininet.def
@@ -545,6 +553,7 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
+lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedefault.reg
 lib/wine/winedos.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6909d2627c4b..3e9ae783ae22 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20031016
+PORTVERSION=	20031118
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 89197d0d7142..346f29d9b3ba 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20031016.tar.gz) = 67eed2fb7a86d805ec8fc4bcf7a04254
+MD5 (Wine-20031118.tar.gz) = 5787e6b3205b54f2230b4c4c0d422c3c
diff --git a/emulators/wine/files/patch-dlls::ntdll::cdrom.c b/emulators/wine/files/patch-dlls::ntdll::cdrom.c
deleted file mode 100644
index cf161e0b4485..000000000000
--- a/emulators/wine/files/patch-dlls::ntdll::cdrom.c
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: dlls/ntdll/cdrom.c
-===================================================================
-RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
-retrieving revision 1.38
-diff -u -3 -p -r1.38 cdrom.c
---- cdrom.c	8 Oct 2003 02:59:22 -0000	1.38
-+++ cdrom.c	31 Oct 2003 14:24:08 -0000
-@@ -1350,10 +1350,8 @@ static NTSTATUS CDROM_RawRead(int dev, c
-             return ret;
-         }
-     }
--#elif defined(__FreeBSD__)
-+#else
-     {
--        struct ioc_read_audio   ira;
--
-         switch (raw->TrackMode)
-         {
-         case YellowMode2:
-@@ -1363,33 +1361,12 @@ static NTSTATUS CDROM_RawRead(int dev, c
-             FIXME("XAForm2: NIY\n");
-             return ret;
-         case CDDA:
--            /* 2048 = 2 ** 11 */
--            if (raw->DiskOffset.s.HighPart & ~2047) FIXME("Unsupported value\n");
--            ira.address.lba = ((raw->DiskOffset.s.LowPart >> 11) |
--                raw->DiskOffset.s.HighPart << (32 - 11)) - 1;
--            ira.address_format = CD_LBA_FORMAT;
--            ira.nframes = raw->SectorCount;
--            ira.buffer = buffer;
--            io = ioctl(cdrom_cache[dev].fd, CDIOCREADAUDIO, &ira);
--            break;
--        }
--    }
--#elif defined(__NetBSD__)
--    {
--        switch (raw->TrackMode)
--        {
--        case YellowMode2:
--            FIXME("YellowMode2: NIY\n");
--            return ret;
--        case XAForm2:
--            FIXME("XAForm2: NIY\n");
-+            FIXME("CDDA: NIY\n");
-             return ret;
--        case CDDA:
--	    FIXME("CDDA: NIY\n");
--	    return ret;
--	}
-+        }
-     }
- #endif
-+
-     *sz = sectSize * raw->SectorCount;
-     ret = CDROM_GetStatusCode(io);
-     return ret;
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 73b966565eac..3448d93ca68c 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -70,7 +70,10 @@ include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
+include/wine/windows/amvideo.h
+include/wine/windows/amvideo.idl
 include/wine/windows/audevcod.h
+include/wine/windows/aviriff.h
 include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
@@ -139,7 +142,6 @@ include/wine/windows/icmpapi.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
 include/wine/windows/initguid.h
-include/wine/windows/instance.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
@@ -211,6 +213,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/sddl.h
 include/wine/windows/servprov.h
 include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
@@ -288,7 +291,9 @@ lib/wine/avifile.dll.so
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/bug_report.pl
+lib/wine/capi2032.dll.so
 lib/wine/cabinet.dll.so
+lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
@@ -345,6 +350,8 @@ lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
+lib/wine/libcapi2032.def
+lib/wine/libcfgmgr32.def
 lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
@@ -429,6 +436,7 @@ lib/wine/libuser32.def
 lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
+lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwineps.def
 lib/wine/libwininet.def
@@ -545,6 +553,7 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
+lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedefault.reg
 lib/wine/winedos.dll.so