8 files changed, 184 insertions, 16 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 01d2d328e9e8..2ddc3b389112 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.36
-PORTREVISION=	1
+PORTVERSION=	0.9.39
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -18,11 +17,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
 
-# wine/dlls/glut32/ depends on the presence of libglut.
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdraw.1:${PORTSDIR}/print/fontforge \
-		glut.4:${PORTSDIR}/graphics/libglut \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
@@ -38,7 +35,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GL=		yes
+USE_GL=		glut
 USE_XPM=	yes
 
 SUB_FILES=	pkg-message
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 4ea67cd8f95e..f246b3d6589f 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.36.tar.bz2) = 8cc54b83b5beafcc3d998a04ed723a39
-SHA256 (wine-0.9.36.tar.bz2) = 97266030c40266dce8bc3a0f7085dd1b101c4660562137ac606a96a4cb9133f3
-SIZE (wine-0.9.36.tar.bz2) = 11843261
+MD5 (wine-0.9.39.tar.bz2) = 6535691a7558c53bbe66455c6df559a1
+SHA256 (wine-0.9.39.tar.bz2) = 0db60883fcc119d7258e0cbfbf888c8b81b7cab3d96b46a7ff0100a2d2b790e0
+SIZE (wine-0.9.39.tar.bz2) = 12093172
diff --git a/emulators/wine-devel/files/patch-avoid-user_shared_data b/emulators/wine-devel/files/patch-avoid-user_shared_data
new file mode 100644
index 000000000000..976941fa4db1
--- /dev/null
+++ b/emulators/wine-devel/files/patch-avoid-user_shared_data
@@ -0,0 +1,62 @@
+Index: dlls/ntdll/loader.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
+retrieving revision 1.155
+diff -u -3 -p -r1.155 loader.c
+--- dlls/ntdll/loader.c	23 May 2007 13:12:18 -0000	1.155
++++ dlls/ntdll/loader.c	3 Jun 2007 14:20:23 -0000
+@@ -2308,7 +2308,9 @@ void __wine_init_windows_dir( const WCHA
+     LPWSTR buffer, p;
+ 
+     RtlCreateUnicodeString( &system_dir, sysdir );
++#if !defined(__FreeBSD__)
+     strcpyW( user_shared_data->NtSystemRoot, windir );
++#endif
+ 
+     /* prepend the system dir to the name of the already created modules */
+     mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
+Index: dlls/ntdll/thread.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/thread.c,v
+retrieving revision 1.84
+diff -u -3 -p -r1.84 thread.c
+--- dlls/ntdll/thread.c	23 May 2007 13:12:18 -0000	1.84
++++ dlls/ntdll/thread.c	3 Jun 2007 14:20:23 -0000
+@@ -332,12 +332,15 @@ HANDLE thread_init(void)
+ 
+     /* initialize time values in user_shared_data */
+     NtQuerySystemTime( &now );
++
++#if !defined(__FreeBSD__)
+     user_shared_data->SystemTime.LowPart = now.u.LowPart;
+     user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.u.HighPart;
+     user_shared_data->u.TickCountQuad = (now.QuadPart - server_start_time) / 10000;
+     user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time;
+     user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart;
+     user_shared_data->TickCountMultiplier = 1 << 24;
++#endif
+ 
+     return exe_file;
+ }
+Index: dlls/ntdll/version.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/version.c,v
+retrieving revision 1.38
+diff -u -3 -p -r1.38 version.c
+--- dlls/ntdll/version.c	18 May 2007 18:57:23 -0000	1.38
++++ dlls/ntdll/version.c	3 Jun 2007 14:20:25 -0000
+@@ -506,12 +506,14 @@ done:
+     NtCurrentTeb()->Peb->OSBuildNumber  = current_version->dwBuildNumber;
+     NtCurrentTeb()->Peb->OSPlatformId   = current_version->dwPlatformId;
+ 
++#if ! defined(__FreeBSD__)
+     user_shared_data->NtProductType      = current_version->wProductType;
+     user_shared_data->ProductTypeIsValid = TRUE;
+     user_shared_data->MajorNtVersion     = current_version->dwMajorVersion;
+     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
+     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
+     user_shared_data->SuiteMask          = current_version->wSuiteMask;
++#endif
+ 
+     TRACE( "got %d.%d plaform %d build %x name %s service pack %d.%d product %d\n",
+            current_version->dwMajorVersion, current_version->dwMinorVersion,
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 3c484502f7c9..4cb51fef2c3a 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -183,6 +183,14 @@ include/wine/windows/exdisp.idl
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/gdiplus.h
+include/wine/windows/gdiplusenums.h
+include/wine/windows/gdiplusflat.h
+include/wine/windows/gdiplusgpstubs.h
+include/wine/windows/gdiplusinit.h
+include/wine/windows/gdiplusmem.h
+include/wine/windows/gdipluspixelformats.h
+include/wine/windows/gdiplustypes.h
 include/wine/windows/guiddef.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
@@ -192,6 +200,8 @@ include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
+include/wine/windows/icftypes.h
+include/wine/windows/icftypes.idl
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
@@ -268,6 +278,8 @@ include/wine/windows/msxml2did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/ndrtypes.h
+include/wine/windows/netfw.h
+include/wine/windows/netfw.idl
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
@@ -329,6 +341,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/scarderr.h
 include/wine/windows/schannel.h
 include/wine/windows/schnlsp.h
 include/wine/windows/schemadef.h
@@ -405,6 +418,8 @@ include/wine/windows/winnt.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h
 include/wine/windows/winresrc.h
+include/wine/windows/winscard.h
+include/wine/windows/winsmcrd.h
 include/wine/windows/winsock.h
 include/wine/windows/winsock2.h
 include/wine/windows/winspool.h
@@ -516,8 +531,10 @@ lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
+lib/wine/gdiplus.dll.so
 lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
+lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
@@ -578,6 +595,7 @@ lib/wine/libdxerr8.a
 lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
+lib/wine/libgdiplus.def
 lib/wine/libglu32.def
 lib/wine/libhid.def
 lib/wine/libhlink.def
@@ -608,6 +626,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
+lib/wine/libntoskrnl.exe.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -657,6 +676,7 @@ lib/wine/libwinedos.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
+lib/wine/libwinscard.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
@@ -708,11 +728,13 @@ lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/nddeapi.dll.so
+lib/wine/net.exe.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
+lib/wine/ntoskrnl.exe.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
@@ -733,6 +755,7 @@ lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
 lib/wine/oleview.exe.so
 lib/wine/opengl32.dll.so
+lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
@@ -820,6 +843,7 @@ lib/wine/wineconsole.exe.so
 lib/wine/winecoreaudio.drv.so
 lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
+lib/wine/winedevice.exe.so
 lib/wine/winedos.dll.so
 lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
@@ -842,6 +866,7 @@ lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
+lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
 lib/wine/wintab.dll16
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 01d2d328e9e8..2ddc3b389112 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.36
-PORTREVISION=	1
+PORTVERSION=	0.9.39
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -18,11 +17,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
 
-# wine/dlls/glut32/ depends on the presence of libglut.
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdraw.1:${PORTSDIR}/print/fontforge \
-		glut.4:${PORTSDIR}/graphics/libglut \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
@@ -38,7 +35,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GL=		yes
+USE_GL=		glut
 USE_XPM=	yes
 
 SUB_FILES=	pkg-message
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 4ea67cd8f95e..f246b3d6589f 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.36.tar.bz2) = 8cc54b83b5beafcc3d998a04ed723a39
-SHA256 (wine-0.9.36.tar.bz2) = 97266030c40266dce8bc3a0f7085dd1b101c4660562137ac606a96a4cb9133f3
-SIZE (wine-0.9.36.tar.bz2) = 11843261
+MD5 (wine-0.9.39.tar.bz2) = 6535691a7558c53bbe66455c6df559a1
+SHA256 (wine-0.9.39.tar.bz2) = 0db60883fcc119d7258e0cbfbf888c8b81b7cab3d96b46a7ff0100a2d2b790e0
+SIZE (wine-0.9.39.tar.bz2) = 12093172
diff --git a/emulators/wine/files/patch-avoid-user_shared_data b/emulators/wine/files/patch-avoid-user_shared_data
new file mode 100644
index 000000000000..976941fa4db1
--- /dev/null
+++ b/emulators/wine/files/patch-avoid-user_shared_data
@@ -0,0 +1,62 @@
+Index: dlls/ntdll/loader.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
+retrieving revision 1.155
+diff -u -3 -p -r1.155 loader.c
+--- dlls/ntdll/loader.c	23 May 2007 13:12:18 -0000	1.155
++++ dlls/ntdll/loader.c	3 Jun 2007 14:20:23 -0000
+@@ -2308,7 +2308,9 @@ void __wine_init_windows_dir( const WCHA
+     LPWSTR buffer, p;
+ 
+     RtlCreateUnicodeString( &system_dir, sysdir );
++#if !defined(__FreeBSD__)
+     strcpyW( user_shared_data->NtSystemRoot, windir );
++#endif
+ 
+     /* prepend the system dir to the name of the already created modules */
+     mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
+Index: dlls/ntdll/thread.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/thread.c,v
+retrieving revision 1.84
+diff -u -3 -p -r1.84 thread.c
+--- dlls/ntdll/thread.c	23 May 2007 13:12:18 -0000	1.84
++++ dlls/ntdll/thread.c	3 Jun 2007 14:20:23 -0000
+@@ -332,12 +332,15 @@ HANDLE thread_init(void)
+ 
+     /* initialize time values in user_shared_data */
+     NtQuerySystemTime( &now );
++
++#if !defined(__FreeBSD__)
+     user_shared_data->SystemTime.LowPart = now.u.LowPart;
+     user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.u.HighPart;
+     user_shared_data->u.TickCountQuad = (now.QuadPart - server_start_time) / 10000;
+     user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time;
+     user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart;
+     user_shared_data->TickCountMultiplier = 1 << 24;
++#endif
+ 
+     return exe_file;
+ }
+Index: dlls/ntdll/version.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/version.c,v
+retrieving revision 1.38
+diff -u -3 -p -r1.38 version.c
+--- dlls/ntdll/version.c	18 May 2007 18:57:23 -0000	1.38
++++ dlls/ntdll/version.c	3 Jun 2007 14:20:25 -0000
+@@ -506,12 +506,14 @@ done:
+     NtCurrentTeb()->Peb->OSBuildNumber  = current_version->dwBuildNumber;
+     NtCurrentTeb()->Peb->OSPlatformId   = current_version->dwPlatformId;
+ 
++#if ! defined(__FreeBSD__)
+     user_shared_data->NtProductType      = current_version->wProductType;
+     user_shared_data->ProductTypeIsValid = TRUE;
+     user_shared_data->MajorNtVersion     = current_version->dwMajorVersion;
+     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
+     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
+     user_shared_data->SuiteMask          = current_version->wSuiteMask;
++#endif
+ 
+     TRACE( "got %d.%d plaform %d build %x name %s service pack %d.%d product %d\n",
+            current_version->dwMajorVersion, current_version->dwMinorVersion,
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 3c484502f7c9..4cb51fef2c3a 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -183,6 +183,14 @@ include/wine/windows/exdisp.idl
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/gdiplus.h
+include/wine/windows/gdiplusenums.h
+include/wine/windows/gdiplusflat.h
+include/wine/windows/gdiplusgpstubs.h
+include/wine/windows/gdiplusinit.h
+include/wine/windows/gdiplusmem.h
+include/wine/windows/gdipluspixelformats.h
+include/wine/windows/gdiplustypes.h
 include/wine/windows/guiddef.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
@@ -192,6 +200,8 @@ include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
+include/wine/windows/icftypes.h
+include/wine/windows/icftypes.idl
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
@@ -268,6 +278,8 @@ include/wine/windows/msxml2did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/ndrtypes.h
+include/wine/windows/netfw.h
+include/wine/windows/netfw.idl
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
@@ -329,6 +341,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/scarderr.h
 include/wine/windows/schannel.h
 include/wine/windows/schnlsp.h
 include/wine/windows/schemadef.h
@@ -405,6 +418,8 @@ include/wine/windows/winnt.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h
 include/wine/windows/winresrc.h
+include/wine/windows/winscard.h
+include/wine/windows/winsmcrd.h
 include/wine/windows/winsock.h
 include/wine/windows/winsock2.h
 include/wine/windows/winspool.h
@@ -516,8 +531,10 @@ lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
+lib/wine/gdiplus.dll.so
 lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
+lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
@@ -578,6 +595,7 @@ lib/wine/libdxerr8.a
 lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
+lib/wine/libgdiplus.def
 lib/wine/libglu32.def
 lib/wine/libhid.def
 lib/wine/libhlink.def
@@ -608,6 +626,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
+lib/wine/libntoskrnl.exe.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -657,6 +676,7 @@ lib/wine/libwinedos.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
+lib/wine/libwinscard.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
@@ -708,11 +728,13 @@ lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/nddeapi.dll.so
+lib/wine/net.exe.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
+lib/wine/ntoskrnl.exe.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
@@ -733,6 +755,7 @@ lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
 lib/wine/oleview.exe.so
 lib/wine/opengl32.dll.so
+lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
@@ -820,6 +843,7 @@ lib/wine/wineconsole.exe.so
 lib/wine/winecoreaudio.drv.so
 lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
+lib/wine/winedevice.exe.so
 lib/wine/winedos.dll.so
 lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
@@ -842,6 +866,7 @@ lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
+lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
 lib/wine/wintab.dll16