diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 3 | ||||
| -rw-r--r-- | www/apache2/Makefile.common | 2 | ||||
| -rw-r--r-- | www/apache2/PLIST | 19 | ||||
| -rw-r--r-- | www/apache2/distinfo | 8 | ||||
| -rw-r--r-- | www/apache2/patches/patch-aa | 18 |
5 files changed, 32 insertions, 18 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 3b3504e1997..0a34deaeac7 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2003/10/11 13:40:20 grant Exp $ +# $NetBSD: Makefile,v 1.28 2003/10/28 04:49:32 itojun Exp $ PKGNAME= apache-${APACHE_VERSION} -PKGREVISION= 1 CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common index 694a9e2035d..8753f74ae8f 100644 --- a/www/apache2/Makefile.common +++ b/www/apache2/Makefile.common @@ -1,5 +1,5 @@ DISTNAME= httpd-${APACHE_VERSION} -APACHE_VERSION= 2.0.47 +APACHE_VERSION= 2.0.48 APR_VERSION= 0.9.4 MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} \ diff --git a/www/apache2/PLIST b/www/apache2/PLIST index c35e063f605..baea041d7c4 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2003/07/09 08:09:05 itojun Exp $ +@comment $NetBSD: PLIST,v 1.17 2003/10/28 04:49:32 itojun Exp $ etc/rc.d/apache include/httpd/ap_compat.h include/httpd/ap_config.h @@ -78,6 +78,7 @@ share/examples/httpd/httpd-std.conf share/examples/httpd/magic share/examples/httpd/mime.types share/examples/httpd/ssl-std.conf +share/httpd/build/config.nice share/httpd/build/config_vars.mk share/httpd/build/instdso.sh share/httpd/build/library.mk @@ -489,10 +490,12 @@ share/httpd/manual/filter.html share/httpd/manual/filter.html.en share/httpd/manual/filter.html.ja.jis share/httpd/manual/filter.html.ko.euc-kr +share/httpd/manual/filter.html.ru.koi8-r share/httpd/manual/filter.xml share/httpd/manual/filter.xml.ja share/httpd/manual/filter.xml.ko share/httpd/manual/filter.xml.meta +share/httpd/manual/filter.xml.ru share/httpd/manual/glossary.html share/httpd/manual/glossary.html.en share/httpd/manual/glossary.html.ko.euc-kr @@ -503,10 +506,12 @@ share/httpd/manual/handler.html share/httpd/manual/handler.html.en share/httpd/manual/handler.html.ja.jis share/httpd/manual/handler.html.ko.euc-kr +share/httpd/manual/handler.html.ru.koi8-r share/httpd/manual/handler.xml share/httpd/manual/handler.xml.ja share/httpd/manual/handler.xml.ko share/httpd/manual/handler.xml.meta +share/httpd/manual/handler.xml.ru share/httpd/manual/howto/auth.html share/httpd/manual/howto/auth.html.en share/httpd/manual/howto/auth.html.ja.jis @@ -553,14 +558,15 @@ share/httpd/manual/images/up.gif share/httpd/manual/index.html share/httpd/manual/index.html.de share/httpd/manual/index.html.en -share/httpd/manual/index.html.fr share/httpd/manual/index.html.ja.jis share/httpd/manual/index.html.ko.euc-kr +share/httpd/manual/index.html.ru.koi8-r share/httpd/manual/index.xml share/httpd/manual/index.xml.de share/httpd/manual/index.xml.ja share/httpd/manual/index.xml.ko share/httpd/manual/index.xml.meta +share/httpd/manual/index.xml.ru share/httpd/manual/install.html share/httpd/manual/install.html.de share/httpd/manual/install.html.en @@ -621,6 +627,10 @@ share/httpd/manual/misc/perf-tuning.html share/httpd/manual/misc/perf-tuning.html.en share/httpd/manual/misc/perf-tuning.xml share/httpd/manual/misc/perf-tuning.xml.meta +share/httpd/manual/misc/relevant_standards.html +share/httpd/manual/misc/relevant_standards.html.en +share/httpd/manual/misc/relevant_standards.xml +share/httpd/manual/misc/relevant_standards.xml.meta share/httpd/manual/misc/rewriteguide.html share/httpd/manual/misc/rewriteguide.html.en share/httpd/manual/misc/rewriteguide.xml @@ -1119,8 +1129,10 @@ share/httpd/manual/programs/httpd.xml share/httpd/manual/programs/httpd.xml.meta share/httpd/manual/programs/index.html share/httpd/manual/programs/index.html.en +share/httpd/manual/programs/index.html.ru.koi8-r share/httpd/manual/programs/index.xml share/httpd/manual/programs/index.xml.meta +share/httpd/manual/programs/index.xml.ru share/httpd/manual/programs/logresolve.html share/httpd/manual/programs/logresolve.html.en share/httpd/manual/programs/logresolve.xml @@ -1334,11 +1346,13 @@ share/httpd/manual/vhosts/index.html.de share/httpd/manual/vhosts/index.html.en share/httpd/manual/vhosts/index.html.ja.jis share/httpd/manual/vhosts/index.html.ko.euc-kr +share/httpd/manual/vhosts/index.html.ru.koi8-r share/httpd/manual/vhosts/index.xml share/httpd/manual/vhosts/index.xml.de share/httpd/manual/vhosts/index.xml.ja share/httpd/manual/vhosts/index.xml.ko share/httpd/manual/vhosts/index.xml.meta +share/httpd/manual/vhosts/index.xml.ru share/httpd/manual/vhosts/ip-based.html share/httpd/manual/vhosts/ip-based.html.en share/httpd/manual/vhosts/ip-based.html.ko.euc-kr @@ -1358,6 +1372,7 @@ share/httpd/manual/vhosts/name-based.html.ja.jis share/httpd/manual/vhosts/name-based.html.ko.euc-kr share/httpd/manual/vhosts/name-based.xml share/httpd/manual/vhosts/name-based.xml.de +share/httpd/manual/vhosts/name-based.xml.ja share/httpd/manual/vhosts/name-based.xml.ko share/httpd/manual/vhosts/name-based.xml.meta @dirrm share/httpd/manual/developer diff --git a/www/apache2/distinfo b/www/apache2/distinfo index f5184067873..a57883be0a6 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.22 2003/07/09 08:09:06 itojun Exp $ +$NetBSD: distinfo,v 1.23 2003/10/28 04:49:32 itojun Exp $ -SHA1 (httpd-2.0.47.tar.gz) = dbbb06472ddc65cbc59028e42d4476b186275632 -Size (httpd-2.0.47.tar.gz) = 6217401 bytes -SHA1 (patch-aa) = 2b7a2c0db5abac66966eaea2efb8609843e8abf4 +SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4 +Size (httpd-2.0.48.tar.gz) = 6258490 bytes +SHA1 (patch-aa) = b04f73fcc090e64c7c7de480fe504bb7a9e305bd SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74 diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa index b915194969c..8202e447362 100644 --- a/www/apache2/patches/patch-aa +++ b/www/apache2/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $ +$NetBSD: patch-aa,v 1.11 2003/10/28 04:49:33 itojun Exp $ ---- Makefile.in.orig 2003-05-18 02:11:37.000000000 +0900 -+++ Makefile.in 2003-05-29 09:48:23.000000000 +0900 +--- Makefile.in.orig Mon Aug 25 09:12:06 2003 ++++ Makefile.in Tue Oct 28 13:39:36 2003 @@ -14,7 +14,7 @@ PROGRAMS = $(PROGRAM_NAME) TARGETS = $(PROGRAMS) $(shared_build) $(other_targets) @@ -42,10 +42,10 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $ cp build/*.mk $(DESTDIR)$(installbuilddir); \ - sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \ - build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \ - cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); + cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \ + cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir); - htdocs-srcdir = $(top_srcdir)/docs/docroot -@@ -107,7 +109,7 @@ +@@ -108,7 +110,7 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $ echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ else \ echo Installing HTML documents ; \ -@@ -117,7 +119,7 @@ +@@ -118,7 +120,7 @@ fi install-error: @@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $ echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ else \ echo Installing error documents ; \ -@@ -127,7 +129,7 @@ +@@ -128,7 +130,7 @@ fi install-icons: @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $ echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ else \ echo Installing icons ; \ -@@ -137,7 +139,7 @@ +@@ -138,7 +140,7 @@ fi install-cgi: |