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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9521603a1ce
branches:  trunk
changeset: 492679:a9521603a1ce
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Apr 18 14:35:57 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 "apache2" package.

diffstat:

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

diffs (42 lines):

diff -r b68d3ea212bb -r a9521603a1ce www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Apr 18 14:31:29 2005 +0000
+++ b/www/apache2/Makefile      Mon Apr 18 14:35:57 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2005/04/12 05:49:45 martti Exp $
+# $NetBSD: Makefile,v 1.70 2005/04/18 14:35:57 tron Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               apache-${APACHE_VERSION}
-PKGREVISION=   1
+PKGREVISION=           2
 CATEGORIES=            www
 
 HOMEPAGE=              http://httpd.apache.org/
diff -r b68d3ea212bb -r a9521603a1ce www/apache2/files/apache.sh
--- a/www/apache2/files/apache.sh       Mon Apr 18 14:31:29 2005 +0000
+++ b/www/apache2/files/apache.sh       Mon Apr 18 14:35:57 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.8 2002/11/19 23:08:27 jlam Exp $
+# $NetBSD: apache.sh,v 1.9 2005/04/18 14:35:57 tron 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 ()
@@ -45,7 +44,6 @@
        case ${action} in
        start|startssl) @ECHO@ "Starting ${name}." ;;
        stop)           @ECHO@ "Stopping ${name}." ;;
-       restart)        @ECHO@ "Restarting ${name}." ;;
        esac
 
        ${ctl_command} ${action}