From owner-svn-ports-head@freebsd.org Sun Jul 23 19:59:17 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C30EEDABE99; Sun, 23 Jul 2017 19:59:17 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EA056D13F; Sun, 23 Jul 2017 19:59:17 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NJxGVX079457; Sun, 23 Jul 2017 19:59:16 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NJxGQV079454; Sun, 23 Jul 2017 19:59:16 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201707231959.v6NJxGQV079454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 23 Jul 2017 19:59:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446505 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 446505 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2017 19:59:17 -0000 Author: gerald Date: Sun Jul 23 19:59:16 2017 New Revision: 446505 URL: https://svnweb.freebsd.org/changeset/ports/446505 Log: Move some twenty files that originally were part of the Wine Staging patchset when Wine 2.0 branched and have been integrated into the Wine development tree since then from being only included in packages / installed ports when option STAGING is active to the general case (i.e., omit the leading %%STAGING%% marker from their entries in pkg-plist). This points to an unfortunate deficiency in Mk/Scripts/check-stagedir.sh which we are relying on. [1] PR: 220950 [1] Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/pkg-plist Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sun Jul 23 19:14:21 2017 (r446504) +++ head/emulators/wine-devel/Makefile Sun Jul 23 19:59:16 2017 (r446505) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 2.12 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Sun Jul 23 19:14:21 2017 (r446504) +++ head/emulators/wine-devel/pkg-plist Sun Jul 23 19:59:16 2017 (r446505) @@ -466,8 +466,8 @@ include/wine/windows/metahost.h include/wine/windows/metahost.idl include/wine/windows/mfapi.h include/wine/windows/mferror.h -%%STAGING%%include/wine/windows/mfidl.h -%%STAGING%%include/wine/windows/mfidl.idl +include/wine/windows/mfidl.h +include/wine/windows/mfidl.idl include/wine/windows/mfobjects.h include/wine/windows/mfobjects.idl include/wine/windows/mfreadwrite.h @@ -994,10 +994,10 @@ lib/wine/api-ms-win-core-processthreads-l1-1-2.dll.so lib/wine/api-ms-win-core-profile-l1-1-0.dll.so lib/wine/api-ms-win-core-psapi-l1-1-0.dll.so lib/wine/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so -%%STAGING%%lib/wine/api-ms-win-core-quirks-l1-1-0.dll.so +lib/wine/api-ms-win-core-quirks-l1-1-0.dll.so lib/wine/api-ms-win-core-realtime-l1-1-0.dll.so lib/wine/api-ms-win-core-registry-l1-1-0.dll.so -%%STAGING%%lib/wine/api-ms-win-core-registry-l2-1-0.dll.so +lib/wine/api-ms-win-core-registry-l2-1-0.dll.so lib/wine/api-ms-win-core-registryuserspecific-l1-1-0.dll.so lib/wine/api-ms-win-core-rtlsupport-l1-1-0.dll.so lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so @@ -1017,7 +1017,7 @@ lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so lib/wine/api-ms-win-core-threadpool-l1-1-0.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 -%%STAGING%%lib/wine/api-ms-win-core-threadpool-private-l1-1-0.dll.so +lib/wine/api-ms-win-core-threadpool-private-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 @@ -1031,7 +1031,7 @@ lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so lib/wine/api-ms-win-core-winrt-errorprivate-l1-1-1.dll.so lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so lib/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so -%%STAGING%%lib/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so +lib/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so lib/wine/api-ms-win-core-wow64-l1-1-0.dll.so lib/wine/api-ms-win-core-xstate-l1-1-0.dll.so @@ -1068,8 +1068,8 @@ lib/wine/api-ms-win-eventing-consumer-l1-1-0.dll.so lib/wine/api-ms-win-eventing-controller-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 -%%STAGING%%lib/wine/api-ms-win-mm-misc-l1-1-1.dll.so -%%STAGING%%lib/wine/api-ms-win-mm-mme-l1-1-0.dll.so +lib/wine/api-ms-win-mm-misc-l1-1-1.dll.so +lib/wine/api-ms-win-mm-mme-l1-1-0.dll.so lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so lib/wine/api-ms-win-power-base-l1-1-0.dll.so lib/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -1082,13 +1082,13 @@ lib/wine/api-ms-win-security-base-l1-1-0.dll.so lib/wine/api-ms-win-security-base-l1-2-0.dll.so lib/wine/api-ms-win-security-base-private-l1-1-1.dll.so lib/wine/api-ms-win-security-credentials-l1-1-0.dll.so -%%STAGING%%lib/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so +lib/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so lib/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so lib/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so lib/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so lib/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so -%%STAGING%%lib/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so +lib/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so lib/wine/api-ms-win-service-core-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 @@ -1374,10 +1374,10 @@ lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1- lib/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-psapi-obsolete-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll +lib/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll lib/wine/fakedlls/api-ms-win-core-registryuserspecific-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll @@ -1397,7 +1397,7 @@ lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll lib/wine/fakedlls/api-ms-win-core-threadpool-l1-1-0.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 -%%STAGING%%lib/wine/fakedlls/api-ms-win-core-threadpool-private-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-threadpool-private-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 @@ -1411,7 +1411,7 @@ lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.d lib/wine/fakedlls/api-ms-win-core-winrt-errorprivate-l1-1-1.dll lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-xstate-l1-1-0.dll @@ -1448,8 +1448,8 @@ lib/wine/fakedlls/api-ms-win-eventing-consumer-l1-1-0. lib/wine/fakedlls/api-ms-win-eventing-controller-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 -%%STAGING%%lib/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll lib/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll lib/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -1462,13 +1462,13 @@ lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll lib/wine/fakedlls/api-ms-win-security-base-private-l1-1-1.dll lib/wine/fakedlls/api-ms-win-security-credentials-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll lib/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll lib/wine/fakedlls/api-ms-win-service-core-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 @@ -1991,7 +1991,7 @@ lib/wine/fakedlls/traffic.dll lib/wine/fakedlls/twain_32.dll %%WINE32%%lib/wine/fakedlls/typelib.dll16 lib/wine/fakedlls/ucrtbase.dll -%%STAGING%%lib/wine/fakedlls/uiautomationcore.dll +lib/wine/fakedlls/uiautomationcore.dll lib/wine/fakedlls/unicows.dll lib/wine/fakedlls/uninstaller.exe lib/wine/fakedlls/unlodctr.exe @@ -2645,7 +2645,7 @@ lib/wine/traffic.dll.so lib/wine/twain_32.dll.so %%WINE32%%lib/wine/typelib.dll16.so lib/wine/ucrtbase.dll.so -%%STAGING%%lib/wine/uiautomationcore.dll.so +lib/wine/uiautomationcore.dll.so lib/wine/unicows.dll.so lib/wine/uninstaller.exe.so lib/wine/unlodctr.exe.so