git: 10f08bc4ba0f - main - sysutils/devcpu-data-amd: Unbreak & fix syntax error
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 16 Nov 2021 08:05:44 UTC
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=10f08bc4ba0f1a46397ebc36f7bd694aa83f7ab3
commit 10f08bc4ba0f1a46397ebc36f7bd694aa83f7ab3
Author: Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2021-11-16 07:28:36 +0000
Commit: Koichiro Iwao <meta@FreeBSD.org>
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