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 18:59:47 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat May 10 18:59:47 UTC 2025

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

Log Message:
sysutils/xfce4-power-manager: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/xfce4-power-manager/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/xfce4-power-manager/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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-pm-helper.c
cvs rdiff -u -r1.4 -r1.5 \
    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.39 pkgsrc/sysutils/xfce4-power-manager/Makefile:1.40
--- pkgsrc/sysutils/xfce4-power-manager/Makefile:1.39   Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/Makefile        Sat May 10 18:59:47 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2025/05/10 17:21:40 vins Exp $
+# $NetBSD: Makefile,v 1.40 2025/05/10 18:59:47 vins Exp $
 
-PKGREVISION=   3
+PKGREVISION=   4
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce4-power-manager-4.20.0
@@ -14,7 +14,7 @@ BUILD_DEFS+=  PKG_SYSCONFBASE
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-backend=${LOWER_OPSYS}
 .endif
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE} \

Index: pkgsrc/sysutils/xfce4-power-manager/distinfo
diff -u pkgsrc/sysutils/xfce4-power-manager/distinfo:1.15 pkgsrc/sysutils/xfce4-power-manager/distinfo:1.16
--- pkgsrc/sysutils/xfce4-power-manager/distinfo:1.15   Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/distinfo        Sat May 10 18:59:47 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2025/05/10 17:21:40 vins Exp $
+$NetBSD: distinfo,v 1.16 2025/05/10 18:59:47 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-config.h.in) = b54bc196e95936f85a059a35bb50203ee9499714
+SHA1 (patch-configure) = b5aa8c91582b80a70767055c5d3ee820d5d504b2
 SHA1 (patch-src_Makefile.in) = aad658d19417609138d281ea99a708ab5ea49acb
-SHA1 (patch-src_xfpm-pm-helper.c) = 094b0f893c36774ee025457eab8f8a208cdacdc6
-SHA1 (patch-src_xfpm-suspend.c) = f4fc7ebc9bc775efbdc0a54fd07993e94581f419
+SHA1 (patch-src_xfpm-pm-helper.c) = f295fcb2f8591b6b9ab807765e35b60a9e25a5a2
+SHA1 (patch-src_xfpm-suspend.c) = a469eea958e8bfc0c950264ddf6406dda58c8a97

Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in
diff -u pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in:1.1 pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in:1.2
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in:1.1   Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-config.h.in       Sat May 10 18:59:47 2025
@@ -1,16 +1,19 @@
-$NetBSD: patch-config.h.in,v 1.1 2025/05/10 17:21:40 vins Exp $
+$NetBSD: patch-config.h.in,v 1.2 2025/05/10 18:59:47 vins Exp $
 
-Support NetBSD backend.
+Support NetBSD and SunOS backends.
 
---- config.h.in.orig   2025-05-10 15:04:24.380772673 +0000
+--- config.h.in.orig   2024-12-15 09:22:32.000000000 +0000
 +++ config.h.in
-@@ -12,6 +12,9 @@
+@@ -12,6 +12,12 @@
  /* OpenBSD suspend/hibernate backend */
  #undef BACKEND_TYPE_OPENBSD
  
 +/* NetBSD suspend/hibernate backend */
 +#undef BACKEND_TYPE_NETBSD
 +
++/* SunOS suspend  backend */
++#undef BACKEND_TYPE_SOLARIS
++
  /* Define for debugging support */
  #undef DEBUG
  
Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure
diff -u pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure:1.1 pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure:1.2
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure:1.1     Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-configure Sat May 10 18:59:47 2025
@@ -1,36 +1,41 @@
-$NetBSD: patch-configure,v 1.1 2025/05/10 17:21:40 vins Exp $
+$NetBSD: patch-configure,v 1.2 2025/05/10 18:59:47 vins Exp $
 
-Support NetBSD backend.
+Support NetBSD and SunOS backends.
 
 --- configure.orig     2024-12-15 09:22:31.000000000 +0000
 +++ configure
-@@ -1638,7 +1638,7 @@ Optional Packages:
+@@ -1638,7 +1638,8 @@ 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
++  --with-backend=<option> Default backend to use linux, freebsd, openbsd,
++                          netbsd, solaris
  
  Some influential environment variables:
    CC          C compiler command
-@@ -23752,6 +23752,8 @@ if test x$with_backend = x; then
+@@ -23752,6 +23753,10 @@ if test x$with_backend = x; then
      with_backend=freebsd ;; #(
    *-openbsd*|*-bitrig*) :
      with_backend=openbsd ;; #(
 +  *-netbsd*) :
 +    with_backend=netbsd ;; #(
++  *-sun-solaris*) :
++    with_backend=solaris ;; #(
    *) :
       ;;
  esac
-@@ -23777,7 +23779,11 @@ if test x$with_backend = xopenbsd; then
+@@ -23777,8 +23782,14 @@ 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
- 
- 
  
++fi
++if test x$with_backend = xsolaris; then
+
++printf "%s\n" "#define BACKEND_TYPE_SOLARIS 1" >>confdefs.h
+
++fi

Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c
diff -u pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.3 pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.4
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.3  Sun Jan  5 13:50:37 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c      Sat May 10 18:59:47 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_xfpm-pm-helper.c,v 1.3 2025/01/05 13:50:37 bsiegert Exp $
+$NetBSD: patch-src_xfpm-pm-helper.c,v 1.4 2025/05/10 18:59:47 vins Exp $
 
-Add NetBSD support.
+Add NetBSD and SunOS support.
 
 --- src/xfpm-pm-helper.c.orig  2024-11-21 06:26:21.000000000 +0000
 +++ src/xfpm-pm-helper.c
-@@ -82,6 +82,11 @@
+@@ -82,6 +82,16 @@
  #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
  #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false"
  #endif
@@ -13,6 +13,11 @@ Add NetBSD support.
 +#define UP_BACKEND_HIBERNATE_COMMAND "sysctl -w hw.acpi.sleep.state=4"
 +#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false"
 +#endif
++#ifdef BACKEND_TYPE_SOLARIS
++#define UP_BACKEND_SUSPEND_COMMAND "/usr/bin/sys-suspend -x"
++#define UP_BACKEND_HIBERNATE_COMMAND "/usr/bin/false"
++#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false"
++#endif
  
  
  static gboolean

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.4 pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c:1.5
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c:1.4    Sat May 10 17:21:40 2025
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c        Sat May 10 18:59:47 2025
@@ -1,26 +1,34 @@
-$NetBSD: patch-src_xfpm-suspend.c,v 1.4 2025/05/10 17:21:40 vins Exp $
+$NetBSD: patch-src_xfpm-suspend.c,v 1.5 2025/05/10 18:59:47 vins Exp $
 
-Add NetBSD support.
+Add NetBSD and SunOS support.
 
---- src/xfpm-suspend.c.orig    2020-11-04 23:23:14.000000000 +0000
+--- src/xfpm-suspend.c.orig    2024-11-21 06:26:21.000000000 +0000
 +++ src/xfpm-suspend.c
-@@ -152,6 +151,9 @@ xfpm_suspend_can_suspend (void)
- #ifdef BACKEND_TYPE_OPENBSD
+@@ -141,7 +141,7 @@ xfpm_suspend_can_suspend (void)
+ #ifdef BACKEND_TYPE_LINUX
+   return linux_supports_sleep_state ("suspend");
+ #endif
+-#ifdef BACKEND_TYPE_OPENBSD
++#if defined (BACKEND_TYPE_OPENBSD) || defined (BACKEND_TYPE_NETBSD) || defined (BACKEND_TYPE_SOLARIS)
    return TRUE;
  #endif
-+#ifdef BACKEND_TYPE_NETBSD
-+  return TRUE;
-+#endif
-
-   return FALSE;
- }
-@@ -169,6 +171,9 @@ xfpm_suspend_can_hibernate (void)
+ 
+@@ -157,7 +157,7 @@ xfpm_suspend_can_hibernate (void)
+ #ifdef BACKEND_TYPE_LINUX
+   return linux_supports_sleep_state ("hibernate");
+ #endif
+-#ifdef BACKEND_TYPE_OPENBSD
++#if defined (BACKEND_TYPE_OPENBSD) || defined (BACKEND_TYPE_NETBSD)
+   return TRUE;
+ #endif
+ 
+@@ -176,6 +176,9 @@ xfpm_suspend_can_hybrid_sleep (void)
  #ifdef BACKEND_TYPE_OPENBSD
    return TRUE;
  #endif
-+#ifdef BACKEND_TYPE_NETBSD
++#if defined(BACKEND_TYPE_NETBSD) || defined(BACKEND_TYPE_SOLARIS)
 +  return TRUE;
 +#endif
-
+ 
    return FALSE;
  }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/mk/defaults
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/mk/defaults
Indexes:

Home | Main Index | Thread Index | Old Index