Mon Oct 17 01:11:30 2016 UTC ()
Add IRIX support from Stuart Shelton in PR 38656.


(dholland)
diff -r1.29 -r1.30 pkgsrc/pkgtools/rc.subr/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/rc.subr/files/rc.subr
cvs diff -r1.29 -r1.30 pkgsrc/pkgtools/rc.subr/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/rc.subr/Makefile 2015/05/10 19:20:09 1.29
+++ pkgsrc/pkgtools/rc.subr/Makefile 2016/10/17 01:11:30 1.30
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.29 2015/05/10 19:20:09 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.30 2016/10/17 01:11:30 dholland Exp $
2# 2#
3 3
4PKGNAME= rc.subr-20150510 4PKGNAME= rc.subr-20161016
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6 6
7MAINTAINER= sbd@NetBSD.org 7MAINTAINER= sbd@NetBSD.org
8HOMEPAGE= http://www.NetBSD.org/ 8HOMEPAGE= http://www.NetBSD.org/
9COMMENT= Portable NetBSD rc.subr implementation for pkgsrc 9COMMENT= Portable NetBSD rc.subr implementation for pkgsrc
10LICENSE= original-bsd 10LICENSE= original-bsd
11 11
12ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-[0-4].*-* Interix-*-* 12ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-[0-4].*-* Interix-*-* IRIX*-*-*
13ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-* 13ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-*
14ONLY_FOR_PLATFORM+= QNX-*-* 14ONLY_FOR_PLATFORM+= QNX-*-*
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17NO_CONFIGURE= yes 17NO_CONFIGURE= yes
18 18
19CHECK_FILES_SUPPORTED= no 19CHECK_FILES_SUPPORTED= no
20BUILD_DEFS+= RCD_SCRIPTS_DIR 20BUILD_DEFS+= RCD_SCRIPTS_DIR
21 21
22PLIST_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:S/^\///} 22PLIST_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:S/^\///}
23 23
24CONF_FILES+= etc/rc.conf.example etc/rc.conf 24CONF_FILES+= etc/rc.conf.example etc/rc.conf
25 25
cvs diff -r1.12 -r1.13 pkgsrc/pkgtools/rc.subr/files/rc.subr (expand / switch to unified diff)

--- pkgsrc/pkgtools/rc.subr/files/rc.subr 2015/05/10 19:20:09 1.12
+++ pkgsrc/pkgtools/rc.subr/files/rc.subr 2016/10/17 01:11:30 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rc.subr,v 1.12 2015/05/10 19:20:09 bsiegert Exp $ 1# $NetBSD: rc.subr,v 1.13 2016/10/17 01:11:30 dholland Exp $
2# 2#
3# Copyright (c) 1997-2002 The NetBSD Foundation, Inc. 3# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Luke Mewburn. 7# by Luke Mewburn.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -97,26 +97,47 @@ case $_osname in @@ -97,26 +97,47 @@ case $_osname in
97 if [ "$1" = "-n" ]; then 97 if [ "$1" = "-n" ]; then
98 shift; echo "$@\c" 98 shift; echo "$@\c"
99 else 99 else
100 echo "$@" 100 echo "$@"
101 fi 101 fi
102 } 102 }
103 _RCCMD_chown="/usr/bin/chown" 103 _RCCMD_chown="/usr/bin/chown"
104 _RCCMD_ci="/usr/contrib/bin/ci" 104 _RCCMD_ci="/usr/contrib/bin/ci"
105 _RCCMD_co="/usr/contrib/bin/co" 105 _RCCMD_co="/usr/contrib/bin/co"
106 _RCCMD_echo="bsd_echo" 106 _RCCMD_echo="bsd_echo"
107 _RCCMD_rcs="/usr/contrib/bin/rcs" 107 _RCCMD_rcs="/usr/contrib/bin/rcs"
108 _RCARG_psformat="-wwo pid,comm" 108 _RCARG_psformat="-wwo pid,comm"
109 ;; 109 ;;
 110 IRIX*)
 111 _RCCMD_chown="/sbin/chown"
 112 _RCCMD_ci="/usr/sbin/ci"
 113 _RCCMD_co="/usr/sbin/co"
 114 _RCCMD_cp="/sbin/cp"
 115 _RCCMD_kill="kill" # use sh builtin
 116# _RCCMD_logger="/usr/bin/logger" # not in IRIX
 117 _RCCMD_mv="/sbin/mv"
 118 _RCCMD_nice="/sbin/nice"
 119 _RCCMD_ps="/sbin/ps"
 120 _RCCMD_rcs="/usr/sbin/rcs"
 121 _RCCMD_rm="/sbin/rm"
 122 _RCCMD_sh="/sbin/sh"
 123 _RCCMD_su="/sbin/su"
 124# _RCCMD_systrace="/bin/systrace" # not in IRIX
 125 _RCCMD_whoami="/bin/whoami"
 126 _RCARG_psformat="-o pid,comm=12345678901234567890"
 127 # widen column to try to get full command-name
 128 _RCARG_ps="-ef"
 129 _RCARG_su=""
 130 ;;
110 Linux) 131 Linux)
111 _RCCMD_chown="/bin/chown" 132 _RCCMD_chown="/bin/chown"
112# _RCCMD_ci="/usr/bin/ci" # not in Slackware 8.1 133# _RCCMD_ci="/usr/bin/ci" # not in Slackware 8.1
113# _RCCMD_co="/usr/bin/co" # not in Slackware 8.1 134# _RCCMD_co="/usr/bin/co" # not in Slackware 8.1
114 _RCCMD_nice=$(which nice) 135 _RCCMD_nice=$(which nice)
115# _RCCMD_rcs="/usr/bin/rcs" # not in Slackware 8.1 136# _RCCMD_rcs="/usr/bin/rcs" # not in Slackware 8.1
116# _RCCMD_systrace="/bin/systrace" # not in Slackware 8.1 137# _RCCMD_systrace="/bin/systrace" # not in Slackware 8.1
117 _RCARG_ps="ax" 138 _RCARG_ps="ax"
118 if [ -e /etc/redhat-release ]; then 139 if [ -e /etc/redhat-release ]; then
119 _RCCMD_su="/bin/su" # for CentOS/RHEL 140 _RCCMD_su="/bin/su" # for CentOS/RHEL
120 fi 141 fi
121 ;; 142 ;;
122 QNX) 143 QNX)