6 files changed, 78 insertions, 14 deletions

diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index fa9ff28073c8..498fbda6d07c 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.11
+PORTVERSION=	1.3.12
 CATEGORIES=	www russian
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -23,7 +23,7 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.mtnranch.net/pub/apache/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
-DISTNAME=	apache_${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/ \
 		ftp://ftp.lexa.ru/pub/apache-rus/old-versions/
@@ -31,7 +31,7 @@ PATCHFILES=	patches_${PORTVERSION}rusPL${RA_VERSION}.tar.gz
 
 MAINTAINER=	vns@delta.odessa.ua
 
-RA_VERSION=	29.3
+RA_VERSION=	29.4
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 
 #
@@ -56,9 +56,6 @@ CONFIGURE_ARGS=	\
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-# Currently perl version don't matter
-#                 --with-perl=${PERL5}
-
 OPTIM=-DHARD_SERVER_LIMIT=512 \
 -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
 -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo
index 5e53fe3a63d5..28321971e750 100644
--- a/russian/apache13/distinfo
+++ b/russian/apache13/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (patches_1.3.11rusPL29.3.tar.gz) = 51450694dacc969ab599067c9d4a5730
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
+MD5 (patches_1.3.12rusPL29.4.tar.gz) = 46c5531ea9c0100ec73d1391fb0a772a
diff --git a/russian/apache13/files/patch-ac b/russian/apache13/files/patch-ac
new file mode 100644
index 000000000000..bcbeb3171d11
--- /dev/null
+++ b/russian/apache13/files/patch-ac
@@ -0,0 +1,11 @@
+--- src/Configure.bak	Sun Feb  6 04:27:19 2000
++++ src/Configure	Sun Mar 19 21:51:00 2000
+@@ -1043,7 +1043,7 @@
+ 	    LDFLAGS_SHLIB_EXPORT=""
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+-	*-freebsd3*|*-freebsd4*)
++	*-freebsd[3-9]*)
+ 		LD_SHLIB="gcc"
+ 	    CFLAGS_SHLIB="-fpic"
+ 	    LDFLAGS_SHLIB="-shared"
diff --git a/russian/apache13/files/patch-ag b/russian/apache13/files/patch-ag
index 436f8f3f7d95..80373fbcca63 100644
--- a/russian/apache13/files/patch-ag
+++ b/russian/apache13/files/patch-ag
@@ -1,6 +1,30 @@
---- conf/httpd.conf-dist.orig	Thu May  6 00:17:59 1999
-+++ conf/httpd.conf-dist	Fri Sep  3 15:42:56 1999
-@@ -467,7 +467,7 @@
+--- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
++++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
+@@ -354,7 +354,22 @@
+ # directory index.  Separate multiple entries with spaces.
+ #
+ <IfModule mod_dir.c>
+-    DirectoryIndex index.html
++    <IfModule mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.php3 index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.php3 index.html
++        </IfModule>
++    </IfModule>
++    <IfModule !mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.html
++        </IfModule>
++    </IfModule>
+ </IfModule>
+ 
+ #
+@@ -473,7 +488,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -9,7 +33,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -480,7 +480,7 @@
+@@ -486,7 +501,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -18,3 +42,25 @@
  
  #
  # Optionally add a line containing the server version and virtual host
+@@ -708,13 +723,17 @@
+     # For example, the PHP 3.x module (not part of the Apache distribution - see
+     # http://www.php.net) will typically use:
+     #
+-    #AddType application/x-httpd-php3 .php3
+-    #AddType application/x-httpd-php3-source .phps
++    <IfModule mod_php3.c>
++        AddType application/x-httpd-php3 .php3
++        AddType application/x-httpd-php3-source .php3s
++    </IfModule>
+     #
+     # And for PHP 4.x, use:
+     #
+-    #AddType application/x-httpd-php .php
+-    #AddType application/x-httpd-php-source .phps
++    <IfModule mod_php4.c>
++        AddType application/x-httpd-php .php
++        AddType application/x-httpd-php-source .phps
++    </IfModule>
+ 
+     AddType application/x-tar .tgz
+ 
diff --git a/russian/apache13/pkg-descr b/russian/apache13/pkg-descr
index 2f1bdbaf8fce..ff7c97e30ba6 100644
--- a/russian/apache13/pkg-descr
+++ b/russian/apache13/pkg-descr
@@ -1,5 +1,5 @@
                                 Russian Apache
-                             Version 29.3 (and up)
+                             Version 29.4 (and up)
 
 Russian Apache is an HTTP server designed to work on a Russian market.
 
diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist
index f33b7eea196c..d343d6daf918 100644
--- a/russian/apache13/pkg-plist
+++ b/russian/apache13/pkg-plist
@@ -1,14 +1,19 @@
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
 etc/apache/access.conf.default
 @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
 etc/apache/httpd.conf.default
 @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
 etc/apache/magic.default
 @exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
 etc/apache/mime.types.default
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
 etc/apache/srm.conf.default
 @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
 etc/apache/tables/russian/alt-alt.tab
@@ -168,7 +173,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/index.html
+share/doc/apache/index.html.ru
 share/doc/apache/index.html.ca
 share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
@@ -178,9 +183,12 @@ share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
 share/doc/apache/index.html.it
+share/doc/apache/index.html.ja.jis
 share/doc/apache/index.html.lu
 share/doc/apache/index.html.nl
+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.se
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
@@ -424,6 +432,8 @@ www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
 @exec mkdir -p %D/www/proxy
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm etc/apache/tables/russian
 @dirrm etc/apache/tables/russian2
 @dirrm etc/apache/tables/czech