Change dependencies from static to shared openssl libraries,

because openssl also builds shared libraries, now.

14 files changed, 29 insertions, 21 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index ce5746a36cb..cbcded5c8b9 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES=	http://www.fts.frontec.se/~dast/stuff/ \
 MAINTAINER=	kris@FreeBSD.org
 
 .if defined(USE_SSL)
-BUILD_DEPENDS=	${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 .endif
 
 .if defined(USE_SSL)
diff --git a/mail/pine4-ssl/Makefile b/mail/pine4-ssl/Makefile
index 22dbd9badbd..860216049a9 100644
--- a/mail/pine4-ssl/Makefile
+++ b/mail/pine4-ssl/Makefile
@@ -20,10 +20,9 @@ CATEGORIES=	mail news
 
 MAINTAINER=	nsayer@freebsd.org
 
-BUILD_DEPENDS+=	${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libRSAglue.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/librsaref.a:${PORTSDIR}/security/rsaref
+BUILD_DEPENDS=	${PREFIX}/lib/librsaref.a:${PORTSDIR}/security/rsaref
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 
 EXTRACT_ONLY=	pine4.10${EXTRACT_SUFX}
 
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 672e747a7ef..3225b52c033 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.enst.fr/~beyssac/pipsec/ \
 
 MAINTAINER=	patrick@mindstep.com
 
-BUILD_DEPENDS=	${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl:install
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl
 
 ALL_TARGET=	pipsecd
 
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 1f8bb3a9881..303ed1cdb3e 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -25,6 +25,8 @@ LIB_DEPENDS=		rsaref.2:${PORTSDIR}/security/rsaref
 .endif
 .endif
 BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 RESTRICTED=	"Cryptography"
diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index 89911facaab..cbf5363e6f3 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	http://www.cis.upenn.edu/~angelos/Code/
 MAINTAINER=	se@FreeBSD.org
 
 BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 
 WRKSRC=		${WRKDIR}/KeyNote-2-beta4
 
diff --git a/security/slush/Makefile b/security/slush/Makefile
index e20b291a594..9461a4e4a07 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	http://violet.ibs.com.au/slush/files/ \
 MAINTAINER=	shipley@dis.org
 
 BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 
 #MAN=		slush.1
 
diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index 4e67d4c5e12..c2b39bbb219 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.obdev.at/pub/Products/sslproxy/
 MAINTAINER=	alexlh@funk.org
 
 BUILD_DEPENDS=	${PREFIX}/include/openssl/ssl.h:${PORTSDIR}/security/openssl
-RUN_DEPENDS=	${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
 LIB_DEPENDS=	rsaref.2:${PORTSDIR}/security/rsaref
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 81ccbfa2d76..9396d662f7e 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -16,9 +16,9 @@ MASTER_SITES=	http://opensores.thebunker.net/pub/mirrors/stunnel/ \
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
-BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl
+BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index cd8f5d21a46..100d35bf3b7 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -43,9 +43,9 @@ MAINTAINER=	rse@engelschall.com
 
 BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl \
 		mm-config:${PORTSDIR}/devel/mm \
-		${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \
 		${PREFIX}/lib/libmm.a:${PORTSDIR}/devel/mm
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 VERSION_APACHE=	1.3.9
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index ad3570c8126..019d7fbfc44 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -39,8 +39,8 @@ MAINTAINER=     adam@algroup.co.uk
 
 BUILD_DEPENDS=  openssl:${PORTSDIR}/security/openssl
 
-BUILD_DEPENDS=	${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \
-		${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 
 HAS_CONFIGURE=	yes
diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index 08f6a0b82a0..418366d58f1 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -23,6 +23,8 @@ PATCH_DIST_STRIP= -p1
 MAINTAINER=	sec@42.org
 
 BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
+		ssl.1:${PORTSDIR}/security/openssl
 
 RESTRICTED=     "Contains cryptography"
 
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index afabc2dd562..40f57f46ee4 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -132,9 +132,9 @@ DISTFILES+=	mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
 
 BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		mm-config:\${PORTSDIR}/devel/mm \\
-		\${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/openssl \\
-		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
+LIB_DEPENDS+=	crypto.1:\${PORTSDIR}/security/openssl \\
+		ssl.1:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
 VERSION_MODSSL=	2.4.8
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 7f227ba462f..76c467e782f 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -144,9 +144,9 @@ DISTFILES+=	mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
 
 BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		mm-config:\${PORTSDIR}/devel/mm \\
-		\${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/openssl \\
-		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
+LIB_DEPENDS+=	crypto.1:\${PORTSDIR}/security/openssl \\
+		ssl.1:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
 VERSION_MODSSL=	2.4.8
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 7f227ba462f..76c467e782f 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -144,9 +144,9 @@ DISTFILES+=	mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
 
 BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		mm-config:\${PORTSDIR}/devel/mm \\
-		\${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/openssl \\
-		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
+LIB_DEPENDS+=	crypto.1:\${PORTSDIR}/security/openssl \\
+		ssl.1:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
 VERSION_MODSSL=	2.4.8