CVS commit: pkgsrc/x11/slim

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Jan 10 19:13:33 UTC 2020

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

Log Message:
slim: seems to require global dbus in order to successfully start things.

Make the rc.d script depend on dbus to have successful startup.
Add PREFIX/bin to path, so it works better with pkgsrc environments even
in the base xsrc case.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/slim/files/slim.sh
cvs rdiff -u -r1.3 -r1.4 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.5 pkgsrc/x11/slim/Makefile:1.6
--- pkgsrc/x11/slim/Makefile:1.5        Tue Jun 18 16:54:07 2019
+++ pkgsrc/x11/slim/Makefile    Fri Jan 10 19:13:33 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/06/18 16:54:07 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/01/10 19:13:33 maya Exp $
 
 DISTNAME=      slim-1.3.6
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim.berlios/}
 
@@ -20,6 +20,7 @@ AUTO_MKDIRS=  yes
 RCD_SCRIPTS+=  slim
 
 DEPENDS+=      bash-[0-9]*:../../shells/bash
+DEPENDS+=      dbus-[0-9]*:../../sysutils/dbus
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.6 pkgsrc/x11/slim/distinfo:1.7
--- pkgsrc/x11/slim/distinfo:1.6        Mon Oct 15 00:48:47 2018
+++ pkgsrc/x11/slim/distinfo    Fri Jan 10 19:13:33 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2018/10/15 00:48:47 maya Exp $
+$NetBSD: distinfo,v 1.7 2020/01/10 19:13:33 maya Exp $
 
 SHA1 (slim-1.3.6.tar.gz) = 9407ea2ee7b2ed649f17a8ddbf1f7b26a7c7b9fb
 RMD160 (slim-1.3.6.tar.gz) = 1bf3269b23275c50b67ada8cb5709e093eb6764f
@@ -6,4 +6,4 @@ SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6
 Size (slim-1.3.6.tar.gz) = 232547 bytes
 SHA1 (patch-CMakeLists.txt) = 8eaeba1bb48bcdb825a3809feefb62b7182fde42
 SHA1 (patch-panel.cpp) = 51f87c90214cbc55fd5628f7d852d6287d763903
-SHA1 (patch-slim.conf) = 374bd751be43a0c04e70f38adc34ddbc03370cf4
+SHA1 (patch-slim.conf) = ff838df99c53512524863631e3dda77542b01dbf

Index: pkgsrc/x11/slim/files/slim.sh
diff -u pkgsrc/x11/slim/files/slim.sh:1.1 pkgsrc/x11/slim/files/slim.sh:1.2
--- pkgsrc/x11/slim/files/slim.sh:1.1   Fri May 18 14:51:17 2018
+++ pkgsrc/x11/slim/files/slim.sh       Fri Jan 10 19:13:33 2020
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: slim.sh,v 1.1 2018/05/18 14:51:17 youri Exp $
+# $NetBSD: slim.sh,v 1.2 2020/01/10 19:13:33 maya Exp $
 #
 
 # PROVIDE: slim
-# REQUIRE: DAEMON LOGIN wscons
+# REQUIRE: DAEMON LOGIN wscons dbus
 # KEYWORD: shutdown
 
 if [ -f /etc/rc.subr ]; then

Index: pkgsrc/x11/slim/patches/patch-slim.conf
diff -u pkgsrc/x11/slim/patches/patch-slim.conf:1.3 pkgsrc/x11/slim/patches/patch-slim.conf:1.4
--- pkgsrc/x11/slim/patches/patch-slim.conf:1.3 Mon Oct 15 00:48:47 2018
+++ pkgsrc/x11/slim/patches/patch-slim.conf     Fri Jan 10 19:13:33 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-slim.conf,v 1.3 2018/10/15 00:48:47 maya Exp $
+$NetBSD: patch-slim.conf,v 1.4 2020/01/10 19:13:33 maya Exp $
 
 Adjust for NetBSD
 
@@ -9,7 +9,7 @@ Adjust for NetBSD
  # 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_path        /bin:/usr/bin:@X11BASE@/bin:@PREFIX@/bin
 +default_xserver     @X11BASE@/bin/X
  #xserver_arguments   -dpi 75
 +xserver_arguments   vt05