CVS commit: pkgsrc/x11/slim

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Oct 15 00:48:47 UTC 2018

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

Log Message:
slim: do replace PREFIX (+= vs =) in slim.conf
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.2 -r1.3 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.2 pkgsrc/x11/slim/Makefile:1.3
--- pkgsrc/x11/slim/Makefile:1.2        Mon Oct  8 17:46:07 2018
+++ pkgsrc/x11/slim/Makefile    Mon Oct 15 00:48:47 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/10/08 17:46:07 abs Exp $
+# $NetBSD: Makefile,v 1.3 2018/10/15 00:48:47 maya Exp $
 
 DISTNAME=      slim-1.3.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim.berlios/}
 
@@ -24,7 +24,7 @@ SUBST_CLASSES+=               paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     CMakeLists.txt slim.conf
 SUBST_SED.paths=       -e 's,@PREFIX@,${PREFIX},'
-SUBST_SED.paths=       -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
+SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
 SUBST_SED.paths+=      -e 's,@X11BASE@,${X11BASE},'
 
 CONF_FILES+=   share/examples/slim/slim.conf \

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.5 pkgsrc/x11/slim/distinfo:1.6
--- pkgsrc/x11/slim/distinfo:1.5        Mon Oct  8 17:46:07 2018
+++ pkgsrc/x11/slim/distinfo    Mon Oct 15 00:48:47 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2018/10/08 17:46:07 abs Exp $
+$NetBSD: distinfo,v 1.6 2018/10/15 00:48:47 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) = c85fb8f14e02e602f1dd5a72ffa20de7a34e5a13
+SHA1 (patch-slim.conf) = 374bd751be43a0c04e70f38adc34ddbc03370cf4

Index: pkgsrc/x11/slim/patches/patch-slim.conf
diff -u pkgsrc/x11/slim/patches/patch-slim.conf:1.2 pkgsrc/x11/slim/patches/patch-slim.conf:1.3
--- pkgsrc/x11/slim/patches/patch-slim.conf:1.2 Fri May 18 15:16:12 2018
+++ pkgsrc/x11/slim/patches/patch-slim.conf     Mon Oct 15 00:48:47 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-slim.conf,v 1.2 2018/05/18 15:16:12 youri Exp $
+$NetBSD: patch-slim.conf,v 1.3 2018/10/15 00:48:47 maya Exp $
 
 Adjust for NetBSD
 
@@ -12,7 +12,7 @@ Adjust for NetBSD
 +default_path        /bin:/usr/bin:@X11BASE@/bin:
 +default_xserver     @X11BASE@/bin/X
  #xserver_arguments   -dpi 75
-+xserver_arguments   vt05 -noretro
++xserver_arguments   vt05
  
  # Commands for halt, login, etc.
  halt_cmd            /sbin/shutdown -h now