Update: Apache 1.3.14;

	mod_ssl: 2.7.1;
	RA: 30.0

Also sync with www/apache13-modssl a bit.

PR:		22775 (partially)

3 files changed, 100 insertions, 12 deletions

diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 00a66edc7099..d84074baa5f5 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -26,16 +26,15 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	demon@FreeBSD.org
 
-BUILD_DEPENDS=	mm-config:${PORTSDIR}/devel/mm \
-		${LOCALBASE}/lib/libmm.a:${PORTSDIR}/devel/mm
-
 USE_OPENSSL=	YES
 
 .include <bsd.port.pre.mk>
 
-VERSION_APACHE=	1.3.12
-VERSION_MODSSL=	2.6.6
-RA_VERSION=	29.7
+LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
+
+VERSION_APACHE=	1.3.14
+VERSION_MODSSL=	2.7.1
+RA_VERSION=	30.0
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
@@ -44,15 +43,18 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-perl=${PERL} \
 		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
 		--without-confadjust \
-		--enable-module=ssl \
 		--enable-module=most \
 		--enable-module=auth_db \
+		--enable-module=mmap_static \
 		--disable-module=auth_dbm \
-		--enable-shared=max
+		--enable-shared=max \
+		--enable-module=ssl \
+		--enable-module=define
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
+		-DACCEPT_FILTER_NAME=\\"httpready\\"
 
 pre-extract:
 .if defined(WITH_SUEXEC)
diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo
index a398ce26c069..3bc67d930a4a 100644
--- a/russian/apache13-modssl/distinfo
+++ b/russian/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.12rusPL29.7.tar.gz) = 170c951be96e88e5e05fbc0ed4452ff7
-MD5 (mod_ssl-2.6.6-1.3.12.tar.gz) = 573b4d89c1f203216a55fb5c2aece009
+MD5 (apache_1.3.14rusPL30.0.tar.gz) = d72dd594773d1030499c87c0b4e1aa49
+MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index 6fd3f6e6c465..df90865e5312 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -37,6 +37,70 @@ etc/apache/ssl.key/snakeoil-ca-dsa.key
 etc/apache/ssl.key/snakeoil-rsa.key
 etc/apache/ssl.key/snakeoil-dsa.key
 etc/apache/ssl.key/server.key
+etc/apache/tables/cyrillic/dos-dos.tab
+etc/apache/tables/cyrillic/dos-iso.tab
+etc/apache/tables/cyrillic/dos-koi.tab
+etc/apache/tables/cyrillic/dos-koiu.tab
+etc/apache/tables/cyrillic/dos-mac.tab
+etc/apache/tables/cyrillic/dos-macu.tab
+etc/apache/tables/cyrillic/dos-utf7.tab
+etc/apache/tables/cyrillic/dos-utf8.tab
+etc/apache/tables/cyrillic/dos-win.tab
+etc/apache/tables/cyrillic/iso-dos.tab
+etc/apache/tables/cyrillic/iso-iso.tab
+etc/apache/tables/cyrillic/iso-koi.tab
+etc/apache/tables/cyrillic/iso-koiu.tab
+etc/apache/tables/cyrillic/iso-mac.tab
+etc/apache/tables/cyrillic/iso-macu.tab
+etc/apache/tables/cyrillic/iso-utf7.tab
+etc/apache/tables/cyrillic/iso-utf8.tab
+etc/apache/tables/cyrillic/iso-win.tab
+etc/apache/tables/cyrillic/koi-dos.tab
+etc/apache/tables/cyrillic/koi-iso.tab
+etc/apache/tables/cyrillic/koi-koi.tab
+etc/apache/tables/cyrillic/koi-koiu.tab
+etc/apache/tables/cyrillic/koi-mac.tab
+etc/apache/tables/cyrillic/koi-macu.tab
+etc/apache/tables/cyrillic/koi-utf7.tab
+etc/apache/tables/cyrillic/koi-utf8.tab
+etc/apache/tables/cyrillic/koi-win.tab
+etc/apache/tables/cyrillic/koiu-dos.tab
+etc/apache/tables/cyrillic/koiu-iso.tab
+etc/apache/tables/cyrillic/koiu-koi.tab
+etc/apache/tables/cyrillic/koiu-koiu.tab
+etc/apache/tables/cyrillic/koiu-mac.tab
+etc/apache/tables/cyrillic/koiu-macu.tab
+etc/apache/tables/cyrillic/koiu-utf7.tab
+etc/apache/tables/cyrillic/koiu-utf8.tab
+etc/apache/tables/cyrillic/koiu-win.tab
+etc/apache/tables/cyrillic/mac-dos.tab
+etc/apache/tables/cyrillic/mac-iso.tab
+etc/apache/tables/cyrillic/mac-koi.tab
+etc/apache/tables/cyrillic/mac-koiu.tab
+etc/apache/tables/cyrillic/mac-mac.tab
+etc/apache/tables/cyrillic/mac-macu.tab
+etc/apache/tables/cyrillic/mac-utf7.tab
+etc/apache/tables/cyrillic/mac-utf8.tab
+etc/apache/tables/cyrillic/mac-win.tab
+etc/apache/tables/cyrillic/macu-dos.tab
+etc/apache/tables/cyrillic/macu-iso.tab
+etc/apache/tables/cyrillic/macu-koi.tab
+etc/apache/tables/cyrillic/macu-koiu.tab
+etc/apache/tables/cyrillic/macu-mac.tab
+etc/apache/tables/cyrillic/macu-macu.tab
+etc/apache/tables/cyrillic/macu-utf7.tab
+etc/apache/tables/cyrillic/macu-utf8.tab
+etc/apache/tables/cyrillic/macu-win.tab
+etc/apache/tables/cyrillic/readme.txt
+etc/apache/tables/cyrillic/win-dos.tab
+etc/apache/tables/cyrillic/win-iso.tab
+etc/apache/tables/cyrillic/win-koi.tab
+etc/apache/tables/cyrillic/win-koiu.tab
+etc/apache/tables/cyrillic/win-mac.tab
+etc/apache/tables/cyrillic/win-macu.tab
+etc/apache/tables/cyrillic/win-utf7.tab
+etc/apache/tables/cyrillic/win-utf8.tab
+etc/apache/tables/cyrillic/win-win.tab
 etc/apache/tables/russian/alt-alt.tab
 etc/apache/tables/russian/alt-iso.tab
 etc/apache/tables/russian/alt-koi.tab
@@ -122,8 +186,8 @@ etc/apache/tables/ukrainian2/win-mac.tab
 etc/apache/tables/ukrainian2/win-ruscii.tab
 etc/apache/tables/ukrainian2/win-trans.tab
 etc/rc.d/apache.sh
-include/apache/alloc.h
 include/apache/ap.h
+include/apache/ap_alloc.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
 include/apache/ap_config_auto.h
@@ -194,6 +258,7 @@ libexec/apache/mod_info.so
 libexec/apache/mod_log_config.so
 libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mmap_static.so
 libexec/apache/mod_negotiation.so
 libexec/apache/mod_rewrite.so
 libexec/apache/mod_setenvif.so
@@ -216,6 +281,7 @@ share/doc/apache/ra-powered.gif
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
+share/doc/apache/README.rus
 share/doc/apache/index.html.ca
 share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
@@ -224,24 +290,37 @@ share/doc/apache/index.html.ee
 share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
+share/doc/apache/index.html.he.iso8859-8
 share/doc/apache/index.html.it
 share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.kr.iso-kr
 share/doc/apache/index.html.lu
 share/doc/apache/index.html.nl
+share/doc/apache/index.html.no
 share/doc/apache/index.html.po.iso-pl
 share/doc/apache/index.html.pt
 share/doc/apache/index.html.pt-br
 share/doc/apache/index.html.ru
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.tw.Big5
 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/content-negotiation.html
 share/doc/apache/manual/custom-error.html
 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/header.html
@@ -285,6 +364,7 @@ share/doc/apache/manual/misc/perf-tuning.html
 share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
+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
@@ -293,6 +373,7 @@ share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
 share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index-bytype.html
 share/doc/apache/manual/mod/mod_access.html
 share/doc/apache/manual/mod/mod_actions.html
 share/doc/apache/manual/mod/mod_alias.html
@@ -392,12 +473,14 @@ 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/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_2_0.html
 share/doc/apache/manual/process-model.html
 share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
@@ -422,6 +505,8 @@ share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
 share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/windows.html
+share/doc/apache/manual/win_compiling.html
+share/doc/apache/manual/win_service.html
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
 www/icons/README
@@ -543,6 +628,7 @@ www/icons/world2.gif
 @dirrm etc/apache/ssl.csr
 @dirrm etc/apache/ssl.key
 @dirrm etc/apache/ssl.prm
+@dirrm etc/apache/tables/cyrillic
 @dirrm etc/apache/tables/czech
 @dirrm etc/apache/tables/russian
 @dirrm etc/apache/tables/russian2