- use hook for bsd.openssl.mk

- Cleanup Makefile

1 files changed, 27 insertions, 28 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index def2c868ed98..4cbd4bec42f3 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -9,26 +9,10 @@
 
 PORTNAME=	apache+ssl
 PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
-		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/:ssl \
-		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/:ssl \
-		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/:ssl \
-		ftp://ftp.win.ne.jp/pub/network/security/apache-ssl/:ssl \
-		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/:ssl \
-		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/:ssl \
-		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/:ssl \
-		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/:ssl \
-		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/:ssl \
-		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/:ssl \
-		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/:ssl \
-		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/:ssl \
-		ftp://ftp.sekure.net/pub/apache-ssl/:ssl \
-		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/:ssl \
-		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/:ssl \
-		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/:ssl \
-		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL/:ssl
+		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
 DISTNAME=	apache_${APACHE_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
@@ -39,19 +23,16 @@ COMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
 
 APACHE_VERSION=		1.3.27
 APACHE_SSL_VERSION=	1.48
-
+USE_OPENSSL=	YES
 USE_PERL5=	YES
-
-.include <bsd.port.pre.mk>
+HAS_CONFIGURE=	yes
+MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
+MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
 
 #
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
-.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
-
 CFLAGS+=	-I${OPENSSLINC}/openssl
-
-HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--prefix=${PREFIX} \
 		--server-uid=www \
@@ -80,11 +61,29 @@ OPTIM+=		-DBUFFERED_LOGS
 CFLAGS+=	-O6 -fomit-frame-pointer
 .endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ENV+=	OPTIM='${OPTIM}'
 CONFIGURE_ENV+=	EXTRA_SSL_LIBS="-L${OPENSSLLIB} -L${LOCALBASE}/lib"
 
-MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
+MASTER_SITES_APACHE_SSL= \
+		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/ \
+		ftp://ftp.win.ne.jp/pub/network/security/apache-ssl/ \
+		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/ \
+		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/ \
+		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
+		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/ \
+		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/ \
+		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
+		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/ \
+		ftp://ftp.sekure.net/pub/apache-ssl/ \
+		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/ \
+		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ \
+		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
+		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL/
+
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}