Update to the 2002.10.31 snapshot of Wine.

Approved by:	obrien (mentor)
Also tested by:	Ulrich 'Q' Spoerlein <q@galgenberg.net>

8 files changed, 6 insertions, 44 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 31434d7..4029dee 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.10.07
+PORTVERSION=	2002.10.31
 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 e1163b3..c8fced6 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021007.tar.gz) = 5134822f9bc0da7f80d84b51480652a3
+MD5 (Wine-20021031.tar.gz) = 98079fb3deb111b8fddc777a047d1fe3
diff --git a/emulators/wine-devel/files/patch-upstream b/emulators/wine-devel/files/patch-upstream
deleted file mode 100644
index dd8268d..0000000
--- a/emulators/wine-devel/files/patch-upstream
+++ /dev/null
@@ -1,20 +0,0 @@
---- dlls/winmm/wineoss/audio.c:1.62	Wed Oct 30 08:38:42 2002
-+++ dlls/winmm/wineoss/audio.c	Wed Oct 30 08:38:42 2002
-@@ -245,7 +245,7 @@
-     if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1)
-     {
-         WARN("Couldn't open out %s (%s)\n", ossdev->dev_name, strerror(errno));
--        return (errno == EBUSY) ? MMSYSERR_ALLOCATED : MMSYSERR_ERROR;
-+        return -1;
-     }
-     fcntl(fd, F_SETFD, 1); /* set close on exec flag */
-     /* turn full duplex on if it has been requested */
-@@ -373,7 +373,7 @@
-     }
-     TRACE("Changing fd from %d to ", ossdev->fd);
-     close(ossdev->fd);
--    OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment);
-+    ossdev->fd = OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment);
-     TRACE("%d\n", ossdev->fd);
-     return ossdev->fd;
- }
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 70d0216..a7b7438 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -379,6 +379,7 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/winedos16.dll.so
 lib/wine/winefile.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 31434d7..4029dee 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.10.07
+PORTVERSION=	2002.10.31
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index e1163b3..c8fced6 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021007.tar.gz) = 5134822f9bc0da7f80d84b51480652a3
+MD5 (Wine-20021031.tar.gz) = 98079fb3deb111b8fddc777a047d1fe3
diff --git a/emulators/wine/files/patch-upstream b/emulators/wine/files/patch-upstream
deleted file mode 100644
index dd8268d..0000000
--- a/emulators/wine/files/patch-upstream
+++ /dev/null
@@ -1,20 +0,0 @@
---- dlls/winmm/wineoss/audio.c:1.62	Wed Oct 30 08:38:42 2002
-+++ dlls/winmm/wineoss/audio.c	Wed Oct 30 08:38:42 2002
-@@ -245,7 +245,7 @@
-     if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1)
-     {
-         WARN("Couldn't open out %s (%s)\n", ossdev->dev_name, strerror(errno));
--        return (errno == EBUSY) ? MMSYSERR_ALLOCATED : MMSYSERR_ERROR;
-+        return -1;
-     }
-     fcntl(fd, F_SETFD, 1); /* set close on exec flag */
-     /* turn full duplex on if it has been requested */
-@@ -373,7 +373,7 @@
-     }
-     TRACE("Changing fd from %d to ", ossdev->fd);
-     close(ossdev->fd);
--    OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment);
-+    ossdev->fd = OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment);
-     TRACE("%d\n", ossdev->fd);
-     return ossdev->fd;
- }
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 70d0216..a7b7438 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -379,6 +379,7 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/winedos16.dll.so
 lib/wine/winefile.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so