diff options
36 files changed, 331 insertions, 133 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index ff09e17..1668e2f 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -53,9 +53,9 @@ USE_OPENSSL= YES LIB_DEPENDS= mm.12:${PORTSDIR}/devel/mm -VERSION_APACHE= 1.3.26 -VERSION_MODSSL= 2.8.10 -VERSION_RA= 30.15 +VERSION_APACHE= 1.3.27 +VERSION_MODSSL= 2.8.11 +VERSION_RA= 30.16 # # some defaults diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo index ba78bbb..193566e 100644 --- a/russian/apache13-modssl/distinfo +++ b/russian/apache13-modssl/distinfo @@ -1,3 +1,3 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 -MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4 -MD5 (patches_1.3.26rusPL30.15.tar.gz) = 5ccfb76804631e4cf1c9df71eb1f96e2 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa +MD5 (mod_ssl-2.8.11-1.3.27.tar.gz) = f84bd971aa8db28f31ad6bab2e7acc2c +MD5 (patches_1.3.27rusPL30.16.tar.gz) = e33a0e9ed40d39ce67fea77bbfe342ba diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist index 68fa14b..34dd6ad 100644 --- a/russian/apache13-modssl/pkg-plist +++ b/russian/apache13-modssl/pkg-plist @@ -353,6 +353,7 @@ 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/htaccess.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 @@ -442,11 +443,13 @@ share/doc/apache/manual/mod/mod_access.html.ja.jis share/doc/apache/manual/mod/mod_actions.html.en share/doc/apache/manual/mod/mod_actions.html.html share/doc/apache/manual/mod/mod_actions.html.ja.jis -share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_alias.html.en +share/doc/apache/manual/mod/mod_alias.html.ja.jis share/doc/apache/manual/mod/mod_asis.html.en share/doc/apache/manual/mod/mod_asis.html.html share/doc/apache/manual/mod/mod_asis.html.ja.jis -share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth.html.en +share/doc/apache/manual/mod/mod_auth.html.ja.jis share/doc/apache/manual/mod/mod_auth_anon.html share/doc/apache/manual/mod/mod_auth_db.html share/doc/apache/manual/mod/mod_auth_dbm.html diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile index 293e90a..d68c74d 100644 --- a/russian/apache13/Makefile +++ b/russian/apache13/Makefile @@ -31,8 +31,8 @@ PATCHFILES= patches_${APACHE_VERSION}rusPL${RA_VERSION}.tar.gz MAINTAINER= lev@serebryakov.spb.ru -RA_VERSION= 30.15 -APACHE_VERSION= 1.3.26 +RA_VERSION= 30.16 +APACHE_VERSION= 1.3.27 Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo index 18f93de0..1032ff7 100644 --- a/russian/apache13/distinfo +++ b/russian/apache13/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 -MD5 (patches_1.3.26rusPL30.15.tar.gz) = 5ccfb76804631e4cf1c9df71eb1f96e2 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa +MD5 (patches_1.3.27rusPL30.16.tar.gz) = e33a0e9ed40d39ce67fea77bbfe342ba diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist index 1219aee..d88ec10 100644 --- a/russian/apache13/pkg-plist +++ b/russian/apache13/pkg-plist @@ -327,6 +327,7 @@ 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/htaccess.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 @@ -411,11 +412,13 @@ share/doc/apache/manual/mod/mod_access.html.ja.jis share/doc/apache/manual/mod/mod_actions.html.en share/doc/apache/manual/mod/mod_actions.html.html share/doc/apache/manual/mod/mod_actions.html.ja.jis -share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_alias.html.en +share/doc/apache/manual/mod/mod_alias.html.ja.jis share/doc/apache/manual/mod/mod_asis.html.en share/doc/apache/manual/mod/mod_asis.html.html share/doc/apache/manual/mod/mod_asis.html.ja.jis -share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth.html.en +share/doc/apache/manual/mod/mod_auth.html.ja.jis share/doc/apache/manual/mod/mod_auth_anon.html share/doc/apache/manual/mod/mod_auth_db.html share/doc/apache/manual/mod/mod_auth_dbm.html diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 3b2dc94..2930b330 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -6,8 +6,7 @@ # PORTNAME= apache+ipv6 -PORTVERSION= 1.3.26 -PORTREVISION= 1 +PORTVERSION= 1.3.27 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -27,7 +26,7 @@ MASTER_SITES= http://www.apache.org/dist/httpd/ \ DISTNAME= apache_${PORTVERSION} PATCH_SITES= http://motoyuki.bsdclub.org/data/IPv6/ -PATCHFILES= apache-1.3.26-v6-20020620.diff.gz +PATCHFILES= apache-1.3.27-v6-20021004.diff.gz MAINTAINER= sumikawa@FreeBSD.org diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo index 0954151..3c63759 100644 --- a/www/apache13+ipv6/distinfo +++ b/www/apache13+ipv6/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 -MD5 (apache-1.3.26-v6-20020620.diff.gz) = e4f268a0a58d24827552faefd73d1859 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa +MD5 (apache-1.3.27-v6-20021004.diff.gz) = 72753dcc35ee2ba29e1ee1e376c00907 diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist index eac68a8..034d72b 100644 --- a/www/apache13+ipv6/pkg-plist +++ b/www/apache13+ipv6/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.15 2002-06-28 09:51:31 sumikawa Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.16 2002-10-05 09:18:44 kris Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -177,6 +177,7 @@ share/doc/apache/howto/cgi.html.html share/doc/apache/howto/cgi.html.ja.jis share/doc/apache/howto/footer.html share/doc/apache/howto/header.html +share/doc/apache/howto/htaccess.html share/doc/apache/howto/ssi.html.en share/doc/apache/howto/ssi.html.html share/doc/apache/howto/ssi.html.ja.jis @@ -261,11 +262,13 @@ share/doc/apache/mod/mod_access.html.ja.jis share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile index d5d6b3e..c3484e7 100644 --- a/www/apache13-fp/Makefile +++ b/www/apache13-fp/Makefile @@ -7,8 +7,7 @@ PORTNAME= apache PKGNAMESUFFIX= _fp -PORTVERSION= 1.3.26 -PORTREVISION= 3 +PORTVERSION= 1.3.27 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://www.freebsd.org/gifs/ \ diff --git a/www/apache13-fp/distinfo b/www/apache13-fp/distinfo index e25f9aa..24b1dcd 100644 --- a/www/apache13-fp/distinfo +++ b/www/apache13-fp/distinfo @@ -1,3 +1,3 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6 diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist index 80389d0..4752c10 100644 --- a/www/apache13-fp/pkg-plist +++ b/www/apache13-fp/pkg-plist @@ -172,6 +172,7 @@ 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/htaccess.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 @@ -259,11 +260,13 @@ share/doc/apache/manual/mod/mod_access.html.ja.jis share/doc/apache/manual/mod/mod_actions.html.en share/doc/apache/manual/mod/mod_actions.html.html share/doc/apache/manual/mod/mod_actions.html.ja.jis -share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_alias.html.en +share/doc/apache/manual/mod/mod_alias.html.ja.jis share/doc/apache/manual/mod/mod_asis.html.en share/doc/apache/manual/mod/mod_asis.html.html share/doc/apache/manual/mod/mod_asis.html.ja.jis -share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth.html.en +share/doc/apache/manual/mod/mod_auth.html.ja.jis share/doc/apache/manual/mod/mod_auth_anon.html share/doc/apache/manual/mod/mod_auth_db.html share/doc/apache/manual/mod/mod_auth_dbm.html @@ -637,6 +640,7 @@ www/icons/world2.png @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 diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 584e7e16..25f8fa2 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -48,8 +48,8 @@ USE_OPENSSL= YES .include <bsd.port.pre.mk> -VERSION_APACHE= 1.3.26 -VERSION_MODSSL= 2.8.10 +VERSION_APACHE= 1.3.27 +VERSION_MODSSL= 2.8.11 DATADIR= ${PREFIX}/www DOCUMENT_ROOT= ${DATADIR}/data diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo index 47865cb..31e1f5f 100644 --- a/www/apache13-modssl/distinfo +++ b/www/apache13-modssl/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 -MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa +MD5 (mod_ssl-2.8.11-1.3.27.tar.gz) = f84bd971aa8db28f31ad6bab2e7acc2c diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist index 54fa604..81ab42d 100644 --- a/www/apache13-modssl/pkg-plist +++ b/www/apache13-modssl/pkg-plist @@ -194,6 +194,7 @@ share/doc/apache/howto/cgi.html.en share/doc/apache/howto/cgi.html.ja.jis share/doc/apache/howto/footer.html share/doc/apache/howto/header.html +share/doc/apache/howto/htaccess.html share/doc/apache/images/apache_pb.gif share/doc/apache/images/apache_header.gif share/doc/apache/images/custom_errordocs.gif @@ -273,11 +274,13 @@ share/doc/apache/mod/mod_access.html.ja.jis share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile index 2522265..f3f9bb4 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -40,7 +40,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@freebsd.org -APACHE_VERSION= 1.3.26 +FORBIDDEN= "Security vulnerability; new version does not yet exist" + +APACHE_VERSION= 1.3.27 APACHE_SSL_VERSION= 1.48 USE_OPENSSL= YES diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo index 2e32eee..f435870 100644 --- a/www/apache13-ssl/distinfo +++ b/www/apache13-ssl/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 -MD5 (apache_1.3.26+ssl_1.48.tar.gz) = c0b9574b15dd4668cfc4f27b009ae1dd +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa +MD5 (apache_1.3.27+ssl_1.48.tar.gz) = c0b9574b15dd4668cfc4f27b009ae1dd diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 3afd99e..aa56e34 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -6,8 +6,7 @@ # PORTNAME= apache -PORTVERSION= 1.3.26 -PORTREVISION= 3 +PORTVERSION= 1.3.27 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ diff --git a/www/apache13/distinfo b/www/apache13/distinfo index ac76549..624b829 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6 +MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 8b39a77..88772c6 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -175,6 +175,7 @@ share/doc/apache/howto/cgi.html.html share/doc/apache/howto/cgi.html.ja.jis share/doc/apache/howto/footer.html share/doc/apache/howto/header.html +share/doc/apache/howto/htaccess.html share/doc/apache/howto/ssi.html.en share/doc/apache/howto/ssi.html.html share/doc/apache/howto/ssi.html.ja.jis @@ -259,11 +260,13 @@ share/doc/apache/mod/mod_access.html.ja.jis share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 2237e9b..034e10a 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.42 +PORTVERSION= 2.0.43 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index b979772..0b7d94b 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9 +MD5 (httpd-2.0.43.tar.gz) = 8051de5d160c43d4ed2cc47dc9be6fd3 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in index c0e8422..728fb88 100644 --- a/www/apache2/files/patch-Makefile.in +++ b/www/apache2/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 26 00:47:12 2002 -+++ Makefile.in Sat Aug 10 09:38:48 2002 +--- Makefile.in.orig Mon Sep 30 08:34:40 2002 ++++ Makefile.in Thu Oct 3 21:05:42 2002 @@ -36,10 +36,13 @@ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ @@ -24,7 +24,7 @@ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ -@@ -106,44 +112,32 @@ +@@ -106,45 +112,33 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -34,7 +34,7 @@ - echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing HTML documents + @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist @@ -49,7 +49,7 @@ - echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing error documents + @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist @@ -64,14 +64,15 @@ - echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing icons + @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist + -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) - ++ install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ @@ -79,16 +80,18 @@ - echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing CGIs + @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist + -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) - ++ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) + @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) @@ -185,11 +179,13 @@ @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @@ -99,7 +102,7 @@ +.if !defined(NOPORTDOCS) + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf) + @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true +.endif install-suexec: diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 79829eb..755ba5f 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -229,6 +229,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/custom-error.html.en %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis %%PORTDOCS%%share/doc/apache2/custom-error.xml +%%PORTDOCS%%share/doc/apache2/custom-error.xml.ja %%PORTDOCS%%share/doc/apache2/developer/API.html %%PORTDOCS%%share/doc/apache2/developer/debugging.html %%PORTDOCS%%share/doc/apache2/developer/documenting.html @@ -249,7 +250,6 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/dso.xml %%PORTDOCS%%share/doc/apache2/dso.xml.ja -%%PORTDOCS%%share/doc/apache2/ebcdic.html %%PORTDOCS%%share/doc/apache2/env.html.en %%PORTDOCS%%share/doc/apache2/env.html.ja.jis %%PORTDOCS%%share/doc/apache2/env.xml @@ -313,6 +313,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/install.xml %%PORTDOCS%%share/doc/apache2/install.xml.de +%%PORTDOCS%%share/doc/apache2/install.xml.ja %%PORTDOCS%%share/doc/apache2/invoking.html.en %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis %%PORTDOCS%%share/doc/apache2/invoking.xml @@ -320,25 +321,28 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/logs.html.en %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis %%PORTDOCS%%share/doc/apache2/logs.xml +%%PORTDOCS%%share/doc/apache2/logs.xml.ja %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html %%PORTDOCS%%share/doc/apache2/misc/descriptors.html %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html %%PORTDOCS%%share/doc/apache2/misc/footer.html %%PORTDOCS%%share/doc/apache2/misc/header.html -%%PORTDOCS%%share/doc/apache2/misc/index.html +%%PORTDOCS%%share/doc/apache2/misc/index.html.en +%%PORTDOCS%%share/doc/apache2/misc/index.xml %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html -%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html -%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html.en +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.xml +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html.en +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.xml %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml %%PORTDOCS%%share/doc/apache2/misc/tutorials.html -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja %%PORTDOCS%%share/doc/apache2/mod/core.html.en %%PORTDOCS%%share/doc/apache2/mod/core.xml %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/directives.html.en %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directives.xml @@ -386,7 +390,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml %%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en @@ -406,7 +412,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml @@ -426,13 +434,17 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en @@ -440,19 +452,25 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml %%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en @@ -462,7 +480,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml @@ -474,6 +494,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml @@ -490,6 +511,10 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/prefork.xml %%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja %%PORTDOCS%%share/doc/apache2/mod/worker.html.en %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/worker.xml @@ -506,8 +531,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de +%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ja +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.html.en +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.xml %%PORTDOCS%%share/doc/apache2/platform/footer.html %%PORTDOCS%%share/doc/apache2/platform/header.html +%%PORTDOCS%%share/doc/apache2/platform/index.html.en +%%PORTDOCS%%share/doc/apache2/platform/index.xml %%PORTDOCS%%share/doc/apache2/platform/netware.html.en %%PORTDOCS%%share/doc/apache2/platform/netware.xml %%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en @@ -539,20 +569,26 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/server-wide.xml +%%PORTDOCS%%share/doc/apache2/server-wide.xml.ja %%PORTDOCS%%share/doc/apache2/sitemap.html.en %%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis %%PORTDOCS%%share/doc/apache2/sitemap.xml +%%PORTDOCS%%share/doc/apache2/sitemap.xml.ja %%PORTDOCS%%share/doc/apache2/ssl/footer.html %%PORTDOCS%%share/doc/apache2/ssl/header.html %%PORTDOCS%%share/doc/apache2/ssl/index.html.en %%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html +%%PORTDOCS%%share/doc/apache2/ssl/index.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif @@ -562,6 +598,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/stopping.html.en %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis %%PORTDOCS%%share/doc/apache2/stopping.xml +%%PORTDOCS%%share/doc/apache2/stopping.xml.ja %%PORTDOCS%%share/doc/apache2/style/common.dtd %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc-b.css %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css @@ -592,11 +629,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/lang/de.xml %%PORTDOCS%%share/doc/apache2/style/lang/en.xml %%PORTDOCS%%share/doc/apache2/style/lang/ja.xml +%%PORTDOCS%%share/doc/apache2/style/lang/ru.xml %%PORTDOCS%%share/doc/apache2/style/lang/sv.xml %%PORTDOCS%%share/doc/apache2/style/manual.de.xsl %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl %%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl +%%PORTDOCS%%share/doc/apache2/style/manual.ru.xsl %%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd @@ -605,11 +644,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/xsl/directiveindex.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/manualpage.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl +%%PORTDOCS%%share/doc/apache2/style/xsl/quickreference.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl %%PORTDOCS%%share/doc/apache2/suexec.html.en %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis %%PORTDOCS%%share/doc/apache2/suexec.xml +%%PORTDOCS%%share/doc/apache2/suexec.xml.ja %%PORTDOCS%%share/doc/apache2/upgrading.html.de %%PORTDOCS%%share/doc/apache2/upgrading.html.en %%PORTDOCS%%share/doc/apache2/upgrading.html.fr @@ -621,6 +662,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/urlmapping.html.en %%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis %%PORTDOCS%%share/doc/apache2/urlmapping.xml +%%PORTDOCS%%share/doc/apache2/urlmapping.xml.ja %%PORTDOCS%%share/doc/apache2/vhosts/details.html %%PORTDOCS%%share/doc/apache2/vhosts/examples.html %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 2237e9b..034e10a 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.42 +PORTVERSION= 2.0.43 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache20/distinfo b/www/apache20/distinfo index b979772..0b7d94b 100644 --- a/www/apache20/distinfo +++ b/www/apache20/distinfo @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9 +MD5 (httpd-2.0.43.tar.gz) = 8051de5d160c43d4ed2cc47dc9be6fd3 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in index c0e8422..728fb88 100644 --- a/www/apache20/files/patch-Makefile.in +++ b/www/apache20/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 26 00:47:12 2002 -+++ Makefile.in Sat Aug 10 09:38:48 2002 +--- Makefile.in.orig Mon Sep 30 08:34:40 2002 ++++ Makefile.in Thu Oct 3 21:05:42 2002 @@ -36,10 +36,13 @@ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ @@ -24,7 +24,7 @@ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ -@@ -106,44 +112,32 @@ +@@ -106,45 +112,33 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -34,7 +34,7 @@ - echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing HTML documents + @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist @@ -49,7 +49,7 @@ - echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing error documents + @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist @@ -64,14 +64,15 @@ - echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing icons + @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist + -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) - ++ install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ @@ -79,16 +80,18 @@ - echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing CGIs + @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist + -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) - ++ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) + @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) @@ -185,11 +179,13 @@ @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @@ -99,7 +102,7 @@ +.if !defined(NOPORTDOCS) + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf) + @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true +.endif install-suexec: diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 79829eb..755ba5f 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -229,6 +229,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/custom-error.html.en %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis %%PORTDOCS%%share/doc/apache2/custom-error.xml +%%PORTDOCS%%share/doc/apache2/custom-error.xml.ja %%PORTDOCS%%share/doc/apache2/developer/API.html %%PORTDOCS%%share/doc/apache2/developer/debugging.html %%PORTDOCS%%share/doc/apache2/developer/documenting.html @@ -249,7 +250,6 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/dso.xml %%PORTDOCS%%share/doc/apache2/dso.xml.ja -%%PORTDOCS%%share/doc/apache2/ebcdic.html %%PORTDOCS%%share/doc/apache2/env.html.en %%PORTDOCS%%share/doc/apache2/env.html.ja.jis %%PORTDOCS%%share/doc/apache2/env.xml @@ -313,6 +313,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/install.xml %%PORTDOCS%%share/doc/apache2/install.xml.de +%%PORTDOCS%%share/doc/apache2/install.xml.ja %%PORTDOCS%%share/doc/apache2/invoking.html.en %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis %%PORTDOCS%%share/doc/apache2/invoking.xml @@ -320,25 +321,28 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/logs.html.en %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis %%PORTDOCS%%share/doc/apache2/logs.xml +%%PORTDOCS%%share/doc/apache2/logs.xml.ja %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html %%PORTDOCS%%share/doc/apache2/misc/descriptors.html %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html %%PORTDOCS%%share/doc/apache2/misc/footer.html %%PORTDOCS%%share/doc/apache2/misc/header.html -%%PORTDOCS%%share/doc/apache2/misc/index.html +%%PORTDOCS%%share/doc/apache2/misc/index.html.en +%%PORTDOCS%%share/doc/apache2/misc/index.xml %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html -%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html -%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html.en +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.xml +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html.en +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.xml %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml %%PORTDOCS%%share/doc/apache2/misc/tutorials.html -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja %%PORTDOCS%%share/doc/apache2/mod/core.html.en %%PORTDOCS%%share/doc/apache2/mod/core.xml %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/directives.html.en %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directives.xml @@ -386,7 +390,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml %%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en @@ -406,7 +412,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml @@ -426,13 +434,17 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en @@ -440,19 +452,25 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml %%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en @@ -462,7 +480,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml @@ -474,6 +494,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml @@ -490,6 +511,10 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/prefork.xml %%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja %%PORTDOCS%%share/doc/apache2/mod/worker.html.en %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/worker.xml @@ -506,8 +531,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de +%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ja +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.html.en +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.xml %%PORTDOCS%%share/doc/apache2/platform/footer.html %%PORTDOCS%%share/doc/apache2/platform/header.html +%%PORTDOCS%%share/doc/apache2/platform/index.html.en +%%PORTDOCS%%share/doc/apache2/platform/index.xml %%PORTDOCS%%share/doc/apache2/platform/netware.html.en %%PORTDOCS%%share/doc/apache2/platform/netware.xml %%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en @@ -539,20 +569,26 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/server-wide.xml +%%PORTDOCS%%share/doc/apache2/server-wide.xml.ja %%PORTDOCS%%share/doc/apache2/sitemap.html.en %%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis %%PORTDOCS%%share/doc/apache2/sitemap.xml +%%PORTDOCS%%share/doc/apache2/sitemap.xml.ja %%PORTDOCS%%share/doc/apache2/ssl/footer.html %%PORTDOCS%%share/doc/apache2/ssl/header.html %%PORTDOCS%%share/doc/apache2/ssl/index.html.en %%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html +%%PORTDOCS%%share/doc/apache2/ssl/index.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif @@ -562,6 +598,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/stopping.html.en %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis %%PORTDOCS%%share/doc/apache2/stopping.xml +%%PORTDOCS%%share/doc/apache2/stopping.xml.ja %%PORTDOCS%%share/doc/apache2/style/common.dtd %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc-b.css %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css @@ -592,11 +629,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/lang/de.xml %%PORTDOCS%%share/doc/apache2/style/lang/en.xml %%PORTDOCS%%share/doc/apache2/style/lang/ja.xml +%%PORTDOCS%%share/doc/apache2/style/lang/ru.xml %%PORTDOCS%%share/doc/apache2/style/lang/sv.xml %%PORTDOCS%%share/doc/apache2/style/manual.de.xsl %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl %%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl +%%PORTDOCS%%share/doc/apache2/style/manual.ru.xsl %%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd @@ -605,11 +644,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/xsl/directiveindex.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/manualpage.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl +%%PORTDOCS%%share/doc/apache2/style/xsl/quickreference.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl %%PORTDOCS%%share/doc/apache2/suexec.html.en %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis %%PORTDOCS%%share/doc/apache2/suexec.xml +%%PORTDOCS%%share/doc/apache2/suexec.xml.ja %%PORTDOCS%%share/doc/apache2/upgrading.html.de %%PORTDOCS%%share/doc/apache2/upgrading.html.en %%PORTDOCS%%share/doc/apache2/upgrading.html.fr @@ -621,6 +662,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/urlmapping.html.en %%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis %%PORTDOCS%%share/doc/apache2/urlmapping.xml +%%PORTDOCS%%share/doc/apache2/urlmapping.xml.ja %%PORTDOCS%%share/doc/apache2/vhosts/details.html %%PORTDOCS%%share/doc/apache2/vhosts/examples.html %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 2237e9b..034e10a 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.42 +PORTVERSION= 2.0.43 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache21/distinfo b/www/apache21/distinfo index b979772..0b7d94b 100644 --- a/www/apache21/distinfo +++ b/www/apache21/distinfo @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9 +MD5 (httpd-2.0.43.tar.gz) = 8051de5d160c43d4ed2cc47dc9be6fd3 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in index c0e8422..728fb88 100644 --- a/www/apache21/files/patch-Makefile.in +++ b/www/apache21/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 26 00:47:12 2002 -+++ Makefile.in Sat Aug 10 09:38:48 2002 +--- Makefile.in.orig Mon Sep 30 08:34:40 2002 ++++ Makefile.in Thu Oct 3 21:05:42 2002 @@ -36,10 +36,13 @@ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ @@ -24,7 +24,7 @@ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ -@@ -106,44 +112,32 @@ +@@ -106,45 +112,33 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -34,7 +34,7 @@ - echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing HTML documents + @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist @@ -49,7 +49,7 @@ - echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing error documents + @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist @@ -64,14 +64,15 @@ - echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing icons + @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist + -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) - ++ install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ @@ -79,16 +80,18 @@ - echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing CGIs + @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist + -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) - ++ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) + @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) @@ -185,11 +179,13 @@ @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @@ -99,7 +102,7 @@ +.if !defined(NOPORTDOCS) + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf) + @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true +.endif install-suexec: diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index 79829eb..755ba5f 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -229,6 +229,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/custom-error.html.en %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis %%PORTDOCS%%share/doc/apache2/custom-error.xml +%%PORTDOCS%%share/doc/apache2/custom-error.xml.ja %%PORTDOCS%%share/doc/apache2/developer/API.html %%PORTDOCS%%share/doc/apache2/developer/debugging.html %%PORTDOCS%%share/doc/apache2/developer/documenting.html @@ -249,7 +250,6 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/dso.xml %%PORTDOCS%%share/doc/apache2/dso.xml.ja -%%PORTDOCS%%share/doc/apache2/ebcdic.html %%PORTDOCS%%share/doc/apache2/env.html.en %%PORTDOCS%%share/doc/apache2/env.html.ja.jis %%PORTDOCS%%share/doc/apache2/env.xml @@ -313,6 +313,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/install.xml %%PORTDOCS%%share/doc/apache2/install.xml.de +%%PORTDOCS%%share/doc/apache2/install.xml.ja %%PORTDOCS%%share/doc/apache2/invoking.html.en %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis %%PORTDOCS%%share/doc/apache2/invoking.xml @@ -320,25 +321,28 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/logs.html.en %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis %%PORTDOCS%%share/doc/apache2/logs.xml +%%PORTDOCS%%share/doc/apache2/logs.xml.ja %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html %%PORTDOCS%%share/doc/apache2/misc/descriptors.html %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html %%PORTDOCS%%share/doc/apache2/misc/footer.html %%PORTDOCS%%share/doc/apache2/misc/header.html -%%PORTDOCS%%share/doc/apache2/misc/index.html +%%PORTDOCS%%share/doc/apache2/misc/index.html.en +%%PORTDOCS%%share/doc/apache2/misc/index.xml %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html -%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html -%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html.en +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.xml +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html.en +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.xml %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml %%PORTDOCS%%share/doc/apache2/misc/tutorials.html -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja %%PORTDOCS%%share/doc/apache2/mod/core.html.en %%PORTDOCS%%share/doc/apache2/mod/core.xml %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/directives.html.en %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directives.xml @@ -386,7 +390,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml %%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en @@ -406,7 +412,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml @@ -426,13 +434,17 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en @@ -440,19 +452,25 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml %%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en @@ -462,7 +480,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml @@ -474,6 +494,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml @@ -490,6 +511,10 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/prefork.xml %%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja %%PORTDOCS%%share/doc/apache2/mod/worker.html.en %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/worker.xml @@ -506,8 +531,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de +%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ja +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.html.en +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.xml %%PORTDOCS%%share/doc/apache2/platform/footer.html %%PORTDOCS%%share/doc/apache2/platform/header.html +%%PORTDOCS%%share/doc/apache2/platform/index.html.en +%%PORTDOCS%%share/doc/apache2/platform/index.xml %%PORTDOCS%%share/doc/apache2/platform/netware.html.en %%PORTDOCS%%share/doc/apache2/platform/netware.xml %%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en @@ -539,20 +569,26 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/server-wide.xml +%%PORTDOCS%%share/doc/apache2/server-wide.xml.ja %%PORTDOCS%%share/doc/apache2/sitemap.html.en %%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis %%PORTDOCS%%share/doc/apache2/sitemap.xml +%%PORTDOCS%%share/doc/apache2/sitemap.xml.ja %%PORTDOCS%%share/doc/apache2/ssl/footer.html %%PORTDOCS%%share/doc/apache2/ssl/header.html %%PORTDOCS%%share/doc/apache2/ssl/index.html.en %%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html +%%PORTDOCS%%share/doc/apache2/ssl/index.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif @@ -562,6 +598,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/stopping.html.en %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis %%PORTDOCS%%share/doc/apache2/stopping.xml +%%PORTDOCS%%share/doc/apache2/stopping.xml.ja %%PORTDOCS%%share/doc/apache2/style/common.dtd %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc-b.css %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css @@ -592,11 +629,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/lang/de.xml %%PORTDOCS%%share/doc/apache2/style/lang/en.xml %%PORTDOCS%%share/doc/apache2/style/lang/ja.xml +%%PORTDOCS%%share/doc/apache2/style/lang/ru.xml %%PORTDOCS%%share/doc/apache2/style/lang/sv.xml %%PORTDOCS%%share/doc/apache2/style/manual.de.xsl %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl %%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl +%%PORTDOCS%%share/doc/apache2/style/manual.ru.xsl %%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd @@ -605,11 +644,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/xsl/directiveindex.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/manualpage.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl +%%PORTDOCS%%share/doc/apache2/style/xsl/quickreference.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl %%PORTDOCS%%share/doc/apache2/suexec.html.en %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis %%PORTDOCS%%share/doc/apache2/suexec.xml +%%PORTDOCS%%share/doc/apache2/suexec.xml.ja %%PORTDOCS%%share/doc/apache2/upgrading.html.de %%PORTDOCS%%share/doc/apache2/upgrading.html.en %%PORTDOCS%%share/doc/apache2/upgrading.html.fr @@ -621,6 +662,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/urlmapping.html.en %%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis %%PORTDOCS%%share/doc/apache2/urlmapping.xml +%%PORTDOCS%%share/doc/apache2/urlmapping.xml.ja %%PORTDOCS%%share/doc/apache2/vhosts/details.html %%PORTDOCS%%share/doc/apache2/vhosts/examples.html %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 2237e9b..034e10a 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.42 +PORTVERSION= 2.0.43 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index b979772..0b7d94b 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9 +MD5 (httpd-2.0.43.tar.gz) = 8051de5d160c43d4ed2cc47dc9be6fd3 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in index c0e8422..728fb88 100644 --- a/www/apache22/files/patch-Makefile.in +++ b/www/apache22/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 26 00:47:12 2002 -+++ Makefile.in Sat Aug 10 09:38:48 2002 +--- Makefile.in.orig Mon Sep 30 08:34:40 2002 ++++ Makefile.in Thu Oct 3 21:05:42 2002 @@ -36,10 +36,13 @@ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ @@ -24,7 +24,7 @@ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ -@@ -106,44 +112,32 @@ +@@ -106,45 +112,33 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -34,7 +34,7 @@ - echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing HTML documents + @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist @@ -49,7 +49,7 @@ - echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + @echo Installing error documents + @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist @@ -64,14 +64,15 @@ - echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing icons + @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist + -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) - ++ install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ @@ -79,16 +80,18 @@ - echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi +- + @echo Installing CGIs + @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist + -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) - ++ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) + @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) @@ -185,11 +179,13 @@ @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @@ -99,7 +102,7 @@ +.if !defined(NOPORTDOCS) + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf) + @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true +.endif install-suexec: diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index 79829eb..755ba5f 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -229,6 +229,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/custom-error.html.en %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis %%PORTDOCS%%share/doc/apache2/custom-error.xml +%%PORTDOCS%%share/doc/apache2/custom-error.xml.ja %%PORTDOCS%%share/doc/apache2/developer/API.html %%PORTDOCS%%share/doc/apache2/developer/debugging.html %%PORTDOCS%%share/doc/apache2/developer/documenting.html @@ -249,7 +250,6 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/dso.xml %%PORTDOCS%%share/doc/apache2/dso.xml.ja -%%PORTDOCS%%share/doc/apache2/ebcdic.html %%PORTDOCS%%share/doc/apache2/env.html.en %%PORTDOCS%%share/doc/apache2/env.html.ja.jis %%PORTDOCS%%share/doc/apache2/env.xml @@ -313,6 +313,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/install.xml %%PORTDOCS%%share/doc/apache2/install.xml.de +%%PORTDOCS%%share/doc/apache2/install.xml.ja %%PORTDOCS%%share/doc/apache2/invoking.html.en %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis %%PORTDOCS%%share/doc/apache2/invoking.xml @@ -320,25 +321,28 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/logs.html.en %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis %%PORTDOCS%%share/doc/apache2/logs.xml +%%PORTDOCS%%share/doc/apache2/logs.xml.ja %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html %%PORTDOCS%%share/doc/apache2/misc/descriptors.html %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html %%PORTDOCS%%share/doc/apache2/misc/footer.html %%PORTDOCS%%share/doc/apache2/misc/header.html -%%PORTDOCS%%share/doc/apache2/misc/index.html +%%PORTDOCS%%share/doc/apache2/misc/index.html.en +%%PORTDOCS%%share/doc/apache2/misc/index.xml %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html -%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html -%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html.en +%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.xml +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html.en +%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.xml %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml %%PORTDOCS%%share/doc/apache2/misc/tutorials.html -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml -%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja %%PORTDOCS%%share/doc/apache2/mod/core.html.en %%PORTDOCS%%share/doc/apache2/mod/core.xml %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/directives.html.en %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directives.xml @@ -386,7 +390,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml %%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en @@ -406,7 +412,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml @@ -426,13 +434,17 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_logio.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.xml %%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en @@ -440,19 +452,25 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml %%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en @@ -462,7 +480,9 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml @@ -474,6 +494,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml +%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml @@ -490,6 +511,10 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/prefork.xml %%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja %%PORTDOCS%%share/doc/apache2/mod/worker.html.en %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/worker.xml @@ -506,8 +531,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de +%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ja +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.html.en +%%PORTDOCS%%share/doc/apache2/platform/ebcdic.xml %%PORTDOCS%%share/doc/apache2/platform/footer.html %%PORTDOCS%%share/doc/apache2/platform/header.html +%%PORTDOCS%%share/doc/apache2/platform/index.html.en +%%PORTDOCS%%share/doc/apache2/platform/index.xml %%PORTDOCS%%share/doc/apache2/platform/netware.html.en %%PORTDOCS%%share/doc/apache2/platform/netware.xml %%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en @@ -539,20 +569,26 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/server-wide.xml +%%PORTDOCS%%share/doc/apache2/server-wide.xml.ja %%PORTDOCS%%share/doc/apache2/sitemap.html.en %%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis %%PORTDOCS%%share/doc/apache2/sitemap.xml +%%PORTDOCS%%share/doc/apache2/sitemap.xml.ja %%PORTDOCS%%share/doc/apache2/ssl/footer.html %%PORTDOCS%%share/doc/apache2/ssl/header.html %%PORTDOCS%%share/doc/apache2/ssl/index.html.en %%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html +%%PORTDOCS%%share/doc/apache2/ssl/index.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.xml +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html.en +%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.xml %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif @@ -562,6 +598,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/stopping.html.en %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis %%PORTDOCS%%share/doc/apache2/stopping.xml +%%PORTDOCS%%share/doc/apache2/stopping.xml.ja %%PORTDOCS%%share/doc/apache2/style/common.dtd %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc-b.css %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css @@ -592,11 +629,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/lang/de.xml %%PORTDOCS%%share/doc/apache2/style/lang/en.xml %%PORTDOCS%%share/doc/apache2/style/lang/ja.xml +%%PORTDOCS%%share/doc/apache2/style/lang/ru.xml %%PORTDOCS%%share/doc/apache2/style/lang/sv.xml %%PORTDOCS%%share/doc/apache2/style/manual.de.xsl %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl %%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl +%%PORTDOCS%%share/doc/apache2/style/manual.ru.xsl %%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd @@ -605,11 +644,13 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/style/xsl/directiveindex.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/manualpage.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl +%%PORTDOCS%%share/doc/apache2/style/xsl/quickreference.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl %%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl %%PORTDOCS%%share/doc/apache2/suexec.html.en %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis %%PORTDOCS%%share/doc/apache2/suexec.xml +%%PORTDOCS%%share/doc/apache2/suexec.xml.ja %%PORTDOCS%%share/doc/apache2/upgrading.html.de %%PORTDOCS%%share/doc/apache2/upgrading.html.en %%PORTDOCS%%share/doc/apache2/upgrading.html.fr @@ -621,6 +662,7 @@ share/apache2/special.mk %%PORTDOCS%%share/doc/apache2/urlmapping.html.en %%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis %%PORTDOCS%%share/doc/apache2/urlmapping.xml +%%PORTDOCS%%share/doc/apache2/urlmapping.xml.ja %%PORTDOCS%%share/doc/apache2/vhosts/details.html %%PORTDOCS%%share/doc/apache2/vhosts/examples.html %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en |
