From 53bd945a40f4f0d9d886230c37d45e9afda20376 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Mon, 18 Apr 2005 14:35:57 +0000
Subject: 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.

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

(limited to 'www')

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index dd7c449ed0b..5b69d58027f 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -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 --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index 893c05e24fa..0cde9e57094 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -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 @@ required_files="@PKG_SYSCONFDIR@/httpd.conf"
 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 @@ apache_doit ()
 	case ${action} in
 	start|startssl)	@ECHO@ "Starting ${name}." ;;
 	stop)		@ECHO@ "Stopping ${name}." ;;
-	restart)	@ECHO@ "Restarting ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
-- 
cgit v1.2.3