emulators/i386-wine-devel: fix plist generation.

The port-update target incorrectly used ${suffix:U} - instead of ${suffix:tu} -
causing the plists for compholio to be used for both itself and devel.  Devel,
however, does not include all those files.  Thus, filtering of compholio
specific files broke.

Apologies for the issues during the update of i386-wine-devel to 1.7.34.

PR:		197110

2 files changed, 147 insertions, 39 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 12da0c9ae9cd..5c6b062b2da8 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -88,7 +88,7 @@ port-update:
 	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix}
 	${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~
 	${RM} ${SLAVEDIR}/distinfo
-	${MAKE} pkg-plist.${osrel}${suffix:U} PLIST=pkg-plist.${osrel}${suffix:U} OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix}
+	${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix}
 .endfor
 .endfor
 	${MV} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/distinfo
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index a2b036a1b9db..e8b456c03aab 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -244,7 +244,10 @@ include/wine/windows/dde.h
 include/wine/windows/dde.rh
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/compstui.h
-include/wine/windows/ddk/csq.h
+%%OSREL8-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/ddk/csq.h
 include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/imm.h
 include/wine/windows/ddk/mountmgr.h
@@ -457,7 +460,10 @@ include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
 include/wine/windows/metahost.h
 include/wine/windows/metahost.idl
-include/wine/windows/mferror.h
+%%OSREL8-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/mferror.h
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
@@ -535,7 +541,10 @@ include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
 include/wine/windows/ntdsapi.h
-include/wine/windows/ntifs.h
+%%OSREL8-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/ntifs.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntsecpkg.h
@@ -858,36 +867,67 @@ lib32/libdrm.so.2
 lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
 lib32/libexpat.so.1
-lib32/libffi.so.6
+%%OSREL8-COMPHOLIO%%lib32/libffi.so.6
+%%OSREL9-COMPHOLIO%%lib32/libffi.so.6
+%%OSREL10-COMPHOLIO%%lib32/libffi.so.6
+%%OSREL11-COMPHOLIO%%lib32/libffi.so.6
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
+%%OSREL8%%lib32/libgcc_s.so.1
 lib32/libglapi.so.0
-lib32/libgmp.so.10
-lib32/libgnutls.so.28
-lib32/libhogweed.so.2
-%%OSREL8%%lib32/libhogweed.so.2
+%%OSREL8-COMPHOLIO%%lib32/libgmp.so.10
+%%OSREL9-COMPHOLIO%%lib32/libgmp.so.10
+%%OSREL10-COMPHOLIO%%lib32/libgmp.so.10
+%%OSREL11-COMPHOLIO%%lib32/libgmp.so.10
+%%OSREL8-COMPHOLIO%%lib32/libgnutls.so.28
+%%OSREL9-COMPHOLIO%%lib32/libgnutls.so.28
+%%OSREL10-COMPHOLIO%%lib32/libgnutls.so.28
+%%OSREL11-COMPHOLIO%%lib32/libgnutls.so.28
+%%OSREL8-COMPHOLIO%%lib32/libhogweed.so.2
+%%OSREL9-COMPHOLIO%%lib32/libhogweed.so.2
+%%OSREL10-COMPHOLIO%%lib32/libhogweed.so.2
+%%OSREL11-COMPHOLIO%%lib32/libhogweed.so.2
 %%OSREL8%%lib32/libiconv.so.2
 %%OSREL9%%lib32/libiconv.so.2
-lib32/libintl.so.8
+%%OSREL8-COMPHOLIO%%lib32/libintl.so.8
+%%OSREL9-COMPHOLIO%%lib32/libintl.so.8
+%%OSREL10-COMPHOLIO%%lib32/libintl.so.8
+%%OSREL11-COMPHOLIO%%lib32/libintl.so.8
 lib32/libjpeg.so.8
 lib32/liblcms2.so.2
 %%OSREL8%%lib32/libllvmradeon9.1.7.so
 %%OSREL9%%lib32/libllvmradeon9.1.7.so
 %%OSREL10%%lib32/libllvmradeon9.1.7.so
-lib32/libnettle.so.4
-lib32/libp11-kit.so.0
+%%OSREL8-COMPHOLIO%%lib32/libnettle.so.4
+%%OSREL9-COMPHOLIO%%lib32/libnettle.so.4
+%%OSREL10-COMPHOLIO%%lib32/libnettle.so.4
+%%OSREL11-COMPHOLIO%%lib32/libnettle.so.4
+%%OSREL8-COMPHOLIO%%lib32/libp11-kit.so.0
+%%OSREL9-COMPHOLIO%%lib32/libp11-kit.so.0
+%%OSREL10-COMPHOLIO%%lib32/libp11-kit.so.0
+%%OSREL11-COMPHOLIO%%lib32/libp11-kit.so.0
 lib32/libpciaccess.so.0
 lib32/libpng16.so.16
 lib32/libpthread-stubs.so.0
-lib32/libtasn1.so.6
-lib32/libtspi.so.1
+%%OSREL8%%lib32/libstdc++.so.6
+%%OSREL8-COMPHOLIO%%lib32/libtasn1.so.6
+%%OSREL9-COMPHOLIO%%lib32/libtasn1.so.6
+%%OSREL10-COMPHOLIO%%lib32/libtasn1.so.6
+%%OSREL11-COMPHOLIO%%lib32/libtasn1.so.6
+%%OSREL8-COMPHOLIO%%lib32/libtspi.so.1
+%%OSREL9-COMPHOLIO%%lib32/libtspi.so.1
+%%OSREL10-COMPHOLIO%%lib32/libtspi.so.1
+%%OSREL11-COMPHOLIO%%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
-lib32/libxslt.so.1
+%%OSREL8-COMPHOLIO%%lib32/libxslt.so.1
+%%OSREL9-COMPHOLIO%%lib32/libxslt.so.1
+%%OSREL10-COMPHOLIO%%lib32/libxslt.so.1
+%%OSREL11-COMPHOLIO%%lib32/libxslt.so.1
 lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so
 lib32/wine/activeds.dll.so
@@ -897,15 +937,30 @@ lib32/wine/advpack.dll.so
 lib32/wine/amstream.dll.so
 lib32/wine/api-ms-win-core-com-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-console-l1-1-0.dll.so
-lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
-lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-debug-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so
-lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
-lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-file-l1-2-0.dll.so
-lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
 lib32/wine/api-ms-win-core-file-l2-1-1.dll.so
 lib32/wine/api-ms-win-core-handle-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-heap-l1-2-0.dll.so
@@ -915,7 +970,10 @@ lib32/wine/api-ms-win-core-io-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-localization-l1-2-0.dll.so
-lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
 lib32/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-memory-l1-1-1.dll.so
@@ -938,10 +996,19 @@ lib32/wine/api-ms-win-core-timezone-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-url-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-util-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
-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
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%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
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-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
@@ -1121,15 +1188,30 @@ lib32/wine/fakedlls/advpack.dll
 lib32/wine/fakedlls/amstream.dll
 lib32/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
-lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
-lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll
-lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
-lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
-lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll
@@ -1139,7 +1221,10 @@ lib32/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
-lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
 lib32/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
@@ -1162,10 +1247,19 @@ lib32/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
-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
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%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
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-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
@@ -1665,7 +1759,10 @@ lib32/wine/fakedlls/wineboot.exe
 lib32/wine/fakedlls/winebrowser.exe
 lib32/wine/fakedlls/winecfg.exe
 lib32/wine/fakedlls/wineconsole.exe
-lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
 lib32/wine/fakedlls/wined3d.dll
 lib32/wine/fakedlls/winedbg.exe
 lib32/wine/fakedlls/winedevice.exe
@@ -2239,7 +2336,10 @@ lib32/wine/wineboot.exe.so
 lib32/wine/winebrowser.exe.so
 lib32/wine/winecfg.exe.so
 lib32/wine/wineconsole.exe.so
-lib32/wine/wined3d-csmt.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
 lib32/wine/wined3d.dll.so
 lib32/wine/winedbg.exe.so
 lib32/wine/winedevice.exe.so
@@ -2340,11 +2440,17 @@ share/doc/wine/AUTHORS
 share/doc/wine/README
 share/doc/wine/README.winedbg
 share/doc/wine/README.winedump
-share/wine/fonts/arial.ttf
+%%OSREL8-COMPHOLIO%%share/wine/fonts/arial.ttf
+%%OSREL9-COMPHOLIO%%share/wine/fonts/arial.ttf
+%%OSREL10-COMPHOLIO%%share/wine/fonts/arial.ttf
+%%OSREL11-COMPHOLIO%%share/wine/fonts/arial.ttf
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon
 share/wine/fonts/coue1257.fon
-share/wine/fonts/cour.ttf
+%%OSREL8-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL9-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL10-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL11-COMPHOLIO%%share/wine/fonts/cour.ttf
 share/wine/fonts/coure.fon
 share/wine/fonts/couree.fon
 share/wine/fonts/coureg.fon
@@ -2356,7 +2462,10 @@ share/wine/fonts/jsmalle.fon
 share/wine/fonts/jvgafix.fon
 share/wine/fonts/jvgasys.fon
 share/wine/fonts/marlett.ttf
-share/wine/fonts/msyh.ttf
+%%OSREL8-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL9-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL10-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL11-COMPHOLIO%%share/wine/fonts/msyh.ttf
 share/wine/fonts/smae1255.fon
 share/wine/fonts/smae1256.fon
 share/wine/fonts/smae1257.fon
@@ -2401,4 +2510,3 @@ share/wine/fonts/wingding.ttf
 share/wine/l_intl.nls
 share/wine/patch-nvidia.sh
 share/wine/wine.inf
-%%OSREL8%%share/wine/wine.inf