emulators/i386-wine-devel: update to 1.7.55

Changes:
 1) Update mergeplist.py:
   a) Produce shorter plists
   b) Improve naming of iteration variables
 2) Add DEVEL and STAGING to the plist substitution list, for 1.
 3) Bump minimum OSVERSION for -CURRENT
 4) Mark port an broken on -CURRENT: dependencies not building

4 files changed, 126 insertions, 260 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 75320509a45b..94fed722d53e 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.53
+PORTVERSION=	1.7.55
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -52,9 +52,13 @@ MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine
 .if ${OSREL:C/\..*//} == ${osrel}
 PLIST_SUB+=	OSREL${osrel}=""
 .if ${PKGNAMESUFFIX} == -devel
+PLIST_SUB+=	DEVEL=""
+PLIST_SUB+=	STAGING="@comment "
 PLIST_SUB+=	OSREL${osrel}-DEVEL=""
 PLIST_SUB+=	OSREL${osrel}-STAGING="@comment "
 .else
+PLIST_SUB+=	DEVEL="@comment "
+PLIST_SUB+=	STAGING=""
 PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
 PLIST_SUB+=	OSREL${osrel}-STAGING=""
 .endif
@@ -65,11 +69,15 @@ PLIST_SUB+=	OSREL${osrel}-STAGING="@comment "
 .endif
 .endfor
 
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1000000) && !(${OSVERSION} >= 1001000 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100077 && ${OSVERSION} < 1200000))
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1000000) && !(${OSVERSION} >= 1001000 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100085 && ${OSVERSION} < 1200000))
 IGNORE=		binaries compiled for FreeBSD 9.3+, 10.1+ and -current only
 DISTFILES=
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100085
+BROKEN=		unable to build binaries due to packaging issues with gnutls and git.
+.endif
+
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index f06bc34b9c07..ba7ef9aae00f 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,12 +1,8 @@
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.53,1.txz) = 248a6335fc5c244fd632f199d046e982662d1355a4c68362d7ee165ecb0aa68b
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.53,1.txz) = 38474060
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.7.53,1.txz) = 16176c19f1e4291a45b6cd3997e90882ba8ff8e9d93f40912b722675310c73ed
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.7.53,1.txz) = 41940792
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.53,1.txz) = bcedec2c1e80a6e82e0a669a232456d15b8e956ee5f30a44b2175960364e3f9b
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.53,1.txz) = 35334188
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.7.53,1.txz) = 907c7480c9763f49432b53501f80ce03338ae674b0ffddb8a20136b7bb3f75be
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.7.53,1.txz) = 38776548
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.53,1.txz) = d2de9845d071d42884c2a63a902e4546073e9c44a0ad112b61329003e83f6987
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.53,1.txz) = 34793428
-SHA256 (freebsd:11:x86:64/i386-wine-staging-1.7.53,1.txz) = b7a5d108a86f1f5bc0ff9ff63ef16f15adf6ed12269bf7acac33402629a45372
-SIZE (freebsd:11:x86:64/i386-wine-staging-1.7.53,1.txz) = 38203852
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.55,1.txz) = 30f4c61bc0c1c865f970d865a90f04ee263c14a26e59e8bc0960ef8b206205a6
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.55,1.txz) = 38535572
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.7.55,1.txz) = 0640d268e6282d2f21dcdd04a0500303c7e0f216082ef81044bce67f873734a9
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.7.55,1.txz) = 41991592
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.55,1.txz) = f8c51599715d57fa22c7a155d90bb2e978079acb99473620d65f7ffb97a42dce
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.55,1.txz) = 35390948
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.7.55,1.txz) = 302e848c9797376dd5dfa7b9b77323115fabda8793b71de3d26232a8558533da
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.7.55,1.txz) = 38818320
diff --git a/emulators/i386-wine-devel/files/mergeplist.py b/emulators/i386-wine-devel/files/mergeplist.py
index e301e025fc25..0c877616f147 100644
--- a/emulators/i386-wine-devel/files/mergeplist.py
+++ b/emulators/i386-wine-devel/files/mergeplist.py
@@ -95,29 +95,33 @@ def main(plists):
 def gen_list(plists):
     plists_len = len(plists)
     plists.sort(key=lambda x: int(x.rsplit('.', 2)[-1].split('-', 2)[0]))
-    names = ["OSREL" + i.rsplit('.', 2)[-1] for i in plists]
+    names = ["OSREL" + plist.rsplit('.', 2)[-1] for plist in plists]
     for i in range(plists_len):
         with open(plists[i], 'r') as file:
-            plists[i] = OrderedSet(i.strip() for i in file.readlines())
-    empty = sum(len(i) == 0 for i in plists)
+            plists[i] = OrderedSet(line.strip() for line in file.readlines())
+    empty = sum(len(plist) == 0 for plist in plists)
     while empty < plists_len:
-        if not empty and all(plists[1].peek() == i.peek() for i in plists[1:]):
-            # Test if the top of the queues are all common
-            yield plists[1].peek()
-            for i in plists:
-                i.pop()
+        line = plists[0].peek()
+        # Test if the top of the plists are all common
+        if not empty and all(line == plist.peek() for plist in plists):
+            yield line
+            for plist in plists:
+                plist.pop()
         else:
-            # Find which of the queues have non-common lines
+            # Find which of the plists have non-common lines
             lines = {}
             for i in range(plists_len):
-                while len(plists[i]) and not all(plists[i].peek() in j for j in plists):
-                    lines.setdefault(plists[i].pop(), []).append(i)
-            keys = list(lines.keys())
-            keys.sort()
-            for k in keys:
-                for i in lines[k]:
-                    yield "%%" + names[i] + "%%" + k
-        empty = sum(len(i) == 0 for i in plists)
+                while len(plists[i]) and not all(plists[i].peek() in plist for plist in plists):
+                    lines.setdefault(plists[i].pop(), []).append(names[i])
+            for line in sorted(lines.keys()):
+                suffix = lines[line][0].split('-', 2)
+                suffix = len(suffix) == 2 and suffix[-1]
+                if suffix and all(name.split('-', 2)[-1] == suffix for name in lines[line]):
+                    yield "%%" + suffix + "%%" + line
+                else:
+                    for name in lines[line]:
+                        yield "%%" + name + "%%" + line
+        empty = sum(len(plist) == 0 for plist in plists)
 
 if __name__ == '__main__':
     main(sys.argv[1:])
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 2322f0040b2c..86a3acb8d132 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -1,7 +1,5 @@
 bin/function_grep.pl
-%%OSREL9-STAGING%%bin/msidb
-%%OSREL10-STAGING%%bin/msidb
-%%OSREL11-STAGING%%bin/msidb
+%%STAGING%%bin/msidb
 bin/msiexec
 bin/notepad
 bin/regedit
@@ -25,9 +23,7 @@ bin/wineserver
 bin/wmc
 bin/wrc
 bin32/function_grep.pl
-%%OSREL9-STAGING%%bin32/msidb
-%%OSREL10-STAGING%%bin32/msidb
-%%OSREL11-STAGING%%bin32/msidb
+%%STAGING%%bin32/msidb
 bin32/msiexec
 bin32/notepad
 bin32/regedit
@@ -189,13 +185,9 @@ include/wine/windows/ctfutb.h
 include/wine/windows/ctfutb.idl
 include/wine/windows/ctxtcall.h
 include/wine/windows/ctxtcall.idl
-%%OSREL9-STAGING%%include/wine/windows/cuda.h
-%%OSREL10-STAGING%%include/wine/windows/cuda.h
-%%OSREL11-STAGING%%include/wine/windows/cuda.h
+%%STAGING%%include/wine/windows/cuda.h
 include/wine/windows/custcntl.h
-%%OSREL9-STAGING%%include/wine/windows/cuviddec.h
-%%OSREL10-STAGING%%include/wine/windows/cuviddec.h
-%%OSREL11-STAGING%%include/wine/windows/cuviddec.h
+%%STAGING%%include/wine/windows/cuviddec.h
 include/wine/windows/cvconst.h
 include/wine/windows/d2d1.h
 include/wine/windows/d2d1.idl
@@ -234,12 +226,9 @@ include/wine/windows/d3drmobj.h
 include/wine/windows/d3drmwin.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
-%%OSREL9-STAGING%%include/wine/windows/d3dx10core.h
-%%OSREL10-STAGING%%include/wine/windows/d3dx10core.h
-%%OSREL11-STAGING%%include/wine/windows/d3dx10core.h
-%%OSREL9-STAGING%%include/wine/windows/d3dx10core.idl
-%%OSREL10-STAGING%%include/wine/windows/d3dx10core.idl
-%%OSREL11-STAGING%%include/wine/windows/d3dx10core.idl
+include/wine/windows/d3dx10.h
+%%STAGING%%include/wine/windows/d3dx10core.h
+%%STAGING%%include/wine/windows/d3dx10core.idl
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -361,9 +350,7 @@ include/wine/windows/dxgi1_2.h
 include/wine/windows/dxgi1_2.idl
 include/wine/windows/dxgiformat.h
 include/wine/windows/dxgitype.h
-%%OSREL9-STAGING%%include/wine/windows/dxva.h
-%%OSREL10-STAGING%%include/wine/windows/dxva.h
-%%OSREL11-STAGING%%include/wine/windows/dxva.h
+%%STAGING%%include/wine/windows/dxva.h
 include/wine/windows/dxva2api.h
 include/wine/windows/dxva2api.idl
 include/wine/windows/dyngraph.idl
@@ -390,9 +377,7 @@ include/wine/windows/gameux.idl
 include/wine/windows/gdiplus.h
 include/wine/windows/gdipluscolor.h
 include/wine/windows/gdipluscolormatrix.h
-%%OSREL9-STAGING%%include/wine/windows/gdipluseffects.h
-%%OSREL10-STAGING%%include/wine/windows/gdipluseffects.h
-%%OSREL11-STAGING%%include/wine/windows/gdipluseffects.h
+%%STAGING%%include/wine/windows/gdipluseffects.h
 include/wine/windows/gdiplusenums.h
 include/wine/windows/gdiplusflat.h
 include/wine/windows/gdiplusgpstubs.h
@@ -581,22 +566,14 @@ include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
-%%OSREL9-STAGING%%include/wine/windows/ntifs.h
-%%OSREL10-STAGING%%include/wine/windows/ntifs.h
-%%OSREL11-STAGING%%include/wine/windows/ntifs.h
+%%STAGING%%include/wine/windows/ntifs.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntsecpkg.h
 include/wine/windows/ntstatus.h
-%%OSREL9-STAGING%%include/wine/windows/nvapi.h
-%%OSREL10-STAGING%%include/wine/windows/nvapi.h
-%%OSREL11-STAGING%%include/wine/windows/nvapi.h
-%%OSREL9-STAGING%%include/wine/windows/nvcuvid.h
-%%OSREL10-STAGING%%include/wine/windows/nvcuvid.h
-%%OSREL11-STAGING%%include/wine/windows/nvcuvid.h
-%%OSREL9-STAGING%%include/wine/windows/nvencodeapi.h
-%%OSREL10-STAGING%%include/wine/windows/nvencodeapi.h
-%%OSREL11-STAGING%%include/wine/windows/nvencodeapi.h
+%%STAGING%%include/wine/windows/nvapi.h
+%%STAGING%%include/wine/windows/nvcuvid.h
+%%STAGING%%include/wine/windows/nvencodeapi.h
 include/wine/windows/oaidl.h
 include/wine/windows/oaidl.idl
 include/wine/windows/objbase.h
@@ -636,6 +613,7 @@ include/wine/windows/physicalmonitorenumerationapi.h
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
+include/wine/windows/prntvpt.h
 include/wine/windows/profinfo.h
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
@@ -878,6 +856,7 @@ include/wine/windows/wuapi.idl
 include/wine/windows/x3daudio.h
 include/wine/windows/xapo.h
 include/wine/windows/xapo.idl
+include/wine/windows/xapofx.h
 include/wine/windows/xaudio2.h
 include/wine/windows/xaudio2.idl
 include/wine/windows/xaudio2fx.h
@@ -924,53 +903,33 @@ lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
 lib32/libedit.so.0
 lib32/libexpat.so.1
-%%OSREL9-STAGING%%lib32/libffi.so.6
-%%OSREL10-STAGING%%lib32/libffi.so.6
-%%OSREL11-STAGING%%lib32/libffi.so.6
+%%STAGING%%lib32/libffi.so.6
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
 %%OSREL9%%lib32/libgcc_s.so.1
 lib32/libglapi.so.0
-%%OSREL9-STAGING%%lib32/libgmp.so.10
-%%OSREL10-STAGING%%lib32/libgmp.so.10
-%%OSREL11-STAGING%%lib32/libgmp.so.10
-%%OSREL9-STAGING%%lib32/libgnutls.so.28
-%%OSREL10-STAGING%%lib32/libgnutls.so.28
-%%OSREL11-STAGING%%lib32/libgnutls.so.28
-%%OSREL9-STAGING%%lib32/libhogweed.so.2
-%%OSREL10-STAGING%%lib32/libhogweed.so.2
-%%OSREL11-STAGING%%lib32/libhogweed.so.2
+%%STAGING%%lib32/libgmp.so.10
+%%STAGING%%lib32/libgnutls.so.28
+%%STAGING%%lib32/libhogweed.so.2
 %%OSREL9%%lib32/libiconv.so.2
-%%OSREL9-STAGING%%lib32/libintl.so.8
-%%OSREL10-STAGING%%lib32/libintl.so.8
-%%OSREL11-STAGING%%lib32/libintl.so.8
+%%STAGING%%lib32/libintl.so.8
 lib32/libjpeg.so.8
 lib32/liblcms2.so.2
-%%OSREL9-STAGING%%lib32/libnettle.so.4
-%%OSREL10-STAGING%%lib32/libnettle.so.4
-%%OSREL11-STAGING%%lib32/libnettle.so.4
-%%OSREL9-STAGING%%lib32/libp11-kit.so.0
-%%OSREL10-STAGING%%lib32/libp11-kit.so.0
-%%OSREL11-STAGING%%lib32/libp11-kit.so.0
+%%STAGING%%lib32/libnettle.so.4
+%%STAGING%%lib32/libp11-kit.so.0
 lib32/libpciaccess.so.0
 lib32/libpng16.so.16
 lib32/libpthread-stubs.so.0
 %%OSREL9%%lib32/libstdc++.so.6
-%%OSREL9-STAGING%%lib32/libtasn1.so.6
-%%OSREL10-STAGING%%lib32/libtasn1.so.6
-%%OSREL11-STAGING%%lib32/libtasn1.so.6
-%%OSREL9-STAGING%%lib32/libtspi.so.1
-%%OSREL10-STAGING%%lib32/libtspi.so.1
-%%OSREL11-STAGING%%lib32/libtspi.so.1
+%%STAGING%%lib32/libtasn1.so.6
+%%STAGING%%lib32/libtspi.so.1
 lib32/libwine.so
 lib32/libwine.so.1
 lib32/libxcb-dri2.so.0
 lib32/libxcb-glx.so.0
 lib32/libxcb.so.1
 lib32/libxml2.so.2
-%%OSREL9-STAGING%%lib32/libxslt.so.1
-%%OSREL10-STAGING%%lib32/libxslt.so.1
-%%OSREL11-STAGING%%lib32/libxslt.so.1
+%%STAGING%%lib32/libxslt.so.1
 lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so
 lib32/wine/activeds.dll.so
@@ -1038,51 +997,21 @@ lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-conio-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-conio-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-conio-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-convert-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-convert-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-convert-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-environment-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-environment-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-environment-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-filesystem-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-filesystem-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-filesystem-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-heap-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-heap-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-heap-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-locale-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-locale-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-locale-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-math-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-math-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-math-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-multibyte-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-multibyte-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-multibyte-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-private-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-private-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-private-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-process-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-process-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-process-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-runtime-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-runtime-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-runtime-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-stdio-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-stdio-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-stdio-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-string-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-string-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-string-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-time-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-time-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-time-l1-1-0.dll.so
-%%OSREL9-STAGING%%lib32/wine/api-ms-win-crt-utility-l1-1-0.dll.so
-%%OSREL10-STAGING%%lib32/wine/api-ms-win-crt-utility-l1-1-0.dll.so
-%%OSREL11-STAGING%%lib32/wine/api-ms-win-crt-utility-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-conio-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-convert-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-environment-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-filesystem-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-heap-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-locale-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-math-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-multibyte-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-private-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-process-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-runtime-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-stdio-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-string-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-time-l1-1-0.dll.so
+%%STAGING%%lib32/wine/api-ms-win-crt-utility-l1-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
@@ -1116,7 +1045,9 @@ lib32/wine/avifil32.dll.so
 lib32/wine/avifile.dll16.so
 lib32/wine/avrt.dll.so
 lib32/wine/bcrypt.dll.so
+lib32/wine/bluetoothapis.dll.so
 lib32/wine/browseui.dll.so
+lib32/wine/bthprops.cpl.so
 lib32/wine/cabarc.exe.so
 lib32/wine/cabinet.dll.so
 lib32/wine/cacls.exe.so
@@ -1326,51 +1257,21 @@ lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-environment-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-environment-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-environment-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-filesystem-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-filesystem-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-filesystem-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-heap-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-heap-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-heap-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-locale-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-locale-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-locale-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-math-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-math-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-math-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-multibyte-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-multibyte-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-multibyte-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-private-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-private-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-private-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-process-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-process-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-process-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-runtime-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-runtime-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-runtime-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-stdio-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-stdio-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-stdio-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-string-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-string-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-string-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-time-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-time-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-time-l1-1-0.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-utility-l1-1-0.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-utility-l1-1-0.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/api-ms-win-crt-utility-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-environment-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-filesystem-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-heap-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-locale-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-math-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-multibyte-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-private-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-process-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-runtime-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-stdio-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-string-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-time-l1-1-0.dll
+%%STAGING%%lib32/wine/fakedlls/api-ms-win-crt-utility-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll
@@ -1404,7 +1305,9 @@ lib32/wine/fakedlls/avifil32.dll
 lib32/wine/fakedlls/avifile.dll16
 lib32/wine/fakedlls/avrt.dll
 lib32/wine/fakedlls/bcrypt.dll
+lib32/wine/fakedlls/bluetoothapis.dll
 lib32/wine/fakedlls/browseui.dll
+lib32/wine/fakedlls/bthprops.cpl
 lib32/wine/fakedlls/cabarc.exe
 lib32/wine/fakedlls/cabinet.dll
 lib32/wine/fakedlls/cacls.exe
@@ -1550,9 +1453,7 @@ lib32/wine/fakedlls/extrac32.exe
 lib32/wine/fakedlls/faultrep.dll
 lib32/wine/fakedlls/findstr.exe
 lib32/wine/fakedlls/fltlib.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/fltmgr.sys
-%%OSREL10-STAGING%%lib32/wine/fakedlls/fltmgr.sys
-%%OSREL11-STAGING%%lib32/wine/fakedlls/fltmgr.sys
+%%STAGING%%lib32/wine/fakedlls/fltmgr.sys
 lib32/wine/fakedlls/fntcache.dll
 lib32/wine/fakedlls/fontsub.dll
 lib32/wine/fakedlls/fusion.dll
@@ -1651,9 +1552,7 @@ lib32/wine/fakedlls/mshta.exe
 lib32/wine/fakedlls/mshtml.dll
 lib32/wine/fakedlls/mshtml.tlb
 lib32/wine/fakedlls/msi.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/msidb.exe
-%%OSREL10-STAGING%%lib32/wine/fakedlls/msidb.exe
-%%OSREL11-STAGING%%lib32/wine/fakedlls/msidb.exe
+%%STAGING%%lib32/wine/fakedlls/msidb.exe
 lib32/wine/fakedlls/msident.dll
 lib32/wine/fakedlls/msiexec.exe
 lib32/wine/fakedlls/msimg32.dll
@@ -1720,18 +1619,10 @@ lib32/wine/fakedlls/ntdll.dll
 lib32/wine/fakedlls/ntdsapi.dll
 lib32/wine/fakedlls/ntoskrnl.exe
 lib32/wine/fakedlls/ntprint.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/nvapi.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/nvapi.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/nvapi.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/nvcuda.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/nvcuda.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/nvcuda.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/nvcuvid.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/nvcuvid.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/nvcuvid.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/nvencodeapi.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/nvencodeapi.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/nvencodeapi.dll
+%%STAGING%%lib32/wine/fakedlls/nvapi.dll
+%%STAGING%%lib32/wine/fakedlls/nvcuda.dll
+%%STAGING%%lib32/wine/fakedlls/nvcuvid.dll
+%%STAGING%%lib32/wine/fakedlls/nvencodeapi.dll
 lib32/wine/fakedlls/objsel.dll
 lib32/wine/fakedlls/odbc32.dll
 lib32/wine/fakedlls/odbccp32.dll
@@ -1853,9 +1744,7 @@ lib32/wine/fakedlls/traffic.dll
 lib32/wine/fakedlls/twain.dll16
 lib32/wine/fakedlls/twain_32.dll
 lib32/wine/fakedlls/typelib.dll16
-%%OSREL9-STAGING%%lib32/wine/fakedlls/ucrtbase.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/ucrtbase.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/ucrtbase.dll
+%%STAGING%%lib32/wine/fakedlls/ucrtbase.dll
 lib32/wine/fakedlls/unicows.dll
 lib32/wine/fakedlls/uninstaller.exe
 lib32/wine/fakedlls/unlodctr.exe
@@ -1874,9 +1763,7 @@ lib32/wine/fakedlls/vcomp100.dll
 lib32/wine/fakedlls/vcomp110.dll
 lib32/wine/fakedlls/vcomp120.dll
 lib32/wine/fakedlls/vcomp90.dll
-%%OSREL9-STAGING%%lib32/wine/fakedlls/vcruntime140.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/vcruntime140.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/vcruntime140.dll
+%%STAGING%%lib32/wine/fakedlls/vcruntime140.dll
 lib32/wine/fakedlls/vdhcp.vxd
 lib32/wine/fakedlls/vdmdbg.dll
 lib32/wine/fakedlls/ver.dll16
@@ -1897,6 +1784,7 @@ lib32/wine/fakedlls/wer.dll
 lib32/wine/fakedlls/wevtapi.dll
 lib32/wine/fakedlls/wevtutil.exe
 lib32/wine/fakedlls/wiaservc.dll
+lib32/wine/fakedlls/wimgapi.dll
 lib32/wine/fakedlls/win32s16.dll16
 lib32/wine/fakedlls/win87em.dll16
 lib32/wine/fakedlls/winaspi.dll16
@@ -1907,9 +1795,7 @@ lib32/wine/fakedlls/wineboot.exe
 lib32/wine/fakedlls/winebrowser.exe
 lib32/wine/fakedlls/winecfg.exe
 lib32/wine/fakedlls/wineconsole.exe
-%%OSREL9-STAGING%%lib32/wine/fakedlls/wined3d-csmt.dll
-%%OSREL10-STAGING%%lib32/wine/fakedlls/wined3d-csmt.dll
-%%OSREL11-STAGING%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%STAGING%%lib32/wine/fakedlls/wined3d-csmt.dll
 lib32/wine/fakedlls/wined3d.dll
 lib32/wine/fakedlls/winedbg.exe
 lib32/wine/fakedlls/winedevice.exe
@@ -1948,6 +1834,7 @@ lib32/wine/fakedlls/wmi.dll
 lib32/wine/fakedlls/wmic.exe
 lib32/wine/fakedlls/wmiutils.dll
 lib32/wine/fakedlls/wmp.dll
+lib32/wine/fakedlls/wmplayer.exe
 lib32/wine/fakedlls/wmvcore.dll
 lib32/wine/fakedlls/wnaspi32.dll
 lib32/wine/fakedlls/wordpad.exe
@@ -1997,9 +1884,7 @@ lib32/wine/fakedlls/xpssvcs.dll
 lib32/wine/faultrep.dll.so
 lib32/wine/findstr.exe.so
 lib32/wine/fltlib.dll.so
-%%OSREL9-STAGING%%lib32/wine/fltmgr.sys.so
-%%OSREL10-STAGING%%lib32/wine/fltmgr.sys.so
-%%OSREL11-STAGING%%lib32/wine/fltmgr.sys.so
+%%STAGING%%lib32/wine/fltmgr.sys.so
 lib32/wine/fntcache.dll.so
 lib32/wine/fontsub.dll.so
 lib32/wine/fusion.dll.so
@@ -2206,18 +2091,13 @@ lib32/wine/libuserenv.def
 lib32/wine/libusp10.def
 lib32/wine/libuuid.a
 lib32/wine/libuxtheme.def
-%%OSREL9-STAGING%%lib32/wine/libvcruntime140.def
-%%OSREL10-STAGING%%lib32/wine/libvcruntime140.def
-%%OSREL11-STAGING%%lib32/wine/libvcruntime140.def
 lib32/wine/libvdmdbg.def
 lib32/wine/libversion.def
 lib32/wine/libwebservices.def
 lib32/wine/libwer.def
 lib32/wine/libwindowscodecs.def
 lib32/wine/libwindowscodecsext.def
-%%OSREL9-STAGING%%lib32/wine/libwinealsa.drv.def
-%%OSREL10-STAGING%%lib32/wine/libwinealsa.drv.def
-%%OSREL11-STAGING%%lib32/wine/libwinealsa.drv.def
+%%STAGING%%lib32/wine/libwinealsa.drv.def
 lib32/wine/libwinecrt0.a
 lib32/wine/libwined3d.def
 lib32/wine/libwinhttp.def
@@ -2235,7 +2115,7 @@ lib32/wine/libws2_32.def
 lib32/wine/libwsnmp32.def
 lib32/wine/libwsock32.def
 lib32/wine/libwtsapi32.def
-lib32/wine/libx3daudio1_7.def
+lib32/wine/libxaudio2_8.def
 lib32/wine/libxinput.def
 lib32/wine/libxmllite.def
 lib32/wine/loadperf.dll.so
@@ -2287,9 +2167,7 @@ lib32/wine/mshta.exe.so
 lib32/wine/mshtml.dll.so
 lib32/wine/mshtml.tlb.so
 lib32/wine/msi.dll.so
-%%OSREL9-STAGING%%lib32/wine/msidb.exe.so
-%%OSREL10-STAGING%%lib32/wine/msidb.exe.so
-%%OSREL11-STAGING%%lib32/wine/msidb.exe.so
+%%STAGING%%lib32/wine/msidb.exe.so
 lib32/wine/msident.dll.so
 lib32/wine/msiexec.exe.so
 lib32/wine/msimg32.dll.so
@@ -2356,18 +2234,10 @@ lib32/wine/ntdll.dll.so
 lib32/wine/ntdsapi.dll.so
 lib32/wine/ntoskrnl.exe.so
 lib32/wine/ntprint.dll.so
-%%OSREL9-STAGING%%lib32/wine/nvapi.dll.so
-%%OSREL10-STAGING%%lib32/wine/nvapi.dll.so
-%%OSREL11-STAGING%%lib32/wine/nvapi.dll.so
-%%OSREL9-STAGING%%lib32/wine/nvcuda.dll.so
-%%OSREL10-STAGING%%lib32/wine/nvcuda.dll.so
-%%OSREL11-STAGING%%lib32/wine/nvcuda.dll.so
-%%OSREL9-STAGING%%lib32/wine/nvcuvid.dll.so
-%%OSREL10-STAGING%%lib32/wine/nvcuvid.dll.so
-%%OSREL11-STAGING%%lib32/wine/nvcuvid.dll.so
-%%OSREL9-STAGING%%lib32/wine/nvencodeapi.dll.so
-%%OSREL10-STAGING%%lib32/wine/nvencodeapi.dll.so
-%%OSREL11-STAGING%%lib32/wine/nvencodeapi.dll.so
+%%STAGING%%lib32/wine/nvapi.dll.so
+%%STAGING%%lib32/wine/nvcuda.dll.so
+%%STAGING%%lib32/wine/nvcuvid.dll.so
+%%STAGING%%lib32/wine/nvencodeapi.dll.so
 lib32/wine/objsel.dll.so
 lib32/wine/odbc32.dll.so
 lib32/wine/odbccp32.dll.so
@@ -2489,9 +2359,7 @@ lib32/wine/traffic.dll.so
 lib32/wine/twain.dll16.so
 lib32/wine/twain_32.dll.so
 lib32/wine/typelib.dll16.so
-%%OSREL9-STAGING%%lib32/wine/ucrtbase.dll.so
-%%OSREL10-STAGING%%lib32/wine/ucrtbase.dll.so
-%%OSREL11-STAGING%%lib32/wine/ucrtbase.dll.so
+%%STAGING%%lib32/wine/ucrtbase.dll.so
 lib32/wine/unicows.dll.so
 lib32/wine/uninstaller.exe.so
 lib32/wine/unlodctr.exe.so
@@ -2510,9 +2378,7 @@ lib32/wine/vcomp100.dll.so
 lib32/wine/vcomp110.dll.so
 lib32/wine/vcomp120.dll.so
 lib32/wine/vcomp90.dll.so
-%%OSREL9-STAGING%%lib32/wine/vcruntime140.dll.so
-%%OSREL10-STAGING%%lib32/wine/vcruntime140.dll.so
-%%OSREL11-STAGING%%lib32/wine/vcruntime140.dll.so
+%%STAGING%%lib32/wine/vcruntime140.dll.so
 lib32/wine/vdhcp.vxd.so
 lib32/wine/vdmdbg.dll.so
 lib32/wine/ver.dll16.so
@@ -2533,6 +2399,7 @@ lib32/wine/wer.dll.so
 lib32/wine/wevtapi.dll.so
 lib32/wine/wevtutil.exe.so
 lib32/wine/wiaservc.dll.so
+lib32/wine/wimgapi.dll.so
 lib32/wine/win32s16.dll16.so
 lib32/wine/win87em.dll16.so
 lib32/wine/winaspi.dll16.so
@@ -2543,9 +2410,7 @@ lib32/wine/wineboot.exe.so
 lib32/wine/winebrowser.exe.so
 lib32/wine/winecfg.exe.so
 lib32/wine/wineconsole.exe.so
-%%OSREL9-STAGING%%lib32/wine/wined3d-csmt.dll.so
-%%OSREL10-STAGING%%lib32/wine/wined3d-csmt.dll.so
-%%OSREL11-STAGING%%lib32/wine/wined3d-csmt.dll.so
+%%STAGING%%lib32/wine/wined3d-csmt.dll.so
 lib32/wine/wined3d.dll.so
 lib32/wine/winedbg.exe.so
 lib32/wine/winedevice.exe.so
@@ -2584,6 +2449,7 @@ lib32/wine/wmi.dll.so
 lib32/wine/wmic.exe.so
 lib32/wine/wmiutils.dll.so
 lib32/wine/wmp.dll.so
+lib32/wine/wmplayer.exe.so
 lib32/wine/wmvcore.dll.so
 lib32/wine/wnaspi32.dll.so
 lib32/wine/wordpad.exe.so
@@ -2665,15 +2531,11 @@ share/doc/wine/AUTHORS
 share/doc/wine/README
 share/doc/wine/README.winedbg
 share/doc/wine/README.winedump
-%%OSREL9-STAGING%%share/wine/fonts/arial.ttf
-%%OSREL10-STAGING%%share/wine/fonts/arial.ttf
-%%OSREL11-STAGING%%share/wine/fonts/arial.ttf
+%%STAGING%%share/wine/fonts/arial.ttf
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon
 share/wine/fonts/coue1257.fon
-%%OSREL9-STAGING%%share/wine/fonts/cour.ttf
-%%OSREL10-STAGING%%share/wine/fonts/cour.ttf
-%%OSREL11-STAGING%%share/wine/fonts/cour.ttf
+%%STAGING%%share/wine/fonts/cour.ttf
 share/wine/fonts/coure.fon
 share/wine/fonts/couree.fon
 share/wine/fonts/coureg.fon
@@ -2685,9 +2547,7 @@ share/wine/fonts/jsmalle.fon
 share/wine/fonts/jvgafix.fon
 share/wine/fonts/jvgasys.fon
 share/wine/fonts/marlett.ttf
-%%OSREL9-STAGING%%share/wine/fonts/msyh.ttf
-%%OSREL10-STAGING%%share/wine/fonts/msyh.ttf
-%%OSREL11-STAGING%%share/wine/fonts/msyh.ttf
+%%STAGING%%share/wine/fonts/msyh.ttf
 share/wine/fonts/smae1255.fon
 share/wine/fonts/smae1256.fon
 share/wine/fonts/smae1257.fon
@@ -2718,9 +2578,7 @@ share/wine/fonts/svgasys.fon
 share/wine/fonts/symbol.ttf
 share/wine/fonts/tahoma.ttf
 share/wine/fonts/tahomabd.ttf
-%%OSREL9-STAGING%%share/wine/fonts/times.ttf
-%%OSREL10-STAGING%%share/wine/fonts/times.ttf
-%%OSREL11-STAGING%%share/wine/fonts/times.ttf
+%%STAGING%%share/wine/fonts/times.ttf
 share/wine/fonts/vgafix.fon
 share/wine/fonts/vgas1255.fon
 share/wine/fonts/vgas1256.fon