Created attachment 226352 [details] net-mgmt/prometheus2: Update to 2.28.1 This patch updates net-mgmt/prometheus2 to v2.28.1. The changelogs can be found at https://github.com/prometheus/prometheus/releases/tag/v2.28.0 and https://github.com/prometheus/prometheus/releases/tag/v2.28.1 -David
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2691a5b56f006c479fe9cabaf5908538b665473d commit 2691a5b56f006c479fe9cabaf5908538b665473d Author: David O'Rourke <dor.bsd@xm0.uk> AuthorDate: 2021-07-10 19:57:52 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2021-07-10 20:03:56 +0000 net-mgmt/prometheus2: Update to 2.28.1 (bugfix release) * pet portclippy: reorder variables * pet portfmt: reformat Makefile ChangeLog: https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md PR: 257099 net-mgmt/prometheus2/Makefile | 42 ++++---- net-mgmt/prometheus2/Makefile.modules | 85 ++++++++-------- net-mgmt/prometheus2/distinfo | 180 ++++++++++++++++++---------------- net-mgmt/prometheus2/pkg-plist | 1 + 4 files changed, 161 insertions(+), 147 deletions(-)
Committed thanks!
A commit in branch 2021Q3 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0103c2679f6c24abcf3bca9ab0614524623d24b6 commit 0103c2679f6c24abcf3bca9ab0614524623d24b6 Author: David O'Rourke <dor.bsd@xm0.uk> AuthorDate: 2021-07-10 19:57:52 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2021-07-10 20:18:40 +0000 net-mgmt/prometheus2: Update to 2.28.1 (bugfix release) * pet portclippy: reorder variables * pet portfmt: reformat Makefile ChangeLog: https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md PR: 257099 (cherry picked from commit 2691a5b56f006c479fe9cabaf5908538b665473d) net-mgmt/prometheus2/Makefile | 42 ++++---- net-mgmt/prometheus2/Makefile.modules | 85 ++++++++-------- net-mgmt/prometheus2/distinfo | 180 ++++++++++++++++++---------------- net-mgmt/prometheus2/pkg-plist | 1 + 4 files changed, 161 insertions(+), 147 deletions(-)
Hi, Thanks for the commit, I was looking through the other changes made to the Makefile, and this change looks odd. -SOURCE_DATE_EPOCH_CMD= date -ur $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%Y%m%d-%T' +SOURCE_DATE_EPOCH_CMD= $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \ + '+%Y%m%d-%T' -ur date Building the port, this has broken the "Build date" inside the port. Could this change be undone? Thanks. -David
(In reply to David O'Rourke from comment #4) Hi, portfmt respected 72 columns: --- VAR= 1 2 3 .. 72 \ 73 .. * --- using a "\" But do the following and change Makefile so that it not contains the "\" and rebuild port. Tell me if it solves the problem.
That wasn't the only change it made though, it completely broke the command. SOURCE_DATE_EPOCH_CMD=date -ur $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%Y%m%d-%T' became SOURCE_DATE_EPOCH_CMD=$$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%Y%m%d-%T' -ur date The `date -ur` component has been moved to the end and had its order reversed, the command is nonsense now. Perhaps it's a bug in portfmt. I'll fix the command and add a new diff, and I'll get portfmt so I can run it over the port in the future. -David
(In reply to David O'Rourke from comment #6) yes, it's an error/bug introduced by portfmt! Next time I will be more carefull using it. Please send an updated diff so I can correct this typo
Created attachment 226361 [details] net-mgmt/prometheus2: Fix build date issue This patch fixes a SOURCE_DATE_EPOCH_CMD introduced by portfmt and bumps the PORTREVISION to 1.
(In reply to David O'Rourke from comment #8) Thanks for the patch. Committed. https://cgit.freebsd.org/ports/commit/?id=99b217d54d46a600c19016b20ce791bef5f4d160