From 43b0e80ad60e2c32b43ad2e949d50e72c78d28e0 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 18 Jul 2009 19:50:09 +0000 Subject: [PATCH] Update to Wine 1.1.26. Among others, this includes the following changes: - Still more translation updates. - Faster bitmap stretching using XRender. - Proxy support in WinHTTP. - Many more JScript functions. - Various bug fixes. Plus documentation has been consolidated and some READMEs removed. --- emulators/wine-devel/Makefile | 7 ++----- emulators/wine-devel/distinfo | 6 +++--- emulators/wine-devel/pkg-plist | 17 +++++++---------- emulators/wine/Makefile | 7 ++----- emulators/wine/distinfo | 6 +++--- emulators/wine/pkg-plist | 17 +++++++---------- 6 files changed, 24 insertions(+), 36 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index daff10ae0370..55979927d114 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -7,8 +7,7 @@ # PORTNAME= wine -DISTVERSION= 1.1.25 -PORTREVISION= 1 +DISTVERSION= 1.1.26 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SFE \ @@ -106,9 +105,7 @@ post-install: .for i in README ANNOUNCE AUTHORS LICENSE @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor -.for i in progman uninstaller winedbg winemine - @${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i} -.endfor + @${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${DOCSDIR}/README.winedbg @${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif @${MKDIR} ${DESKTOPDIR} diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 280f1e3b0734..88e781d3aa00 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (wine-1.1.25.tar.bz2) = fccfb3aa05b29c7e8f877b38352eca39 -SHA256 (wine-1.1.25.tar.bz2) = 1b272c0b7b42681cba63ec4301517f77103483fffe4601cab9029bb9ed80a1e2 -SIZE (wine-1.1.25.tar.bz2) = 15555891 +MD5 (wine-1.1.26.tar.bz2) = 6fa2d157bdc7d1acbd4f21a38801c58a +SHA256 (wine-1.1.26.tar.bz2) = 0285b346ca7af8def0773cece1e9b01f47e7340577d6c780cd38863c948a1f5a +SIZE (wine-1.1.26.tar.bz2) = 15666433 diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 2dc5a6681968..398f6cf243b4 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -140,11 +140,6 @@ include/wine/windows/d3drmdef.h include/wine/windows/d3drmobj.h include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl -include/wine/windows/d3dx8.h -include/wine/windows/d3dx8core.h -include/wine/windows/d3dx8math.h -include/wine/windows/d3dx8math.inl -include/wine/windows/d3dx8mesh.h include/wine/windows/d3dx9.h include/wine/windows/d3dx9core.h include/wine/windows/d3dx9math.h @@ -352,11 +347,14 @@ include/wine/windows/msxml2did.h include/wine/windows/msxmldid.h include/wine/windows/nb30.h include/wine/windows/ndrtypes.h +include/wine/windows/netcon.h +include/wine/windows/netcon.idl 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 +include/wine/windows/ntddndis.h include/wine/windows/ntddscsi.h include/wine/windows/ntddstor.h include/wine/windows/ntdsapi.h @@ -468,6 +466,7 @@ include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl include/wine/windows/svrapi.h +include/wine/windows/t2embapi.h include/wine/windows/tapi.h include/wine/windows/tchar.h include/wine/windows/textserv.h @@ -496,6 +495,8 @@ include/wine/windows/vfwmsgs.h include/wine/windows/vmr9.h include/wine/windows/vmr9.idl include/wine/windows/vmrender.idl +include/wine/windows/wbemcli.h +include/wine/windows/wbemcli.idl include/wine/windows/wfext.h include/wine/windows/winbase.h include/wine/windows/wincodec.h @@ -624,7 +625,6 @@ 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/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -747,7 +747,6 @@ lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dim.def lib/wine/libd3drm.def -lib/wine/libd3dx8.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def lib/wine/libdbghelp.def @@ -1099,6 +1098,7 @@ lib/wine/wintrust.dll.so lib/wine/winver.exe.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmiutils.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so lib/wine/wow32.dll.so @@ -1165,11 +1165,8 @@ share/applications/wine.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.progman -%%PORTDOCS%%%%DOCSDIR%%/README.uninstaller %%PORTDOCS%%%%DOCSDIR%%/README.winedbg %%PORTDOCS%%%%DOCSDIR%%/README.winedump -%%PORTDOCS%%%%DOCSDIR%%/README.winemine %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/wine @dirrm include/wine/windows/ddk diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index daff10ae0370..55979927d114 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,8 +7,7 @@ # PORTNAME= wine -DISTVERSION= 1.1.25 -PORTREVISION= 1 +DISTVERSION= 1.1.26 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SFE \ @@ -106,9 +105,7 @@ post-install: .for i in README ANNOUNCE AUTHORS LICENSE @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor -.for i in progman uninstaller winedbg winemine - @${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i} -.endfor + @${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${DOCSDIR}/README.winedbg @${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif @${MKDIR} ${DESKTOPDIR} diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 280f1e3b0734..88e781d3aa00 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,3 +1,3 @@ -MD5 (wine-1.1.25.tar.bz2) = fccfb3aa05b29c7e8f877b38352eca39 -SHA256 (wine-1.1.25.tar.bz2) = 1b272c0b7b42681cba63ec4301517f77103483fffe4601cab9029bb9ed80a1e2 -SIZE (wine-1.1.25.tar.bz2) = 15555891 +MD5 (wine-1.1.26.tar.bz2) = 6fa2d157bdc7d1acbd4f21a38801c58a +SHA256 (wine-1.1.26.tar.bz2) = 0285b346ca7af8def0773cece1e9b01f47e7340577d6c780cd38863c948a1f5a +SIZE (wine-1.1.26.tar.bz2) = 15666433 diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index 2dc5a6681968..398f6cf243b4 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -140,11 +140,6 @@ include/wine/windows/d3drmdef.h include/wine/windows/d3drmobj.h include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl -include/wine/windows/d3dx8.h -include/wine/windows/d3dx8core.h -include/wine/windows/d3dx8math.h -include/wine/windows/d3dx8math.inl -include/wine/windows/d3dx8mesh.h include/wine/windows/d3dx9.h include/wine/windows/d3dx9core.h include/wine/windows/d3dx9math.h @@ -352,11 +347,14 @@ include/wine/windows/msxml2did.h include/wine/windows/msxmldid.h include/wine/windows/nb30.h include/wine/windows/ndrtypes.h +include/wine/windows/netcon.h +include/wine/windows/netcon.idl 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 +include/wine/windows/ntddndis.h include/wine/windows/ntddscsi.h include/wine/windows/ntddstor.h include/wine/windows/ntdsapi.h @@ -468,6 +466,7 @@ include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl include/wine/windows/svrapi.h +include/wine/windows/t2embapi.h include/wine/windows/tapi.h include/wine/windows/tchar.h include/wine/windows/textserv.h @@ -496,6 +495,8 @@ include/wine/windows/vfwmsgs.h include/wine/windows/vmr9.h include/wine/windows/vmr9.idl include/wine/windows/vmrender.idl +include/wine/windows/wbemcli.h +include/wine/windows/wbemcli.idl include/wine/windows/wfext.h include/wine/windows/winbase.h include/wine/windows/wincodec.h @@ -624,7 +625,6 @@ 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/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -747,7 +747,6 @@ lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dim.def lib/wine/libd3drm.def -lib/wine/libd3dx8.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def lib/wine/libdbghelp.def @@ -1099,6 +1098,7 @@ lib/wine/wintrust.dll.so lib/wine/winver.exe.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmiutils.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so lib/wine/wow32.dll.so @@ -1165,11 +1165,8 @@ share/applications/wine.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.progman -%%PORTDOCS%%%%DOCSDIR%%/README.uninstaller %%PORTDOCS%%%%DOCSDIR%%/README.winedbg %%PORTDOCS%%%%DOCSDIR%%/README.winedump -%%PORTDOCS%%%%DOCSDIR%%/README.winemine %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/wine @dirrm include/wine/windows/ddk