The attached patch changes fplogo.gif to createdwFP.gif, and adds a usage

guideline for the Frontpage Logo.

Updated apache.sh.tmpl to have the default apache_* variables in the script,
instead of in an external file.

PR:		52541
Submitted by:	maintainer
Approved by:	edwin (mentor)

2 files changed, 43 insertions, 56 deletions

diff --git a/www/apache13-fp/files/apache.sh.tmpl b/www/apache13-fp/files/apache.sh.tmpl
index 982cbdcc8174..da843d3d95a2 100644
--- a/www/apache13-fp/files/apache.sh.tmpl
+++ b/www/apache13-fp/files/apache.sh.tmpl
@@ -10,21 +10,19 @@
 # If you want this script to start with the base rc scripts
 # move apache.sh to /etc/rc.d/apache
 
+prefix=%%PREFIX%%
+
 # 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
+#       /etc/rc.conf.d/apache
 #
-#       apache_program - Path to apache program
-#                        Default: ${prefix}/sbin/httpd
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-#	apache_start   - Subcommand sent to apachectl to control how
-#			 httpd is started.
-#			 Default: start_FP
-
-prefix=%%PREFIX%%
+apache_enable="YES"			# Enable Apache
+#apache_program="${prefix}/sbin/httpd	# Location of httpd
+apache_start="start_FP"	# Subcommand sent to apachectl to control how
+			# httpd is started.
 
 apache_doit ()
 {
@@ -75,56 +73,45 @@ if [ -f /etc/rc.subr ]; then
 	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
-
-	if [ -z "${apache_enable}" ] ; then
-		apache_enable=yes
-	fi
-
-	# 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
-
-	if [ -z '${apache_start}" ]; then
-		apache_start="start_FP"
-	fi
-
-	case "$1" in
-
-	start)
-        	if [ -x ${prefix}/sbin/apachectl ]; then
-			new_key
-			${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
+	# Suck in the configuration variables.
+	if [ -z "${source_rc_confs_defined}" ]; then
+		if [ -r /etc/defaults/rc.conf ]; then
+			. /etc/defaults/rc.conf
+			source_rc_confs
+		elif [ -r /etc/rc.conf ]; then
+			. /etc/rc.conf
 		fi
-		;;
-
-	stop)
-		if [ -r /var/run/httpd.pid ]; then
-			${prefix}/sbin/apachectl stop && echo -n ' httpd'
-		fi
-		;;
+	fi
 
-	*)
-		echo "usage: $0 {start|stop}" 1>&2
-		exit 64
+	rc=0
+
+	case "${apache_enable}" in
+	    [Yy][Ee][Ss])
+		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
+			rc=64
+			;;
+		esac
 		;;
-
+            *)
+                rc=0
+                ;;
 	esac
+
+	exit $rc
 fi
diff --git a/www/apache13-fp/files/patch-lang.en b/www/apache13-fp/files/patch-lang.en
index 22d2a000ed46..72b578997fe0 100644
--- a/www/apache13-fp/files/patch-lang.en
+++ b/www/apache13-fp/files/patch-lang.en
@@ -23,7 +23,7 @@
 +  <A HREF="http://www.freebsd.org">
 +    <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
 +  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+    <IMG SRC="/images/fplogo.gif" ALT="Create with Microsoft Frontpage 2002"></A>
++    <IMG SRC="/images/createdwFP.gif" ALT="Create with Microsoft Frontpage 2002"></A>
 +</DIV>
  
 -<div align="center"><img src="apache_pb.gif" alt="" /></div>