CVS commit: pkgsrc/sysutils/xfce4-power-manager

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/xfce4-power-manager
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sat, 10 May 2025 17:21:40 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat May 10 17:21:40 UTC 2025

Modified Files:
        pkgsrc/sysutils/xfce4-power-manager: Makefile PLIST distinfo
        pkgsrc/sysutils/xfce4-power-manager/patches: patch-src_xfpm-suspend.c
Added Files:
        pkgsrc/sysutils/xfce4-power-manager/patches: patch-config.h.in
            patch-configure

Log Message:
sysutils/xfce4-power-manager: package revision

# pkgsrc changes
* Support BACKEND_TYPE_NETBSD in configure script, as noted in:
  https://mail-index.netbsd.org/pkgsrc-users/2025/05/10/msg041556.html
* Make polkit support optional (previously always enabled as recursively
  pulled by upower). Fixes PLIST issue.
* Add libxfce4panel support (optional, enabled by default)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/sysutils/xfce4-power-manager/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xfce4-power-manager/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/xfce4-power-manager/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in \
    pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xfce4-power-manager/Makefile
diff -u pkgsrc/sysutils/xfce4-power-manager/Makefile:1.38 pkgsrc/sysutils/xfce4-power-manager/Makefile:1.39
--- pkgsrc/sysutils/xfce4-power-manager/Makefile:1.38   Sun May  4 06:10:59 2025
+++ pkgsrc/sysutils/xfce4-power-manager/Makefile        Sat May 10 17:21:40 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2025/05/04 06:10:59 vins Exp $
+# $NetBSD: Makefile,v 1.39 2025/05/10 17:21:40 vins Exp $
 
-PKGREVISION= 2
+PKGREVISION=   3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce4-power-manager-4.20.0
@@ -10,12 +10,24 @@ MASTER_SITES=       https://archive.xfce.org/s
 HOMEPAGE=      https://goodies.xfce.org/projects/applications/xfce4-power-manager
 COMMENT=       Xfce power manager
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+BUILD_DEFS+=   PKG_SYSCONFBASE
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-backend=${LOWER_OPSYS}
+.endif
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE} \
+                       --enable-x11 \
+                       --with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib}
+
+.include "options.mk"
 
 CONF_FILES=    share/examples/xfce4/autostart/xfce4-power-manager.desktop \
                ${PKG_SYSCONFDIR}/xdg/autostart/xfce4-power-manager.desktop
 
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/sysutils/xfce4-power-manager/PLIST
diff -u pkgsrc/sysutils/xfce4-power-manager/PLIST:1.6 pkgsrc/sysutils/xfce4-power-manager/PLIST:1.7
--- pkgsrc/sysutils/xfce4-power-manager/PLIST:1.6       Sun Jan  5 13:50:37 2025
+++ pkgsrc/sysutils/xfce4-power-manager/PLIST   Sat May 10 17:21:40 2025
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2025/01/05 13:50:37 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/05/10 17:21:40 vins Exp $
 bin/xfce4-power-manager
 bin/xfce4-power-manager-settings
+${PLIST.xfce4-panel}lib/xfce4/panel/plugins/libxfce4powermanager.la
 man/man1/xfce4-power-manager-settings.1
 man/man1/xfce4-power-manager.1
+${PLIST.polkit}sbin/xfce4-pm-helper
+${PLIST.polkit}sbin/xfpm-power-backlight-helper
 share/applications/xfce4-power-manager-settings.desktop
 share/examples/xfce4/autostart/xfce4-power-manager.desktop
 share/icons/hicolor/128x128/apps/org.xfce.powermanager.png
@@ -136,3 +139,5 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-pow
 share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo
 share/metainfo/xfce4-power-manager.appdata.xml
+${PLIST.polkit}share/polkit-1/actions/org.xfce.power.policy
+${PLIST.xfce4-panel}share/xfce4/panel/plugins/power-manager-plugin.desktop

Index: pkgsrc/sysutils/xfce4-power-manager/distinfo
diff -u pkgsrc/sysutils/xfce4-power-manager/distinfo:1.14 pkgsrc/sysutils/xfce4-power-manager/distinfo:1.15
--- pkgsrc/sysutils/xfce4-power-manager/distinfo:1.14   Sun Jan  5 13:50:37 2025
+++ pkgsrc/sysutils/xfce4-power-manager/distinfo        Sat May 10 17:21:40 2025
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.14 2025/01/05 13:50:37 bsiegert Exp $
+$NetBSD: distinfo,v 1.15 2025/05/10 17:21:40 vins Exp $
 
 BLAKE2s (xfce4-power-manager-4.20.0.tar.bz2) = ef3a2d020c8ab6060bdc82fd99e3eaf9b7c000eb552847293009963bb441273a
 SHA512 (xfce4-power-manager-4.20.0.tar.bz2) = e61762b4ff374562fa3d70b1eb7c9928a1a7197df5b597763adf16435183fd693307267f37f0eb7dd08b573664a397d2fd22674b5db7e07ee9302089772ff6e7
 Size (xfce4-power-manager-4.20.0.tar.bz2) = 1523787 bytes
+SHA1 (patch-config.h.in) = 9836291aa525833822da4ace8ffc88ec760fca8e
+SHA1 (patch-configure) = 6ce477c3639381be5e4b1689d5ffa667a21fd3d1
 SHA1 (patch-src_Makefile.in) = aad658d19417609138d281ea99a708ab5ea49acb
 SHA1 (patch-src_xfpm-pm-helper.c) = 094b0f893c36774ee025457eab8f8a208cdacdc6
-SHA1 (patch-src_xfpm-suspend.c) = 661a39b0009dded0c0ed90068589424239abcc35
+SHA1 (patch-src_xfpm-suspend.c) = f4fc7ebc9bc775efbdc0a54fd07993e94581f419

Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c
diff -u pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c:1.3 pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c:1.4
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c:1.3    Tue Nov 30 15:28:00 2021
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c        Sat May 10 17:21:40 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_xfpm-suspend.c,v 1.3 2021/11/30 15:28:00 gutteridge Exp $
+$NetBSD: patch-src_xfpm-suspend.c,v 1.4 2025/05/10 17:21:40 vins Exp $
 
 Add NetBSD support.
 
@@ -11,7 +11,7 @@ Add NetBSD support.
 +#ifdef BACKEND_TYPE_NETBSD
 +  return TRUE;
 +#endif
- 
+
    return FALSE;
  }
 @@ -169,6 +171,9 @@ xfpm_suspend_can_hibernate (void)
@@ -21,6 +21,6 @@ Add NetBSD support.
 +#ifdef BACKEND_TYPE_NETBSD
 +  return TRUE;
 +#endif
- 
+
    return FALSE;
  }

Added files:

Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in
diff -u /dev/null pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in:1.1
--- /dev/null   Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in       Sat May 10 17:21:40 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.h.in,v 1.1 2025/05/10 17:21:40 vins Exp $
+
+Support NetBSD backend.
+
+--- config.h.in.orig   2025-05-10 15:04:24.380772673 +0000
++++ config.h.in
+@@ -12,6 +12,9 @@
+ /* OpenBSD suspend/hibernate backend */
+ #undef BACKEND_TYPE_OPENBSD
+ 
++/* NetBSD suspend/hibernate backend */
++#undef BACKEND_TYPE_NETBSD
++
+ /* Define for debugging support */
+ #undef DEBUG
+ 
Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure
diff -u /dev/null pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure:1.1
--- /dev/null   Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure Sat May 10 17:21:40 2025
@@ -0,0 +1,36 @@
+$NetBSD: patch-configure,v 1.1 2025/05/10 17:21:40 vins Exp $
+
+Support NetBSD backend.
+
+--- configure.orig     2024-12-15 09:22:31.000000000 +0000
++++ configure
+@@ -1638,7 +1638,7 @@ Optional Packages:
+   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+   --without-libintl-prefix     don't search for libintl in includedir and libdir
+-  --with-backend=<option> Default backend to use linux, freebsd, openbsd
++  --with-backend=<option> Default backend to use linux, freebsd, openbsd, netbsd
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -23752,6 +23752,8 @@ if test x$with_backend = x; then
+     with_backend=freebsd ;; #(
+   *-openbsd*|*-bitrig*) :
+     with_backend=openbsd ;; #(
++  *-netbsd*) :
++    with_backend=netbsd ;; #(
+   *) :
+      ;;
+ esac
+@@ -23777,7 +23779,11 @@ if test x$with_backend = xopenbsd; then
+ printf "%s\n" "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
+ 
+ fi
++if test x$with_backend = xnetbsd; then
+ 
++printf "%s\n" "#define BACKEND_TYPE_NETBSD 1" >>confdefs.h
++
++fi
+ 
+ 
+

Prev by Date: CVS commit: pkgsrc/www/varnish
Next by Date: CVS commit: pkgsrc/sysutils/xfce4-power-manager
Previous by Thread: CVS commit: pkgsrc/www/varnish
Next by Thread: CVS commit: pkgsrc/sysutils/xfce4-power-manager
Indexes:

Home | Main Index | Thread Index | Old Index