diff options
| author | wiz <wiz@pkgsrc.org> | 2005-04-18 14:40:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-04-18 14:40:17 +0000 |
| commit | ebca909aa81de5541ab9b6d6dfc7be7b9c9b8dc2 (patch) | |
| tree | 71077429d47329307a308eb7a1c4764adb58154b /www/apache | |
| parent | 2f5f4b54083a8988799cb30a6fa31f251a2ff781 (diff) | |
| download | pkgsrc-ebca909aa81de5541ab9b6d6dfc7be7b9c9b8dc2.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 "apache" package.
Based on a similar change for the apache2 package.
Bump PKGREVISION.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/apache/files/apache.sh | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 5817e61fcfb..20b6fc1f3b2 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -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 --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh index 28a3df9d5f4..ba45defaf07 100644 --- a/www/apache/files/apache.sh +++ b/www/apache/files/apache.sh @@ -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 @@ 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 () @@ -34,7 +33,6 @@ apache_doit () case $1 in start) action=${apache_start} ;; - restart)action=re${apache_start} ;; # For apache_start=startssl reload) action=graceful ;; *) action=$1 ;; esac |