From nobody Tue Nov 16 08:05:44 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A38F71890F4E; Tue, 16 Nov 2021 08:05:44 +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 4Htdsh49SPz4lYs; Tue, 16 Nov 2021 08:05:44 +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 6FE9A16FE; Tue, 16 Nov 2021 08:05:44 +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 1AG85iMY050193; Tue, 16 Nov 2021 08:05:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AG85iRh050192; Tue, 16 Nov 2021 08:05:44 GMT (envelope-from git) Date: Tue, 16 Nov 2021 08:05:44 GMT Message-Id: <202111160805.1AG85iRh050192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: 10f08bc4ba0f - main - sysutils/devcpu-data-amd: Unbreak & fix syntax error List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10f08bc4ba0f1a46397ebc36f7bd694aa83f7ab3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=10f08bc4ba0f1a46397ebc36f7bd694aa83f7ab3 commit 10f08bc4ba0f1a46397ebc36f7bd694aa83f7ab3 Author: Koichiro Iwao AuthorDate: 2021-11-16 07:28:36 +0000 Commit: Koichiro Iwao CommitDate: 2021-11-16 08:05:38 +0000 sysutils/devcpu-data-amd: Unbreak & fix syntax error when PORTREVISION=0 && MASTER_SITE_FREEBSD=yes. make[4]: "/usr/ports/Mk/bsd.port.mk" line 2505: Unclosed variable "/" make[4]: "/usr/ports/Mk/bsd.port.mk" line 2505: Undefined variable "${/" make[4]: Fatal errors encountered -- cannot continue===> sysutils/devcpu-data-amd failed *** [describe.sysutils] Error code 1 I don't see any reasons to use per-version DIST_SUBDIR since it causes Makefile syntax error and distfiles now includes its revision hash like this: - microcode_amd.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac Approved by: portmgr (build fix blanket) --- sysutils/devcpu-data-amd/Makefile | 2 +- sysutils/devcpu-data-amd/distinfo | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sysutils/devcpu-data-amd/Makefile b/sysutils/devcpu-data-amd/Makefile index bd5d3540c431..1a4097d5b33e 100644 --- a/sysutils/devcpu-data-amd/Makefile +++ b/sysutils/devcpu-data-amd/Makefile @@ -9,7 +9,7 @@ DISTFILES= microcode_amd.bin?id=${_REV} \ microcode_amd_fam16h.bin?id=${_REV} \ microcode_amd_fam17h.bin?id=${_REV} \ microcode_amd_fam19h.bin?id=${_REV} -DIST_SUBDIR= ${PKGNAME:C/_.*$//} +DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} MAINTAINER= sbruno@FreeBSD.org COMMENT= AMD CPUs microcode updates diff --git a/sysutils/devcpu-data-amd/distinfo b/sysutils/devcpu-data-amd/distinfo index 97bf20982e4e..7e9816ceb86e 100644 --- a/sysutils/devcpu-data-amd/distinfo +++ b/sysutils/devcpu-data-amd/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1637013481 -SHA256 (devcpu-data-amd-20211115/microcode_amd.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 8a9d9e8b788e31e61cddc03cb1eeab5db99e0f667128943ff0780e6437d2e43e -SIZE (devcpu-data-amd-20211115/microcode_amd.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 12684 -SHA256 (devcpu-data-amd-20211115/microcode_amd_fam15h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 9d4a668410e72a4bdb86dc23e4261eca04daa83456ada02504115223f356981a -SIZE (devcpu-data-amd-20211115/microcode_amd_fam15h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 7876 -SHA256 (devcpu-data-amd-20211115/microcode_amd_fam16h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = e02ad653b39c975d6c52674b50f23727bb6706bab7b4e5b391a4ce229e7ff121 -SIZE (devcpu-data-amd-20211115/microcode_amd_fam16h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 3510 -SHA256 (devcpu-data-amd-20211115/microcode_amd_fam17h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 5288d1ac032abe61441c5626091458803f925304ee45ca18de38a4edd66cddd2 -SIZE (devcpu-data-amd-20211115/microcode_amd_fam17h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 6476 -SHA256 (devcpu-data-amd-20211115/microcode_amd_fam19h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = dee0e71fc01482e4e1d89c18a25410ef82e56665f26f58912387f91e5c368bcf -SIZE (devcpu-data-amd-20211115/microcode_amd_fam19h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 16804 +TIMESTAMP = 1637047582 +SHA256 (devcpu-data-amd/microcode_amd.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 8a9d9e8b788e31e61cddc03cb1eeab5db99e0f667128943ff0780e6437d2e43e +SIZE (devcpu-data-amd/microcode_amd.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 12684 +SHA256 (devcpu-data-amd/microcode_amd_fam15h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 9d4a668410e72a4bdb86dc23e4261eca04daa83456ada02504115223f356981a +SIZE (devcpu-data-amd/microcode_amd_fam15h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 7876 +SHA256 (devcpu-data-amd/microcode_amd_fam16h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = e02ad653b39c975d6c52674b50f23727bb6706bab7b4e5b391a4ce229e7ff121 +SIZE (devcpu-data-amd/microcode_amd_fam16h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 3510 +SHA256 (devcpu-data-amd/microcode_amd_fam17h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 5288d1ac032abe61441c5626091458803f925304ee45ca18de38a4edd66cddd2 +SIZE (devcpu-data-amd/microcode_amd_fam17h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 6476 +SHA256 (devcpu-data-amd/microcode_amd_fam19h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = dee0e71fc01482e4e1d89c18a25410ef82e56665f26f58912387f91e5c368bcf +SIZE (devcpu-data-amd/microcode_amd_fam19h.bin?id=f5d519563ac9d2d1f382a817aae5ec5473811ac8) = 16804