From 90a7e7c0cff64adeac425979bb3bb43594c06232 Mon Sep 17 00:00:00 2001 From: Clive Lin Date: Mon, 20 Aug 2001 10:29:38 +0000 Subject: Upgrade the apache13-fp to Apache 1.3.20. PR: ports/29379 Submitted by: Scot W. Hetzel (MAINTAINER) --- www/apache13-fp/Makefile | 9 ++++---- www/apache13-fp/distinfo | 2 +- www/apache13-fp/files/patch-at | 12 ---------- www/apache13-fp/files/patch-fj | 46 ------------------------------------- www/apache13-fp/files/patch-lang.en | 39 +++++++++++++++++-------------- www/apache13-fp/pkg-plist | 35 +++++++++++++++++++++------- 6 files changed, 55 insertions(+), 88 deletions(-) delete mode 100644 www/apache13-fp/files/patch-at (limited to 'www') diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile index b835eef97ecf..f18d7233c5f5 100644 --- a/www/apache13-fp/Makefile +++ b/www/apache13-fp/Makefile @@ -6,8 +6,8 @@ # PORTNAME= apache_fp -PORTVERSION= 1.3.19 -PORTREVISION= 1 +PORTVERSION= 1.3.20 +#PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.microsoft.com/products/frontpage/ \ @@ -51,7 +51,7 @@ PKGMESSAGE= pkg-message.freebsd .else FRONTPAGE= fp40.bsdi.tar.Z EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi -.if ${OSVERSION} < 50016 +.if ${OSVERSION} < 500016 PKGMESSAGE= pkg-message.bsdi .endif .endif @@ -97,10 +97,11 @@ CONFIGURE_ARGS= \ --server-uid=${HTTPD_USER} \ --server-gid=${HTTPD_GROUP} \ --without-confadjust \ - --enable-shared=max \ --enable-module=most \ --enable-module=auth_db \ + --enable-module=mmap_static \ --disable-module=auth_dbm \ + --enable-shared=max \ --add-module=${MOD_FP} \ --enable-shared=frontpage diff --git a/www/apache13-fp/distinfo b/www/apache13-fp/distinfo index dfb2f410d8e3..d04950b1a36e 100644 --- a/www/apache13-fp/distinfo +++ b/www/apache13-fp/distinfo @@ -1,4 +1,4 @@ -MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855 +MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f MD5 (fp40.bsdi.tar.Z) = f469ea85b69d69f80f32c58fb0d273c4 MD5 (fp40.freebsd.tar.Z) = 8893bec896e36d3f4a0e20b52ad9f5d7 MD5 (fp40.alpha.tar.Z) = 6e6832c9dbe0975420020c06da9ae44e diff --git a/www/apache13-fp/files/patch-at b/www/apache13-fp/files/patch-at deleted file mode 100644 index 12fc013b93a6..000000000000 --- a/www/apache13-fp/files/patch-at +++ /dev/null @@ -1,12 +0,0 @@ ---- src/support/apxs.pl.orig Thu Dec 16 10:10:30 1999 -+++ src/support/apxs.pl Sun Feb 20 17:33:18 2000 -@@ -424,8 +424,7 @@ - my $t = $f; - $t =~ s|^.+/([^/]+)$|$1|; - if ($opt_i) { -- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); -- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); - } - - # determine module symbolname and filename diff --git a/www/apache13-fp/files/patch-fj b/www/apache13-fp/files/patch-fj index b092e0e5c559..0df391d7b4d8 100644 --- a/www/apache13-fp/files/patch-fj +++ b/www/apache13-fp/files/patch-fj @@ -9,49 +9,3 @@ pos = x; break; } -@@ -2013,12 +2013,14 @@ - int x; - - if (!strchr(p->h_name, '.')) { -- for (x = 0; p->h_aliases[x]; ++x) { -- if (strchr(p->h_aliases[x], '.') && -- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -- return ap_pstrdup(a, p->h_aliases[x]); -- } -- return NULL; -+ if (p->h_aliases) { -+ for (x = 0; p->h_aliases[x]; ++x) { -+ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') && -+ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) -+ return ap_pstrdup(a, p->h_aliases[x]); -+ } -+ } -+ return NULL; - } - return ap_pstrdup(a, (void *) p->h_name); - } -@@ -2040,7 +2042,6 @@ - ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, - "%s: gethostname() failed to determine ServerName\n", - ap_server_argv0); -- server_hostname = ap_pstrdup(a, "127.0.0.1"); - } - else - { -@@ -2048,14 +2049,14 @@ - if ((!(p = gethostbyname(str))) - || (!(server_hostname = find_fqdn(a, p)))) { - /* Recovery - return the default servername by IP: */ -- if (p->h_addr_list[0]) { -+ if (p && p->h_addr_list && p->h_addr_list[0]) { - ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]); - server_hostname = ap_pstrdup(a, str); - /* We will drop through to report the IP-named server */ - } - } - else -- /* Since we found a fdqn, return it with no logged message. */ -+ /* Since we found a fqdn, return it with no logged message. */ - return server_hostname; - } - diff --git a/www/apache13-fp/files/patch-lang.en b/www/apache13-fp/files/patch-lang.en index 46053c24008d..6d68f1c90fc5 100644 --- a/www/apache13-fp/files/patch-lang.en +++ b/www/apache13-fp/files/patch-lang.en @@ -1,23 +1,26 @@ ---- htdocs/index.html.en.orig Fri Jan 19 13:39:47 2001 -+++ htdocs/index.html.en Thu Feb 8 22:10:30 2001 -@@ -32,13 +32,25 @@ +--- 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.

-
- --

The Apache documentation has been included with -+

The Apache documentation has been included with - this distribution.

+
+-

The Apache documentation has been included ++

The Apache documentation has been included + with this distribution.

+-

You are free to use the image below on an Apache-powered web +-server. Thanks for using Apache!

+

The Microsoft FrontPage 2000 Extentions has been installed with this -+Apache Server. Read the Microsoft FrontPage 2000 documentation carefully.

++Apache Server. Read the ++Microsoft FrontPage 2000 documentation ++carefully.

+ -+

Information of the FreeBSD operating system can be found on the FreeBSD web site.

++

Information of the FreeBSD operating system can be found on the ++FreeBSD web site.

++ ++

You are free to use the images below on the Apache-powered web ++server. Thanks for using Apache and FreeBSD!

+ -

You are free to use the image below on an Apache-powered web server. --Thanks for using Apache!

-+Thanks for using Apache and FreeBSD!

- --
+
+ + Powered by Apache @@ -27,5 +30,7 @@ + Create with Microsoft Frontpage 2000 +
- - +-
+ + + diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist index 408647028c45..9844fea6965c 100644 --- a/www/apache13-fp/pkg-plist +++ b/www/apache13-fp/pkg-plist @@ -13,6 +13,7 @@ include/apache/ap_compat.h include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h +include/apache/ap_ebcdic.h include/apache/ap_md5.h include/apache/ap_mmn.h include/apache/ap_sha1.h @@ -75,6 +76,7 @@ libexec/apache/mod_info.so libexec/apache/mod_log_config.so libexec/apache/mod_mime.so libexec/apache/mod_mime_magic.so +libexec/apache/mod_mmap_static.so libexec/apache/mod_negotiation.so libexec/apache/mod_rewrite.so libexec/apache/mod_setenvif.so @@ -122,12 +124,13 @@ share/doc/apache/index.html.ru.ucs2 share/doc/apache/index.html.ru.ucs4 share/doc/apache/index.html.ru.utf8 share/doc/apache/index.html.se -share/doc/apache/index.html.tw.Big5 +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/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 @@ -170,11 +173,13 @@ 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.es 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/invoking.html.html share/doc/apache/manual/keepalive.html share/doc/apache/manual/location.html share/doc/apache/manual/man-template.html @@ -209,8 +214,10 @@ share/doc/apache/manual/mod/directive-dict.html.ja.jis share/doc/apache/manual/mod/directives.html share/doc/apache/manual/mod/footer.html share/doc/apache/manual/mod/header.html -share/doc/apache/manual/mod/index.html share/doc/apache/manual/mod/index-bytype.html +share/doc/apache/manual/mod/index-bytype.html.fr +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/index.html.fr share/doc/apache/manual/mod/mod_access.html share/doc/apache/manual/mod/mod_actions.html share/doc/apache/manual/mod/mod_alias.html @@ -228,7 +235,9 @@ share/doc/apache/manual/mod/mod_cookies.html share/doc/apache/manual/mod/mod_digest.html share/doc/apache/manual/mod/mod_dir.html share/doc/apache/manual/mod/mod_dld.html -share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_env.html.en +share/doc/apache/manual/mod/mod_env.html.html +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 @@ -243,15 +252,19 @@ share/doc/apache/manual/mod/mod_log_agent.html share/doc/apache/manual/mod/mod_log_common.html share/doc/apache/manual/mod/mod_log_config.html share/doc/apache/manual/mod/mod_log_referer.html -share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime.html.en +share/doc/apache/manual/mod/mod_mime.html.html +share/doc/apache/manual/mod/mod_mime.html.ja.jis 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.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 -share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_setenvif.html.en +share/doc/apache/manual/mod/mod_setenvif.html.html +share/doc/apache/manual/mod/mod_setenvif.html.ja.jis share/doc/apache/manual/mod/mod_so.html share/doc/apache/manual/mod/mod_speling.html share/doc/apache/manual/mod/mod_status.html @@ -282,7 +295,9 @@ share/doc/apache/manual/programs/header.html share/doc/apache/manual/programs/htdigest.html share/doc/apache/manual/programs/htpasswd.html share/doc/apache/manual/programs/httpd.html -share/doc/apache/manual/programs/index.html +share/doc/apache/manual/programs/index.html.en +share/doc/apache/manual/programs/index.html.html +share/doc/apache/manual/programs/index.html.ja.jis share/doc/apache/manual/programs/logresolve.html share/doc/apache/manual/programs/other.html share/doc/apache/manual/programs/rotatelogs.html @@ -296,7 +311,11 @@ 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/suexec.html +share/doc/apache/manual/stopping.html.fr +share/doc/apache/manual/stopping.html.html +share/doc/apache/manual/suexec.html.en +share/doc/apache/manual/suexec.html.html +share/doc/apache/manual/suexec.html.ja.jis share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html -- cgit