From 612fc7354f11a5fd68498b0da534fb2c2181e49c Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Fri, 26 Mar 1999 08:49:50 +0000
Subject: ${PREFIX}/bin/ssleay     -> ${PREFIX}/bin/openssl and
 ${PREFIX}/etc/ssleay.cnf -> ${PREFIX}/lib/openssl.cnf due to openssl upgrade.

Replaced GNU_CONFIGURE with HAS_CONFIGURE and
CONFIGURE_ARGS+=--prefix=${PREFIX} because GNU_CONFIGURE=yes adds
${CONFIGURE_TARGET} to ${CONFIGURE_ARGS} now.
---
 www/apache13-ssl/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'www/apache13-ssl')

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 236ae6b75b69..e596ddad9bca 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -6,7 +6,7 @@
 #			and apache-ssl port by Mark Murray <mark@grondar.za>.
 #			Oh, and with a little bit of help from Ben :)
 #
-# $Id: Makefile,v 1.53 1999/01/10 14:11:19 dirk Exp $
+# $Id: Makefile,v 1.54 1999/03/13 17:11:04 billf Exp $
 
 APACHE= 	1.3.3
 APACHE-SSL=	1.28
@@ -50,7 +50,7 @@ DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=     adam@algroup.co.uk
 
 
-RUN_DEPENDS=	ssleay:${PORTSDIR}/security/openssl
+RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
@@ -60,8 +60,9 @@ RESTRICTED=     "Contains cryptography"
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		--prefix=${PREFIX} \
 		--sysconfdir=${PREFIX}/etc/apache \
 		--includedir=${PREFIX}/include/apache \
 		--logfiledir=/var/log \
@@ -106,14 +107,14 @@ post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
 
 post-patch:
-	@cd ${WRKSRC} && ./FixPatch
+	@cd ${WRKSRC} && ./FixPatch ${PREFIX}
 
 certificate:
-	@if [ -f ${PREFIX}/etc/ssleay.cnf ]; then \
+	@if [ -f ${PREFIX}/lib/openssl.cnf ]; then \
 		cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@; \
 		${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem; \
 	else \
-		${ECHO} "You must create the file ${PREFIX}/etc/ssleay.cnf first."; \
+		${ECHO} "You must create the file ${PREFIX}/lib/openssl.cnf first."; \
 	fi
 
 .include <bsd.port.mk>
-- 
cgit v1.2.3