CVS commit: pkgsrc/pkgtools/rc.d-boot

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Dec 28 20:24:51 UTC 2022

Modified Files:
        pkgsrc/pkgtools/rc.d-boot: Makefile
        pkgsrc/pkgtools/rc.d-boot/files: rc.d-boot

Log Message:
rc.d-boot: fix references to rc.subr in previous (it will have gotten
installed to ${SYSCONFBASE}, not necessarily the same as
${PKG_SYSCONFDIR}). UNPRIVILEGED still works, says triaxx@. Bump
version.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/pkgtools/rc.d-boot/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/rc.d-boot/Makefile
diff -u pkgsrc/pkgtools/rc.d-boot/Makefile:1.13 pkgsrc/pkgtools/rc.d-boot/Makefile:1.14
--- pkgsrc/pkgtools/rc.d-boot/Makefile:1.13     Sat Dec 17 21:36:11 2022
+++ pkgsrc/pkgtools/rc.d-boot/Makefile  Wed Dec 28 20:24:50 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/12/17 21:36:11 triaxx Exp $
+# $NetBSD: Makefile,v 1.14 2022/12/28 20:24:50 schmonz Exp $
 #
 
-PKGNAME=               rc.d-boot-20221202
+PKGNAME=               rc.d-boot-20221225
 CATEGORIES=            pkgtools
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
@@ -30,7 +30,7 @@ SUBST_FILES.paths=    rc.d-boot
 SUBST_FILES.paths+=    org.pkgsrc.rc.d-boot.plist \
                        pkgsrc-rc.d-boot \
                        pkgsrc-rc.d-boot.service
-SUBST_VARS.paths=      GREP PKG_SYSCONFDIR PKGNAME PREFIX RCD_SCRIPTS_DIR RCORDER VARBASE
+SUBST_VARS.paths=      GREP SYSCONFBASE PKGNAME PREFIX RCD_SCRIPTS_DIR RCORDER VARBASE
 
 FILES_SUBST+=          RCDBOOT_STYLE=${RCDBOOT_STYLE:Q}
 FILES_SUBST+=          RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:Q}

Index: pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot
diff -u pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot:1.4 pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot:1.5
--- pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot:1.4       Sat Dec 17 21:36:11 2022
+++ pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot   Wed Dec 28 20:24:50 2022
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. @PKG_SYSCONFDIR@/rc.subr
+. @SYSCONFBASE@/rc.subr
 
 run_all_rcd_scripts() {
        action="$1"; shift