CVS commit: pkgsrc/x11/slim

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Oct  8 17:46:07 UTC 2018

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

Log Message:
Honour PKG_SYSCONFDIR. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/slim/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/slim/patches/patch-CMakeLists.txt

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.1 pkgsrc/x11/slim/Makefile:1.2
--- pkgsrc/x11/slim/Makefile:1.1        Fri May 18 14:51:17 2018
+++ pkgsrc/x11/slim/Makefile    Mon Oct  8 17:46:07 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2018/05/18 14:51:17 youri Exp $
+# $NetBSD: Makefile,v 1.2 2018/10/08 17:46:07 abs Exp $
 
 DISTNAME=      slim-1.3.6
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slim.berlios/}
 
@@ -23,6 +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,@X11BASE@,${X11BASE},'
 
 CONF_FILES+=   share/examples/slim/slim.conf \

Index: pkgsrc/x11/slim/distinfo
diff -u pkgsrc/x11/slim/distinfo:1.4 pkgsrc/x11/slim/distinfo:1.5
--- pkgsrc/x11/slim/distinfo:1.4        Sat Jun  2 21:00:03 2018
+++ pkgsrc/x11/slim/distinfo    Mon Oct  8 17:46:07 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2018/06/02 21:00:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2018/10/08 17:46:07 abs Exp $
 
 SHA1 (slim-1.3.6.tar.gz) = 9407ea2ee7b2ed649f17a8ddbf1f7b26a7c7b9fb
 RMD160 (slim-1.3.6.tar.gz) = 1bf3269b23275c50b67ada8cb5709e093eb6764f
 SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 Size (slim-1.3.6.tar.gz) = 232547 bytes
-SHA1 (patch-CMakeLists.txt) = 27f0222a206465e12f22f78e418b1615f7825cd4
+SHA1 (patch-CMakeLists.txt) = 8eaeba1bb48bcdb825a3809feefb62b7182fde42
 SHA1 (patch-panel.cpp) = 51f87c90214cbc55fd5628f7d852d6287d763903
 SHA1 (patch-slim.conf) = c85fb8f14e02e602f1dd5a72ffa20de7a34e5a13

Index: pkgsrc/x11/slim/patches/patch-CMakeLists.txt
diff -u pkgsrc/x11/slim/patches/patch-CMakeLists.txt:1.1 pkgsrc/x11/slim/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/x11/slim/patches/patch-CMakeLists.txt:1.1    Fri May 18 14:51:17 2018
+++ pkgsrc/x11/slim/patches/patch-CMakeLists.txt        Mon Oct  8 17:46:07 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/18 14:51:17 youri Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2018/10/08 17:46:07 abs Exp $
 
 Fix build.
 
@@ -12,7 +12,7 @@ Fix build.
 +set(CMAKE_INSTALL_PREFIX "@PREFIX@" CACHE PATH "Installation Directory")
  set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
 -set(SYSCONFDIR "/etc")
-+set(SYSCONFDIR "@PREFIX@/etc")
++set(SYSCONFDIR "@PKG_SYSCONFDIR@")
  set(LIBDIR "/lib")
 -set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
 +set(MANDIR "${CMAKE_INSTALL_PREFIX}/man")