c05f977235
don't pass -noretro because unmodified xorg doesn't support this and errors out (this happens with pkgsrc xorg, netbsd base xorg is undoing a commit to support it) bump PKGREVISION.
47 lines
2 KiB
Text
47 lines
2 KiB
Text
$NetBSD: patch-slim.conf,v 1.3 2018/10/15 00:48:47 maya Exp $
|
|
|
|
Adjust for NetBSD
|
|
|
|
--- slim.conf.orig 2013-10-01 22:38:05.000000000 +0000
|
|
+++ slim.conf
|
|
@@ -1,17 +1,18 @@
|
|
# Path, X server and arguments (if needed)
|
|
# Note: -xauth $authfile is automatically appended
|
|
-default_path /bin:/usr/bin:/usr/local/bin
|
|
-default_xserver /usr/bin/X
|
|
+default_path /bin:/usr/bin:@X11BASE@/bin:
|
|
+default_xserver @X11BASE@/bin/X
|
|
#xserver_arguments -dpi 75
|
|
+xserver_arguments vt05
|
|
|
|
# Commands for halt, login, etc.
|
|
halt_cmd /sbin/shutdown -h now
|
|
reboot_cmd /sbin/shutdown -r now
|
|
-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
|
|
+console_cmd @X11BASE@/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /usr/bin/login"
|
|
#suspend_cmd /usr/sbin/suspend
|
|
|
|
# Full path to the xauth binary
|
|
-xauth_path /usr/bin/xauth
|
|
+xauth_path @X11BASE@/bin/xauth
|
|
|
|
# Xauth file for server
|
|
authfile /var/run/slim.auth
|
|
@@ -33,7 +34,7 @@ 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
|
|
|
|
# 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
|
|
# 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
|
|
-sessions xfce4,icewm-session,wmaker,blackbox
|
|
+sessions xfce4,mate,icewm-session,wmaker,blackbox
|
|
|
|
# Executed when pressing F11 (requires imagemagick)
|
|
screenshot_cmd import -window root /slim.png
|