diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2002-01-25 05:40:18 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2002-01-25 05:40:18 +0000 |
commit | 9dc2701dc4e3e9521499df55e85abfa669de6075 (patch) | |
tree | e16db15d506e79d5833d6c179ad85717c9c3ae0c /www/apache13 | |
parent | The I128 driver doesn't build properly on the Alpha so remove it. (diff) |
Upgrade to 1.3.23
Notes
Notes:
svn path=/head/; revision=53701
Diffstat (limited to 'www/apache13')
-rw-r--r-- | www/apache13/Makefile | 10 | ||||
-rw-r--r-- | www/apache13/distinfo | 2 | ||||
-rw-r--r-- | www/apache13/files/FreeBSD.layout | 20 | ||||
-rw-r--r-- | www/apache13/files/patch-aa | 8 | ||||
-rw-r--r-- | www/apache13/files/patch-ab | 13 | ||||
-rw-r--r-- | www/apache13/files/patch-ag | 38 | ||||
-rw-r--r-- | www/apache13/files/patch-al | 8 | ||||
-rw-r--r-- | www/apache13/pkg-plist | 6 |
8 files changed, 38 insertions, 67 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index d176e9cbe8e4..f215e149c7a9 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -6,10 +6,9 @@ # PORTNAME= apache -PORTVERSION= 1.3.22 -PORTREVISION= 7 +PORTVERSION= 1.3.23 CATEGORIES= www -MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ +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/ \ @@ -38,7 +37,7 @@ CONFIGURE_ARGS+= \ --server-uid=www \ --server-gid=www \ --with-perl=${PERL} \ - --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ + --with-layout=FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-module=most \ @@ -49,8 +48,7 @@ CONFIGURE_ARGS+= \ OPTIM= -DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ - -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \ - -DACCEPT_FILTER_NAME=\\"httpready\\" + -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" # # Set WITH_APACHE_PERF_TUNING env. variable to YES to get maximum performance diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 722ea9d62460..1e5c6f23eb03 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90 +MD5 (apache_1.3.23.tar.gz) = 4499443fa1d604243467afe64522abac diff --git a/www/apache13/files/FreeBSD.layout b/www/apache13/files/FreeBSD.layout deleted file mode 100644 index b73ee2ae1484..000000000000 --- a/www/apache13/files/FreeBSD.layout +++ /dev/null @@ -1,20 +0,0 @@ -# FreeBSD layout... -<Layout FreeBSD> - prefix: /usr/local - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec/apache - mandir: $prefix/man - sysconfdir: $prefix/etc/apache - datadir: $prefix/www - iconsdir: $datadir/icons - htdocsdir: $datadir/data - manualdir: $prefix/share/doc/apache - cgidir: $datadir/cgi-bin - includedir: $prefix/include/apache - localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log - proxycachedir: $datadir/proxy -</Layout> diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa index 15cd58c27ef2..0524f0c3db2a 100644 --- a/www/apache13/files/patch-aa +++ b/www/apache13/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Jan 18 01:53:17 2000 -+++ configure Mon Jan 24 19:37:21 2000 -@@ -1232,8 +1232,8 @@ +--- configure.orig Thu Sep 27 22:12:03 2001 ++++ configure Fri Jan 25 07:46:03 2002 +@@ -1251,8 +1251,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" @@ -11,7 +11,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1330,8 +1330,8 @@ +@@ -1350,8 +1350,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index a6d93e733362..7e823f446bd1 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.tmpl.orig Sun Oct 7 02:01:09 2001 -+++ Makefile.tmpl Sun Dec 2 11:19:23 2001 +--- Makefile.tmpl.orig Wed Nov 28 18:02:12 2001 ++++ Makefile.tmpl Fri Jan 25 07:48:19 2002 @@ -270,10 +270,12 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 @@ -15,7 +15,7 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -457,33 +459,39 @@ +@@ -459,33 +461,39 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -70,7 +70,7 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -522,14 +530,14 @@ +@@ -524,10 +532,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ @@ -85,8 +85,3 @@ -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;Port 80;Port $(conf_port);' \ - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \ diff --git a/www/apache13/files/patch-ag b/www/apache13/files/patch-ag index 80373fbcca63..58c60812aa88 100644 --- a/www/apache13/files/patch-ag +++ b/www/apache13/files/patch-ag @@ -1,6 +1,6 @@ ---- conf/httpd.conf-dist.orig Mon Feb 21 08:30:46 2000 -+++ conf/httpd.conf-dist Mon May 29 16:48:49 2000 -@@ -354,7 +354,22 @@ +--- conf/httpd.conf-dist.orig Wed Jan 9 19:05:31 2002 ++++ conf/httpd.conf-dist Fri Jan 25 07:59:12 2002 +@@ -356,7 +356,22 @@ # directory index. Separate multiple entries with spaces. # <IfModule mod_dir.c> @@ -24,7 +24,7 @@ </IfModule> # -@@ -473,7 +488,7 @@ +@@ -476,7 +491,7 @@ # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # @@ -33,7 +33,7 @@ # # If you would like to have agent and referer logfiles, uncomment the -@@ -486,7 +501,7 @@ +@@ -489,7 +504,7 @@ # If you prefer a single logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # @@ -42,25 +42,19 @@ # # Optionally add a line containing the server version and virtual host -@@ -708,13 +723,17 @@ - # For example, the PHP 3.x module (not part of the Apache distribution - see - # http://www.php.net) will typically use: +@@ -759,6 +774,15 @@ # -- #AddType application/x-httpd-php3 .php3 -- #AddType application/x-httpd-php3-source .phps + <IfModule mod_negotiation.c> + LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw ++ </IfModule> ++ + <IfModule mod_php3.c> -+ AddType application/x-httpd-php3 .php3 -+ AddType application/x-httpd-php3-source .php3s ++ AddType application/x-httpd-php3 .php3 ++ AddType application/x-httpd-php3-source .php3s + </IfModule> - # - # And for PHP 4.x, use: - # -- #AddType application/x-httpd-php .php -- #AddType application/x-httpd-php-source .phps + <IfModule mod_php4.c> -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps -+ </IfModule> - - AddType application/x-tar .tgz ++ AddType application/x-httpd-php .php ++ AddType application/x-httpd-php-source .phps + </IfModule> + # diff --git a/www/apache13/files/patch-al b/www/apache13/files/patch-al index b355a697b4ab..bd792616581e 100644 --- a/www/apache13/files/patch-al +++ b/www/apache13/files/patch-al @@ -1,6 +1,6 @@ ---- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999 -+++ src/support/log_server_status Fri Sep 3 15:53:16 1999 -@@ -67,10 +67,10 @@ +--- src/support/log_server_status.orig Mon Jan 15 20:06:38 2001 ++++ src/support/log_server_status Fri Jan 25 08:03:03 2002 +@@ -70,10 +70,10 @@ # require 'sys/socket.ph'; @@ -13,7 +13,7 @@ sub tcp_connect { -@@ -100,7 +100,7 @@ +@@ -103,7 +103,7 @@ chomp($date); ($day,$time)=split(/:/,$date); $res=&tcp_connect($server,$port); diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index fc90f5dd0bff..d22b77c18bf0 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -162,6 +162,7 @@ share/doc/apache/handler.html.en share/doc/apache/handler.html.html share/doc/apache/handler.html.ja.jis share/doc/apache/header.html +share/doc/apache/howto/auth.html share/doc/apache/howto/cgi.html.en share/doc/apache/howto/cgi.html.html share/doc/apache/howto/cgi.html.ja.jis @@ -259,7 +260,9 @@ share/doc/apache/mod/mod_cern_meta.html share/doc/apache/mod/mod_cgi.html share/doc/apache/mod/mod_cookies.html share/doc/apache/mod/mod_digest.html -share/doc/apache/mod/mod_dir.html +share/doc/apache/mod/mod_dir.html.en +share/doc/apache/mod/mod_dir.html.html +share/doc/apache/mod/mod_dir.html.ja.jis share/doc/apache/mod/mod_dld.html share/doc/apache/mod/mod_env.html.en share/doc/apache/mod/mod_env.html.html @@ -332,6 +335,7 @@ share/doc/apache/server-wide.html.en share/doc/apache/server-wide.html.fr share/doc/apache/server-wide.html.html share/doc/apache/server-wide.html.ja.jis +share/doc/apache/sitemap.html share/doc/apache/sourcereorg.html share/doc/apache/stopping.html.en share/doc/apache/stopping.html.fr |