1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Upgrade to Apache 1.3.19

Also, from the PR:

* Alpha FrontPage Ext (OSF1) install for FreeBSD/alpha.
* FreeBSD FrontPage Ext install (define WANT_FREEBSD_EXT)

PR:		25604
Submitted by:	Scot W. Hetzel <hetzels@westbend.net>
This commit is contained in:
Jimmy Olgeni 2001-03-08 12:35:10 +00:00
parent fbc223bae5
commit 49aea8ddc1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39253
14 changed files with 134 additions and 49 deletions

View File

@ -6,13 +6,13 @@
#
PORTNAME= apache_fp
PORTVERSION= 1.3.17
PORTVERSION= 1.3.19
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.microsoft.com/products/frontpage/ \
ftp://www.westbend.net/Mirrors/ftp.microsoft.com/Products/frontpage/ \
http://www.freebsd.org/gifs/ \
http://officeupdate.microsoft.com/frontpage/wpp/serk/ \
ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.microsoft.com/Products/frontpage/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
ftp://apache.compuex.com/pub/apache/dist/ \
@ -36,7 +36,29 @@ MAINTAINER= hetzels@westbend.net
#PATCHFILES=
APACHE= ${DISTNAME}${EXTRACT_SUFX}
.if !defined(ARCH)
ARCH!= /usr/bin/uname -m
.endif
.if ${ARCH} == i386
.ifdef WANT_FREEBSD_EXT
FRONTPAGE= fp40.freebsd.tar.z
PKGMESSAGE= pkg-message.freebsd
.else
FRONTPAGE= fp40.bsdi.tar.z
EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi
PKGMESSAGE= pkg-message.bsdi
.endif
.elif ${ARCH} == alpha
FRONTPAGE= fp40.alpha.tar.z
EXTRA_PATCHES= ${FILESDIR}/change_server.alpha ${FILESDIR}/fp_install.alpha
.else
.BEGIN:
@${ECHO} "Unsupported system ${ARCH}"
@${FALSE}
.endif
EXTRACT_ONLY= ${APACHE}
@ -130,6 +152,15 @@ pre-extract:
${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
post-extract:
@${ECHO} "===> Extracting FrontPage install scripts"
@ -180,5 +211,8 @@ post-install:
@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${ARCH} == i386
@${CAT} ${PKGMESSAGE}
.endif
.include <bsd.port.mk>

View File

@ -1,4 +1,6 @@
MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4
MD5 (fp40.freebsd.tar.z) = 8893bec896e36d3f4a0e20b52ad9f5d7
MD5 (fp40.alpha.tar.z) = 6e6832c9dbe0975420020c06da9ae44e
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6

View File

@ -0,0 +1,11 @@
--- frontpage/version4.0/change_server.sh.orig Wed Mar 7 22:12:02 2001
+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:13:11 2001
@@ -62,7 +62,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="alpha" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1

View File

@ -0,0 +1,11 @@
--- frontpage/version4.0/change_server.sh.bsdi Wed Mar 7 22:12:02 2001
+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:10:59 2001
@@ -62,7 +62,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1

View File

@ -0,0 +1,11 @@
--- frontpage/version4.0/fp_install.sh.alpha Wed Mar 7 22:16:28 2001
+++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:22:07 2001
@@ -70,7 +70,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="alpha" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1

View File

@ -0,0 +1,11 @@
--- frontpage/version4.0/fp_install.sh.bsdi Wed Mar 7 22:16:28 2001
+++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:00 2001
@@ -70,7 +70,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1

View File

@ -1,6 +1,6 @@
--- conf/httpd.conf-dist.orig Thu Sep 28 08:12:36 2000
+++ conf/httpd.conf-dist Sat Nov 25 11:40:39 2000
@@ -97,6 +97,9 @@
--- conf/httpd.conf-dist.orig Wed Feb 21 21:48:15 2001
+++ conf/httpd.conf-dist Wed Mar 7 23:43:56 2001
@@ -95,6 +95,9 @@
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
@ -10,7 +10,7 @@
#
# Timeout: The number of seconds before receives and sends time out.
#
@@ -176,6 +179,10 @@
@@ -174,6 +177,10 @@
#Listen 3000
#Listen 12.34.56.78:80
@ -21,7 +21,7 @@
#
# 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
@@ -278,7 +285,7 @@
@@ -276,7 +283,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 +30,7 @@
#
# Each directory to which Apache has access, can be configured with respect
@@ -319,7 +326,16 @@
@@ -317,7 +324,16 @@
# override. Can also be "All", or any combination of "Options", "FileInfo",
# "AuthConfig", and "Limit"
#
@ -48,7 +48,7 @@
#
# Controls who can get stuff from this server.
@@ -353,12 +369,36 @@
@@ -351,12 +367,36 @@
# </LimitExcept>
#</Directory>
@ -86,7 +86,7 @@
</IfModule>
#
@@ -477,7 +517,7 @@
@@ -475,7 +515,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@ -95,7 +95,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
@@ -490,7 +530,7 @@
@@ -488,7 +528,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
@ -104,7 +104,7 @@
#
# Optionally add a line containing the server version and virtual host
@@ -729,13 +769,17 @@
@@ -728,13 +768,17 @@
# For example, the PHP 3.x module (not part of the Apache distribution - see
# http://www.php.net) will typically use:
#
@ -126,10 +126,10 @@
AddType application/x-tar .tgz
@@ -854,6 +898,51 @@
# Deny from all
# Allow from .your_domain.com
#</Location>
@@ -944,3 +988,47 @@
# 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>
@ -141,13 +141,13 @@
+
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
+ # doesn't give it to you.
+ # 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",
@ -174,7 +174,3 @@
+ ServerAdmin webmaster@@@HOSTNAME@@
+ ServerName @@HOSTNAME@@
+</VirtualHost>
+
#
# Allow remote server configuration reports, with the URL of

View File

@ -1,5 +1,5 @@
--- frontpage/version4.0/change_server.sh.orig Tue May 2 15:41:43 2000
+++ frontpage/version4.0/change_server.sh Thu Jul 6 21:45:52 2000
--- frontpage/version4.0/change_server.sh.orig Mon Aug 14 11:51:36 2000
+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:12:02 2001
@@ -38,9 +38,12 @@
{
VERSION="4.0"
@ -16,15 +16,6 @@
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
@@ -62,7 +65,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1
@@ -217,8 +220,22 @@
clear

View File

@ -1,5 +1,5 @@
--- frontpage/version4.0/fp_install.sh.orig Tue May 2 15:41:43 2000
+++ frontpage/version4.0/fp_install.sh Thu Jul 6 21:46:15 2000
--- frontpage/version4.0/fp_install.sh.orig Mon Aug 14 11:51:36 2000
+++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:28 2001
@@ -48,7 +48,8 @@
{
VERSION="4.0"
@ -10,15 +10,6 @@
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
@@ -70,7 +71,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
- FreeBSD*) machine="freebsd" ;;
+ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
*) echo "ERROR: Unsupported platform! Uname is $system."
return 1
@@ -129,7 +130,7 @@
checkuser()
{

View File

@ -11,7 +11,7 @@
+<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> carefully.<p>
+
+<p>Information of the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org>FreeBSD</A> web site.<p>
+<p>Information of the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org">FreeBSD</A> web site.<p>
+
<p>You are free to use the image below on an Apache-powered web server.
-Thanks for using Apache!</p>

View File

@ -105,7 +105,7 @@ fix_frontpage_scripts ()
fix_httpd_conf ()
{
if [ ! -f ${AP_CONF}/httpd.conf} ] ; then
if [ ! -f ${AP_CONF}/httpd.conf ] ; then
/bin/cat ${AP_CONF}/httpd.conf.default | \
/usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
> ${AP_CONF}/httpd.conf

View File

@ -0,0 +1,4 @@
The BSDI FrontPage Extentions require that libcrypt.* be linked to the
libdescrypt.* libraries. The fpsrvadm.exe program can only create DES
passwords, but the Apache server is unable to use them when libcrypt.*
are linked to the libscrypt.* libraries.

View File

@ -0,0 +1,4 @@
The FreeBSD FrontPage Extentions require that libcrypt.* be linked to the
libdescrypt.* libraries. This is due to a problem with the fpsrvadm.exe
program will create invaild MD5 passwords when libcrypt.* are linked to
the libscrypt.* libraries.

View File

@ -128,9 +128,11 @@ share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
share/doc/apache/manual/configuring.html.en
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.html
share/doc/apache/manual/custom-error.html.ja.jis
share/doc/apache/manual/dns-caveats.html
share/doc/apache/manual/dso.html
@ -138,13 +140,17 @@ share/doc/apache/manual/ebcdic.html
share/doc/apache/manual/env.html
share/doc/apache/manual/footer.html
share/doc/apache/manual/handler.html.en
share/doc/apache/manual/handler.html.html
share/doc/apache/manual/handler.html.ja.jis
share/doc/apache/manual/header.html
share/doc/apache/manual/howto/cgi.html.en
share/doc/apache/manual/howto/cgi.html.html
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/ssi.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
share/doc/apache/manual/images/apache_header.gif
share/doc/apache/manual/images/apache_pb.gif
share/doc/apache/manual/images/custom_errordocs.gif
@ -159,11 +165,16 @@ share/doc/apache/manual/images/pixel.gif
share/doc/apache/manual/images/powerlogo.gif
share/doc/apache/manual/images/sub.gif
share/doc/apache/manual/index.html.en
share/doc/apache/manual/index.html.fr
share/doc/apache/manual/index.html.html
share/doc/apache/manual/index.html.ja.jis
share/doc/apache/manual/install-tpf.html
share/doc/apache/manual/install.html.en
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.fr
share/doc/apache/manual/keepalive.html
share/doc/apache/manual/location.html
share/doc/apache/manual/man-template.html
@ -193,6 +204,7 @@ 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/directive-dict.html.en
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/footer.html
@ -235,6 +247,7 @@ share/doc/apache/manual/mod/mod_mime.html
share/doc/apache/manual/mod/mod_mime_magic.html
share/doc/apache/manual/mod/mod_mmap_static.html
share/doc/apache/manual/mod/mod_negotiation.html.en
share/doc/apache/manual/mod/mod_negotiation.html.html
share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
share/doc/apache/manual/mod/mod_proxy.html
share/doc/apache/manual/mod/mod_rewrite.html
@ -247,6 +260,7 @@ share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/mod/module-dict.html.en
share/doc/apache/manual/mod/module-dict.html.html
share/doc/apache/manual/mod/module-dict.html.ja.jis
share/doc/apache/manual/mpeix.html
share/doc/apache/manual/multilogs.html
@ -255,6 +269,7 @@ share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
share/doc/apache/manual/new_features_1_3.html.en
share/doc/apache/manual/new_features_1_3.html.html
share/doc/apache/manual/new_features_1_3.html.ja.jis
share/doc/apache/manual/new_features_2_0.html
share/doc/apache/manual/process-model.html
@ -276,6 +291,8 @@ share/doc/apache/manual/readme-tpf.html
share/doc/apache/manual/search/manual-index.cgi
share/doc/apache/manual/sections.html
share/doc/apache/manual/server-wide.html.en
share/doc/apache/manual/server-wide.html.fr
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
@ -283,6 +300,7 @@ share/doc/apache/manual/suexec.html
share/doc/apache/manual/suexec_1_2.html
share/doc/apache/manual/unixware.html
share/doc/apache/manual/upgrading_to_1_3.html
share/doc/apache/manual/urlmapping.html
share/doc/apache/manual/vhosts/details.html
share/doc/apache/manual/vhosts/details_1_2.html
share/doc/apache/manual/vhosts/examples.html
@ -291,6 +309,7 @@ share/doc/apache/manual/vhosts/footer.html
share/doc/apache/manual/vhosts/header.html
share/doc/apache/manual/vhosts/host.html
share/doc/apache/manual/vhosts/index.html.en
share/doc/apache/manual/vhosts/index.html.html
share/doc/apache/manual/vhosts/index.html.ja.jis
share/doc/apache/manual/vhosts/ip-based.html
share/doc/apache/manual/vhosts/mass.html