pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/rc.subr Add OpenBSD support. Mostly just work...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fa32cc284dd
branches:  trunk
changeset: 389272:3fa32cc284dd
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Dec 26 00:29:07 2018 +0000

description:
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:

 pkgtools/rc.subr/Makefile      |  7 +++----
 pkgtools/rc.subr/files/rc.subr |  5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r ed4be2212e05 -r 3fa32cc284dd pkgtools/rc.subr/Makefile
--- a/pkgtools/rc.subr/Makefile Tue Dec 25 16:24:26 2018 +0000
+++ b/pkgtools/rc.subr/Makefile Wed Dec 26 00:29:07 2018 +0000
@@ -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 @@
 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 -r ed4be2212e05 -r 3fa32cc284dd pkgtools/rc.subr/files/rc.subr
--- a/pkgtools/rc.subr/files/rc.subr    Tue Dec 25 16:24:26 2018 +0000
+++ b/pkgtools/rc.subr/files/rc.subr    Wed Dec 26 00:29:07 2018 +0000
@@ -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 @@
                . /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



Home | Main Index | Thread Index | Old Index