6 files changed, 86 insertions, 29 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 8bbe47046ddb..b734a40c684c 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20040505
+PORTVERSION=	20041201
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/wine
-MAN1=		widl.1 wine.1 winebuild.1 winedump.1 winemaker.1 wmc.1 wrc.1
+MAN1=		widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winemaker.1 wmc.1 wrc.1
 MAN5=		wine.conf.5
 ONLY_FOR_ARCHS=	i386
 USE_BISON=	yes
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 8f4f1cf65a6d..604887d668fd 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20040505.tar.gz) = 80db8c5c0ca2e0733bf232017a558757
-SIZE (Wine-20040505.tar.gz) = 10499070
+MD5 (Wine-20041201.tar.gz) = f47c26c012a78a37f22ad56122402f11
+SIZE (Wine-20041201.tar.gz) = 11264647
diff --git a/emulators/wine/files/patch-dlls-ntdll b/emulators/wine/files/patch-dlls-ntdll
new file mode 100644
index 000000000000..6ee56acae645
--- /dev/null
+++ b/emulators/wine/files/patch-dlls-ntdll
@@ -0,0 +1,29 @@
+Index: dlls/ntdll/virtual.c
+===================================================================
+RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
+retrieving revision 1.41
+diff -u -3 -p -r1.41 virtual.c
+--- dlls/ntdll/virtual.c	11 Oct 2004 20:59:06 -0000	1.41
++++ dlls/ntdll/virtual.c	3 Dec 2004 04:06:42 -0000
+@@ -119,6 +119,12 @@ static CRITICAL_SECTION csVirtual = { &c
+ /* Note: these are Windows limits, you cannot change them. */
+ # define ADDRESS_SPACE_LIMIT  ((void *)0xc0000000)  /* top of the total available address space */
+ # define USER_SPACE_LIMIT     ((void *)0x80000000)  /* top of the user address space */
++# ifdef __FreeBSD__
++#  define LOW_SPACE_LIMIT     ((void *)0x110000)   /* lower address space limit */
++# else
++#  define LOW_SPACE_LIMIT     NULL
++# endif
++
+ #else
+ static UINT page_shift;
+ static UINT page_mask;
+@@ -600,7 +606,7 @@ static NTSTATUS map_view( struct file_vi
+ 
+         for (;;)
+         {
+-            if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
++            if ((ptr = wine_anon_mmap( LOW_SPACE_LIMIT, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
+             {
+                 if (errno == ENOMEM) return STATUS_NO_MEMORY;
+                 return STATUS_INVALID_PARAMETER;
diff --git a/emulators/wine/files/patch-loader::main.c b/emulators/wine/files/patch-loader::main.c
deleted file mode 100644
index b7a60402ad5b..000000000000
--- a/emulators/wine/files/patch-loader::main.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: loader/main.c
-===================================================================
-RCS file: /home/wine/wine/loader/main.c,v
-retrieving revision 1.90
-retrieving revision 1.89
-diff -u -3 -p -r1.90 -r1.89
---- loader/main.c	20 Jan 2004 00:28:01 -0000	1.90
-+++ loader/main.c	22 Nov 2003 00:08:26 -0000	1.89
-@@ -29,7 +29,7 @@ int main( int argc, char *argv[] )
- {
-     char error[1024];
-
--#if 0
-+#ifdef __i386__
-     static char pe_load[256*1024*1024] __attribute__((aligned(4096)));
-     wine_set_pe_load_area( pe_load, sizeof(pe_load) );
- #endif
diff --git a/emulators/wine/files/patch-program::Makefile.in b/emulators/wine/files/patch-program::Makefile.in
index a11e87a3a0d1..2ba5e0de2ca2 100644
--- a/emulators/wine/files/patch-program::Makefile.in
+++ b/emulators/wine/files/patch-program::Makefile.in
@@ -17,10 +17,10 @@
  	winhelp \
  	winver
 @@ -106,7 +104,6 @@ SYMLINKS = \
- 	winemenubuilder.exe \
- 	winemine.exe \
- 	winepath.exe \
--	winetest.exe \
- 	winevdm.exe \
- 	winhelp.exe \
- 	winver.exe
+ 	winemenubuilder.exe$(DLLEXT) \
+ 	winemine.exe$(DLLEXT) \
+ 	winepath.exe$(DLLEXT) \
+-	winetest.exe$(DLLEXT) \
+ 	winevdm.exe$(DLLEXT) \
+ 	winhelp.exe$(DLLEXT) \
+ 	winver.exe$(DLLEXT)
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index e98493f44d0c..71901ea146c6 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -11,7 +11,6 @@ bin/wineboot
 bin/winebrowser
 bin/winebuild
 bin/winecfg
-bin/wineclipsrv
 bin/wineconsole
 bin/winecpp
 bin/winedbg
@@ -72,6 +71,10 @@ include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
+include/wine/windows/aclapi.h
+include/wine/windows/activscp.h
+include/wine/windows/activscp.idl
+include/wine/windows/advpub.h
 include/wine/windows/amstream.h
 include/wine/windows/amstream.idl
 include/wine/windows/amvideo.h
@@ -91,6 +94,7 @@ include/wine/windows/commctrl.h
 include/wine/windows/commdlg.h
 include/wine/windows/compobj.h
 include/wine/windows/control.h
+include/wine/windows/control.idl
 include/wine/windows/cpl.h
 include/wine/windows/custcntl.h
 include/wine/windows/cvconst.h
@@ -115,9 +119,12 @@ include/wine/windows/ddrawi.h
 include/wine/windows/ddstream.h
 include/wine/windows/ddstream.idl
 include/wine/windows/devenum.idl
+include/wine/windows/devguid.h
 include/wine/windows/digitalv.h
 include/wine/windows/dinput.h
 include/wine/windows/dispdib.h
+include/wine/windows/dispex.h
+include/wine/windows/dispex.idl
 include/wine/windows/dlgs.h
 include/wine/windows/dls1.h
 include/wine/windows/dls2.h
@@ -145,14 +152,17 @@ include/wine/windows/dsound.h
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
 include/wine/windows/dxerr9.h
+include/wine/windows/dxfile.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/evcode.h
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 include/wine/windows/exdisp.idl
+include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/guiddef.h
+include/wine/windows/htmlhelp.h
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/imagehlp.h
@@ -163,6 +173,9 @@ include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
 include/wine/windows/iprtrmib.h
 include/wine/windows/iptypes.h
+include/wine/windows/ks.h
+include/wine/windows/ksguid.h
+include/wine/windows/ksmedia.h
 include/wine/windows/lm.h
 include/wine/windows/lmaccess.h
 include/wine/windows/lmapibuf.h
@@ -186,7 +199,10 @@ include/wine/windows/mciavi.h
 include/wine/windows/mcx.h
 include/wine/windows/mediaerr.h
 include/wine/windows/mediaobj.h
+include/wine/windows/mediaobj.idl
 include/wine/windows/minmax.h
+include/wine/windows/mlang.h
+include/wine/windows/mlang.idl
 include/wine/windows/mmddk.h
 include/wine/windows/mmreg.h
 include/wine/windows/mmstream.h
@@ -195,6 +211,7 @@ include/wine/windows/mmsystem.h
 include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
+include/wine/windows/mscat.h
 include/wine/windows/msi.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
@@ -224,6 +241,8 @@ include/wine/windows/oleidl.h
 include/wine/windows/oleidl.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
+include/wine/windows/propidl.h
+include/wine/windows/propidl.idl
 include/wine/windows/prsht.h
 include/wine/windows/psapi.h
 include/wine/windows/pshpack1.h
@@ -233,16 +252,20 @@ include/wine/windows/pshpack8.h
 include/wine/windows/pstore.h
 include/wine/windows/pstore.idl
 include/wine/windows/ras.h
+include/wine/windows/reason.h
 include/wine/windows/regstr.h
 include/wine/windows/richedit.h
 include/wine/windows/richole.h
+include/wine/windows/richole.idl
 include/wine/windows/rpc.h
 include/wine/windows/rpcdce.h
 include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/schemadef.h
 include/wine/windows/sddl.h
+include/wine/windows/secext.h
 include/wine/windows/servprov.h
 include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
@@ -300,6 +323,7 @@ include/wine/windows/winsvc.h
 include/wine/windows/wintab.h
 include/wine/windows/wintabx.h
 include/wine/windows/winternl.h
+include/wine/windows/wintrust.h
 include/wine/windows/winuser.h
 include/wine/windows/winver.h
 include/wine/windows/wnaspi32.h
@@ -308,6 +332,7 @@ include/wine/windows/ws2spi.h
 include/wine/windows/ws2tcpip.h
 include/wine/windows/wshisotp.h
 include/wine/windows/wsipx.h
+include/wine/windows/wsnwlink.h
 include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/xcmc.h
@@ -317,7 +342,9 @@ lib/libwine.so.1
 lib/libwine_unicode.so
 lib/libwine_unicode.so.1
 lib/wine/advapi32.dll.so
+lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
+lib/wine/atl.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll.so
@@ -344,7 +371,9 @@ lib/wine/ctl3dv2.dll.so
 lib/wine/d3d8.dll.so
 lib/wine/d3d9.dll.so
 lib/wine/d3dim.dll.so
+lib/wine/d3drm.dll.so
 lib/wine/d3dx8.dll.so
+lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
@@ -385,12 +414,15 @@ lib/wine/imagehlp.dll.so
 lib/wine/imm.dll.so
 lib/wine/imm32.dll.so
 lib/wine/iphlpapi.dll.so
+lib/wine/itss.dll.so
 lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv.so
 lib/wine/krnl386.exe.so
 lib/wine/libadvapi32.def
+lib/wine/libadvpack.def
 lib/wine/libamstream.def
+lib/wine/libatl.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
@@ -406,7 +438,9 @@ lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
 lib/wine/libd3d9.def
 lib/wine/libd3dim.def
+lib/wine/libd3drm.def
 lib/wine/libd3dx8.def
+lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
@@ -440,11 +474,14 @@ lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
 lib/wine/libiphlpapi.def
+lib/wine/libitss.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
+lib/wine/libmlang.def
 lib/wine/libmpr.def
 lib/wine/libmsacm32.def
+lib/wine/libmscms.def
 lib/wine/libmsdmo.def
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
@@ -474,6 +511,7 @@ lib/wine/libpsapi.def
 lib/wine/libqcap.def
 lib/wine/libquartz.def
 lib/wine/librasapi32.def
+lib/wine/librsaenh.def
 lib/wine/libriched32.def
 lib/wine/librpcrt4.def
 lib/wine/librsabase.def
@@ -486,6 +524,7 @@ lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
 lib/wine/libsnmpapi.def
 lib/wine/libsti.def
+lib/wine/libstrmiids.a
 lib/wine/libtapi32.def
 lib/wine/libttydrv.def
 lib/wine/libtwain_32.def
@@ -521,6 +560,7 @@ lib/wine/mcicda.drv.so
 lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.drv.so
+lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
 lib/wine/mmsystem.dll.so
 lib/wine/monodebg.vxd.so
@@ -530,10 +570,12 @@ lib/wine/msacm.drv.so
 lib/wine/msacm.dll.so
 lib/wine/msacm32.dll.so
 lib/wine/msadp32.acm.so
+lib/wine/mscms.dll.so
 lib/wine/msdmo.dll.so
 lib/wine/msg711.acm.so
 lib/wine/mshtml.dll.so
 lib/wine/msi.dll.so
+lib/wine/msiexec.exe.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
@@ -579,6 +621,7 @@ lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
 lib/wine/rpcss.exe.so
 lib/wine/rsabase.dll.so
+lib/wine/rsaenh.dll.so
 lib/wine/rundll32.exe.so
 lib/wine/secur32.dll.so
 lib/wine/serialui.dll.so
@@ -600,6 +643,7 @@ lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
+lib/wine/twain.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
 lib/wine/unicows.dll.so
@@ -665,6 +709,7 @@ lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/x11drv.dll.so
 share/aclocal/wine.m4
+share/applications/wine.desktop 
 share/wine/generic.ppd
 share/wine/wine.inf
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE