From ffdca75c9451244fd12111715212bf4bce68dc0e Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Tue, 8 Nov 2005 08:31:20 +0000 Subject: [PATCH] - RELENG_6_0 check limited to port PR: 88645 Submitted by: NIIMI Satoshi --- Mk/bsd.openssl.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index c5a460d4d9eb..a40fa75deadd 100644 --- a/Mk/bsd.openssl.mk +++ b/Mk/bsd.openssl.mk @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.25 2005-11-07 20:58:17 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.26 2005-11-08 08:31:20 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -46,11 +46,13 @@ WITH_OPENSSL_PORT=yes WITH_OPENSSL_STABLE=yes .endif +.if defined(WITH_OPENSSL_PORT) .if !defined(WITHOUT_OPENSSL_097) && !defined(WITH_OPENSSL_BETA) .if ( ${OSVERSION} >= 600000 ) && ( ${OSVERSION} < 600100 ) WITH_OPENSSL_STABLE=yes .endif .endif +.endif # if no preference was set, check for an installed base version # but give an installed port preference over it.