Re: git: 593001cdf958 - main - sysutils/upower: Update to 1.91.0

On 12/1/25 00:04, Guido Falsi wrote:
> The branch main has been updated by madpilot:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=593001cdf95878d0c85029d61c4d699475e6bb2f
> 
> commit 593001cdf95878d0c85029d61c4d699475e6bb2f
> Author:     Guido Falsi <madpilot@FreeBSD.org>
> AuthorDate: 2025-11-30 23:03:20 +0000

The author should have been "Olivier Duchateau 
<duchateau.olivier@gmail.com>".

I'm terribly sorry for the mistake!

> Commit:     Guido Falsi <madpilot@FreeBSD.org>
> CommitDate: 2025-11-30 23:03:20 +0000
> 
>      sysutils/upower: Update to 1.91.0
>      
>      - Added patch to install documentation file in correct diretory
>      - Added DOCS option to handle document installation
>      
>      PR:             291286
> ---
>   sysutils/upower/Makefile                                  | 8 ++++++--
>   sysutils/upower/distinfo                                  | 6 +++---
>   sysutils/upower/files/patch-etc_UPower.conf.d_meson.build | 9 +++++++++
>   sysutils/upower/pkg-plist                                 | 4 +++-
>   4 files changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
> index c7ee2681540e..ea5fd3c80545 100644
> --- a/sysutils/upower/Makefile
> +++ b/sysutils/upower/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	upower
>   DISTVERSIONPREFIX=	v
> -DISTVERSION=	1.90.10
> +DISTVERSION=	1.91.0
>   CATEGORIES=	sysutils
>   
>   MAINTAINER=	desktop@FreeBSD.org
> @@ -18,6 +18,7 @@ GL_SITE=	https://gitlab.freedesktop.org/
>   USE_GNOME=	glib20 introspection:build
>   USE_LDCONFIG=	yes
>   MESON_ARGS=	-Dgtk-doc=false \
> +		-Dinstalled_tests=false \
>   		-Didevice=disabled \
>   		-Dos_backend=freebsd \
>   		-Dpolkit=enabled \
> @@ -27,7 +28,7 @@ MESON_ARGS=	-Dgtk-doc=false \
>   		-Dzshcompletiondir=no
>   LDFLAGS+=	-lkvm
>   
> -OPTIONS_DEFINE=		MANPAGES NLS
> +OPTIONS_DEFINE=		DOCS MANPAGES NLS
>   OPTIONS_DEFAULT=	MANPAGES
>   OPTIONS_SUB=		yes
>   
> @@ -42,4 +43,7 @@ NLS_USES=	gettext-runtime
>   post-patch-NLS-off:
>   	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
>   
> +post-install:
> +	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/UPower/UPower.conf.d
> +
>   .include <bsd.port.mk>
> diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
> index 0b2d507046f5..a068f8c5e1c2 100644
> --- a/sysutils/upower/distinfo
> +++ b/sysutils/upower/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1756224594
> -SHA256 (upower-v1.90.10.tar.bz2) = c1baf418b685ffe4150c8a75c04da0cec70323fe094b5b257b287eea564d3f56
> -SIZE (upower-v1.90.10.tar.bz2) = 160031
> +TIMESTAMP = 1764448523
> +SHA256 (upower-v1.91.0.tar.bz2) = 954f8ee8d1422c813615862bc6249cb9b31ace1d905fd1f06549c4e47f4ba401
> +SIZE (upower-v1.91.0.tar.bz2) = 166922
> diff --git a/sysutils/upower/files/patch-etc_UPower.conf.d_meson.build b/sysutils/upower/files/patch-etc_UPower.conf.d_meson.build
> new file mode 100644
> index 000000000000..e0de7580bf81
> --- /dev/null
> +++ b/sysutils/upower/files/patch-etc_UPower.conf.d_meson.build
> @@ -0,0 +1,9 @@
> +--- etc/UPower.conf.d/meson.build.orig	2025-11-25 08:39:56 UTC
> ++++ etc/UPower.conf.d/meson.build
> +@@ -1,5 +1,4 @@ install_data(
> + install_data(
> +     'README.md',
> +-    install_tag: 'doc',
> +-    install_dir: get_option('sysconfdir') / 'UPower' / 'UPower.conf.d',
> ++    install_dir: get_option('datadir') / 'doc' / 'upower',
> + )
> diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
> index b3a3e708279b..cf51c4d3f2ff 100644
> --- a/sysutils/upower/pkg-plist
> +++ b/sysutils/upower/pkg-plist
> @@ -11,7 +11,7 @@ include/libupower-glib/upower.h
>   lib/girepository-1.0/UPowerGlib-1.0.typelib
>   lib/libupower-glib.so
>   lib/libupower-glib.so.3
> -lib/libupower-glib.so.3.1.0
> +lib/libupower-glib.so.3.1.1
>   libdata/pkgconfig/upower-glib.pc
>   libexec/upowerd
>   %%MANPAGES%%share/man/man1/upower.1.gz
> @@ -22,6 +22,7 @@ share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
>   share/dbus-1/interfaces/org.freedesktop.UPower.xml
>   share/dbus-1/system.d/org.freedesktop.UPower.conf
>   share/dbus-1/system-services/org.freedesktop.UPower.service
> +%%PORTDOCS%%%%DOCSDIR%%/README.md
>   share/gir-1.0/UPowerGlib-1.0.gir
>   %%NLS%%share/locale/fr/LC_MESSAGES/upower.mo
>   %%NLS%%share/locale/it/LC_MESSAGES/upower.mo
> @@ -29,5 +30,6 @@ share/gir-1.0/UPowerGlib-1.0.gir
>   %%NLS%%share/locale/pl/LC_MESSAGES/upower.mo
>   %%NLS%%share/locale/sv/LC_MESSAGES/upower.mo
>   share/polkit-1/actions/org.freedesktop.upower.policy
> +@dir etc/UPower/UPower.conf.d
>   @dir /var/lib/upower
>   @dir /var/lib/
> 

-- 
Guido Falsi <madpilot@FreeBSD.org>