1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

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)
This commit is contained in:
Erwin Lansing 2003-06-08 09:56:51 +00:00
parent b8db9441a8
commit 9d8d99dc35
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=82519
7 changed files with 62 additions and 88 deletions

View File

@ -9,31 +9,17 @@ PORTNAME= apache
PKGNAMESUFFIX= _fp
PORTVERSION= 1.3.27
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/httpd/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
ftp://apache.compuex.com/pub/apache/dist/httpd/ \
ftp://apache.arctic.org/pub/apache/dist/httpd/ \
ftp://ftp.epix.net/pub/apache/dist/httpd/ \
ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
ftp://www3.service.digital.com/apache/dist/httpd/ \
ftp://galileo.galilei.com/pub/apache/httpd/ \
ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
http://www.freebsd.org/gifs/:powerlogo \
http://officeupdate.microsoft.com/frontpage/wpp/serk/:fplogo
http://www.microsoft.com/frontpage/images/:fplogo
DISTNAME= ${PORTNAME}_${PORTVERSION}
DISTFILES= ${APACHE} powerlogo.gif:powerlogo fplogo.gif:fplogo
DISTFILES= ${APACHE} powerlogo.gif:powerlogo createdwFP.gif:fplogo
MAINTAINER= hetzels@westbend.net
COMMENT= The Apache webserver with MS Frontpage Module
#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
#PATCH_SITES= ${MASTER_SITE_APACHE_HTTPD}
#PATCH_SITE_SUBDIR= patches/apply_to_${PORTVERSION}/
#PATCHFILES=
APACHE= ${DISTNAME}${EXTRACT_SUFX}
@ -149,7 +135,8 @@ post-install:
${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${IMAGES_DIR}
@${INSTALL} -c -m 644 ${DISTDIR}/createdwFP.gif ${IMAGES_DIR}
@${INSTALL_DATA} ${FILESDIR}/createdwFP.txt ${DOCSDIR}
@${INSTALL} -c -m 644 ${DOCSDIR}/apache_pb.gif ${IMAGES_DIR}
@( cd ${DOCSDIR} ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

View File

@ -1,3 +1,3 @@
MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
MD5 (createdwFP.gif) = 59e227f6dc0d2512e538489458b8835b

View File

@ -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
# /etc/rc.conf.d/apache
#
# apache_enable - Set to YES to enable apache
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
# 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_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
# 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
fi
if [ -z '${apache_start}" ]; then
apache_start="start_FP"
fi
rc=0
case "$1" in
start)
if [ -x ${prefix}/sbin/apachectl ]; then
new_key
${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
fi
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
;;
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
;;
*)
rc=0
;;
esac
exit $rc
fi

View File

@ -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>

View File

@ -65,7 +65,7 @@ remove_apache_doc_root ()
if [ -d ${AP_DATA} ]; then
if [ -d ${AP_DATA}/images ] ; then
for file in apache_pb.gif fplogo.gif powerlogo.gif
for file in apache_pb.gif createdwFP.gif powerlogo.gif
{
if remove_file ${IMAGES_DIR} ${AP_DATA}/images ${file}; then
if [ -d ${IMAGES_VTI} -a -f ${IMAGES_VTI}/${file} ] ; then

View File

@ -85,7 +85,7 @@ create_apache_doc_root ()
if [ ! -d ${AP_DATA} ]; then
/bin/mkdir -p ${AP_DATA}/images
for file in apache_pb.gif fplogo.gif powerlogo.gif
for file in apache_pb.gif createdwFP.gif powerlogo.gif
{
/bin/cp -rp ${IMAGES_DIR}/${file} ${AP_DATA}/images
}
@ -118,9 +118,9 @@ comment_files ()
[ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then
/bin/echo "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif
fi
if [ -f ${IMAGES_VTI}/fplogo.gif ] && \
[ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then
/bin/echo "vti_description:SW|Created with Microsoft FrontPage" >> ${IMAGES_VTI}/fplogo.gif
if [ -f ${IMAGES_VTI}/createdwFP.gif ] && \
[ ! "`grep description ${IMAGES_VTI}/createdwFP.gif`" ] ; then
/bin/echo "vti_description:SW|Created and Managed with Microsoft FrontPage" >> ${IMAGES_VTI}/createdwFP.gif
fi
if [ -f ${IMAGES_VTI}/powerlogo.gif ] && \
[ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then

View File

@ -105,6 +105,7 @@ sbin/rotatelogs
share/doc/apache/apache_pb.gif
@exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
@unexec if [ -h %B/images ]; then rm -f %B/images; fi
share/doc/apache/createdwFP.txt
share/doc/apache/index.html.ca
share/doc/apache/index.html.cz
share/doc/apache/index.html.de
@ -179,7 +180,7 @@ share/doc/apache/manual/howto/ssi.html.ja.jis
share/doc/apache/manual/images/apache_header.gif
share/doc/apache/manual/images/apache_pb.gif
share/doc/apache/manual/images/custom_errordocs.gif
share/doc/apache/manual/images/fplogo.gif
share/doc/apache/manual/images/createdwFP.gif
share/doc/apache/manual/images/home.gif
share/doc/apache/manual/images/index.gif
share/doc/apache/manual/images/mod_rewrite_fig1.fig
@ -640,7 +641,6 @@ www/icons/world2.png
@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/frontpage
@dirrm share/doc/apache/manual/howto
@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@ -648,13 +648,13 @@ www/icons/world2.png
@dirrm share/doc/apache/manual/programs
@dirrm share/doc/apache/manual/search
@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache
@unexec rmdir %D/share/doc/apache/manual 2> /dev/null || true
@unexec rmdir %D/share/doc/apache 2> /dev/null || true
@dirrm www/cgi-bin
@dirrm www/cgi-bin.default
@dirrm www/data/images
@dirrm www/data
@unexec rmdir %D/www/data/images 2> /dev/null || true
@unexec rmdir %D/www/data 2> /dev/null || true
@dirrm www/icons/small
@dirrm www/icons
@dirrm www/proxy
@dirrm www
@unexec rmdir %D/www 2> /dev/null || true