summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2005-04-18 14:35:57 +0000
committertron <tron@pkgsrc.org>2005-04-18 14:35:57 +0000
commit53bd945a40f4f0d9d886230c37d45e9afda20376 (patch)
treec33dab107ee3fa8b9d3b7ffe18549392bb9eeea9 /www/apache2
parentc5d2ffe6272bb63d30962d5fb93904b2d73e21f8 (diff)
downloadpkgsrc-53bd945a40f4f0d9d886230c37d45e9afda20376.tar.gz
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 (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/files/apache.sh4
2 files changed, 3 insertions, 5 deletions
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}