From 2cac7395cf50d4dd8c4903bcf2c809da5163117f Mon Sep 17 00:00:00 2001 From: David Naylor Date: Fri, 16 Jan 2015 06:00:00 +0000 Subject: [PATCH] Update emulators/i386-wine-devel to 1.7.34. Changes: - Set UNAME_r and OSVERSION in port update target. --- emulators/i386-wine-devel/Makefile.inc | 6 +- emulators/i386-wine-devel/pkg-plist | 130 +++++-------------------- 2 files changed, 29 insertions(+), 107 deletions(-) diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 982e5741409a..54af7a55dd33 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -85,11 +85,11 @@ port-update: ${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 8 9 10 11 .for suffix in -devel -compholio - ${MAKE} fetch OSREL=${osrel} PKGNAMESUFFIX=${suffix} - ${MAKE} makesum OSREL=${osrel} PKGNAMESUFFIX=${suffix} + ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix} + ${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} PKGNAMESUFFIX=${suffix} + ${MAKE} pkg-plist.${osrel}${suffix:U} PLIST=pkg-plist.${osrel}${suffix:U} 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 b953d34975af..0b68e4b4e1f8 100644 --- a/emulators/i386-wine-devel/pkg-plist +++ b/emulators/i386-wine-devel/pkg-plist @@ -242,10 +242,7 @@ include/wine/windows/dde.h include/wine/windows/dde.rh include/wine/windows/ddeml.h include/wine/windows/ddk/compstui.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/csq.h include/wine/windows/ddk/hidsdi.h include/wine/windows/ddk/imm.h include/wine/windows/ddk/mountmgr.h @@ -458,10 +455,7 @@ include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl include/wine/windows/metahost.h include/wine/windows/metahost.idl -%%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/mferror.h include/wine/windows/midles.h include/wine/windows/mimeinfo.h include/wine/windows/mimeinfo.idl @@ -539,10 +533,7 @@ include/wine/windows/ntddndis.h include/wine/windows/ntddscsi.h include/wine/windows/ntddstor.h include/wine/windows/ntdsapi.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/ntifs.h include/wine/windows/ntquery.h include/wine/windows/ntsecapi.h include/wine/windows/ntsecpkg.h @@ -917,30 +908,15 @@ 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 -%%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-datetime-l1-1-0.dll.so +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 -%%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-fibers-l1-1-0.dll.so +lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so lib32/wine/api-ms-win-core-file-l1-2-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-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 @@ -950,10 +926,7 @@ 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 -%%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-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 @@ -976,19 +949,10 @@ 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 -%%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-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 -%%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-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 @@ -1168,30 +1132,15 @@ 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 -%%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-datetime-l1-1-0.dll +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 -%%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-fibers-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-core-file-l1-2-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-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 @@ -1201,10 +1150,7 @@ 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 -%%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-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 @@ -1227,19 +1173,10 @@ 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 -%%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-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 -%%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-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 @@ -1740,10 +1677,7 @@ lib32/wine/fakedlls/wineboot.exe lib32/wine/fakedlls/winebrowser.exe lib32/wine/fakedlls/winecfg.exe lib32/wine/fakedlls/wineconsole.exe -%%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-csmt.dll lib32/wine/fakedlls/wined3d.dll lib32/wine/fakedlls/winedbg.exe lib32/wine/fakedlls/winedevice.exe @@ -2318,10 +2252,7 @@ lib32/wine/wineboot.exe.so lib32/wine/winebrowser.exe.so lib32/wine/winecfg.exe.so lib32/wine/wineconsole.exe.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-csmt.dll.so lib32/wine/wined3d.dll.so lib32/wine/winedbg.exe.so lib32/wine/winedevice.exe.so @@ -2422,17 +2353,11 @@ share/doc/wine/AUTHORS share/doc/wine/README share/doc/wine/README.winedbg share/doc/wine/README.winedump -%%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/arial.ttf share/wine/fonts/coue1255.fon share/wine/fonts/coue1256.fon share/wine/fonts/coue1257.fon -%%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/cour.ttf share/wine/fonts/coure.fon share/wine/fonts/couree.fon share/wine/fonts/coureg.fon @@ -2444,10 +2369,7 @@ share/wine/fonts/jsmalle.fon share/wine/fonts/jvgafix.fon share/wine/fonts/jvgasys.fon share/wine/fonts/marlett.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/msyh.ttf share/wine/fonts/smae1255.fon share/wine/fonts/smae1256.fon share/wine/fonts/smae1257.fon