CVS commit: pkgsrc/x11/slim

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu May 29 12:53:41 UTC 2025

Modified Files:
        pkgsrc/x11/slim: Makefile distinfo
        pkgsrc/x11/slim/patches: patch-slim.conf

Log Message:
slim: correct some paths in slim.conf

Tested on NetBSD/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/slim/patches/patch-slim.conf

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

Modified files:

Index: pkgsrc/x11/slim/Makefile
diff -u pkgsrc/x11/slim/Makefile:1.22 pkgsrc/x11/slim/Makefile:1.23
--- pkgsrc/x11/slim/Makefile:1.22       Thu Apr 24 14:16:32 2025
+++ pkgsrc/x11/slim/Makefile    Thu May 29 12:53:40 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2025/04/24 14:16:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/05/29 12:53:40 khorben Exp $
 
 DISTNAME=      slim-1.4.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim-fork/}
 
@@ -28,6 +28,7 @@ SUBST_STAGE.paths=    pre-configure
 SUBST_FILES.paths=     CMakeLists.txt slim.conf
 SUBST_VARS.paths=      PREFIX
 SUBST_VARS.paths+=     PKG_SYSCONFDIR
+SUBST_VARS.paths+=     VARBASE
 SUBST_VARS.paths+=     X11BASE
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.13 pkgsrc/x11/slim/distinfo:1.14
--- pkgsrc/x11/slim/distinfo:1.13       Fri Sep  1 09:37:09 2023
+++ pkgsrc/x11/slim/distinfo    Thu May 29 12:53:40 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2023/09/01 09:37:09 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/05/29 12:53:40 khorben Exp $
 
 BLAKE2s (slim-1.4.0.tar.gz) = 92dcdcdab082c4aaaeecffe62b2dba939959fef4983232df0b2258542927b48e
 SHA512 (slim-1.4.0.tar.gz) = 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f
 Size (slim-1.4.0.tar.gz) = 530318 bytes
 SHA1 (patch-CMakeLists.txt) = c922b9cbf6293d21a0f9ab9b3bf2c54c657a2879
-SHA1 (patch-slim.conf) = bf9ff30614c2dba89b8e3302bb58b36b83cdfc99
+SHA1 (patch-slim.conf) = d0809b58a4c4e0e1632d6d9ffc74cef8d79a05ee
 SHA1 (patch-switchuser.cpp) = 7fcdb1a432c1cb968b388d7827eaac3c2e7d42a7

Index: pkgsrc/x11/slim/patches/patch-slim.conf
diff -u pkgsrc/x11/slim/patches/patch-slim.conf:1.8 pkgsrc/x11/slim/patches/patch-slim.conf:1.9
--- pkgsrc/x11/slim/patches/patch-slim.conf:1.8 Fri Sep  1 09:37:09 2023
+++ pkgsrc/x11/slim/patches/patch-slim.conf     Thu May 29 12:53:41 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-slim.conf,v 1.8 2023/09/01 09:37:09 nia Exp $
+$NetBSD: patch-slim.conf,v 1.9 2025/05/29 12:53:41 khorben Exp $
 
 Adjust for NetBSD
 
 --- slim.conf.orig     2023-01-14 11:47:23.000000000 +0000
 +++ slim.conf
-@@ -1,13 +1,14 @@
+@@ -1,22 +1,23 @@
  # Path, X server and arguments (if needed)
  # Note: -xauth $authfile is automatically appended, vt07 appended if no
  # vtxx argument given.
@@ -22,8 +22,10 @@ Adjust for NetBSD
 +xauth_path         @X11BASE@/bin/xauth 
  
  # Xauth file for server
- authfile           /var/run/slim.auth
-@@ -16,7 +17,7 @@ authfile           /var/run/slim.auth
+-authfile           /var/run/slim.auth
++authfile           @VARBASE@/run/slim.auth
+ 
+ 
  # Commands for halt, login, etc.
  halt_cmd            /sbin/shutdown -h now
  reboot_cmd          /sbin/shutdown -r now
@@ -38,7 +40,7 @@ Adjust for NetBSD
  # login_cmd           exec /bin/sh - ~/.xinitrc %session
 -login_cmd           exec /bin/bash -login ~/.xinitrc %session
 +# original package default:
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec @PREFIX@/bin/bash -login ~/.xinitrc %session
 +login_cmd           exec @SLIM_LOGIN_CMD@
  
  # Commands executed when starting and exiting a session.
@@ -49,8 +51,8 @@ Adjust for NetBSD
  # sessionstop_cmd     some command
 -sessionstart_cmd      /usr/bin/sessreg -a -l "$DISPLAY" %user
 -sessionstop_cmd     /usr/bin/sessreg -d -l "$DISPLAY" %user
-+sessionstart_cmd      @X11BASE@/sessreg -a -l "$DISPLAY" %user
-+sessionstop_cmd     @X11BASE@/sessreg -d -l "$DISPLAY" %user
++sessionstart_cmd      @X11BASE@/bin/sessreg -a -l "$DISPLAY" %user
++sessionstop_cmd     @X11BASE@/bin/sessreg -d -l "$DISPLAY" %user
  
  # Start in daemon mode. Valid values: yes | no
  # Note that this can be overridden by the command line options "-d" and "-n"
@@ -63,7 +65,7 @@ Adjust for NetBSD
  
  
  # Executed when pressing F11 (requires imagemagick)
-@@ -100,10 +103,10 @@ wrong_passwd_timeout            0
+@@ -100,14 +103,14 @@ wrong_passwd_timeout            0
  
  # current theme, use comma separated list to specify a set to 
  # randomly choose from
@@ -72,7 +74,12 @@ Adjust for NetBSD
  
  # Lock file
 -lockfile            /run/slim.pid
-+lockfile            /var/run/slim.pid
++lockfile            @VARBASE@/run/slim.pid
  
  # Log file - full path for a file, or just stderr (or /dev/stderr) to send
  # all log messages to stderr.
+-logfile             /var/log/slim.log
++logfile             @VARBASE@/log/slim.log
+ 
+ #----------------------------------------------------
+ # The following options might be considered better placed in the theme.They