CVS commit: pkgsrc/x11/slim

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Mar 15 13:39:17 UTC 2023

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

Log Message:
Adjust slim default config for NetBSD

Add SLIM_LOGIN_CMD and SLIM_XSERVER_ARGUMENTS values which are
substituted into the default slim.conf, and provide more optimal
values for NetBSD

SLIM_XSERVER_ARGUMENTS: "vt05 -noretro"

  This makes the "vt05" NetBSD specific, so no longer affecting
  other platforms, plus hides the default rootweave (which would
  be replaced by a slim image shortly after startup)

SLIM_LOGIN_CMD: "/bin/sh - /etc/X11/xdm/Xsession"

  /etc/X11/xdm/Xsession is the canonical way to start an xsession
  on NetBSD. The slim shipped defaults rely on a user having
  ~/.xinitrc, otherwise the session fails back to login (which is
  a little unfriendly for new users). As a side effect we lose the
  default ability to pass the theme as a %session parameter to
  .xinitrc, but this is probably a reasonable trade off to have a
  working Out Of The Box config. As a benefit we can drop the
  dependency on bash for NetBSD (which is nice for smaller platforms).

For non NetBSD platforms xserver_arguments is now as originally
shipped, and login_cmd is as shipped modulus bash path substitution

Suggestions/adjustments for other platforms encouraged :)

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.4 -r1.5 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.14 pkgsrc/x11/slim/Makefile:1.15
--- pkgsrc/x11/slim/Makefile:1.14       Sun Jan 29 21:18:22 2023
+++ pkgsrc/x11/slim/Makefile    Wed Mar 15 13:39:16 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2023/01/29 21:18:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2023/03/15 13:39:16 abs Exp $
 
 DISTNAME=      slim-1.3.6
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim.berlios/}
 
@@ -20,6 +20,11 @@ RCD_SCRIPTS+=        slim
 
 DEPENDS+=      bash-[0-9]*:../../shells/bash
 
+SUBST_CLASSES+=                options
+SUBST_FILES.options=   slim.conf
+SUBST_STAGE.options=   pre-configure
+SUBST_VARS.options+=   SLIM_LOGIN_CMD SLIM_XSERVER_ARGUMENTS
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     CMakeLists.txt slim.conf
@@ -27,6 +32,18 @@ SUBST_VARS.paths=    PREFIX
 SUBST_VARS.paths+=     PKG_SYSCONFDIR
 SUBST_VARS.paths+=     X11BASE
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Drops the ability to pass theme as %session param to .xinitrc
+SLIM_LOGIN_CMD?=       /bin/sh - /etc/X11/xdm/Xsession
+SLIM_XSERVER_ARGUMENTS?=vt05 -noretro
+.else
+DEPENDS+=    bash-[0-9]*:../../shells/bash
+SLIM_LOGIN_CMD?=       @PREFIX@/bin/bash -login ~/.xinitrc %session
+SLIM_XSERVER_ARGUMENTS?=       
+.endif
+
 CONF_FILES+=   share/examples/slim/slim.conf \
                ${PKG_SYSCONFDIR}/slim.conf
 

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.9 pkgsrc/x11/slim/distinfo:1.10
--- pkgsrc/x11/slim/distinfo:1.9        Tue Oct 26 11:34:28 2021
+++ pkgsrc/x11/slim/distinfo    Wed Mar 15 13:39:16 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:34:28 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/03/15 13:39:16 abs Exp $
 
 BLAKE2s (slim-1.3.6.tar.gz) = 45b562196e1253a1a341b821c866f4d0db9c747c73fda215cac52097af77ed2c
 SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 Size (slim-1.3.6.tar.gz) = 232547 bytes
 SHA1 (patch-CMakeLists.txt) = 8eaeba1bb48bcdb825a3809feefb62b7182fde42
 SHA1 (patch-panel.cpp) = 51f87c90214cbc55fd5628f7d852d6287d763903
-SHA1 (patch-slim.conf) = ff838df99c53512524863631e3dda77542b01dbf
+SHA1 (patch-slim.conf) = 3bc88e703e002801e757c27c778b0e79f0cb0ad6

Index: pkgsrc/x11/slim/patches/patch-slim.conf
diff -u pkgsrc/x11/slim/patches/patch-slim.conf:1.4 pkgsrc/x11/slim/patches/patch-slim.conf:1.5
--- pkgsrc/x11/slim/patches/patch-slim.conf:1.4 Fri Jan 10 19:13:33 2020
+++ pkgsrc/x11/slim/patches/patch-slim.conf     Wed Mar 15 13:39:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-slim.conf,v 1.4 2020/01/10 19:13:33 maya Exp $
+$NetBSD: patch-slim.conf,v 1.5 2023/03/15 13:39:16 abs Exp $
 
 Adjust for NetBSD
 
@@ -12,7 +12,7 @@ Adjust for NetBSD
 +default_path        /bin:/usr/bin:@X11BASE@/bin:@PREFIX@/bin
 +default_xserver     @X11BASE@/bin/X
  #xserver_arguments   -dpi 75
-+xserver_arguments   vt05
++xserver_arguments   @SLIM_XSERVER_ARGUMENTS@
  
  # Commands for halt, login, etc.
  halt_cmd            /sbin/shutdown -h now
@@ -27,16 +27,18 @@ Adjust for NetBSD
  
  # Xauth file for server
  authfile           /var/run/slim.auth
-@@ -33,7 +34,7 @@ authfile           /var/run/slim.auth
+@@ -33,7 +34,9 @@ authfile           /var/run/slim.auth
  # to adjust the command according to your preferred shell,
  # i.e. for freebsd use:
  # login_cmd           exec /bin/sh - ~/.xinitrc %session
 -login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec @PREFIX@/bin/bash -login ~/.xinitrc %session
++# original package default:
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec @SLIM_LOGIN_CMD@
  
  # Commands executed when starting and exiting a session.
  # They can be used for registering a X11 session with
-@@ -51,7 +52,7 @@ login_cmd           exec /bin/bash -logi
+@@ -51,7 +54,7 @@ login_cmd           exec /bin/bash -logi
  # The current chosen session name is replaced in the login_cmd
  # above, so your login command can handle different sessions.
  # see the xinitrc.sample file shipped with slim sources