[pkgsrc/trunk]: pkgsrc/www/apache Update apache to 1.3.31nb4:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/752396ffcbba
branches:  trunk
changeset: 478971:752396ffcbba
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Aug 02 19:54:17 2004 +0000

description:
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:

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

diffs (37 lines):

diff -r 5b5dfac500bf -r 752396ffcbba www/apache/Makefile
--- a/www/apache/Makefile       Mon Aug 02 19:09:45 2004 +0000
+++ b/www/apache/Makefile       Mon Aug 02 19:54:17 2004 +0000
@@ -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 -r 5b5dfac500bf -r 752396ffcbba www/apache/files/apache.sh
--- a/www/apache/files/apache.sh        Mon Aug 02 19:09:45 2004 +0000
+++ b/www/apache/files/apache.sh        Mon Aug 02 19:54:17 2004 +0000
@@ -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 @@
 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 ()