Update to the 2003.02.19 snapshot of Wine.

The portability issue in dlls/dsound/test was fixed, but a Linuxism in
dlls/ntdll/cdrom.c added.  I have submitted files/patch-dlls-ntdll-cdrom.c
upstream as well.

Approved by:	obrien (mentor)

10 files changed, 92 insertions, 28 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index e225121dfe83..c97a00419cb9 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2003.01.15
+PORTVERSION=	2003.02.19
 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 bf1f747222e0..671e61b98e9d 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
+MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06
diff --git a/emulators/wine-devel/files/patch-dlls-dsound b/emulators/wine-devel/files/patch-dlls-dsound
deleted file mode 100644
index 514354a126e9..000000000000
--- a/emulators/wine-devel/files/patch-dlls-dsound
+++ /dev/null
@@ -1,12 +0,0 @@
---- dlls/dsound/tests/dsound.c	16 Jan 2003 00:19:49 -0000	1.4
-+++ dlls/dsound/tests/dsound.c	19 Jan 2003 21:45:43 -0000
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#include <malloc.h>
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "wine/test.h"
- #include "dsound.h"
diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c b/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c
new file mode 100644
index 000000000000..38b8a72c47a7
--- /dev/null
+++ b/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c
@@ -0,0 +1,41 @@
+--- dlls/ntdll/cdrom.c	19 Feb 2003 22:08:50 -0000	1.25
++++ dlls/ntdll/cdrom.c	20 Feb 2003 09:30:31 -0000
+@@ -72,6 +72,15 @@
+ #include "file.h"
+ #include "wine/debug.h"
+ 
++/* Non-Linux systems do not have linux/cdrom.h and the like, and thus
++   lack the following constants. */ 
++
++#ifndef CD_SECS  
++  #define CD_SECS              60 /* seconds per minute */
++#endif
++#ifndef CD_FRAMES
++  #define CD_FRAMES            75 /* frames per second */
++#endif
+ 
+ static const struct iocodexs
+ {
+@@ -285,8 +294,10 @@ static int CDROM_SyncCache(int dev)
+         + sizeof(TRACK_DATA) * (toc->LastTrack-toc->FirstTrack+2);
+     toc->Length[0] = tsz >> 8;
+     toc->Length[1] = tsz;
+-   
++  
++#ifdef linux
+     TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
++#endif
+ 
+     for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
+     {
+@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
+     if (i <= toc.FirstTrack || i > toc.LastTrack+1)
+       return STATUS_INVALID_PARAMETER;
+     i--;
+-    cp->FormatCode = CDROM_MSF; 
++#ifdef CDROM_MSF
++    cp->FormatCode = CDROM_MSF;
++#endif
+     cp->Control = toc.TrackData[i-toc.FirstTrack].Control; 
+     cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr; 
+     cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 9c9e326a97cb..936c5b7723d3 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -272,6 +272,7 @@ lib/wine/ctl3d.dll.so
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll.so
 lib/wine/d3d8.dll.so
+lib/wine/d3dim.dll.so
 lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
@@ -308,6 +309,7 @@ lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
 lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
+lib/wine/libd3dim.def
 lib/wine/libd3dx8.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
@@ -451,6 +453,7 @@ lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/sound.dll.so
+lib/wine/start.exe.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
 lib/wine/stress.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e225121dfe83..c97a00419cb9 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2003.01.15
+PORTVERSION=	2003.02.19
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index bf1f747222e0..671e61b98e9d 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
+MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06
diff --git a/emulators/wine/files/patch-dlls-dsound b/emulators/wine/files/patch-dlls-dsound
deleted file mode 100644
index 514354a126e9..000000000000
--- a/emulators/wine/files/patch-dlls-dsound
+++ /dev/null
@@ -1,12 +0,0 @@
---- dlls/dsound/tests/dsound.c	16 Jan 2003 00:19:49 -0000	1.4
-+++ dlls/dsound/tests/dsound.c	19 Jan 2003 21:45:43 -0000
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#include <malloc.h>
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "wine/test.h"
- #include "dsound.h"
diff --git a/emulators/wine/files/patch-dlls-ntdll-cdrom.c b/emulators/wine/files/patch-dlls-ntdll-cdrom.c
new file mode 100644
index 000000000000..38b8a72c47a7
--- /dev/null
+++ b/emulators/wine/files/patch-dlls-ntdll-cdrom.c
@@ -0,0 +1,41 @@
+--- dlls/ntdll/cdrom.c	19 Feb 2003 22:08:50 -0000	1.25
++++ dlls/ntdll/cdrom.c	20 Feb 2003 09:30:31 -0000
+@@ -72,6 +72,15 @@
+ #include "file.h"
+ #include "wine/debug.h"
+ 
++/* Non-Linux systems do not have linux/cdrom.h and the like, and thus
++   lack the following constants. */ 
++
++#ifndef CD_SECS  
++  #define CD_SECS              60 /* seconds per minute */
++#endif
++#ifndef CD_FRAMES
++  #define CD_FRAMES            75 /* frames per second */
++#endif
+ 
+ static const struct iocodexs
+ {
+@@ -285,8 +294,10 @@ static int CDROM_SyncCache(int dev)
+         + sizeof(TRACK_DATA) * (toc->LastTrack-toc->FirstTrack+2);
+     toc->Length[0] = tsz >> 8;
+     toc->Length[1] = tsz;
+-   
++  
++#ifdef linux
+     TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
++#endif
+ 
+     for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
+     {
+@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
+     if (i <= toc.FirstTrack || i > toc.LastTrack+1)
+       return STATUS_INVALID_PARAMETER;
+     i--;
+-    cp->FormatCode = CDROM_MSF; 
++#ifdef CDROM_MSF
++    cp->FormatCode = CDROM_MSF;
++#endif
+     cp->Control = toc.TrackData[i-toc.FirstTrack].Control; 
+     cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr; 
+     cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 9c9e326a97cb..936c5b7723d3 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -272,6 +272,7 @@ lib/wine/ctl3d.dll.so
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll.so
 lib/wine/d3d8.dll.so
+lib/wine/d3dim.dll.so
 lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
@@ -308,6 +309,7 @@ lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
 lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
+lib/wine/libd3dim.def
 lib/wine/libd3dx8.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
@@ -451,6 +453,7 @@ lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/sound.dll.so
+lib/wine/start.exe.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
 lib/wine/stress.dll.so