- Update to 1.3.26+2.8.10

- Use MASTER_SITES grouping

3 files changed, 31 insertions, 37 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index eb3bcafb66fd..c4250b906b68 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -9,35 +9,36 @@ PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
-		http://www.modssl.org/source/ \
+		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
+		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
+		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
+		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
+		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
+		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
+		ftp://www3.service.digital.com/apache/dist/httpd/ \
+		ftp://galileo.galilei.com/pub/apache/httpd/ \
+		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
+		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
+		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
+		${MASTER_SITES_MODSSL:S/$/:modssl/}
+MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
 		ftp://ftp.modssl.org/source/ \
 		ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
 		ftp://ftp.ecrc.net/pub/security/mod_ssl/ \
 		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
-		ftp://apache.compuex.com/pub/apache/dist/ \
-		ftp://apache.arctic.org/pub/apache/dist/ \
 		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
 		ftp://glock.missouri.edu/pub/mod_ssl/ \
-		ftp://ftp.epix.net/pub/apache/dist/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
 		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \
 		ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \
-		ftp://ftp.connectnet.com/pub/www/apache/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/ \
 		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/ \
-		ftp://www3.service.digital.com/apache/dist/ \
-		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/ \
-		ftp://galileo.galilei.com/pub/apache/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
-		ftp://apache.nextpath.com/pub/apache/dist/
+		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
 DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
+		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -48,7 +49,7 @@ USE_OPENSSL=	YES
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
 VERSION_APACHE=	1.3.26
-VERSION_MODSSL=	2.8.9
+VERSION_MODSSL=	2.8.10
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index d2f45633377d..47865cb9473c 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.9-1.3.26.tar.gz) = aad438a4eaeeee29ae74483f7afe9db0
+MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index 17697fd23cb3..715e17cede3a 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,18 +1,12 @@
- Apache 1.3 + mod_ssl 2.8         ``mod_ssl combines the flexibility of   
- ========================           Apache with the security of OpenSSL.''
-                                  
- The Apache Interface to OpenSSL  ``The best SSL solution for       
- http://www.modssl.org/             Apache money can't buy.''         
+This is Apache version 1.3 plus mod_ssl which provides strong cryptography
+via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
+v1) protocols by the help of the SSL/TLS implementation toolkit OpenSSL which
+is based on SSLeay from Eric A. Young and Tim J. Hudson. The mod_ssl package
+was created in April 1998 by Ralf S. Engelschall and was originally derived
+from software developed by Ben Laurie for use in the Apache-SSL HTTP server
+project. 
 
- This is Apache version 1.3 plus mod_ssl which provides strong cryptography
- via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
- v1) protocols by the help of the SSL/TLS implementation toolkit OpenSSL which
- is based on SSLeay from Eric A. Young and Tim J. Hudson. The mod_ssl package
- was created in April 1998 by Ralf S. Engelschall and was originally derived
- from software developed by Ben Laurie for use in the Apache-SSL HTTP server
- project. 
-
- As a summary, here are its main SSL/TLS-related features:
+As a summary, here are its main SSL/TLS-related features:
    o  Open-Source software (BSD-style license)
    o  Useable for both commercial and non-commercial use
    o  Available for both Unix and Win32 (Windows 95/98/NT) platforms 
@@ -38,7 +32,6 @@
    o  Assistance in X.509v3 certificate generation (both RSA and DSA)
    o  Experimental support for external Crypto Devices (OpenSSL ENGINE)
 
- All documentation can be found on-line on the Web:
-   o  Apache:  http://www.apache.org/
-   o  mod_ssl: http://www.modssl.org/
-   o  OpenSSL: http://www.openssl.org/
+WWW: http://www.apache.org/
+WWW: http://www.modssl.org/
+WWW: http://www.openssl.org/