CVS commit: pkgsrc/www/apache24

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Mon Nov  8 00:45:43 UTC 2021

Modified Files:
        pkgsrc/www/apache24: Makefile
        pkgsrc/www/apache24/files: apache.sh

Log Message:
apache: let the RC script work unprivileged

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

Bumps PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/apache24/files/apache.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache24/Makefile
diff -u pkgsrc/www/apache24/Makefile:1.105 pkgsrc/www/apache24/Makefile:1.106
--- pkgsrc/www/apache24/Makefile:1.105  Thu Oct  7 19:05:24 2021
+++ pkgsrc/www/apache24/Makefile        Mon Nov  8 00:45:43 2021
@@ -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/

Index: pkgsrc/www/apache24/files/apache.sh
diff -u pkgsrc/www/apache24/files/apache.sh:1.1.1.1 pkgsrc/www/apache24/files/apache.sh:1.2
--- pkgsrc/www/apache24/files/apache.sh:1.1.1.1 Fri Apr 13 18:50:49 2012
+++ pkgsrc/www/apache24/files/apache.sh Mon Nov  8 00:45:43 2021
@@ -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"