Sat Jun 24 08:53:32 2023 UTC ()
slim: Add sbin and games to default path.

Remove pointless mandatory bash dependency.


(nia)
diff -r1.18 -r1.19 pkgsrc/x11/slim/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/slim/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/slim/patches/patch-slim.conf
cvs diff -r1.18 -r1.19 pkgsrc/x11/slim/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/slim/Makefile 2023/06/14 09:43:50 1.18
+++ pkgsrc/x11/slim/Makefile 2023/06/24 08:53:32 1.19
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.18 2023/06/14 09:43:50 abs Exp $ 1# $NetBSD: Makefile,v 1.19 2023/06/24 08:53:32 nia Exp $
2 2
3DISTNAME= slim-1.4.0 3DISTNAME= slim-1.4.0
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slim-fork/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slim-fork/}
6 7
7MAINTAINER= youri@NetBSD.org 8MAINTAINER= youri@NetBSD.org
8HOMEPAGE= https://slim-fork.sourceforge.io/ 9HOMEPAGE= https://slim-fork.sourceforge.io/
9COMMENT= Simple login manager 10COMMENT= Simple login manager
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14 15
15USE_CMAKE= yes 16USE_CMAKE= yes
16 17
@@ -33,28 +34,27 @@ SUBST_VARS.paths+= X11BASE @@ -33,28 +34,27 @@ SUBST_VARS.paths+= X11BASE
33 34
34# Possible todos 35# Possible todos
35# - Install adjusted xinitrc.sample which uses ~/.xsession if present 36# - Install adjusted xinitrc.sample which uses ~/.xsession if present
36# - Adjust CMakeLists.txt to find fontconfig 37# - Adjust CMakeLists.txt to find fontconfig
37 38
38post-install: 39post-install:
39 ${INSTALL_DATA} ${WRKSRC}/xinitrc.sample ${DESTDIR}${PREFIX}/share/examples/slim 40 ${INSTALL_DATA} ${WRKSRC}/xinitrc.sample ${DESTDIR}${PREFIX}/share/examples/slim
40 41
41.if ${OPSYS} == "NetBSD" 42.if ${OPSYS} == "NetBSD"
42# Drops the ability to pass theme as %session param to .xinitrc 43# Drops the ability to pass theme as %session param to .xinitrc
43SLIM_LOGIN_CMD?= /bin/sh - /etc/X11/xdm/Xsession 44SLIM_LOGIN_CMD?= /bin/sh - /etc/X11/xdm/Xsession
44SLIM_XSERVER_ARGUMENTS?= vt05 -noretro -nolisten tcp 45SLIM_XSERVER_ARGUMENTS?= vt05 -noretro -nolisten tcp
45.else 46.else
46DEPENDS+= bash-[0-9]*:../../shells/bash 47SLIM_LOGIN_CMD?= ${TOOLS_PATH.sh} -login ~/.xinitrc %session
47SLIM_LOGIN_CMD?= @PREFIX@/bin/bash -login ~/.xinitrc %session 
48SLIM_XSERVER_ARGUMENTS?= -nolisten tcp 48SLIM_XSERVER_ARGUMENTS?= -nolisten tcp
49.endif 49.endif
50 50
51CONF_FILES+= share/examples/slim/slim.conf \ 51CONF_FILES+= share/examples/slim/slim.conf \
52 ${PKG_SYSCONFDIR}/slim.conf 52 ${PKG_SYSCONFDIR}/slim.conf
53 53
54# XXX the slim.sh file installed for rc.d use specifies dbus as a 54# XXX the slim.sh file installed for rc.d use specifies dbus as a
55# dependency, but this isn't reflected below. 55# dependency, but this isn't reflected below.
56.include "options.mk" 56.include "options.mk"
57.include "../../x11/libX11/buildlink3.mk" 57.include "../../x11/libX11/buildlink3.mk"
58.include "../../x11/libXft/buildlink3.mk" 58.include "../../x11/libXft/buildlink3.mk"
59.include "../../x11/libXmu/buildlink3.mk" 59.include "../../x11/libXmu/buildlink3.mk"
60.include "../../x11/libXrandr/buildlink3.mk" 60.include "../../x11/libXrandr/buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/x11/slim/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/slim/distinfo 2023/06/14 09:43:50 1.11
+++ pkgsrc/x11/slim/distinfo 2023/06/24 08:53:32 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2023/06/14 09:43:50 abs Exp $ 1$NetBSD: distinfo,v 1.12 2023/06/24 08:53:32 nia Exp $
2 2
3BLAKE2s (slim-1.4.0.tar.gz) = 92dcdcdab082c4aaaeecffe62b2dba939959fef4983232df0b2258542927b48e 3BLAKE2s (slim-1.4.0.tar.gz) = 92dcdcdab082c4aaaeecffe62b2dba939959fef4983232df0b2258542927b48e
4SHA512 (slim-1.4.0.tar.gz) = 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f 4SHA512 (slim-1.4.0.tar.gz) = 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f
5Size (slim-1.4.0.tar.gz) = 530318 bytes 5Size (slim-1.4.0.tar.gz) = 530318 bytes
6SHA1 (patch-CMakeLists.txt) = c922b9cbf6293d21a0f9ab9b3bf2c54c657a2879 6SHA1 (patch-CMakeLists.txt) = c922b9cbf6293d21a0f9ab9b3bf2c54c657a2879
7SHA1 (patch-slim.conf) = d2b80700fd4227c350d63eba02e093099437ab25 7SHA1 (patch-slim.conf) = bf9ff30614c2dba89b8e3302bb58b36b83cdfc99
cvs diff -r1.6 -r1.7 pkgsrc/x11/slim/patches/patch-slim.conf (expand / switch to unified diff)

--- pkgsrc/x11/slim/patches/patch-slim.conf 2023/06/14 09:43:50 1.6
+++ pkgsrc/x11/slim/patches/patch-slim.conf 2023/06/24 08:53:32 1.7
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-slim.conf,v 1.6 2023/06/14 09:43:50 abs Exp $ 1$NetBSD: patch-slim.conf,v 1.7 2023/06/24 08:53:32 nia Exp $
2 2
3Adjust for NetBSD 3Adjust for NetBSD
4 4
5--- slim.conf.orig 2023-01-14 11:47:23.000000000 +0000 5--- slim.conf.orig 2023-01-14 11:47:23.000000000 +0000
6+++ slim.conf 6+++ slim.conf
7@@ -1,13 +1,14 @@ 7@@ -1,13 +1,14 @@
8 # Path, X server and arguments (if needed) 8 # Path, X server and arguments (if needed)
9 # Note: -xauth $authfile is automatically appended, vt07 appended if no 9 # Note: -xauth $authfile is automatically appended, vt07 appended if no
10 # vtxx argument given. 10 # vtxx argument given.
11-default_path /bin:/usr/bin:/usr/local/bin 11-default_path /bin:/usr/bin:/usr/local/bin
12-default_xserver /usr/bin/X 12-default_xserver /usr/bin/X
13+default_path /bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@PREFIX@/bin 13+default_path /bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/games
14+default_xserver @X11BASE@/bin/X 14+default_xserver @X11BASE@/bin/X
15 #xserver_arguments -dpi 75 15 #xserver_arguments -dpi 75
16-xserver_arguments -nolisten tcp -deferglyphs 16 16-xserver_arguments -nolisten tcp -deferglyphs 16
17+#xserver_arguments -nolisten tcp -deferglyphs 16 17+#xserver_arguments -nolisten tcp -deferglyphs 16
18+xserver_arguments @SLIM_XSERVER_ARGUMENTS@ 18+xserver_arguments @SLIM_XSERVER_ARGUMENTS@
19  19
20 # Full path to the xauth binary 20 # Full path to the xauth binary
21-xauth_path /usr/bin/xauth  21-xauth_path /usr/bin/xauth
22+xauth_path @X11BASE@/bin/xauth  22+xauth_path @X11BASE@/bin/xauth
23  23
24 # Xauth file for server 24 # Xauth file for server
25 authfile /var/run/slim.auth 25 authfile /var/run/slim.auth
26@@ -16,7 +17,7 @@ authfile /var/run/slim.auth 26@@ -16,7 +17,7 @@ authfile /var/run/slim.auth