diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index eea4da770a16..a3646886cc3e 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,40 +1,45 @@ PORTNAME= accountsservice DISTVERSION= 26.13.3 +PORTREVISION= 1 CATEGORIES= sysutils devel MAINTAINER= desktop@FreeBSD.org COMMENT= D-Bus interface for user account query and manipulation WWW= https://gitlab.freedesktop.org/accountsservice/accountsservice LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= dbus>0:devel/dbus LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libjson-c.so:devel/json-c \ libconsolekit.so:sysutils/consolekit2 USES= cpe gettext-tools gnome meson pkgconfig tar:bz2 CPE_VENDOR= freedesktop USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes MESON_ARGS= -Dconsolekit=true \ -Dwtmpfile=/var/log/utx.log \ -Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \ -Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \ -Dsystemdsystemunitdir=no \ -Dtests=false USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= arrowd GL_TAGNAME= dab9a3e353851bb066c7feb8a12a59150dbdc009 OPTIONS_DEFINE= VAPI OPTIONS_DEFAULT= VAPI 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 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" ]; then