[pkgsrc/trunk]: pkgsrc/www/apache22 Use the pid file to determine whether "ht...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/445bb4019162
branches:  trunk
changeset: 548243:445bb4019162
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Oct 12 12:22:25 2008 +0000

description:
Use the pid file to determine whether "httpd" is still running. This should
make "/etc/rc.d/apache restart" work more reliable and fix PR pkg/39713 by
Martti Kuparinen.

Bump package revision because of this fix.

diffstat:

 www/apache22/Makefile        |  4 ++--
 www/apache22/files/apache.sh |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r e95cb8a77dd4 -r 445bb4019162 www/apache22/Makefile
--- a/www/apache22/Makefile     Sun Oct 12 12:08:23 2008 +0000
+++ b/www/apache22/Makefile     Sun Oct 12 12:22:25 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2008/09/17 15:39:06 epg Exp $
+# $NetBSD: Makefile,v 1.34 2008/10/12 12:22:25 tron Exp $
 
 DISTNAME=      httpd-2.2.9
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/} \
                ${MASTER_SITE_APACHE:=httpd/old/}
diff -r e95cb8a77dd4 -r 445bb4019162 www/apache22/files/apache.sh
--- a/www/apache22/files/apache.sh      Sun Oct 12 12:08:23 2008 +0000
+++ b/www/apache22/files/apache.sh      Sun Oct 12 12:22:25 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+# $NetBSD: apache.sh,v 1.2 2008/10/12 12:22:25 tron Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -20,6 +20,7 @@
 name="apache"
 rcvar=$name
 command="@PREFIX@/sbin/httpd"
+pidfile="/var/run/httpd.pid"
 ctl_command="@PREFIX@/sbin/apachectl"
 required_files="@PKG_SYSCONFDIR@/httpd.conf"
 extra_commands="reload"