diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2010-12-31 08:15:15 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2010-12-31 08:15:15 +0000 |
| commit | 2ee985ee97ca23241c1d1de49a22ddeae701eef9 (patch) | |
| tree | 41026f29372dacb613f5d72f243b26f22bc10371 /emulators | |
| parent | - Drop MD5 checksum from distinfo (diff) | |
Update to Wine 1.3.10. [1][2] This includes the following changes:
- Icons in the "open with" menus.
- Man pages for all installed binaries.
- Support for schemas in MSXML.
- Many installer fixes.
- Beginnings of support for ActiveX in built-in browser.
- More work on ActiveX support.
- Icons on Internet shortcut menu entries.
- Standardization of code implementing COM interfaces.
- New scheme for auto-generated DLL registrations.
- OpenCL library wrapper.
- Support for notification balloons in system tray.
- Obsolete AudioIO sound driver removed.
- Various MSI fixes.
- Translation updates.
- Various bug fixes.
Lots of new man pages.
Also, remove references to FreeBSD 6 from pkg-message. [2]
PR: 153434
Submitted by: Rusty Nejdl <rnejdl@ringofsaturn.com> [1]
Alex Kozlov <spam@rm-rf.kiev.ua> [2]
Notes
Notes:
svn path=/head/; revision=267201
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/Makefile | 9 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-partial-reservation | 7 | ||||
| -rw-r--r-- | emulators/wine-devel/files/pkg-message.in | 4 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 19 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 9 | ||||
| -rw-r--r-- | emulators/wine/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine/files/patch-partial-reservation | 7 | ||||
| -rw-r--r-- | emulators/wine/files/pkg-message.in | 4 | ||||
| -rw-r--r-- | emulators/wine/pkg-plist | 19 |
10 files changed, 58 insertions, 28 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2f3a15196970..4e75a2fa7d66 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -DISTVERSION= 1.3.7 +DISTVERSION= 1.3.10 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -41,7 +41,12 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/wine MAKE_JOBS_SAFE= yes MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ winemaker.1 wineserver.1 wmc.1 wrc.1 -MLINKS= winegcc.1 wineg++.1 +MAN1= msiexec.1 notepad.1 regedit.1 regsvr32.1 widl.1 wine.1 \ + wineboot.1 winebuild.1 winecfg.1 wineconsole.1 winedbg.1 \ + winedump.1 winefile.1 winegcc.1 winemaker.1 winemine.1 \ + winepath.1 wineserver.1 wmc.1 wrc.1 +MLINKS= winegcc.1 winecpp.1 \ + winegcc.1 wineg++.1 ONLY_FOR_ARCHS= i386 USE_BISON= build USE_BZIP2= yes diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 862789119a64..4ce7cf643a9c 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (wine-1.3.7.tar.bz2) = 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025 -SIZE (wine-1.3.7.tar.bz2) = 18379692 +SHA256 (wine-1.3.10.tar.bz2) = f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038 +SIZE (wine-1.3.10.tar.bz2) = 18366433 diff --git a/emulators/wine-devel/files/patch-partial-reservation b/emulators/wine-devel/files/patch-partial-reservation index 6eca6ad32afd..35144fede910 100644 --- a/emulators/wine-devel/files/patch-partial-reservation +++ b/emulators/wine-devel/files/patch-partial-reservation @@ -1,12 +1,13 @@ --- libs/wine/mmap.c +++ libs/wine/mmap.c -@@ -383,6 +383,9 @@ void mmap_init(void) +@@ -380,6 +380,9 @@ reserve_area( base, end ); } else reserve_area( user_space_limit, 0 ); +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 ); +#endif - #endif /* __i386__ */ - + /* reserve the DOS area if not already done */ + + ptr = list_head( &reserved_areas ); diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in index e34fa1dcadab..ac9a492540d2 100644 --- a/emulators/wine-devel/files/pkg-message.in +++ b/emulators/wine-devel/files/pkg-message.in @@ -1,7 +1,3 @@ -Wine requires FreeBSD 6.3 or above; FreeBSD 7.0 or later is strongly -recommended. For FreeBSD 6 you may want to consider the patch(es) -provided at <http://wiki.freebsd.org/Wine>. - Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel configuration. This is incompatible with Wine. The maximum possible is KVA_PAGES=500, which should still be enough for ZFS. diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 802c5135d24c..870b1c44f118 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -542,6 +542,7 @@ include/wine/windows/sti.h include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl +include/wine/windows/strsafe.h include/wine/windows/structuredquerycondition.h include/wine/windows/structuredquerycondition.idl include/wine/windows/svrapi.h @@ -643,7 +644,6 @@ include/wine/windows/xinput.h include/wine/windows/xmldom.h include/wine/windows/xmldom.idl include/wine/windows/xmldomdid.h -include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h include/wine/windows/xmllite.h @@ -760,6 +760,7 @@ lib/wine/d3dx9_41.dll.so lib/wine/d3dx9_42.dll.so lib/wine/d3dx9_43.dll.so lib/wine/d3dxof.dll.so +lib/wine/dbgeng.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so lib/wine/ddeml.dll16.so @@ -895,6 +896,7 @@ lib/wine/fakedlls/d3dx9_41.dll lib/wine/fakedlls/d3dx9_42.dll lib/wine/fakedlls/d3dx9_43.dll lib/wine/fakedlls/d3dxof.dll +lib/wine/fakedlls/dbgeng.dll lib/wine/fakedlls/dbghelp.dll lib/wine/fakedlls/dciman32.dll lib/wine/fakedlls/ddeml.dll16 @@ -1046,15 +1048,19 @@ lib/wine/fakedlls/msvfw32.dll lib/wine/fakedlls/msvidc32.dll lib/wine/fakedlls/msvideo.dll16 lib/wine/fakedlls/mswsock.dll +lib/wine/fakedlls/msxml.dll +lib/wine/fakedlls/msxml2.dll lib/wine/fakedlls/msxml3.dll lib/wine/fakedlls/msxml4.dll lib/wine/fakedlls/msxml6.dll lib/wine/fakedlls/nddeapi.dll lib/wine/fakedlls/net.exe lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/netsh.exe lib/wine/fakedlls/newdev.dll lib/wine/fakedlls/ngen.exe lib/wine/fakedlls/notepad.exe +lib/wine/fakedlls/npmshtml.dll lib/wine/fakedlls/ntdll.dll lib/wine/fakedlls/ntdsapi.dll lib/wine/fakedlls/ntoskrnl.exe @@ -1124,6 +1130,7 @@ lib/wine/fakedlls/secur32.dll lib/wine/fakedlls/security.dll lib/wine/fakedlls/sensapi.dll lib/wine/fakedlls/serialui.dll +lib/wine/fakedlls/servicemodelreg.exe lib/wine/fakedlls/services.exe lib/wine/fakedlls/setupapi.dll lib/wine/fakedlls/setupx.dll16 @@ -1194,7 +1201,6 @@ lib/wine/fakedlls/winaspi.dll16 lib/wine/fakedlls/windebug.dll16 lib/wine/fakedlls/windowscodecs.dll lib/wine/fakedlls/winealsa.drv -lib/wine/fakedlls/wineaudioio.drv lib/wine/fakedlls/wineboot.exe lib/wine/fakedlls/winebrowser.exe lib/wine/fakedlls/winecfg.exe @@ -1237,6 +1243,7 @@ lib/wine/fakedlls/winver.exe lib/wine/fakedlls/wlanapi.dll lib/wine/fakedlls/wldap32.dll lib/wine/fakedlls/wmi.dll +lib/wine/fakedlls/wmic.exe lib/wine/fakedlls/wmiutils.dll lib/wine/fakedlls/wnaspi32.dll lib/wine/fakedlls/wordpad.exe @@ -1331,6 +1338,7 @@ lib/wine/libd3dim.def lib/wine/libd3drm.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def +lib/wine/libdbgeng.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def @@ -1522,15 +1530,19 @@ lib/wine/msvfw32.dll.so lib/wine/msvidc32.dll.so lib/wine/msvideo.dll16.so lib/wine/mswsock.dll.so +lib/wine/msxml.dll.so +lib/wine/msxml2.dll.so lib/wine/msxml3.dll.so lib/wine/msxml4.dll.so lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so +lib/wine/netsh.exe.so lib/wine/newdev.dll.so lib/wine/ngen.exe.so lib/wine/notepad.exe.so +lib/wine/npmshtml.dll.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so lib/wine/ntoskrnl.exe.so @@ -1600,6 +1612,7 @@ lib/wine/secur32.dll.so lib/wine/security.dll.so lib/wine/sensapi.dll.so lib/wine/serialui.dll.so +lib/wine/servicemodelreg.exe.so lib/wine/services.exe.so lib/wine/setupapi.dll.so lib/wine/setupx.dll16.so @@ -1670,7 +1683,6 @@ lib/wine/winaspi.dll16.so lib/wine/windebug.dll16.so lib/wine/windowscodecs.dll.so lib/wine/winealsa.drv.so -lib/wine/wineaudioio.drv.so lib/wine/wineboot.exe.so lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so @@ -1713,6 +1725,7 @@ lib/wine/winver.exe.so lib/wine/wlanapi.dll.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmic.exe.so lib/wine/wmiutils.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 2f3a15196970..4e75a2fa7d66 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -DISTVERSION= 1.3.7 +DISTVERSION= 1.3.10 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -41,7 +41,12 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/wine MAKE_JOBS_SAFE= yes MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ winemaker.1 wineserver.1 wmc.1 wrc.1 -MLINKS= winegcc.1 wineg++.1 +MAN1= msiexec.1 notepad.1 regedit.1 regsvr32.1 widl.1 wine.1 \ + wineboot.1 winebuild.1 winecfg.1 wineconsole.1 winedbg.1 \ + winedump.1 winefile.1 winegcc.1 winemaker.1 winemine.1 \ + winepath.1 wineserver.1 wmc.1 wrc.1 +MLINKS= winegcc.1 winecpp.1 \ + winegcc.1 wineg++.1 ONLY_FOR_ARCHS= i386 USE_BISON= build USE_BZIP2= yes diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 862789119a64..4ce7cf643a9c 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,2 +1,2 @@ -SHA256 (wine-1.3.7.tar.bz2) = 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025 -SIZE (wine-1.3.7.tar.bz2) = 18379692 +SHA256 (wine-1.3.10.tar.bz2) = f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038 +SIZE (wine-1.3.10.tar.bz2) = 18366433 diff --git a/emulators/wine/files/patch-partial-reservation b/emulators/wine/files/patch-partial-reservation index 6eca6ad32afd..35144fede910 100644 --- a/emulators/wine/files/patch-partial-reservation +++ b/emulators/wine/files/patch-partial-reservation @@ -1,12 +1,13 @@ --- libs/wine/mmap.c +++ libs/wine/mmap.c -@@ -383,6 +383,9 @@ void mmap_init(void) +@@ -380,6 +380,9 @@ reserve_area( base, end ); } else reserve_area( user_space_limit, 0 ); +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 ); +#endif - #endif /* __i386__ */ - + /* reserve the DOS area if not already done */ + + ptr = list_head( &reserved_areas ); diff --git a/emulators/wine/files/pkg-message.in b/emulators/wine/files/pkg-message.in index e34fa1dcadab..ac9a492540d2 100644 --- a/emulators/wine/files/pkg-message.in +++ b/emulators/wine/files/pkg-message.in @@ -1,7 +1,3 @@ -Wine requires FreeBSD 6.3 or above; FreeBSD 7.0 or later is strongly -recommended. For FreeBSD 6 you may want to consider the patch(es) -provided at <http://wiki.freebsd.org/Wine>. - Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel configuration. This is incompatible with Wine. The maximum possible is KVA_PAGES=500, which should still be enough for ZFS. diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index 802c5135d24c..870b1c44f118 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -542,6 +542,7 @@ include/wine/windows/sti.h include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl +include/wine/windows/strsafe.h include/wine/windows/structuredquerycondition.h include/wine/windows/structuredquerycondition.idl include/wine/windows/svrapi.h @@ -643,7 +644,6 @@ include/wine/windows/xinput.h include/wine/windows/xmldom.h include/wine/windows/xmldom.idl include/wine/windows/xmldomdid.h -include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h include/wine/windows/xmllite.h @@ -760,6 +760,7 @@ lib/wine/d3dx9_41.dll.so lib/wine/d3dx9_42.dll.so lib/wine/d3dx9_43.dll.so lib/wine/d3dxof.dll.so +lib/wine/dbgeng.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so lib/wine/ddeml.dll16.so @@ -895,6 +896,7 @@ lib/wine/fakedlls/d3dx9_41.dll lib/wine/fakedlls/d3dx9_42.dll lib/wine/fakedlls/d3dx9_43.dll lib/wine/fakedlls/d3dxof.dll +lib/wine/fakedlls/dbgeng.dll lib/wine/fakedlls/dbghelp.dll lib/wine/fakedlls/dciman32.dll lib/wine/fakedlls/ddeml.dll16 @@ -1046,15 +1048,19 @@ lib/wine/fakedlls/msvfw32.dll lib/wine/fakedlls/msvidc32.dll lib/wine/fakedlls/msvideo.dll16 lib/wine/fakedlls/mswsock.dll +lib/wine/fakedlls/msxml.dll +lib/wine/fakedlls/msxml2.dll lib/wine/fakedlls/msxml3.dll lib/wine/fakedlls/msxml4.dll lib/wine/fakedlls/msxml6.dll lib/wine/fakedlls/nddeapi.dll lib/wine/fakedlls/net.exe lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/netsh.exe lib/wine/fakedlls/newdev.dll lib/wine/fakedlls/ngen.exe lib/wine/fakedlls/notepad.exe +lib/wine/fakedlls/npmshtml.dll lib/wine/fakedlls/ntdll.dll lib/wine/fakedlls/ntdsapi.dll lib/wine/fakedlls/ntoskrnl.exe @@ -1124,6 +1130,7 @@ lib/wine/fakedlls/secur32.dll lib/wine/fakedlls/security.dll lib/wine/fakedlls/sensapi.dll lib/wine/fakedlls/serialui.dll +lib/wine/fakedlls/servicemodelreg.exe lib/wine/fakedlls/services.exe lib/wine/fakedlls/setupapi.dll lib/wine/fakedlls/setupx.dll16 @@ -1194,7 +1201,6 @@ lib/wine/fakedlls/winaspi.dll16 lib/wine/fakedlls/windebug.dll16 lib/wine/fakedlls/windowscodecs.dll lib/wine/fakedlls/winealsa.drv -lib/wine/fakedlls/wineaudioio.drv lib/wine/fakedlls/wineboot.exe lib/wine/fakedlls/winebrowser.exe lib/wine/fakedlls/winecfg.exe @@ -1237,6 +1243,7 @@ lib/wine/fakedlls/winver.exe lib/wine/fakedlls/wlanapi.dll lib/wine/fakedlls/wldap32.dll lib/wine/fakedlls/wmi.dll +lib/wine/fakedlls/wmic.exe lib/wine/fakedlls/wmiutils.dll lib/wine/fakedlls/wnaspi32.dll lib/wine/fakedlls/wordpad.exe @@ -1331,6 +1338,7 @@ lib/wine/libd3dim.def lib/wine/libd3drm.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def +lib/wine/libdbgeng.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def @@ -1522,15 +1530,19 @@ lib/wine/msvfw32.dll.so lib/wine/msvidc32.dll.so lib/wine/msvideo.dll16.so lib/wine/mswsock.dll.so +lib/wine/msxml.dll.so +lib/wine/msxml2.dll.so lib/wine/msxml3.dll.so lib/wine/msxml4.dll.so lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so +lib/wine/netsh.exe.so lib/wine/newdev.dll.so lib/wine/ngen.exe.so lib/wine/notepad.exe.so +lib/wine/npmshtml.dll.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so lib/wine/ntoskrnl.exe.so @@ -1600,6 +1612,7 @@ lib/wine/secur32.dll.so lib/wine/security.dll.so lib/wine/sensapi.dll.so lib/wine/serialui.dll.so +lib/wine/servicemodelreg.exe.so lib/wine/services.exe.so lib/wine/setupapi.dll.so lib/wine/setupx.dll16.so @@ -1670,7 +1683,6 @@ lib/wine/winaspi.dll16.so lib/wine/windebug.dll16.so lib/wine/windowscodecs.dll.so lib/wine/winealsa.drv.so -lib/wine/wineaudioio.drv.so lib/wine/wineboot.exe.so lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so @@ -1713,6 +1725,7 @@ lib/wine/winver.exe.so lib/wine/wlanapi.dll.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmic.exe.so lib/wine/wmiutils.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so |