ports/52541: Fix unfetchable distfile for www/apache13-fp
Scot W. Hetzel
hetzels at westbend.net
Wed May 21 20:50:20 UTC 2003
>Number: 52541
>Category: ports
>Synopsis: Fix unfetchable distfile for www/apache13-fp
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 21 13:50:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 4.8-STABLE i386
>Organization:
West Bend Internet
>Environment:
System: FreeBSD WBIw009.westbend.net 4.8-STABLE FreeBSD 4.8-STABLE #2: Tue Apr 22 02:28:52 CDT 2003 root at WBIw009.westbend.net:/usr/obj/usr/src/4x/sys/GENERIC-SMP i386
>Description:
The fplogo.gif is no longer fetchable from the Microsoft Web Site.
>How-To-Repeat:
Remove fplogo.gif from /usr/ports/distfiles, and then try a make fetch.
>Fix:
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.
Changed Files:
Makefile
distinfo
pkg-deinstall
pkg-install
pkg-plist
files/apache.sh.tmpl
New File:
files/createdwFP.txt
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile 21 Feb 2003 14:01:12 -0000 1.40
+++ Makefile 21 May 2003 20:27:20 -0000
@@ -9,31 +9,17 @@
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 at 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 @@
${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
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo 5 Oct 2002 09:18:44 -0000 1.20
+++ distinfo 21 May 2003 19:56:35 -0000
@@ -1,3 +1,3 @@
MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
-MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
+MD5 (createdwFP.gif) = 59e227f6dc0d2512e538489458b8835b
Index: pkg-deinstall
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-deinstall,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall
--- pkg-deinstall 20 Jun 2002 04:35:36 -0000 1.1
+++ pkg-deinstall 21 May 2003 20:02:12 -0000
@@ -65,7 +65,7 @@
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
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-install,v
retrieving revision 1.7
diff -u -r1.7 pkg-install
--- pkg-install 20 Jun 2002 04:35:36 -0000 1.7
+++ pkg-install 21 May 2003 20:01:21 -0000
@@ -85,7 +85,7 @@
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 @@
[ ! "`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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- pkg-plist 5 Oct 2002 09:18:44 -0000 1.23
+++ pkg-plist 21 May 2003 20:24:51 -0000
@@ -105,6 +105,7 @@
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/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
Index: files/apache.sh.tmpl
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/apache.sh.tmpl,v
retrieving revision 1.6
diff -u -r1.6 apache.sh.tmpl
--- files/apache.sh.tmpl 4 Feb 2003 03:08:36 -0000 1.6
+++ files/apache.sh.tmpl 21 May 2003 19:58:09 -0000
@@ -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,44 @@
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
- ;;
+ fi
- stop)
- if [ -r /var/run/httpd.pid ]; then
- ${prefix}/sbin/apachectl stop && echo -n ' httpd'
- fi
- ;;
+ rc=0
- *)
- echo "usage: $0 {start|stop}" 1>&2
- exit 64
+ 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
+ ;;
;;
-
+ *)
+ rc=0
+ ;;
esac
+
+ exit $rc
fi
Index: files/createdwFP.txt
===================================================================
RCS file: files/createdwFP.txt
diff -N files/createdwFP.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/createdwFP.txt 21 May 2003 20:23:24 -0000
@@ -0,0 +1,17 @@
+ Usage Guidelines for the Microsoft FrontPage Logo (createdwFP.gif)
+
+The Microsoft FrontPage(R) Logo Program is designed to provide you with the
+guidelines necessary for displaying the Created and Managed with Microsoft
+FrontPage logo (the "Logo") on your Web site.
+
+1. Except as Microsoft may authorize elsewhere, non-Microsoft Web sites
+ may display only the Created and Managed with Microsoft FrontPage logo
+ provided ("Logo"). By displaying the Logo on your Web site, you agree
+ to be bound by these Policies.
+
+2. You may only display the Logo on your Web site, and not in any other
+ manner than specified herein. It must always be an active link to the
+ Microsoft FrontPage home page at http://www.microsoft.com/frontpage/.
+
+For more restrictions see:
+ http://www.microsoft.com/frontpage/logo.htm
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list