diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-12-26 00:29:07 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-12-26 00:29:07 +0000 |
| commit | 8096dbb24777fc8cc09273945841fffc41943bd7 (patch) | |
| tree | 55ec0f36ef53c952cd5a022344600fe506d26138 /pkgtools/rc.subr | |
| parent | 14585798756eb44084aba2cd5e1f6e2c007f6c4c (diff) | |
| download | pkgsrc-8096dbb24777fc8cc09273945841fffc41943bd7.tar.gz | |
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.
Diffstat (limited to 'pkgtools/rc.subr')
| -rw-r--r-- | pkgtools/rc.subr/Makefile | 7 | ||||
| -rw-r--r-- | pkgtools/rc.subr/files/rc.subr | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile index 9aca6e14275..55d33745862 100644 --- a/pkgtools/rc.subr/Makefile +++ b/pkgtools/rc.subr/Makefile @@ -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 @@ -10,8 +10,7 @@ COMMENT= Portable NetBSD rc.subr implementation for pkgsrc 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 diff --git a/pkgtools/rc.subr/files/rc.subr b/pkgtools/rc.subr/files/rc.subr index 40c7c15b239..ecf5f75d65a 100644 --- a/pkgtools/rc.subr/files/rc.subr +++ b/pkgtools/rc.subr/files/rc.subr @@ -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 |