diff options
| author | abs <abs> | 2004-08-02 19:54:17 +0000 |
|---|---|---|
| committer | abs <abs> | 2004-08-02 19:54:17 +0000 |
| commit | 1e2b3b11c49551191a09785e1170aac7a53b4c2a (patch) | |
| tree | e743bfc01ec8c7dc4e5dd200e961a29770121b26 /www/apache | |
| parent | 7c96cd2cf265775a245f7ec1e376a6e76814f359 (diff) | |
| download | pkgsrc-1e2b3b11c49551191a09785e1170aac7a53b4c2a.tar.gz | |
Update apache to 1.3.31nb4:
Fix rc.d/apache restart to 'apache_doit stop; apache_doit start'
Now in the case of apache_start=startssl and apache not running,
'rc.d/apache restart' will start apache with startssl.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/apache/files/apache.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 0bf03c2152a..aed50b86b2c 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.148 2004/07/30 21:05:42 jlam Exp $ +# $NetBSD: Makefile,v 1.149 2004/08/02 19:54:17 abs 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.31 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 +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 45c9903a1eb..465bb8d9760 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.24 2002/11/19 23:08:47 jlam Exp $ +# $NetBSD: apache.sh,v 1.25 2004/08/02 19:54:17 abs Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -25,7 +25,7 @@ required_files="@PKG_SYSCONFDIR@/httpd.conf" extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" -restart_cmd="apache_doit restart" +restart_cmd="apache_doit stop ; apache_doit start" # For apache_start=startssl reload_cmd="apache_doit reload" apache_doit () |