Update:

Apache: 1.3.19
Russian patch: 30.4
mod_ssl: 2.8.1

4 files changed, 81 insertions, 27 deletions

diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index bdbd2ea749e2..2b0ad3445b6b 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -32,9 +32,9 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.14
-VERSION_MODSSL=	2.7.1
-RA_VERSION=	30.0
+VERSION_APACHE=	1.3.19
+VERSION_MODSSL=	2.8.1
+RA_VERSION=	30.4
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo
index 3bc67d930a4a..41b2c34d2e20 100644
--- a/russian/apache13-modssl/distinfo
+++ b/russian/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.14rusPL30.0.tar.gz) = d72dd594773d1030499c87c0b4e1aa49
-MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
+MD5 (apache_1.3.19rusPL30.4.tar.gz) = 14fd592ea3307b7ae9208c098c12c1fd
+MD5 (mod_ssl-2.8.1-1.3.19.tar.gz) = 7d7cd5db29e1081f5c2fb97fc86c8213
diff --git a/russian/apache13-modssl/files/patch-ab b/russian/apache13-modssl/files/patch-ab
index d09e06a7bea2..97f6cb427bb0 100644
--- a/russian/apache13-modssl/files/patch-ab
+++ b/russian/apache13-modssl/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.tmpl.orig	Thu Jul  6 19:42:40 2000
-+++ Makefile.tmpl	Thu Jul  6 19:43:12 2000
-@@ -123,6 +123,7 @@
+--- Makefile.tmpl.orig	Mon Mar 12 13:11:58 2001
++++ Makefile.tmpl	Mon Mar 12 13:17:31 2001
+@@ -126,6 +126,7 @@
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
  proxycachedir   = @proxycachedir@
@@ -8,7 +8,7 @@
  
  libexecdir_relative   = @libexecdir_relative@
  
-@@ -325,9 +326,9 @@
+@@ -328,9 +329,9 @@
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
  	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
@@ -20,7 +20,7 @@
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(sysconfdir)/tables
-@@ -527,25 +528,33 @@
+@@ -530,25 +531,33 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -67,7 +67,7 @@
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -595,10 +604,10 @@
+@@ -598,10 +607,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;' \
@@ -75,10 +75,10 @@
 -			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
 -			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
 -			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- 			-e 's;conf/tables/;$(sysconfdir)/tables/;' \
++			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}http-access.log;" \
++			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}http-error.log;" \
++			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}http-referer.log;" \
++			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}http-agent.log;" \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ 			-e 's;conf/tables;$(sysconfdir)/tables;g' \
diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index df90865e5312..7b21bbd90cfa 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -287,6 +287,7 @@ share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
 share/doc/apache/index.html.dk
 share/doc/apache/index.html.ee
+share/doc/apache/index.html.el
 share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
@@ -313,18 +314,33 @@ share/doc/apache/index.html.se
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html
+share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
+share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
+share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
 share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html
+share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
+share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_pb.gif
+share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/feather.jpg
 share/doc/apache/manual/images/home.gif
@@ -335,11 +351,19 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/mod_ssl_sb.gif
 share/doc/apache/manual/images/openssl_ics.gif
+share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html
+share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
+share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html
+share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
+share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -368,7 +392,9 @@ share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html
+share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
+share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -392,7 +418,6 @@ share/doc/apache/manual/mod/mod_define.html
 share/doc/apache/manual/mod/mod_digest.html
 share/doc/apache/manual/mod/mod_dir.html
 share/doc/apache/manual/mod/mod_dld.html
-share/doc/apache/manual/mod/mod_dll.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
@@ -408,7 +433,9 @@ share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html
+share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
+share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
@@ -473,24 +500,47 @@ share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mod/module-dict.html.en
+share/doc/apache/manual/mod/module-dict.html.html
+share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/multilogs.html
 share/doc/apache/manual/netware.html
 share/doc/apache/manual/new_features_1_0.html
 share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html
+share/doc/apache/manual/new_features_1_3.html.en
+share/doc/apache/manual/new_features_1_3.html.html
+share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/programs/apachectl.html
+share/doc/apache/manual/programs/apxs.html
+share/doc/apache/manual/programs/dbmmanage.html
+share/doc/apache/manual/programs/footer.html
+share/doc/apache/manual/programs/header.html
+share/doc/apache/manual/programs/htdigest.html
+share/doc/apache/manual/programs/htpasswd.html
+share/doc/apache/manual/programs/httpd.html
+share/doc/apache/manual/programs/index.html
+share/doc/apache/manual/programs/logresolve.html
+share/doc/apache/manual/programs/other.html
+share/doc/apache/manual/programs/rotatelogs.html
+share/doc/apache/manual/programs/suexec.html
 share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
+share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
+share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -498,7 +548,9 @@ share/doc/apache/manual/vhosts/fd-limits.html
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
+share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
+share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
@@ -640,6 +692,8 @@ www/icons/world2.gif
 @dirrm include/apache
 @dirrm libexec/apache
 @dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/programs
 @dirrm share/doc/apache/manual/misc
 @dirrm share/doc/apache/manual/mod/mod_ssl
 @dirrm share/doc/apache/manual/mod