CVS commit: pkgsrc/x11/slim

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 24 08:53:32 UTC 2023

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

Log Message:
slim: Add sbin and games to default path.

Remove pointless mandatory bash dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.6 -r1.7 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.18 pkgsrc/x11/slim/Makefile:1.19
--- pkgsrc/x11/slim/Makefile:1.18       Wed Jun 14 09:43:50 2023
+++ pkgsrc/x11/slim/Makefile    Sat Jun 24 08:53:32 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2023/06/14 09:43:50 abs Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/24 08:53:32 nia Exp $
 
 DISTNAME=      slim-1.4.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim-fork/}
 
@@ -43,8 +44,7 @@ post-install:
 SLIM_LOGIN_CMD?=               /bin/sh - /etc/X11/xdm/Xsession
 SLIM_XSERVER_ARGUMENTS?=       vt05 -noretro -nolisten tcp
 .else
-DEPENDS+=                      bash-[0-9]*:../../shells/bash
-SLIM_LOGIN_CMD?=               @PREFIX@/bin/bash -login ~/.xinitrc %session
+SLIM_LOGIN_CMD?=               ${TOOLS_PATH.sh} -login ~/.xinitrc %session
 SLIM_XSERVER_ARGUMENTS?=       -nolisten tcp
 .endif
 

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.11 pkgsrc/x11/slim/distinfo:1.12
--- pkgsrc/x11/slim/distinfo:1.11       Wed Jun 14 09:43:50 2023
+++ pkgsrc/x11/slim/distinfo    Sat Jun 24 08:53:32 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2023/06/14 09:43:50 abs Exp $
+$NetBSD: distinfo,v 1.12 2023/06/24 08:53:32 nia 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) = d2b80700fd4227c350d63eba02e093099437ab25
+SHA1 (patch-slim.conf) = bf9ff30614c2dba89b8e3302bb58b36b83cdfc99

Index: pkgsrc/x11/slim/patches/patch-slim.conf
diff -u pkgsrc/x11/slim/patches/patch-slim.conf:1.6 pkgsrc/x11/slim/patches/patch-slim.conf:1.7
--- pkgsrc/x11/slim/patches/patch-slim.conf:1.6 Wed Jun 14 09:43:50 2023
+++ pkgsrc/x11/slim/patches/patch-slim.conf     Sat Jun 24 08:53:32 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-slim.conf,v 1.6 2023/06/14 09:43:50 abs Exp $
+$NetBSD: patch-slim.conf,v 1.7 2023/06/24 08:53:32 nia Exp $
 
 Adjust for NetBSD
 
@@ -10,7 +10,7 @@ Adjust for NetBSD
  # vtxx argument given.
 -default_path        /bin:/usr/bin:/usr/local/bin
 -default_xserver     /usr/bin/X
-+default_path        /bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@PREFIX@/bin
++default_path        /bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/games
 +default_xserver     @X11BASE@/bin/X
  #xserver_arguments   -dpi 75
 -xserver_arguments   -nolisten tcp -deferglyphs 16