upgrade to 1.3.12

15 files changed, 30 insertions, 35 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 7cb945beacb9..d81c6e81af7c 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       apache_1.3.11
-PKGNAME=        apache-1.3.11
+DISTNAME=       apache_1.3.12
+PKGNAME=        apache-1.3.12
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -25,9 +25,6 @@ MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 
-PATCH_SITES=    http://www.apache.org/info/css-security/
-PATCHFILES=     apache_1.3.11_css_patch.txt
-
 MAINTAINER=     ache@freebsd.org
 
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index 9e3d8709885e..26359e664602 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index 63f7532eebb7..52277a5de835 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -92,9 +92,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
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 7cb945beacb9..d81c6e81af7c 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       apache_1.3.11
-PKGNAME=        apache-1.3.11
+DISTNAME=       apache_1.3.12
+PKGNAME=        apache-1.3.12
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -25,9 +25,6 @@ MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 
-PATCH_SITES=    http://www.apache.org/info/css-security/
-PATCHFILES=     apache_1.3.11_css_patch.txt
-
 MAINTAINER=     ache@freebsd.org
 
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 9e3d8709885e..26359e664602 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 63f7532eebb7..52277a5de835 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -92,9 +92,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
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 7cb945beacb9..d81c6e81af7c 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       apache_1.3.11
-PKGNAME=        apache-1.3.11
+DISTNAME=       apache_1.3.12
+PKGNAME=        apache-1.3.12
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -25,9 +25,6 @@ MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 
-PATCH_SITES=    http://www.apache.org/info/css-security/
-PATCHFILES=     apache_1.3.11_css_patch.txt
-
 MAINTAINER=     ache@freebsd.org
 
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 9e3d8709885e..26359e664602 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 63f7532eebb7..52277a5de835 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -92,9 +92,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
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 7cb945beacb9..d81c6e81af7c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       apache_1.3.11
-PKGNAME=        apache-1.3.11
+DISTNAME=       apache_1.3.12
+PKGNAME=        apache-1.3.12
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -25,9 +25,6 @@ MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 
-PATCH_SITES=    http://www.apache.org/info/css-security/
-PATCHFILES=     apache_1.3.11_css_patch.txt
-
 MAINTAINER=     ache@freebsd.org
 
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index 9e3d8709885e..26359e664602 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 63f7532eebb7..52277a5de835 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -92,9 +92,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
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 7cb945beacb9..d81c6e81af7c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       apache_1.3.11
-PKGNAME=        apache-1.3.11
+DISTNAME=       apache_1.3.12
+PKGNAME=        apache-1.3.12
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -25,9 +25,6 @@ MASTER_SITES=   http://www.apache.org/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 
-PATCH_SITES=    http://www.apache.org/info/css-security/
-PATCHFILES=     apache_1.3.11_css_patch.txt
-
 MAINTAINER=     ache@freebsd.org
 
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 9e3d8709885e..26359e664602 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 63f7532eebb7..52277a5de835 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -92,9 +92,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