wine-devel: update to 1.9.18

diff --git a/wine-devel/Makefile b/wine-devel/Makefile
index f6312d23115400b75618958811d6e6b27b21ddd6..574709f1b434bf1511d9ed7411da231e41fd123c 100644 (file)
--- a/wine-devel/Makefile
+++ b/wine-devel/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.56 2016/03/05 11:28:29 jperkin Exp $
 
-DISTNAME=      wine-1.9.12
+DISTNAME=      wine-1.9.18
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -17,6 +17,7 @@ ONLY_FOR_PLATFORM+=   *-*-i386 *-*-x86_64
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+
 USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 USE_NCURSES=           yes
@@ -49,11 +50,13 @@ PLIST_VARS+=                oss wine16 wine32 wine64
 #CONFIGURE_ENV+=               ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386
 #PLIST.wine16=         yes
 PLIST_SRC=     PLIST.wine32
+NOT_PAX_MPROTECT_SAFE+=        bin/wine
 #PLIST.wine32=         yes
 .endif
 # Needs GCC >= 4.4; Experimental
 .if !empty(MACHINE_ARCH:Mx86_64)
 CONFIGURE_ARGS+=       --enable-win64 --libdir=${PREFIX}/lib
+NOT_PAX_MPROTECT_SAFE+=        bin/wine64
 PLIST_SRC=     PLIST.wine64
 #PLIST.wine64=         yes
 .endif

diff --git a/wine-devel/PLIST.wine32 b/wine-devel/PLIST.wine32
index 6490d627efaa8faeae5e96b92734f18781661fcc..18a5672a41ebafc233281dd3aa68932c4e815203 100644 (file)
--- a/wine-devel/PLIST.wine32
+++ b/wine-devel/PLIST.wine32
@@ -39,6 +39,7 @@ include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/float.h
+include/wine/msvcrt/fpieee.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
@@ -211,7 +212,13 @@ include/wine/windows/d3dx10.h
 include/wine/windows/d3dx10async.h
 include/wine/windows/d3dx10core.h
 include/wine/windows/d3dx10core.idl
+include/wine/windows/d3dx10math.h
 include/wine/windows/d3dx10tex.h
+include/wine/windows/d3dx11.h
+include/wine/windows/d3dx11async.h
+include/wine/windows/d3dx11core.h
+include/wine/windows/d3dx11core.idl
+include/wine/windows/d3dx11tex.h
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -534,6 +541,7 @@ include/wine/windows/msxml6.idl
 include/wine/windows/msxml6did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
+include/wine/windows/ncrypt.h
 include/wine/windows/ndrtypes.h
 include/wine/windows/netcfgx.h
 include/wine/windows/netcfgx.idl
@@ -816,6 +824,7 @@ include/wine/windows/winuser.rh
 include/wine/windows/winver.h
 include/wine/windows/wlanapi.h
 include/wine/windows/wmistr.h
+include/wine/windows/wmium.h
 include/wine/windows/wmiutils.h
 include/wine/windows/wmiutils.idl
 include/wine/windows/wmp.h
@@ -871,6 +880,7 @@ lib/wine/amstream.dll.so
 lib/wine/api-ms-win-core-com-l1-1-0.dll.so
 lib/wine/api-ms-win-core-com-l1-1-1.dll.so
 lib/wine/api-ms-win-core-console-l1-1-0.dll.so
+lib/wine/api-ms-win-core-console-l2-1-0.dll.so
 lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
 lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
 lib/wine/api-ms-win-core-debug-l1-1-0.dll.so
@@ -893,6 +903,8 @@ lib/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
 lib/wine/api-ms-win-core-interlocked-l1-1-0.dll.so
 lib/wine/api-ms-win-core-interlocked-l1-2-0.dll.so
 lib/wine/api-ms-win-core-io-l1-1-1.dll.so
+lib/wine/api-ms-win-core-job-l1-1-0.dll.so
+lib/wine/api-ms-win-core-job-l2-1-0.dll.so
 lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so
@@ -909,6 +921,8 @@ lib/wine/api-ms-win-core-memory-l1-1-2.dll.so
 lib/wine/api-ms-win-core-misc-l1-1-0.dll.so
 lib/wine/api-ms-win-core-namedpipe-l1-1-0.dll.so
 lib/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
+lib/wine/api-ms-win-core-namespace-l1-1-0.dll.so
+lib/wine/api-ms-win-core-normalization-l1-1-0.dll.so
 lib/wine/api-ms-win-core-path-l1-1-0.dll.so
 lib/wine/api-ms-win-core-processenvironment-l1-1-0.dll.so
 lib/wine/api-ms-win-core-processenvironment-l1-2-0.dll.so
@@ -923,6 +937,7 @@ lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so
 lib/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-string-l1-1-0.dll.so
 lib/wine/api-ms-win-core-string-l2-1-0.dll.so
+lib/wine/api-ms-win-core-string-obsolete-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-2-0.dll.so
 lib/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so
@@ -931,6 +946,7 @@ lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so
 lib/wine/api-ms-win-core-threadpool-l1-2-0.dll.so
 lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so
+lib/wine/api-ms-win-core-toolhelp-l1-1-0.dll.so
 lib/wine/api-ms-win-core-url-l1-1-0.dll.so
 lib/wine/api-ms-win-core-util-l1-1-0.dll.so
 lib/wine/api-ms-win-core-version-l1-1-0.dll.so
@@ -967,6 +983,7 @@ lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so
 lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so
+lib/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so
 lib/wine/api-ms-win-security-base-l1-1-0.dll.so
 lib/wine/api-ms-win-security-base-l1-2-0.dll.so
@@ -976,6 +993,7 @@ lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so
 lib/wine/api-ms-win-service-core-l1-1-1.dll.so
 lib/wine/api-ms-win-service-management-l1-1-0.dll.so
 lib/wine/api-ms-win-service-winsvc-l1-2-0.dll.so
+lib/wine/api-ms-win-shell-shellfolders-l1-1-0.dll.so
 lib/wine/apphelp.dll.so
 lib/wine/appwiz.cpl.so
 lib/wine/arp.exe.so
@@ -1013,6 +1031,7 @@ lib/wine/commdlg.dll16.so
 lib/wine/compobj.dll16.so
 lib/wine/compstui.dll.so
 lib/wine/comsvcs.dll.so
+lib/wine/concrt140.dll.so
 lib/wine/conhost.exe.so
 lib/wine/connect.dll.so
 lib/wine/control.exe.so
@@ -1147,6 +1166,7 @@ lib/wine/fakedlls/amstream.dll
 lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-com-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-console-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-debug-l1-1-0.dll
@@ -1169,6 +1189,8 @@ lib/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-interlocked-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-job-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-job-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll
@@ -1185,6 +1207,8 @@ lib/wine/fakedlls/api-ms-win-core-memory-l1-1-2.dll
 lib/wine/fakedlls/api-ms-win-core-misc-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-namespace-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-normalization-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-path-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-2-0.dll
@@ -1199,6 +1223,7 @@ lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-obsolete-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll
@@ -1207,6 +1232,7 @@ lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll
 lib/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-toolhelp-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-version-l1-1-0.dll
@@ -1243,6 +1269,7 @@ lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll
@@ -1252,6 +1279,7 @@ lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-service-core-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-service-management-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-service-winsvc-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-shell-shellfolders-l1-1-0.dll
 lib/wine/fakedlls/apphelp.dll
 lib/wine/fakedlls/appwiz.cpl
 lib/wine/fakedlls/arp.exe
@@ -1289,6 +1317,7 @@ lib/wine/fakedlls/commdlg.dll16
 lib/wine/fakedlls/compobj.dll16
 lib/wine/fakedlls/compstui.dll
 lib/wine/fakedlls/comsvcs.dll
+lib/wine/fakedlls/concrt140.dll
 lib/wine/fakedlls/conhost.exe
 lib/wine/fakedlls/connect.dll
 lib/wine/fakedlls/control.exe
@@ -1530,6 +1559,7 @@ lib/wine/fakedlls/msisys.ocx
 lib/wine/fakedlls/msls31.dll
 lib/wine/fakedlls/msnet32.dll
 lib/wine/fakedlls/mspatcha.dll
+lib/wine/fakedlls/msports.dll
 lib/wine/fakedlls/msrle32.dll
 lib/wine/fakedlls/msscript.ocx
 lib/wine/fakedlls/mssign32.dll
@@ -1542,6 +1572,7 @@ lib/wine/fakedlls/msvcp100.dll
 lib/wine/fakedlls/msvcp110.dll
 lib/wine/fakedlls/msvcp120.dll
 lib/wine/fakedlls/msvcp120_app.dll
+lib/wine/fakedlls/msvcp140.dll
 lib/wine/fakedlls/msvcp60.dll
 lib/wine/fakedlls/msvcp70.dll
 lib/wine/fakedlls/msvcp71.dll
@@ -1686,6 +1717,7 @@ lib/wine/fakedlls/softpub.dll
 lib/wine/fakedlls/sound.drv16
 lib/wine/fakedlls/spoolss.dll
 lib/wine/fakedlls/spoolsv.exe
+lib/wine/fakedlls/sspicli.dll
 lib/wine/fakedlls/start.exe
 lib/wine/fakedlls/stdole2.tlb
 lib/wine/fakedlls/stdole32.tlb
@@ -1728,6 +1760,7 @@ lib/wine/fakedlls/vcomp.dll
 lib/wine/fakedlls/vcomp100.dll
 lib/wine/fakedlls/vcomp110.dll
 lib/wine/fakedlls/vcomp120.dll
+lib/wine/fakedlls/vcomp140.dll
 lib/wine/fakedlls/vcomp90.dll
 lib/wine/fakedlls/vcruntime140.dll
 lib/wine/fakedlls/vdhcp.vxd
@@ -1805,6 +1838,7 @@ lib/wine/fakedlls/wmvcore.dll
 lib/wine/fakedlls/wnaspi32.dll
 lib/wine/fakedlls/wordpad.exe
 lib/wine/fakedlls/wow32.dll
+lib/wine/fakedlls/wpc.dll
 lib/wine/fakedlls/wpcap.dll
 lib/wine/fakedlls/write.exe
 lib/wine/fakedlls/ws2_32.dll
@@ -1919,6 +1953,7 @@ lib/wine/libd3d9.def
 lib/wine/libd3dcompiler.def
 lib/wine/libd3drm.def
 lib/wine/libd3dx10.def
+lib/wine/libd3dx11.def
 lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbgeng.def
@@ -1984,7 +2019,7 @@ lib/wine/libnewdev.def
 lib/wine/libnormaliz.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
-lib/wine/libntoskrnl.exe.def
+lib/wine/libntoskrnl.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -2025,10 +2060,11 @@ lib/wine/libstrmiids.a
 lib/wine/libsxs.def
 lib/wine/libt2embed.def
 lib/wine/libtapi32.def
+lib/wine/libucrtbase.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
-lib/wine/libusbd.sys.def
+lib/wine/libusbd.def
 lib/wine/libuser32.def
 lib/wine/libuserenv.def
 lib/wine/libusp10.def
@@ -2119,6 +2155,7 @@ lib/wine/msisys.ocx.so
 lib/wine/msls31.dll.so
 lib/wine/msnet32.dll.so
 lib/wine/mspatcha.dll.so
+lib/wine/msports.dll.so
 lib/wine/msrle32.dll.so
 lib/wine/msscript.ocx.so
 lib/wine/mssign32.dll.so
@@ -2131,6 +2168,7 @@ lib/wine/msvcp100.dll.so
 lib/wine/msvcp110.dll.so
 lib/wine/msvcp120.dll.so
 lib/wine/msvcp120_app.dll.so
+lib/wine/msvcp140.dll.so
 lib/wine/msvcp60.dll.so
 lib/wine/msvcp70.dll.so
 lib/wine/msvcp71.dll.so
@@ -2275,6 +2313,7 @@ lib/wine/softpub.dll.so
 lib/wine/sound.drv16.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
+lib/wine/sspicli.dll.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
@@ -2317,6 +2356,7 @@ lib/wine/vcomp.dll.so
 lib/wine/vcomp100.dll.so
 lib/wine/vcomp110.dll.so
 lib/wine/vcomp120.dll.so
+lib/wine/vcomp140.dll.so
 lib/wine/vcomp90.dll.so
 lib/wine/vcruntime140.dll.so
 lib/wine/vdhcp.vxd.so
@@ -2394,6 +2434,7 @@ lib/wine/wmvcore.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
 lib/wine/wow32.dll.so
+lib/wine/wpc.dll.so
 lib/wine/wpcap.dll.so
 lib/wine/write.exe.so
 lib/wine/ws2_32.dll.so
@@ -2501,4 +2542,4 @@ share/wine/fonts/vgasysr.fon
 share/wine/fonts/vgasyst.fon
 share/wine/fonts/wingding.ttf
 share/wine/l_intl.nls
-share/wine/wine.inf
\ No newline at end of file
+share/wine/wine.inf

diff --git a/wine-devel/PLIST.wine64 b/wine-devel/PLIST.wine64
index 0d78a00dbff1687abd3856f9adf3368c1044cb55..34865ff1e2bd1a8a39277bc2f4773efa584d4127 100644 (file)
--- a/wine-devel/PLIST.wine64
+++ b/wine-devel/PLIST.wine64
@@ -39,6 +39,7 @@ include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/float.h
+include/wine/msvcrt/fpieee.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
@@ -211,7 +212,13 @@ include/wine/windows/d3dx10.h
 include/wine/windows/d3dx10async.h
 include/wine/windows/d3dx10core.h
 include/wine/windows/d3dx10core.idl
+include/wine/windows/d3dx10math.h
 include/wine/windows/d3dx10tex.h
+include/wine/windows/d3dx11.h
+include/wine/windows/d3dx11async.h
+include/wine/windows/d3dx11core.h
+include/wine/windows/d3dx11core.idl
+include/wine/windows/d3dx11tex.h
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -534,6 +541,7 @@ include/wine/windows/msxml6.idl
 include/wine/windows/msxml6did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
+include/wine/windows/ncrypt.h
 include/wine/windows/ndrtypes.h
 include/wine/windows/netcfgx.h
 include/wine/windows/netcfgx.idl
@@ -816,6 +824,7 @@ include/wine/windows/winuser.rh
 include/wine/windows/winver.h
 include/wine/windows/wlanapi.h
 include/wine/windows/wmistr.h
+include/wine/windows/wmium.h
 include/wine/windows/wmiutils.h
 include/wine/windows/wmiutils.idl
 include/wine/windows/wmp.h
@@ -871,6 +880,7 @@ lib/wine/amstream.dll.so
 lib/wine/api-ms-win-core-com-l1-1-0.dll.so
 lib/wine/api-ms-win-core-com-l1-1-1.dll.so
 lib/wine/api-ms-win-core-console-l1-1-0.dll.so
+lib/wine/api-ms-win-core-console-l2-1-0.dll.so
 lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
 lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
 lib/wine/api-ms-win-core-debug-l1-1-0.dll.so
@@ -893,6 +903,8 @@ lib/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
 lib/wine/api-ms-win-core-interlocked-l1-1-0.dll.so
 lib/wine/api-ms-win-core-interlocked-l1-2-0.dll.so
 lib/wine/api-ms-win-core-io-l1-1-1.dll.so
+lib/wine/api-ms-win-core-job-l1-1-0.dll.so
+lib/wine/api-ms-win-core-job-l2-1-0.dll.so
 lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so
@@ -909,6 +921,8 @@ lib/wine/api-ms-win-core-memory-l1-1-2.dll.so
 lib/wine/api-ms-win-core-misc-l1-1-0.dll.so
 lib/wine/api-ms-win-core-namedpipe-l1-1-0.dll.so
 lib/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
+lib/wine/api-ms-win-core-namespace-l1-1-0.dll.so
+lib/wine/api-ms-win-core-normalization-l1-1-0.dll.so
 lib/wine/api-ms-win-core-path-l1-1-0.dll.so
 lib/wine/api-ms-win-core-processenvironment-l1-1-0.dll.so
 lib/wine/api-ms-win-core-processenvironment-l1-2-0.dll.so
@@ -923,6 +937,7 @@ lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so
 lib/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-string-l1-1-0.dll.so
 lib/wine/api-ms-win-core-string-l2-1-0.dll.so
+lib/wine/api-ms-win-core-string-obsolete-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-2-0.dll.so
 lib/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so
@@ -931,6 +946,7 @@ lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so
 lib/wine/api-ms-win-core-threadpool-l1-2-0.dll.so
 lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so
+lib/wine/api-ms-win-core-toolhelp-l1-1-0.dll.so
 lib/wine/api-ms-win-core-url-l1-1-0.dll.so
 lib/wine/api-ms-win-core-util-l1-1-0.dll.so
 lib/wine/api-ms-win-core-version-l1-1-0.dll.so
@@ -967,6 +983,7 @@ lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so
 lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so
+lib/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so
 lib/wine/api-ms-win-security-base-l1-1-0.dll.so
 lib/wine/api-ms-win-security-base-l1-2-0.dll.so
@@ -976,6 +993,7 @@ lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so
 lib/wine/api-ms-win-service-core-l1-1-1.dll.so
 lib/wine/api-ms-win-service-management-l1-1-0.dll.so
 lib/wine/api-ms-win-service-winsvc-l1-2-0.dll.so
+lib/wine/api-ms-win-shell-shellfolders-l1-1-0.dll.so
 lib/wine/apphelp.dll.so
 lib/wine/appwiz.cpl.so
 lib/wine/arp.exe.so
@@ -1009,6 +1027,7 @@ lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
 lib/wine/compstui.dll.so
 lib/wine/comsvcs.dll.so
+lib/wine/concrt140.dll.so
 lib/wine/conhost.exe.so
 lib/wine/connect.dll.so
 lib/wine/control.exe.so
@@ -1138,6 +1157,7 @@ lib/wine/fakedlls/amstream.dll
 lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-com-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-console-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-debug-l1-1-0.dll
@@ -1160,6 +1180,8 @@ lib/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-interlocked-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-job-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-job-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll
@@ -1176,6 +1198,8 @@ lib/wine/fakedlls/api-ms-win-core-memory-l1-1-2.dll
 lib/wine/fakedlls/api-ms-win-core-misc-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-namespace-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-normalization-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-path-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-2-0.dll
@@ -1190,6 +1214,7 @@ lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-obsolete-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll
@@ -1198,6 +1223,7 @@ lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll
 lib/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-toolhelp-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-version-l1-1-0.dll
@@ -1234,6 +1260,7 @@ lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll
@@ -1243,6 +1270,7 @@ lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-service-core-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-service-management-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-service-winsvc-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-shell-shellfolders-l1-1-0.dll
 lib/wine/fakedlls/apphelp.dll
 lib/wine/fakedlls/appwiz.cpl
 lib/wine/fakedlls/arp.exe
@@ -1276,6 +1304,7 @@ lib/wine/fakedlls/comctl32.dll
 lib/wine/fakedlls/comdlg32.dll
 lib/wine/fakedlls/compstui.dll
 lib/wine/fakedlls/comsvcs.dll
+lib/wine/fakedlls/concrt140.dll
 lib/wine/fakedlls/conhost.exe
 lib/wine/fakedlls/connect.dll
 lib/wine/fakedlls/control.exe
@@ -1501,6 +1530,7 @@ lib/wine/fakedlls/msisys.ocx
 lib/wine/fakedlls/msls31.dll
 lib/wine/fakedlls/msnet32.dll
 lib/wine/fakedlls/mspatcha.dll
+lib/wine/fakedlls/msports.dll
 lib/wine/fakedlls/msrle32.dll
 lib/wine/fakedlls/msscript.ocx
 lib/wine/fakedlls/mssign32.dll
@@ -1513,6 +1543,7 @@ lib/wine/fakedlls/msvcp100.dll
 lib/wine/fakedlls/msvcp110.dll
 lib/wine/fakedlls/msvcp120.dll
 lib/wine/fakedlls/msvcp120_app.dll
+lib/wine/fakedlls/msvcp140.dll
 lib/wine/fakedlls/msvcp60.dll
 lib/wine/fakedlls/msvcp70.dll
 lib/wine/fakedlls/msvcp71.dll
@@ -1643,6 +1674,7 @@ lib/wine/fakedlls/snmpapi.dll
 lib/wine/fakedlls/softpub.dll
 lib/wine/fakedlls/spoolss.dll
 lib/wine/fakedlls/spoolsv.exe
+lib/wine/fakedlls/sspicli.dll
 lib/wine/fakedlls/start.exe
 lib/wine/fakedlls/stdole2.tlb
 lib/wine/fakedlls/stdole32.tlb
@@ -1678,6 +1710,7 @@ lib/wine/fakedlls/vcomp.dll
 lib/wine/fakedlls/vcomp100.dll
 lib/wine/fakedlls/vcomp110.dll
 lib/wine/fakedlls/vcomp120.dll
+lib/wine/fakedlls/vcomp140.dll
 lib/wine/fakedlls/vcomp90.dll
 lib/wine/fakedlls/vcruntime140.dll
 lib/wine/fakedlls/vdmdbg.dll
@@ -1733,6 +1766,7 @@ lib/wine/fakedlls/wmplayer.exe
 lib/wine/fakedlls/wmvcore.dll
 lib/wine/fakedlls/wnaspi32.dll
 lib/wine/fakedlls/wordpad.exe
+lib/wine/fakedlls/wpc.dll
 lib/wine/fakedlls/wpcap.dll
 lib/wine/fakedlls/write.exe
 lib/wine/fakedlls/ws2_32.dll
@@ -1842,6 +1876,7 @@ lib/wine/libd3d9.def
 lib/wine/libd3dcompiler.def
 lib/wine/libd3drm.def
 lib/wine/libd3dx10.def
+lib/wine/libd3dx11.def
 lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbgeng.def
@@ -1906,7 +1941,7 @@ lib/wine/libnewdev.def
 lib/wine/libnormaliz.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
-lib/wine/libntoskrnl.exe.def
+lib/wine/libntoskrnl.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -1947,10 +1982,11 @@ lib/wine/libstrmiids.a
 lib/wine/libsxs.def
 lib/wine/libt2embed.def
 lib/wine/libtapi32.def
+lib/wine/libucrtbase.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
-lib/wine/libusbd.sys.def
+lib/wine/libusbd.def
 lib/wine/libuser32.def
 lib/wine/libuserenv.def
 lib/wine/libusp10.def
@@ -2034,6 +2070,7 @@ lib/wine/msisys.ocx.so
 lib/wine/msls31.dll.so
 lib/wine/msnet32.dll.so
 lib/wine/mspatcha.dll.so
+lib/wine/msports.dll.so
 lib/wine/msrle32.dll.so
 lib/wine/msscript.ocx.so
 lib/wine/mssign32.dll.so
@@ -2046,6 +2083,7 @@ lib/wine/msvcp100.dll.so
 lib/wine/msvcp110.dll.so
 lib/wine/msvcp120.dll.so
 lib/wine/msvcp120_app.dll.so
+lib/wine/msvcp140.dll.so
 lib/wine/msvcp60.dll.so
 lib/wine/msvcp70.dll.so
 lib/wine/msvcp71.dll.so
@@ -2176,6 +2214,7 @@ lib/wine/snmpapi.dll.so
 lib/wine/softpub.dll.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
+lib/wine/sspicli.dll.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
@@ -2211,6 +2250,7 @@ lib/wine/vcomp.dll.so
 lib/wine/vcomp100.dll.so
 lib/wine/vcomp110.dll.so
 lib/wine/vcomp120.dll.so
+lib/wine/vcomp140.dll.so
 lib/wine/vcomp90.dll.so
 lib/wine/vcruntime140.dll.so
 lib/wine/vdmdbg.dll.so
@@ -2266,6 +2306,7 @@ lib/wine/wmplayer.exe.so
 lib/wine/wmvcore.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
+lib/wine/wpc.dll.so
 lib/wine/wpcap.dll.so
 lib/wine/write.exe.so
 lib/wine/ws2_32.dll.so

diff --git a/wine-devel/distinfo b/wine-devel/distinfo
index 55646fb23b4cc521a577c18af58b0c570fa10315..6051d1370765adc095b824129be6799e1f5b47af 100644 (file)
--- a/wine-devel/distinfo
+++ b/wine-devel/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.26 2016/01/11 22:53:48 joerg Exp $
 
-SHA1 (wine-1.9.12.tar.bz2) = 4b186865f8152aee69799786bd94d027900f0fb5
-RMD160 (wine-1.9.12.tar.bz2) = 2fadbac17353834a4886c9265f67c5cdaf44fbca
-SHA512 (wine-1.9.12.tar.bz2) = 056156260cd71c23f03deff35f97ce9ed0d1b3b153887e9af13ca97c27caebc87d5272fcc27566595feecd65ada3fdba96ea0f58afea566dbd34f7d240519d10
-Size (wine-1.9.12.tar.bz2) = 23240036 bytes
+SHA1 (wine-1.9.18.tar.bz2) = 738ef272b3faf898c47dfb64b93b80fcde7a0c24
+RMD160 (wine-1.9.18.tar.bz2) = c555406acaa0debd5c91276f734534717e0fbf36
+SHA512 (wine-1.9.18.tar.bz2) = fc8ccf844c5913bb9e351f244cf6ec610caabc9513761b140b129e70a56265133a0cbc7b585bf83b028421f29c5ddc0885abfc98cd9a2dc2b0863d6dbb9b59ee
+Size (wine-1.9.18.tar.bz2) = 23473716 bytes
 SHA1 (patch-configure.ac) = 304ab35b7a99c9da4782a5d527ce6c1a5813fc3e
 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 89f9d1c08dbfbed3eac971ee534944f7403246a4
 SHA1 (patch-dlls_winepulse.drv_mmdevdrv.c) = c9aad42d1fbfcc309dcc6ddc3dd9aefb9a556075
-SHA1 (patch-dlls_wininet_http.c) = f186d88e93c00deb7b885fa97f903f4e444669bf
+SHA1 (patch-dlls_wininet_http.c) = 0021568efb075711f20b23e40515dc76868959c6
 SHA1 (patch-include_config.h.in) = 20d14d65ebaaca2dc9ba3f9dfbd644c5819de713
 SHA1 (patch-include_wine_test.h) = af33ec675c67e2fc56cf52e9c6634cab3e6fdfd2

diff --git a/wine-devel/patches/patch-dlls_wininet_http.c b/wine-devel/patches/patch-dlls_wininet_http.c
index 679c60f49521c438e4d89ef88e0d68f96f571af9..730668ef8d8fc1d24320f22fcf213319e8abe4a5 100644 (file)
--- a/wine-devel/patches/patch-dlls_wininet_http.c
+++ b/wine-devel/patches/patch-dlls_wininet_http.c
@@ -1,29 +1,22 @@
 $NetBSD$
 
---- dlls/wininet/http.c.orig   2016-06-10 14:04:01.000000000 +0000
+--- dlls/wininet/http.c.orig   2016-09-02 16:39:28.000000000 +0000
 +++ dlls/wininet/http.c
-@@ -29,6 +29,12 @@
- 
- #include "config.h"
- 
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <assert.h>
-+
- #ifdef HAVE_ZLIB
+@@ -35,14 +35,14 @@
  #  include <zlib.h>
  #endif
-@@ -36,11 +42,6 @@
- #include "winsock2.h"
- #include "ws2ipdef.h"
  
--#include <stdarg.h>
--#include <stdio.h>
--#include <stdlib.h>
--#include <time.h>
--#include <assert.h>
+-#include "winsock2.h"
+-#include "ws2ipdef.h"
+-
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <assert.h>
+ 
++#include "winsock2.h"
++#include "ws2ipdef.h"
++
  #include "windef.h"
  #include "winbase.h"
  #include "wininet.h"