From owner-dev-commits-ports-main@freebsd.org Sat Jun 26 21:37:22 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A228965A035; Sat, 26 Jun 2021 21:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GC6fB3rcZz3nY3; Sat, 26 Jun 2021 21:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 681C42629C; Sat, 26 Jun 2021 21:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15QLbMSN047903; Sat, 26 Jun 2021 21:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15QLbMQk047902; Sat, 26 Jun 2021 21:37:22 GMT (envelope-from git) Date: Sat, 26 Jun 2021 21:37:22 GMT Message-Id: <202106262137.15QLbMQk047902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 3da520449700 - main - emulators/i386-wine{-devel}: fix distfile issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3da5204497006152dbc5cbb73fb0e10002e7de6c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2021 21:37:22 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=3da5204497006152dbc5cbb73fb0e10002e7de6c commit 3da5204497006152dbc5cbb73fb0e10002e7de6c Author: Kevin Bowling AuthorDate: 2021-06-26 21:33:10 +0000 Commit: Kevin Bowling CommitDate: 2021-06-26 21:36:35 +0000 emulators/i386-wine{-devel}: fix distfile issues * Use the i386-wine-devel distfile extraction in i386-wine * Update distinfo PR: 256782 Approved by: maintainer (Alexander Vereeken ) Fixes: 0600023cb017 emulators/i386-wine{-devel}: Fix libglvnd --- emulators/i386-wine-devel/distinfo | 18 +++++++++--------- emulators/i386-wine/Makefile.amd64 | 2 +- emulators/i386-wine/distinfo | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo index 158601cbb152..2738376d4960 100644 --- a/emulators/i386-wine-devel/distinfo +++ b/emulators/i386-wine-devel/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1624695440 -SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = f4d13cf6d24dd0162a83cae68642ccb907f9ee2f8dfe740f52b6066ea707df51 -SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = 99011992 -SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 0b75df95e48cb2cc664478cece681ce4ba00abdbc1e99cfc3d0f85c447d43fca -SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 99425876 -SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 6b4efa025f8d65df65bf55e8a3123ee668520f3becff02bb436352d2d6a12481 -SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 99839772 -SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 9c427a95e624ddf9cb3bdbca30ea45d5a09f9c55ecdd7cffe52c931a5e9bc7a9 -SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 101607056 +TIMESTAMP = 1624700086 +SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11_1,1.txz) = f4d13cf6d24dd0162a83cae68642ccb907f9ee2f8dfe740f52b6066ea707df51 +SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11_1,1.txz) = 99011992 +SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11_1,1.txz) = 0b75df95e48cb2cc664478cece681ce4ba00abdbc1e99cfc3d0f85c447d43fca +SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11_1,1.txz) = 99425876 +SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11_1,1.txz) = 6b4efa025f8d65df65bf55e8a3123ee668520f3becff02bb436352d2d6a12481 +SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11_1,1.txz) = 99839772 +SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11_1,1.txz) = 9c427a95e624ddf9cb3bdbca30ea45d5a09f9c55ecdd7cffe52c931a5e9bc7a9 +SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11_1,1.txz) = 101607056 diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64 index a7c72b78866c..ea77dc5b44b9 100644 --- a/emulators/i386-wine/Makefile.amd64 +++ b/emulators/i386-wine/Makefile.amd64 @@ -46,7 +46,7 @@ MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono do-extract: @${RM} -r ${WRKDIR} @${MKDIR} ${WRKDIR} - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g' + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/[^/]*/LICENSE' -s '|/usr/local/share/licenses/[^/]*/||g' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo index 15ea90e44738..16144cca8eb3 100644 --- a/emulators/i386-wine/distinfo +++ b/emulators/i386-wine/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1624695015 -SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = c0792df623ef5ca2050a470aa643db183a78af0ebd17b47ac970e71d20ce4235 -SIZE (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = 92984208 -SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 8149f3663dddeb0114b76269f869c25db9bb6edde1b03bec5415776c8286dd66 -SIZE (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 93358516 -SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = f510e32ab3ff7337272def5e55258587dfd053c757904078e58aa3dbdced9612 -SIZE (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = 93792036 -SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = f44cf5115c98337ef4358df907196e7619029c9d6416eb7e06b91086401d5cf3 -SIZE (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = 95495224 +TIMESTAMP = 1624700175 +SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4_1,1.txz) = c0792df623ef5ca2050a470aa643db183a78af0ebd17b47ac970e71d20ce4235 +SIZE (FreeBSD:11:amd64/i386-wine-5.0.4_1,1.txz) = 92984208 +SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4_1,1.txz) = 8149f3663dddeb0114b76269f869c25db9bb6edde1b03bec5415776c8286dd66 +SIZE (FreeBSD:12:amd64/i386-wine-5.0.4_1,1.txz) = 93358516 +SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4_1,1.txz) = f510e32ab3ff7337272def5e55258587dfd053c757904078e58aa3dbdced9612 +SIZE (FreeBSD:13:amd64/i386-wine-5.0.4_1,1.txz) = 93792036 +SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4_1,1.txz) = f44cf5115c98337ef4358df907196e7619029c9d6416eb7e06b91086401d5cf3 +SIZE (FreeBSD:14:amd64/i386-wine-5.0.4_1,1.txz) = 95495224