Date: Sat, 09 May 2026 19:46:32 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b8732da4cfd7 - main - sysutils/accountsservice: Fix version reported by pkg-config Message-ID: <69ff8f18.1c358.567d3ed1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8732da4cfd749069376afa96e3bba705d8e3b37 commit b8732da4cfd749069376afa96e3bba705d8e3b37 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-05-09 16:11:31 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-05-09 19:46:25 +0000 sysutils/accountsservice: Fix version reported by pkg-config Reported by: cmt Fixes: 5c1a2fb873434e3b845e8396edbff71e27ec130c --- sysutils/accountsservice/Makefile | 5 +++++ sysutils/accountsservice/files/patch-generate-version.sh | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index eea4da770a16..a3646886cc3e 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,5 +1,6 @@ PORTNAME= accountsservice DISTVERSION= 26.13.3 +PORTREVISION= 1 CATEGORIES= sysutils devel MAINTAINER= desktop@FreeBSD.org @@ -37,4 +38,8 @@ OPTIONS_SUB= yes VAPI_USES= vala:build VAPI_MESON_TRUE= vapi +post-patch: + ${ECHO_CMD} "#!${SH}" > ${WRKSRC}/generate-version.sh + ${ECHO_CMD} "${ECHO_CMD} ${PORTVERSION}" >> ${WRKSRC}/generate-version.sh + .include <bsd.port.mk> diff --git a/sysutils/accountsservice/files/patch-generate-version.sh b/sysutils/accountsservice/files/patch-generate-version.sh deleted file mode 100644 index f979a4b00b78..000000000000 --- a/sysutils/accountsservice/files/patch-generate-version.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- generate-version.sh.orig 2023-08-12 19:01:30 UTC -+++ generate-version.sh -@@ -7,7 +7,7 @@ exec 2>&3 - exec 2>&3 - - # If it's not from a git checkout, assume it's from a tarball --if ! git rev-parse --is-inside-git-dir > /dev/null 2>&1; then -+if ! false > /dev/null 2>&1; then - VERSION_FROM_DIR_NAME=$(basename "$CWD" | sed -n 's/^accountsservice-\([^-]*\)$/\1/p') - - if [ -n "$VERSION_FROM_DIR_NAME" ]; thenhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ff8f18.1c358.567d3ed1>