[pkgsrc/trunk]: pkgsrc/www/apache24 apache: let the RC script work unprivileged

[khorben <khorben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/859a3b5b1215
branches:  trunk
changeset: 769099:859a3b5b1215
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Mon Nov 08 00:45:43 2021 +0000

description:
apache: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

Bumps PKGREVISION.

diffstat:

 www/apache24/Makefile        |  3 ++-
 www/apache24/files/apache.sh |  9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r cb7feb77344f -r 859a3b5b1215 www/apache24/Makefile
--- a/www/apache24/Makefile     Sun Nov 07 21:28:48 2021 +0000
+++ b/www/apache24/Makefile     Mon Nov 08 00:45:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2021/10/07 19:05:24 adam Exp $
+# $NetBSD: Makefile,v 1.106 2021/11/08 00:45:43 khorben Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
@@ -7,6 +7,7 @@
 
 DISTNAME=      httpd-2.4.51
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
 MASTER_SITES+= https://archive.apache.org/dist/httpd/
diff -r cb7feb77344f -r 859a3b5b1215 www/apache24/files/apache.sh
--- a/www/apache24/files/apache.sh      Sun Nov 07 21:28:48 2021 +0000
+++ b/www/apache24/files/apache.sh      Mon Nov 08 00:45:43 2021 +0000
@@ -1,20 +1,19 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+# $NetBSD: apache.sh,v 1.2 2021/11/08 00:45:43 khorben Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
-# You will need to set some variables in /etc/rc.conf to start Apache:
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start Apache:
 #
 # apache=YES
 
 name="apache"
 
-if [ -f /etc/rc.subr ]
-then
-       . /etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+       . @SYSCONFBASE@/rc.subr
 
        rcvar=$name
        command="@PREFIX@/sbin/httpd"