From hetzels@WBIw009.westbend.net  Sat Oct  5 00:03:17 2002
Return-Path: <hetzels@WBIw009.westbend.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2D70B37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Oct 2002 00:03:17 -0700 (PDT)
Received: from mail.westbend.net (ns1.westbend.net [216.47.253.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 35EC843E4A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Oct 2002 00:03:16 -0700 (PDT)
	(envelope-from hetzels@WBIw009.westbend.net)
Received: from WBIw009.westbend.net (wbiw009 [216.47.253.29])
	by mail.westbend.net (8.12.5/8.12.5) with ESMTP id g9573ErH085684
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 5 Oct 2002 02:03:14 -0500 (CDT)
	(envelope-from hetzels@WBIw009.westbend.net)
Received: from WBIw009.westbend.net (localhost [127.0.0.1])
	by WBIw009.westbend.net (8.12.6/8.12.6) with ESMTP id g9573DJ0048674
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 5 Oct 2002 02:03:14 -0500 (CDT)
	(envelope-from hetzels@WBIw009.westbend.net)
Received: (from root@localhost)
	by WBIw009.westbend.net (8.12.6/8.12.6/Submit) id g9573Dr8048673;
	Sat, 5 Oct 2002 02:03:13 -0500 (CDT)
Message-Id: <200210050703.g9573Dr8048673@WBIw009.westbend.net>
Date: Sat, 5 Oct 2002 02:03:13 -0500 (CDT)
From: "Scot W. Hetzel" <hetzels@westbend.net>
Reply-To: "Scot W. Hetzel" <hetzels@westbend.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43681
>Category:       ports
>Synopsis:       www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 05 00:10:01 PDT 2002
>Closed-Date:    Mon Feb 03 19:08:52 PST 2003
>Last-Modified:  Mon Feb 03 19:08:52 PST 2003
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 4.7-RC i386
>Organization:
West Bend Internet
>Environment:
System: FreeBSD WBIw009.westbend.net 4.7-RC FreeBSD 4.7-RC #3: Tue Sep 24 10:30:15 CDT 2002     root@WBIw009.westbend.net:/usr/obj/usr/src/src4/sys/GENERIC-SMP  i386

>Description:
	The attached patch updates www/apache13-fp to 1.3.27.  Also converted rc script
	(apache.sh) to RC_NG, partialy based on the NetBSD apache.sh script.

>How-To-Repeat:

>Fix:
	Apply the attached patch:

	Changed Files:
	    Makefile       - Update for 1.3.27
	    distinfo       - Update for 1.3.27
	    pkg-plist      - Update for 1.3.27
	    apache.sh.tmpl - Convert to RC_NG

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	17 Sep 2002 07:41:02 -0000	1.36
+++ Makefile	4 Oct 2002 23:38:32 -0000
@@ -7,8 +7,8 @@
 
 PORTNAME=	apache
 PKGNAMESUFFIX=	_fp
-PORTVERSION=	1.3.26
-PORTREVISION=	3
+PORTVERSION=	1.3.27
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://www.freebsd.org/gifs/ \
@@ -141,9 +141,9 @@
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."; \
-		${SED}	-e 's;PREFIX;${PREFIX};' \
-			-e 's;PERL5;${PERL};' \
-			-e 's;FP_VER;${FP_VER};' \
+		${SED}	-e 's;%%PREFIX%%;${PREFIX};' \
+			-e 's;%%PERL5%%;${PERL};' \
+			-e 's;%%FP_VER%%;${FP_VER};' \
 		< ${FILESDIR}/apache.sh.tmpl > ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo	19 Jun 2002 20:53:27 -0000	1.19
+++ distinfo	4 Oct 2002 22:39:48 -0000
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
+MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist	20 Jun 2002 04:35:36 -0000	1.22
+++ pkg-plist	5 Oct 2002 06:04:17 -0000
@@ -172,6 +172,7 @@
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/htaccess.html
 share/doc/apache/manual/howto/ssi.html.en
 share/doc/apache/manual/howto/ssi.html.html
 share/doc/apache/manual/howto/ssi.html.ja.jis
@@ -259,11 +260,13 @@
 share/doc/apache/manual/mod/mod_actions.html.en
 share/doc/apache/manual/mod/mod_actions.html.html
 share/doc/apache/manual/mod/mod_actions.html.ja.jis
-share/doc/apache/manual/mod/mod_alias.html
+share/doc/apache/manual/mod/mod_alias.html.en
+share/doc/apache/manual/mod/mod_alias.html.ja.jis
 share/doc/apache/manual/mod/mod_asis.html.en
 share/doc/apache/manual/mod/mod_asis.html.html
 share/doc/apache/manual/mod/mod_asis.html.ja.jis
-share/doc/apache/manual/mod/mod_auth.html
+share/doc/apache/manual/mod/mod_auth.html.en
+share/doc/apache/manual/mod/mod_auth.html.ja.jis
 share/doc/apache/manual/mod/mod_auth_anon.html
 share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
Index: files/apache.sh.tmpl
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/apache.sh.tmpl,v
retrieving revision 1.5
diff -u -r1.5 apache.sh.tmpl
--- files/apache.sh.tmpl	28 Dec 2001 00:39:45 -0000	1.5
+++ files/apache.sh.tmpl	4 Oct 2002 23:39:21 -0000
@@ -1,17 +1,63 @@
 #!/bin/sh
 #
+# $FreeBSD$
 
+# PROVIDE: apache
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD shutdown
 #
-# Create New FrontPage suidkey
+# NOTE for FreeBSD 5.0+:
+# If you want this script to start with the base rc scripts
+# move apache.sh to /etc/rc.d/apache
+
+# Define the following apache_* variables in one of the following:
+#       /etc/rc.conf
+#       /etc/rc.conf.d/apache
+#       ${prefix}/etc/rc.conf.d/apache
+#
+#       apache_enable  - Set to YES to enable apache
+#
+#       apache_program - Path to apache program
+#                       Default: ${prefix}/sbin/httpd
+#
+
+prefix=%%PREFIX%%
+
+# "${apache_start}" is the subcommand sent to apachectl to control how
+# httpd is started.  It's value may be overridden in:
+#
+#       @PKG_SYSCONFDIR@/apache_start.conf
+#       /etc/rc.conf
+#       /etc/rc.conf.d/apache,
 #
+# in order of increasing precedence.  Its possible values are "start"
+# and "start_FP", and defaults to "start_FP". 
+#
+apache_start=start_FP
+if [ -f ${prefix}/etc/apache/apache_start.conf ] 
+then
+        . ${prefix}/etc/apache/apache_start.conf
+fi
+
+apache_doit ()
+{
+	case $1 in
+		 start)	action=${apache_start} ;;
+		reload) action=graceful ;;
+		     *)	action=$1 ;;
+	esac
+	${ctl_command} ${action}
+}
+
+# Create New FrontPage suidkey
 
 new_key() {
 
 	CUR_UMASK=`umask`
-	skdir=PREFIX/frontpage/versionFP_VER/apache-fp
-	PERL=PERL5
+	skdir=${prefix}/frontpage/version%%FP_VER%%/apache-fp
+	PERL=%%PERL5%%
 
-	if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
+	if [ -x ${prefix}/libexec/apache/mod_frontpage.so ]
 	then
 
 		#NOTE: We need Perl 5, to generate a new key
@@ -25,35 +71,60 @@
 
 }
 
-#
-# Main
-#
+if [ -f /etc/rc.subr ]; then
 
-if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
-then
-	MODULES="_FP"
-fi
-
-case "$1" in
+	. /etc/rc.subr
 
-start)
-        if [ -x PREFIX/sbin/apachectl ]
-        then
-		new_key
-		PREFIX/sbin/apachectl start${MODULES} && echo -n ' httpd'
+	name="apache"
+	rcvar=`set_rcvar`
+	command="${prefix}/sbin/httpd"
+	ctl_command="${prefix}/sbin/apachectl"
+	# pidfile=/var/run/httpd.pid
+	required_files="${prefix}/etc/apache/httpd.conf"
+	extra_commands="reload"
+	start_precmd="new_key"
+	start_cmd="apache_doit start"
+	stop_cmd="apache_doit stop"
+	restart_cmd="apache_doit restart"
+	reload_cmd="apache_doit reload"
+
+	# The below may be removed when load_local_rc_config is added to rc.subr
+
+	if [ -f ${prefix}/etc/rc.conf.d/"$name" ]; then
+		debug "Sourcing ${prefix}/etc/rc.conf.d/${name}"
+		. ${prefix}/etc/rc.conf.d/"$name"
 	fi
-	;;
 
-stop)
-	if [ -r /var/run/httpd.pid ]
-	then
-		PREFIX/sbin/apachectl stop && echo -n ' httpd'
+	load_rc_config $name
+
+	if [ -z "${slapd_enable}" ] ; then
+		slapd_enable=yes
 	fi
-	;;
 
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
+	# The above may be removed when load_local_rc_config is added to rc.subr
+	#
+	# load_local_rc_config $name
+	run_rc_command "$1"
+else
+	case "$1" in
+
+	start)
+        	if [ -x ${prefix}/sbin/apachectl ]; then
+			new_key
+			${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
+		fi
+		;;
+
+	stop)
+		if [ -r /var/run/httpd.pid ]; then
+			${prefix}/sbin/apachectl stop && echo -n ' httpd'
+		fi
+		;;
+
+	*)
+		echo "usage: $0 {start|stop}" 1>&2
+		exit 64
+		;;
 
-esac
+	esac
+fi
>Release-Note:
>Audit-Trail:

From: "Scot W. Hetzel" <hetzels@westbend.net>
To: <FreeBSD-gnats-submit@FreeBSD.ORG>
Cc:  
Subject: Re: ports/43681: www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
Date: Sat, 5 Oct 2002 02:29:00 -0500

 One small mistake in apache.sh.tmpl, rename slapd_enable to apache_enable (2
 locations).
 
 > + load_rc_config $name
 > +
 > + if [ -z "${slapd_enable}" ] ; then
 > + slapd_enable=yes
 >   fi
 
 Otherwise a warning message will be printed stating that apache_enable is
 not set properly.
 
 Scot
 
State-Changed-From-To: open->analyzed 
State-Changed-By: kris 
State-Changed-When: Sat Oct 5 02:21:36 PDT 2002 
State-Changed-Why:  
Awaiting updated patch 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43681 

From: "Scot W. Hetzel" <hetzels@westbend.net>
To: "FreeBSD-gnats-submit@FreeBSD.ORG <FreeBSD-gnats-submit@FreeBSD.ORG>; kris" <kris@FreeBSD.ORG>
Cc:  
Subject: Re: ports/43681: www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
Date: Sat, 5 Oct 2002 09:35:02 -0500 (CDT)

 Not sure why the update to apache.sh.tmpl failed as I had cvs updated before
 creating the previous patch.  I have since re-cvsupped from cvsup8.freebsd.org.
 
 Attached below is the RC_NG apache.sh.tmpl update only.
 
 Scot
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v
 retrieving revision 1.37
 diff -u -r1.37 Makefile
 --- Makefile	5 Oct 2002 09:18:44 -0000	1.37
 +++ Makefile	5 Oct 2002 14:02:45 -0000
 @@ -140,9 +140,9 @@
  post-install:
  	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
  		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."; \
 -		${SED}	-e 's;PREFIX;${PREFIX};' \
 -			-e 's;PERL5;${PERL};' \
 -			-e 's;FP_VER;${FP_VER};' \
 +		${SED}	-e 's;%%PREFIX%%;${PREFIX};' \
 +			-e 's;%%PERL5%%;${PERL};' \
 +			-e 's;%%FP_VER%%;${FP_VER};' \
  		< ${FILESDIR}/apache.sh.tmpl > ${PREFIX}/etc/rc.d/apache.sh; \
  		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
  	fi
 Index: files/apache.sh.tmpl
 ===================================================================
 RCS file: /home/ncvs/ports/www/apache13-fp/files/apache.sh.tmpl,v
 retrieving revision 1.5
 diff -u -r1.5 apache.sh.tmpl
 --- files/apache.sh.tmpl	28 Dec 2001 00:39:45 -0000	1.5
 +++ files/apache.sh.tmpl	5 Oct 2002 14:12:23 -0000
 @@ -1,17 +1,50 @@
  #!/bin/sh
  #
 +# $FreeBSD$
  
 +# PROVIDE: apache
 +# REQUIRE: DAEMON
 +# KEYWORD: FreeBSD shutdown
  #
 -# Create New FrontPage suidkey
 +# NOTE for FreeBSD 5.0+:
 +# If you want this script to start with the base rc scripts
 +# move apache.sh to /etc/rc.d/apache
 +
 +# Define the following apache_* variables in one of the following:
 +#       /etc/rc.conf
 +#       /etc/rc.conf.d/apache
 +#       ${prefix}/etc/rc.conf.d/apache
 +#
 +#       apache_enable  - Set to YES to enable apache
 +#
 +#       apache_program - Path to apache program
 +#                        Default: ${prefix}/sbin/httpd
  #
 +#	apache_start   - Subcommand sent to apachectl to control how
 +#			 httpd is started.
 +#			 Default: start_FP
 +
 +prefix=%%PREFIX%%
 +
 +apache_doit ()
 +{
 +	case $1 in
 +		 start)	action=${apache_start} ;;
 +		reload) action=graceful ;;
 +		     *)	action=$1 ;;
 +	esac
 +	${ctl_command} ${action}
 +}
 +
 +# Create New FrontPage suidkey
  
  new_key() {
  
  	CUR_UMASK=`umask`
 -	skdir=PREFIX/frontpage/versionFP_VER/apache-fp
 -	PERL=PERL5
 +	skdir=${prefix}/frontpage/version%%FP_VER%%/apache-fp
 +	PERL=%%PERL5%%
  
 -	if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
 +	if [ -x ${prefix}/libexec/apache/mod_frontpage.so ]
  	then
  
  		#NOTE: We need Perl 5, to generate a new key
 @@ -25,35 +58,73 @@
  
  }
  
 -#
 -# Main
 -#
 +if [ -f /etc/rc.subr ]; then
  
 -if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
 -then
 -	MODULES="_FP"
 -fi
 +	. /etc/rc.subr
  
 -case "$1" in
 +	name="apache"
 +	rcvar=`set_rcvar`
 +	command="${prefix}/sbin/httpd"
 +	ctl_command="${prefix}/sbin/apachectl"
 +	# pidfile=/var/run/httpd.pid
 +	required_files="${prefix}/etc/apache/httpd.conf"
 +	extra_commands="reload"
 +	start_precmd="new_key"
 +	start_cmd="apache_doit start"
 +	stop_cmd="apache_doit stop"
 +	restart_cmd="apache_doit restart"
 +	reload_cmd="apache_doit reload"
 +
 +	# The below may be removed when load_local_rc_config is added to rc.subr
 +
 +	if [ -f ${prefix}/etc/rc.conf.d/"$name" ]; then
 +		debug "Sourcing ${prefix}/etc/rc.conf.d/${name}"
 +		. ${prefix}/etc/rc.conf.d/"$name"
 +	fi
 +
 +	load_rc_config $name
  
 -start)
 -        if [ -x PREFIX/sbin/apachectl ]
 -        then
 -		new_key
 -		PREFIX/sbin/apachectl start${MODULES} && echo -n ' httpd'
 +	if [ -z "${apache_enable}" ] ; then
 +		apache_enable=yes
  	fi
 -	;;
  
 -stop)
 -	if [ -r /var/run/httpd.pid ]
 -	then
 -		PREFIX/sbin/apachectl stop && echo -n ' httpd'
 +	# The above may be removed when load_local_rc_config is added to rc.subr
 +	#
 +	# load_local_rc_config $name
 +
 +	if [ -z "${apache_start}" ]; then
 +		apache_start="start_FP"
 +	fi
 +
 +	run_rc_command "$1"
 +else
 +	if [ -f ${prefix}/etc/rc.conf.d/apache ]; then
 +		. ${prefix}/etc/rc.conf.d/apache
  	fi
 -	;;
  
 -*)
 -	echo "usage: $0 {start|stop}" 1>&2
 -	exit 64
 -	;;
 +	if [ -z '${apache_start}" ]; then
 +		apache_start="start_FP"
 +	fi
 +
 +	case "$1" in
  
 -esac
 +	start)
 +        	if [ -x ${prefix}/sbin/apachectl ]; then
 +			new_key
 +			${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
 +		fi
 +		;;
 +
 +	stop)
 +		if [ -r /var/run/httpd.pid ]; then
 +			${prefix}/sbin/apachectl stop && echo -n ' httpd'
 +		fi
 +		;;
 +
 +	*)
 +		echo "usage: $0 {start|stop}" 1>&2
 +		exit 64
 +		;;
 +
 +	esac
 +fi
State-Changed-From-To: analyzed->feedback 
State-Changed-By: petef 
State-Changed-When: Sun Dec 22 13:06:16 PST 2002 
State-Changed-Why:  
It looks like kris committed part of this, is anything else needed? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43681 

From: "West Bend Fax Proof Reading Service" <hetzels@westbend.net>
To: "Pete Fritchman" <petef@FreeBSD.org>
Cc: "FreeBSD-GNATS" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/43681: www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
Date: Mon, 23 Dec 2002 11:21:28 -0600

 ----- Original Message -----
 From: "Pete Fritchman" <petef@FreeBSD.org>
 To: <hetzels@westbend.net>; <petef@FreeBSD.org>; <freebsd-ports@FreeBSD.org>
 Sent: Sunday, December 22, 2002 3:06 PM
 Subject: Re: ports/43681: www/apache13-fp: Update to 1.3.27 and convert
 apache.sh to RC_NG
 
 
 > Synopsis: www/apache13-fp: Update to 1.3.27 and convert apache.sh to RC_NG
 >
 > State-Changed-From-To: analyzed->feedback
 > State-Changed-By: petef
 > State-Changed-When: Sun Dec 22 13:06:16 PST 2002
 > State-Changed-Why:
 > It looks like kris committed part of this, is anything else needed?
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=43681
 >
 I had submitted a second patch to the PR, after kris had notified me that
 the first had failed to apply correctly to apache.sh.tmpl
 
 Scot
 
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Mon Feb 3 19:08:37 PST 2003 
State-Changed-Why:  
Commited the rest of this PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43681 
>Unformatted:
