Date: Thu, 18 Oct 2001 14:25:29 -0500 (CDT) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31361: Upgrade to Apache 1.3.22 + misc fixes Message-ID: <200110181925.f9IJPT317571@mail.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 31361
>Category: ports
>Synopsis: Upgrade to Apache 1.3.22 + misc fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 18 12:30:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 4.4-STABLE i386
>Organization:
West Bend Internet
>Environment:
System: FreeBSD wbiW009.westbend.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Sep 29 23:33:53 CDT 2001 root@wbiW009.westbend.net:/usr/obj/usr/src/sys/WBIW09-SMP i386
>Description:
The attached patch upgrades the port to use Apache 1.3.22. It
also fixes the following problems:
* fix libdescrypt detection: libdescrypt is only needed for
OSVERSION < 430001 or OSVERSION > 499999 and OSVERSION < 500014,
due to libdescrypt has been combined into the libcrypt library
on recent FreeBSD versions.
* default to using the FreeBSD Frontpage Extentions on i386.
There maybe problems with fpsrvadm.exe when it creates passwords
on a system that by default uses MD5 passwords. May need to set
roots passwd_format to des and change the password, before
installing (login.conf). BSDi FrontPage Extentions can be used
by defining WANT_BSDI_EXT.
* Added dependacy on misc/compat3x for the FreeBSD FP Exts.
* Moved execfilename to the end of the request_rec structure
in httpd.h, so that it would stop breaking binary compatiblity
with other pre-compiled Apache modules. This should allow
compiled modules build for www/apache13 to also work on
www/apache13-fp without needing to recompile them.
* Removed the Virtual host on port 8080 from httpd.conf, due to
the manual directory is now exported using an Alias, which
assigns it to a location on the main document root.
* Moved the Frontpage documents from manual/mod/mod_frontpage to
manual/frontpage. (Avoids patching manual/mod/index.html*)
>How-To-Repeat:
>Fix:
Removed files:
patch-ai
Changed files:
Makefile
distinfo
pkg-install
pkg-plist
files/FreeBSD.layout
files/patch-ab
files/patch-ag
files/patch-fh
patch-lang.en
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 2001/08/20 10:29:31 1.27
+++ Makefile 2001/10/18 19:09:35
@@ -5,8 +5,9 @@
# $FreeBSD: ports/www/apache13-fp/Makefile,v 1.27 2001/08/20 10:29:31 clive Exp $
#
-PORTNAME= apache_fp
-PORTVERSION= 1.3.20
+PORTNAME= apache
+PKGNAMESUFFIX= _fp
+PORTVERSION= 1.3.22
#PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/httpd/ \
@@ -28,7 +29,7 @@
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/
-DISTNAME= apache_${PORTVERSION}
+DISTNAME= ${PORTNAME}_${PORTVERSION}
DISTFILES= ${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif
MAINTAINER= hetzels@westbend.net
@@ -43,17 +44,20 @@
ONLY_FOR_ARCHS= i386 alpha
.if ${ARCH} == i386
-.ifdef WANT_FREEBSD_EXT
-FRONTPAGE= fp40.freebsd.tar.Z
-.if ${OSVERSION} < 500016
-PKGMESSAGE= pkg-message.freebsd
-.endif
-.else
+.ifdef WANT_BSDI_EXT
FRONTPAGE= fp40.bsdi.tar.Z
EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi
-.if ${OSVERSION} < 500016
+.if ${OSVERSION} < 4300001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
PKGMESSAGE= pkg-message.bsdi
.endif
+.else
+.if (defined(BATCH) && ${BATCH} == YES ) || !exists(/usr/lib/compat/libc.so.3)
+LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x
+.endif
+FRONTPAGE= fp40.freebsd.tar.Z
+.if ${OSVERSION} < 4300001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
+PKGMESSAGE= pkg-message.freebsd
+.endif
.endif
.elif ${ARCH} == alpha
FRONTPAGE= fp40.alpha.tar.Z
@@ -71,10 +75,9 @@
README= frontpage/${FP_REV}/readme.htm
SERK= frontpage/${FP_REV}/serk
FPHTTPD= ${PREFIX}/frontpage/${FP_REV}/apache-fp
-AP_SHARE= ${PREFIX}/share/doc/apache
-MOD_FPDOCDIR= ${AP_SHARE}/manual/mod/mod_frontpage
+MOD_FPDOCDIR= ${DOCSDIR}/manual/frontpage
MOD_FP= ${FILESDIR}/mod_frontpage.c
-IMAGES_DIR= ${AP_SHARE}/manual/images
+IMAGES_DIR= ${DOCSDIR}/manual/images
INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin
@@ -140,7 +143,7 @@
MAN8+= suexec.8
.endif
-.if ${OSVERSION} < 500016
+.if ${OSVERSION} < 430001 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
pre-extract:
@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
${ECHO} ; \
@@ -154,15 +157,6 @@
${ECHO} ; \
${FALSE} ; \
fi
-.if defined(WANT_FREEBSD_EXT) && ${ARCH} == i386
- @if ! ${LDCONFIG} -r | ${GREP} -q -e "libc.so.3"; then \
- ${ECHO} ; \
- ${ECHO} "WARNING: MS FrontPage Extentions requires the COMPAT3X Libraries"; \
- ${ECHO} " Install the COMPAT3X Libraries, then build apache-fp"; \
- ${ECHO} ; \
- ${FALSE} ; \
- fi
-.endif
.endif
post-extract:
@@ -202,8 +196,8 @@
fi
@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${IMAGES_DIR}
- @${INSTALL} -c -m 644 ${AP_SHARE}/apache_pb.gif ${IMAGES_DIR}
- @( cd ${PREFIX}/share/doc/apache ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
+ @${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)
# Untar frontpage extentions
@(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS})
@${RM} ${FPHTTPD}/httpd ${FPHTTPD}/httpd.Compat
@@ -214,7 +208,7 @@
@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if ${OSVERSION} < 500016
+.if ${OSVERSION} < 430001 | ( ${OSVERSION} > 499999 && ${OSVERSION} < 500014 )
.if ${ARCH} == i386
@${CAT} ${PKGMESSAGE}
.endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 2001/08/20 10:29:31 1.15
+++ distinfo 2001/10/17 18:23:48
@@ -1,6 +1,6 @@
-MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f
-MD5 (fp40.bsdi.tar.Z) = f469ea85b69d69f80f32c58fb0d273c4
+MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90
MD5 (fp40.freebsd.tar.Z) = 8893bec896e36d3f4a0e20b52ad9f5d7
+MD5 (fp40.bsdi.tar.Z) = f469ea85b69d69f80f32c58fb0d273c4
MD5 (fp40.alpha.tar.Z) = 6e6832c9dbe0975420020c06da9ae44e
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-install,v
retrieving revision 1.4
diff -u -r1.4 pkg-install
--- pkg-install 2001/03/08 12:35:09 1.4
+++ pkg-install 2001/10/18 00:09:06
@@ -18,7 +18,7 @@
FPINSTALL=${PKG_PREFIX}/frontpage/version4.0/fp_install.sh
CHANGESERVER=${PKG_PREFIX}/frontpage/version4.0/change_server.sh
-FPDOCDIR=${AP_SHARE}/manual/mod/mod_frontpage
+FPDOCDIR=${AP_SHARE}/manual/frontpage
IMAGES_DIR=${AP_SHARE}/manual/images
IMAGES_VTI=${PKG_PREFIX}/www/data/images/_vti_cnf
@@ -67,13 +67,6 @@
fi
}
-create_apache_lang_doc ()
-{
- /bin/cat ${AP_SHARE}/index.html.en-dist | \
- /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
- > ${AP_SHARE}/index.html.en
-}
-
create_apache_doc_root ()
{
if [ ! -d ${AP_CGI} ]; then
@@ -145,7 +138,6 @@
POST-INSTALL)
# If we are not in batch mode then run the FP install script.
if [ "${PKG_BATCH}" = "NO" ]; then
- create_apache_lang_doc
create_apache_doc_root
fix_frontpage_scripts
fix_httpd_conf
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist 2001/08/20 10:29:31 1.17
+++ pkg-plist 2001/10/18 02:24:28
@@ -96,14 +96,13 @@
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/README.rus
share/doc/apache/index.html.ca
share/doc/apache/index.html.cz
share/doc/apache/index.html.de
share/doc/apache/index.html.dk
share/doc/apache/index.html.ee
share/doc/apache/index.html.el
-share/doc/apache/index.html.en-dist
+share/doc/apache/index.html.en
share/doc/apache/index.html.es
share/doc/apache/index.html.fr
share/doc/apache/index.html.he.iso8859-8
@@ -112,6 +111,7 @@
share/doc/apache/index.html.kr.iso-kr
share/doc/apache/index.html.lu
share/doc/apache/index.html.nl
+share/doc/apache/index.html.nn
share/doc/apache/index.html.no
share/doc/apache/index.html.po.iso-pl
share/doc/apache/index.html.pt
@@ -127,21 +127,34 @@
share/doc/apache/index.html.zh.Big5
@unexec rm -rf %B/index.html.en
share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html.en
+share/doc/apache/manual/bind.html.fr
+share/doc/apache/manual/bind.html.html
+share/doc/apache/manual/cgi_path.html.en
+share/doc/apache/manual/cgi_path.html.fr
+share/doc/apache/manual/cgi_path.html.html
share/doc/apache/manual/configuring.html.en
share/doc/apache/manual/configuring.html.fr
share/doc/apache/manual/configuring.html.html
share/doc/apache/manual/configuring.html.ja.jis
share/doc/apache/manual/content-negotiation.html
share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.fr
share/doc/apache/manual/custom-error.html.html
share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/cygwin.html
+share/doc/apache/manual/dns-caveats.html.en
+share/doc/apache/manual/dns-caveats.html.fr
+share/doc/apache/manual/dns-caveats.html.html
share/doc/apache/manual/dso.html
share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
+share/doc/apache/manual/env.html.en
+share/doc/apache/manual/env.html.html
+share/doc/apache/manual/env.html.ja.jis
share/doc/apache/manual/footer.html
+share/doc/apache/manual/frontpage/index.html
+@exec if [ -h %B/serk ] ; then rm -f %B/serk ; fi ; ln -fs %D/frontpage/%%FP_REV%%/serk %B/serk
+@unexec rm -f %B/serk
share/doc/apache/manual/handler.html.en
share/doc/apache/manual/handler.html.html
share/doc/apache/manual/handler.html.ja.jis
@@ -177,11 +190,14 @@
share/doc/apache/manual/install.html.fr
share/doc/apache/manual/install.html.html
share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.en
share/doc/apache/manual/invoking.html.fr
share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/keepalive.html.en
+share/doc/apache/manual/keepalive.html.html
+share/doc/apache/manual/keepalive.html.ja.jis
share/doc/apache/manual/location.html
+share/doc/apache/manual/logs.html
share/doc/apache/manual/man-template.html
share/doc/apache/manual/misc/API.html
share/doc/apache/manual/misc/FAQ.html
@@ -207,17 +223,27 @@
share/doc/apache/manual/misc/tutorials.html
share/doc/apache/manual/misc/vif-info.html
share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/core.html.en
+share/doc/apache/manual/mod/core.html.fr
+share/doc/apache/manual/mod/core.html.html
share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.fr
share/doc/apache/manual/mod/directive-dict.html.html
share/doc/apache/manual/mod/directive-dict.html.ja.jis
-share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/directives.html.de
+share/doc/apache/manual/mod/directives.html.html
+share/doc/apache/manual/mod/directives.html.en
+share/doc/apache/manual/mod/directives.html.fr
+share/doc/apache/manual/mod/directives.html.ja.jis
share/doc/apache/manual/mod/footer.html
share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
+share/doc/apache/manual/mod/index-bytype.html.en
share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index-bytype.html.html
+share/doc/apache/manual/mod/index.html.en
share/doc/apache/manual/mod/index.html.fr
+share/doc/apache/manual/mod/index.html.html
+share/doc/apache/manual/mod/index.html.ja.jis
share/doc/apache/manual/mod/mod_access.html
share/doc/apache/manual/mod/mod_actions.html
share/doc/apache/manual/mod/mod_alias.html
@@ -240,9 +266,6 @@
share/doc/apache/manual/mod/mod_env.html.ja.jis
share/doc/apache/manual/mod/mod_example.html
share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_frontpage/index.html
-@exec if [ -h %B/serk ] ; then rm -f %B/serk ; fi ; ln -fs %D/frontpage/%%FP_REV%%/serk %B/serk
-@unexec rm -f %B/serk
share/doc/apache/manual/mod/mod_headers.html
share/doc/apache/manual/mod/mod_imap.html
share/doc/apache/manual/mod/mod_include.html
@@ -310,7 +333,7 @@
share/doc/apache/manual/server-wide.html.html
share/doc/apache/manual/server-wide.html.ja.jis
share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
+share/doc/apache/manual/stopping.html.en
share/doc/apache/manual/stopping.html.fr
share/doc/apache/manual/stopping.html.html
share/doc/apache/manual/suexec.html.en
@@ -332,132 +355,243 @@
share/doc/apache/manual/vhosts/index.html.ja.jis
share/doc/apache/manual/vhosts/ip-based.html
share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/name-based.html.en
+share/doc/apache/manual/vhosts/name-based.html.html
+share/doc/apache/manual/vhosts/name-based.html.ja.jis
share/doc/apache/manual/vhosts/vhosts-in-depth.html
share/doc/apache/manual/vhosts/virtual-host.html
share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
+share/doc/apache/manual/win_service.html.en
+share/doc/apache/manual/win_service.html.html
+share/doc/apache/manual/win_service.html.ja.jis
share/doc/apache/manual/windows.html
www/cgi-bin.default/printenv
www/cgi-bin.default/test-cgi
www/icons/README
www/icons/a.gif
+www/icons/a.png
www/icons/alert.black.gif
+www/icons/alert.black.png
www/icons/alert.red.gif
+www/icons/alert.red.png
www/icons/apache_pb.gif
+www/icons/apache_pb.png
www/icons/back.gif
+www/icons/back.png
www/icons/ball.gray.gif
+www/icons/ball.gray.png
www/icons/ball.red.gif
+www/icons/ball.red.png
www/icons/binary.gif
+www/icons/binary.png
www/icons/binhex.gif
+www/icons/binhex.png
www/icons/blank.gif
+www/icons/blank.png
www/icons/bomb.gif
+www/icons/bomb.png
www/icons/box1.gif
+www/icons/box1.png
www/icons/box2.gif
+www/icons/box2.png
www/icons/broken.gif
+www/icons/broken.png
www/icons/burst.gif
+www/icons/burst.png
www/icons/c.gif
+www/icons/c.png
www/icons/comp.blue.gif
+www/icons/comp.blue.png
www/icons/comp.gray.gif
+www/icons/comp.gray.png
www/icons/compressed.gif
+www/icons/compressed.png
www/icons/continued.gif
+www/icons/continued.png
www/icons/dir.gif
+www/icons/dir.png
www/icons/down.gif
+www/icons/down.png
www/icons/dvi.gif
+www/icons/dvi.png
www/icons/f.gif
+www/icons/f.png
www/icons/folder.gif
+www/icons/folder.png
www/icons/folder.open.gif
+www/icons/folder.open.png
www/icons/folder.sec.gif
+www/icons/folder.sec.png
www/icons/forward.gif
+www/icons/forward.png
www/icons/generic.gif
+www/icons/generic.png
www/icons/generic.red.gif
+www/icons/generic.red.png
www/icons/generic.sec.gif
+www/icons/generic.sec.png
www/icons/hand.right.gif
+www/icons/hand.right.png
www/icons/hand.up.gif
+www/icons/hand.up.png
www/icons/icon.sheet.gif
+www/icons/icon.sheet.png
www/icons/image1.gif
+www/icons/image1.png
www/icons/image2.gif
+www/icons/image2.png
www/icons/image3.gif
+www/icons/image3.png
www/icons/index.gif
+www/icons/index.png
www/icons/layout.gif
+www/icons/layout.png
www/icons/left.gif
+www/icons/left.png
www/icons/link.gif
+www/icons/link.png
www/icons/movie.gif
+www/icons/movie.png
www/icons/p.gif
+www/icons/p.png
www/icons/patch.gif
+www/icons/patch.png
www/icons/pdf.gif
+www/icons/pdf.png
www/icons/pie0.gif
+www/icons/pie0.png
www/icons/pie1.gif
+www/icons/pie1.png
www/icons/pie2.gif
+www/icons/pie2.png
www/icons/pie3.gif
+www/icons/pie3.png
www/icons/pie4.gif
+www/icons/pie4.png
www/icons/pie5.gif
+www/icons/pie5.png
www/icons/pie6.gif
+www/icons/pie6.png
www/icons/pie7.gif
+www/icons/pie7.png
www/icons/pie8.gif
+www/icons/pie8.png
www/icons/portal.gif
+www/icons/portal.png
www/icons/ps.gif
+www/icons/ps.png
www/icons/quill.gif
+www/icons/quill.png
www/icons/right.gif
+www/icons/right.png
www/icons/screw1.gif
+www/icons/screw1.png
www/icons/screw2.gif
+www/icons/screw2.png
www/icons/script.gif
+www/icons/script.png
www/icons/small/README.txt
www/icons/small/back.gif
+www/icons/small/back.png
www/icons/small/binary.gif
+www/icons/small/binary.png
www/icons/small/binhex.gif
+www/icons/small/binhex.png
www/icons/small/blank.gif
+www/icons/small/blank.png
www/icons/small/broken.gif
+www/icons/small/broken.png
www/icons/small/burst.gif
+www/icons/small/burst.png
www/icons/small/comp1.gif
+www/icons/small/comp1.png
www/icons/small/comp2.gif
+www/icons/small/comp2.png
www/icons/small/compressed.gif
+www/icons/small/compressed.png
www/icons/small/continued.gif
+www/icons/small/continued.png
www/icons/small/dir.gif
+www/icons/small/dir.png
www/icons/small/dir2.gif
+www/icons/small/dir2.png
www/icons/small/doc.gif
+www/icons/small/doc.png
www/icons/small/forward.gif
+www/icons/small/forward.png
www/icons/small/generic.gif
+www/icons/small/generic.png
www/icons/small/generic2.gif
+www/icons/small/generic2.png
www/icons/small/generic3.gif
+www/icons/small/generic3.png
www/icons/small/image.gif
+www/icons/small/image.png
www/icons/small/image2.gif
+www/icons/small/image2.png
www/icons/small/index.gif
+www/icons/small/index.png
www/icons/small/key.gif
+www/icons/small/key.png
www/icons/small/movie.gif
+www/icons/small/movie.png
www/icons/small/patch.gif
+www/icons/small/patch.png
www/icons/small/ps.gif
+www/icons/small/ps.png
www/icons/small/rainbow.gif
+www/icons/small/rainbow.png
www/icons/small/sound.gif
+www/icons/small/sound.png
www/icons/small/sound2.gif
+www/icons/small/sound2.png
www/icons/small/tar.gif
+www/icons/small/tar.png
www/icons/small/text.gif
+www/icons/small/text.png
www/icons/small/transfer.gif
+www/icons/small/transfer.png
www/icons/small/unknown.gif
+www/icons/small/unknown.png
www/icons/small/uu.gif
+www/icons/small/uu.png
www/icons/sound1.gif
+www/icons/sound1.png
www/icons/sound2.gif
+www/icons/sound2.png
www/icons/sphere1.gif
+www/icons/sphere1.png
www/icons/sphere2.gif
+www/icons/sphere2.png
www/icons/tar.gif
+www/icons/tar.png
www/icons/tex.gif
+www/icons/tex.png
www/icons/text.gif
+www/icons/text.png
www/icons/transfer.gif
+www/icons/transfer.png
www/icons/unknown.gif
+www/icons/unknown.png
www/icons/up.gif
+www/icons/up.png
www/icons/uu.gif
+www/icons/uu.png
www/icons/uuencoded.gif
+www/icons/uuencoded.png
www/icons/world1.gif
+www/icons/world1.png
www/icons/world2.gif
+www/icons/world2.png
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
@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
-@dirrm share/doc/apache/manual/mod/mod_frontpage
@dirrm share/doc/apache/manual/mod
@dirrm share/doc/apache/manual/programs
@dirrm share/doc/apache/manual/search
Index: files/FreeBSD.layout
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/FreeBSD.layout,v
retrieving revision 1.1
diff -u -r1.1 FreeBSD.layout
--- files/FreeBSD.layout 2000/03/01 06:25:05 1.1
+++ files/FreeBSD.layout 2001/10/17 19:03:37
@@ -10,6 +10,7 @@
datadir: $prefix/www
iconsdir: $datadir/icons
htdocsdir: $datadir/data
+ manualdir: $prefix/share/doc/apache/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include/apache
localstatedir: /var
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-ab,v
retrieving revision 1.12
diff -u -r1.12 patch-ab
--- files/patch-ab 2001/02/11 16:43:53 1.12
+++ files/patch-ab 2001/10/18 17:40:33
@@ -1,26 +1,27 @@
---- Makefile.tmpl.orig Mon Jan 15 10:26:17 2001
-+++ Makefile.tmpl Thu Feb 8 22:41:43 2001
-@@ -126,6 +126,7 @@
+--- Makefile.tmpl.orig Sat Oct 6 17:01:09 2001
++++ Makefile.tmpl Thu Oct 18 12:39:52 2001
+@@ -127,6 +127,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
-+doc_prefix = $(prefix)/share/doc/apache
++docsdir = $(prefix)/share/doc/apache
libexecdir_relative = @libexecdir_relative@
-@@ -269,9 +270,9 @@
+@@ -270,10 +271,10 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(htdocsdir)
-+ $(MKDIR) $(root)$(doc_prefix)
++ $(MKDIR) $(root)$(docsdir)
+ $(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
-@@ -327,19 +328,34 @@
+@@ -329,19 +330,34 @@
echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
@@ -60,7 +61,7 @@
fi
@echo "<=== [programs]"
-@@ -408,6 +424,7 @@
+@@ -410,6 +426,7 @@
echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
@@ -68,7 +69,7 @@
< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
-@@ -455,26 +472,28 @@
+@@ -457,15 +474,15 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -79,23 +80,28 @@
+# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+# else \
-+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(docsdir)/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
- fi
++ (cd $(root)$(docsdir)/ && $(TAR) -xf -); \
++ find $(root)$(docsdir)/ -type d -exec chmod a+rx {} \; ; \
++ find $(root)$(docsdir)/ -type f -print | xargs chmod a+r ; \
++# fi
+ -@if [ -d $(TOP)/htdocs/manual ]; then \
+ echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+ (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+@@ -473,17 +490,17 @@
+ find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ fi
- -@if [ -f $(root)$(cgidir)/printenv ]; then \
-- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
- else \
-+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+ mv $(root)$(doc_prefix)/index.html.en \
-+ $(root)$(doc_prefix)/index.html.en-dist ; \
-+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+# fi
+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++# echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+# else \
for script in printenv test-cgi; do \
cat $(TOP)/cgi-bin/$${script} |\
@@ -111,7 +117,7 @@
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -507,42 +526,47 @@
+@@ -517,42 +534,46 @@
-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
@@ -133,9 +139,9 @@
-e 's;conf/magic;$(sysconfdir)/magic;' \
-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
-e 's;User nobody;User $(conf_user);' \
- -e 's;Group #-1;Group $(conf_group);' \
+- -e 's;Group #-1;Group $(conf_group);' \
++ -e 's;Group \"#-1\";Group $(conf_group);' \
-e 's;Port 80;Port $(conf_port);' \
-+ -e 's;@@MANUAL@@;$(doc_prefix);' \
-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
> $(TOP)/$(SRC)/.apaci.install.tmp && \
Index: files/patch-ag
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-ag,v
retrieving revision 1.7
diff -u -r1.7 patch-ag
--- files/patch-ag 2001/03/08 12:35:10 1.7
+++ files/patch-ag 2001/10/17 23:22:11
@@ -1,5 +1,5 @@
---- conf/httpd.conf-dist.orig Wed Feb 21 21:48:15 2001
-+++ conf/httpd.conf-dist Wed Mar 7 23:43:56 2001
+--- conf/httpd.conf-dist.orig Fri Oct 5 22:40:04 2001
++++ conf/httpd.conf-dist Wed Oct 17 18:16:27 2001
@@ -95,6 +95,9 @@
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
@@ -10,18 +10,7 @@
#
# Timeout: The number of seconds before receives and sends time out.
#
-@@ -174,6 +177,10 @@
- #Listen 3000
- #Listen 12.34.56.78:80
-
-+Listen 80
-+# We need to Listen to port 8080, as that is were the Apache Docs can be accessed from.
-+Listen 8080
-+
- #
- # BindAddress: You can support virtual hosts with this option. This directive
- # is used to tell the server which IP address to listen to. It can either
-@@ -276,7 +283,7 @@
+@@ -276,7 +279,7 @@
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
@@ -30,7 +19,7 @@
#
# Each directory to which Apache has access, can be configured with respect
-@@ -317,7 +324,16 @@
+@@ -317,7 +320,16 @@
# override. Can also be "All", or any combination of "Options", "FileInfo",
# "AuthConfig", and "Limit"
#
@@ -48,7 +37,7 @@
#
# Controls who can get stuff from this server.
-@@ -351,12 +367,36 @@
+@@ -351,12 +363,36 @@
# </LimitExcept>
#</Directory>
@@ -86,7 +75,7 @@
</IfModule>
#
-@@ -475,7 +515,7 @@
+@@ -476,7 +512,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -95,7 +84,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -488,7 +528,7 @@
+@@ -489,7 +525,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
@@ -104,7 +93,7 @@
#
# Optionally add a line containing the server version and virtual host
-@@ -728,13 +768,17 @@
+@@ -768,13 +804,17 @@
# For example, the PHP 3.x module (not part of the Apache distribution - see
# http://www.php.net) will typically use:
#
@@ -126,51 +115,18 @@
AddType application/x-tar .tgz
-@@ -944,3 +988,47 @@
+@@ -984,3 +1024,14 @@
# ErrorLog logs/dummy-host.example.com-error_log
# CustomLog logs/dummy-host.example.com-access_log common
#</VirtualHost>
+
-+# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
-+<VirtualHost _default_:8080>
-+ ServerAdmin webmaster@@@HOSTNAME@@
-+ DocumentRoot @@MANUAL@@
-+ ServerName @@HOSTNAME@@
-+
-+ <Directory "@@MANUAL@@">
-+
-+ #
-+ # This may also be "None", "All", or any combination of "Indexes",
-+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-+ #
-+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
-+ # doesn't give it to you.
-+ #
-+ Options Indexes FollowSymLinks
-+
-+ #
-+ # This controls which options the .htaccess files in directories can
-+ # override. Can also be "All", or any combination of "Options", "FileInfo",
-+ # "AuthConfig", and "Limit"
-+ #
-+ AllowOverride None
-+
-+ #
-+ # Controls who can get stuff from this server.
-+ #
-+ Order allow,deny
-+ Allow from all
-+ </Directory>
-+
-+</VirtualHost>
-+
+# This Virtual Host makes it so FrontPage will display pages from the
-+# root web. Without this virtual host, Frontpage accesses the pages
-+# on the default virtual host (port 8080) instead.
++# root web. When multiple Listen directives are specified, Frontpage
++# will try to access the pages from the wrong virutal host. This fixes it.
+#
+#NOTE: This Virtual Host Entry must be kept as the last _default_
+# virtual host entry.
-+<VirtualHost _default_:80>
-+ ServerAdmin webmaster@@@HOSTNAME@@
-+ ServerName @@HOSTNAME@@
-+</VirtualHost>
++#<VirtualHost _default_:80>
++# ServerAdmin webmaster@@@HOSTNAME@@
++# ServerName @@HOSTNAME@@
++#</VirtualHost>
Index: files/patch-fh
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-fh,v
retrieving revision 1.2
diff -u -r1.2 patch-fh
--- files/patch-fh 1999/09/27 02:52:25 1.2
+++ files/patch-fh 2001/10/17 19:39:00
@@ -1,16 +1,10 @@
---- src/include/httpd.h.orig Mon Aug 16 12:57:53 1999
-+++ src/include/httpd.h Mon Sep 6 13:12:55 1999
-@@ -774,7 +774,12 @@
+--- src/include/httpd.h.orig Mon Oct 8 22:56:05 2001
++++ src/include/httpd.h Wed Oct 17 14:37:56 2001
+@@ -855,6 +855,7 @@
+ * record to improve 64bit alignment the next time we need to break
+ * binary compatibility for some other reason.
+ */
++ char *execfilename; /* physical filename to exec */
+ };
- char *unparsed_uri; /* the uri without any parsing performed */
- char *uri; /* the path portion of the URI */
-- char *filename;
-+ char *execfilename; /* physical filename to exec */
-+ char *filename; /* logical filename to exec -- always the same
-+ * except for FrontPage CGI programs where we
-+ * will execute the CGI program in
-+ * /usr/local/frontpage....
-+ */
- char *path_info;
- char *args; /* QUERY_ARGS, if any */
- struct stat finfo; /* ST_MODE set to zero if no such file */
+
Index: files/patch-lang.en
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-lang.en,v
retrieving revision 1.4
diff -u -r1.4 patch-lang.en
--- files/patch-lang.en 2001/08/20 10:29:38 1.4
+++ files/patch-lang.en 2001/10/17 23:59:38
@@ -1,18 +1,14 @@
--- htdocs/index.html.en.orig Thu May 3 19:00:38 2001
-+++ htdocs/index.html.en Wed Aug 1 22:58:29 2001
-@@ -26,13 +26,29 @@
- issues.</p>
-
- <hr width="50%" size="8" />
--<p>The Apache <a href="manual/">documentation</a> has been included
-+<p>The Apache <a href="http://@@HOSTNAME@@:8080/manual/">documentation</a>; has been included
++++ htdocs/index.html.en Wed Oct 17 18:58:19 2001
+@@ -29,10 +29,26 @@
+ <p>The Apache <a href="manual/">documentation</a> has been included
with this distribution.</p>
-<p>You are free to use the image below on an Apache-powered web
-server. Thanks for using Apache!</p>
+<p>The Microsoft FrontPage 2000 Extentions has been installed with this
+Apache Server. Read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/">Microsoft FrontPage 2000 documentation</A>
++<A HREF="manual/frontpage/">Microsoft FrontPage 2000 documentation</A>
+carefully.</p>
+
+<p>Information of the FreeBSD operating system can be found on the
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110181925.f9IJPT317571>