Update to the 2003-01-15 snapshot of Wine (which now includes two of my

portability patches).

Approved by:	obrien (mentor)

10 files changed, 22 insertions, 56 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index b7a8b1ca82a3..3c61fe831d34 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.12.19
+PORTVERSION=	2003.01.15
 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 38af0d97df5f..bf1f747222e0 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021219.tar.gz) = 0091d9173290430a98f7d772b9deb06f
+MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
diff --git a/emulators/wine-devel/files/patch-dlls-cabinet b/emulators/wine-devel/files/patch-dlls-cabinet
deleted file mode 100644
index bf717630902d..000000000000
--- a/emulators/wine-devel/files/patch-dlls-cabinet
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlls/cabinet/cabextract.c.orig	19 Dec 2002 21:16:56 -0000	1.1
-+++ dlls/cabinet/cabextract.c	26 Dec 2002 21:29:22 -0000
-@@ -472,7 +472,7 @@ BOOL cabinet_read_entries(struct cabinet
-     }
- 
-     fol->cab[0]     = cab;
--    fol->offset[0]  = base_offset + (off_t) EndGetI32(buf+cffold_DataOffset);
-+    fol->offset[0]  = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset);
-     fol->num_blocks = EndGetI16(buf+cffold_NumBlocks);
-     fol->comp_type  = EndGetI16(buf+cffold_CompType);
- 
diff --git a/emulators/wine-devel/files/patch-dlls-winmm b/emulators/wine-devel/files/patch-dlls-winmm
deleted file mode 100644
index 85696b6cdc8f..000000000000
--- a/emulators/wine-devel/files/patch-dlls-winmm
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlls/winmm/tests/wave.c.orig	Fri Jan  3 13:48:04 2003
-+++ dlls/winmm/tests/wave.c	Fri Jan  3 13:48:11 2003
-@@ -18,7 +18,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- 
- #include "wine/test.h"
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 23aad8dddf75..b70348b3816d 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -27,7 +27,6 @@ etc/wine.conf.sample
 include/wine/debug.h
 include/wine/exception.h
 include/wine/library.h
-include/wine/obj_base.h
 include/wine/obj_cache.h
 include/wine/obj_comcat.h
 include/wine/obj_commdlgbrowser.h
@@ -39,10 +38,8 @@ include/wine/obj_dragdrop.h
 include/wine/obj_dragdrophelper.h
 include/wine/obj_enumguid.h
 include/wine/obj_enumidlist.h
-include/wine/obj_errorinfo.h
 include/wine/obj_extracticon.h
 include/wine/obj_inplace.h
-include/wine/obj_oleaut.h
 include/wine/obj_olefont.h
 include/wine/obj_oleobj.h
 include/wine/obj_oleundo.h
@@ -61,6 +58,7 @@ include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
 include/wine/msvcrt/ctype.h
 include/wine/msvcrt/direct.h
+include/wine/msvcrt/dirent.h
 include/wine/msvcrt/dos.h
 include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
@@ -82,8 +80,10 @@ include/wine/msvcrt/sys/locking.h
 include/wine/msvcrt/sys/stat.h
 include/wine/msvcrt/sys/timeb.h
 include/wine/msvcrt/sys/types.h
+include/wine/msvcrt/sys/unistd.h
 include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
+include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
@@ -263,6 +263,9 @@ lib/wine/compobj.dll.so
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/ctl3d.dll.so
+lib/wine/ctl3d32.dll.so
+lib/wine/ctl3dv2.dll.so
 lib/wine/d3d8.dll.so
 lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
@@ -298,6 +301,7 @@ lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
+lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
 lib/wine/libd3dx8.def
 lib/wine/libdciman32.def
@@ -468,6 +472,7 @@ lib/wine/windebug.dll.so
 lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
+lib/wine/wineboot.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
@@ -479,7 +484,7 @@ lib/wine/wineoss.drv.so
 lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
-lib/wine/wineps16.dll.so
+lib/wine/wineps16.drv.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index b7a8b1ca82a3..3c61fe831d34 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.12.19
+PORTVERSION=	2003.01.15
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 38af0d97df5f..bf1f747222e0 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021219.tar.gz) = 0091d9173290430a98f7d772b9deb06f
+MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
diff --git a/emulators/wine/files/patch-dlls-cabinet b/emulators/wine/files/patch-dlls-cabinet
deleted file mode 100644
index bf717630902d..000000000000
--- a/emulators/wine/files/patch-dlls-cabinet
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlls/cabinet/cabextract.c.orig	19 Dec 2002 21:16:56 -0000	1.1
-+++ dlls/cabinet/cabextract.c	26 Dec 2002 21:29:22 -0000
-@@ -472,7 +472,7 @@ BOOL cabinet_read_entries(struct cabinet
-     }
- 
-     fol->cab[0]     = cab;
--    fol->offset[0]  = base_offset + (off_t) EndGetI32(buf+cffold_DataOffset);
-+    fol->offset[0]  = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset);
-     fol->num_blocks = EndGetI16(buf+cffold_NumBlocks);
-     fol->comp_type  = EndGetI16(buf+cffold_CompType);
- 
diff --git a/emulators/wine/files/patch-dlls-winmm b/emulators/wine/files/patch-dlls-winmm
deleted file mode 100644
index 85696b6cdc8f..000000000000
--- a/emulators/wine/files/patch-dlls-winmm
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlls/winmm/tests/wave.c.orig	Fri Jan  3 13:48:04 2003
-+++ dlls/winmm/tests/wave.c	Fri Jan  3 13:48:11 2003
-@@ -18,7 +18,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- 
- #include "wine/test.h"
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 23aad8dddf75..b70348b3816d 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -27,7 +27,6 @@ etc/wine.conf.sample
 include/wine/debug.h
 include/wine/exception.h
 include/wine/library.h
-include/wine/obj_base.h
 include/wine/obj_cache.h
 include/wine/obj_comcat.h
 include/wine/obj_commdlgbrowser.h
@@ -39,10 +38,8 @@ include/wine/obj_dragdrop.h
 include/wine/obj_dragdrophelper.h
 include/wine/obj_enumguid.h
 include/wine/obj_enumidlist.h
-include/wine/obj_errorinfo.h
 include/wine/obj_extracticon.h
 include/wine/obj_inplace.h
-include/wine/obj_oleaut.h
 include/wine/obj_olefont.h
 include/wine/obj_oleobj.h
 include/wine/obj_oleundo.h
@@ -61,6 +58,7 @@ include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
 include/wine/msvcrt/ctype.h
 include/wine/msvcrt/direct.h
+include/wine/msvcrt/dirent.h
 include/wine/msvcrt/dos.h
 include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
@@ -82,8 +80,10 @@ include/wine/msvcrt/sys/locking.h
 include/wine/msvcrt/sys/stat.h
 include/wine/msvcrt/sys/timeb.h
 include/wine/msvcrt/sys/types.h
+include/wine/msvcrt/sys/unistd.h
 include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
+include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
@@ -263,6 +263,9 @@ lib/wine/compobj.dll.so
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/ctl3d.dll.so
+lib/wine/ctl3d32.dll.so
+lib/wine/ctl3dv2.dll.so
 lib/wine/d3d8.dll.so
 lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
@@ -298,6 +301,7 @@ lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
+lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
 lib/wine/libd3dx8.def
 lib/wine/libdciman32.def
@@ -468,6 +472,7 @@ lib/wine/windebug.dll.so
 lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
+lib/wine/wineboot.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
@@ -479,7 +484,7 @@ lib/wine/wineoss.drv.so
 lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
-lib/wine/wineps16.dll.so
+lib/wine/wineps16.drv.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so