CVS commit: pkgsrc/pkgtools/rc.subr

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Dec 26 00:29:07 UTC 2018

Modified Files:
        pkgsrc/pkgtools/rc.subr: Makefile
        pkgsrc/pkgtools/rc.subr/files: rc.subr

Log Message:
Add OpenBSD support. Mostly just works, except that we disagree on the
meaning of "rc.conf" (it's their "defaults/rc.conf", not to be edited).
If we're on OpenBSD and there's an /etc/rc.conf.local, source it.

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/pkgtools/rc.subr/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/pkgtools/rc.subr/files/rc.subr

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.subr/Makefile
diff -u pkgsrc/pkgtools/rc.subr/Makefile:1.31 pkgsrc/pkgtools/rc.subr/Makefile:1.32
--- pkgsrc/pkgtools/rc.subr/Makefile:1.31       Tue Oct 24 14:07:59 2017
+++ pkgsrc/pkgtools/rc.subr/Makefile    Wed Dec 26 00:29:07 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/10/24 14:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2018/12/26 00:29:07 schmonz Exp $
 #
 
-PKGNAME=               rc.subr-20171024
+PKGNAME=               rc.subr-20181226
 CATEGORIES=            pkgtools
 
 MAINTAINER=            sbd%NetBSD.org@localhost
@@ -10,8 +10,7 @@ COMMENT=              Portable NetBSD rc.subr implem
 LICENSE=               original-bsd
 
 ONLY_FOR_PLATFORM=     Darwin-*-* FreeBSD-[0-4].*-* Interix-*-* IRIX*-*-*
-ONLY_FOR_PLATFORM+=    Linux-*-* SunOS-*-*
-ONLY_FOR_PLATFORM+=    QNX-*-*
+ONLY_FOR_PLATFORM+=    Linux-*-* OpenBSD-*-* QNX-*-* SunOS-*-*
 
 NO_BUILD=              yes
 NO_CONFIGURE=          yes

Index: pkgsrc/pkgtools/rc.subr/files/rc.subr
diff -u pkgsrc/pkgtools/rc.subr/files/rc.subr:1.14 pkgsrc/pkgtools/rc.subr/files/rc.subr:1.15
--- pkgsrc/pkgtools/rc.subr/files/rc.subr:1.14  Wed Aug 22 20:48:38 2018
+++ pkgsrc/pkgtools/rc.subr/files/rc.subr       Wed Dec 26 00:29:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.14 2018/08/22 20:48:38 maya Exp $
+# $NetBSD: rc.subr,v 1.15 2018/12/26 00:29:07 schmonz Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -858,6 +858,9 @@ load_rc_config()
                . /etc/rc.conf
                _rc_conf_loaded=true
        fi
+       if [ "$_osname" = "OpenBSD" ] && [ -f /etc/rc.conf.local ]; then
+               . /etc/rc.conf.local
+       fi
        if [ -f /etc/rc.conf.d/"$_command" ]; then
                . /etc/rc.conf.d/"$_command"
        fi