[pkgsrc/trunk]: pkgsrc/www/apache Remove custom "restart" code from startup s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee2fbc26f29f
branches:  trunk
changeset: 492681:ee2fbc26f29f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Apr 18 14:40:17 2005 +0000

description:
Remove custom "restart" code from startup script so that Apache really
gets restarted when "/etc/rc.d/apache restart" is used. This fixes
PR pkg/24179 for the "apache" package.

Based on a similar change for the apache2 package.

Bump PKGREVISION.

diffstat:

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

diffs (44 lines):

diff -r 4753d9cef4b2 -r ee2fbc26f29f www/apache/Makefile
--- a/www/apache/Makefile       Mon Apr 18 14:37:03 2005 +0000
+++ b/www/apache/Makefile       Mon Apr 18 14:40:17 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.161 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.162 2005/04/18 14:40:17 wiz Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=              apache_1.3.33
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
diff -r 4753d9cef4b2 -r ee2fbc26f29f www/apache/files/apache.sh
--- a/www/apache/files/apache.sh        Mon Apr 18 14:37:03 2005 +0000
+++ b/www/apache/files/apache.sh        Mon Apr 18 14:40:17 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.26 2005/02/28 23:30:49 abs Exp $
+# $NetBSD: apache.sh,v 1.27 2005/04/18 14:40:17 wiz Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -25,7 +25,6 @@
 extra_commands="reload"
 start_cmd="apache_doit start"
 stop_cmd="apache_doit stop"
-restart_cmd="apache_doit restart"
 reload_cmd="apache_doit reload"
 
 apache_doit ()
@@ -34,7 +33,6 @@
 
        case $1 in
        start)  action=${apache_start} ;;
-       restart)action=re${apache_start} ;;     # For apache_start=startssl
        reload) action=graceful ;;
        *)      action=$1 ;;
        esac