ports/88645: ports using OpenSSL depends on security/openssl-stable unconditionaly on RELENG_6_0

[NIIMI Satoshi]

>Number:         88645
>Category:       ports
>Synopsis:       ports using OpenSSL depends on security/openssl-stable unconditionaly on RELENG_6_0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 08 07:10:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Wed Nov 2 15:10:33 JST 2005 root at berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

	
>How-To-Repeat:
On FreeBSD 6.0:
% make -C /usr/ports/security/cyrus-sasl2 -V WITH_OPENSSL_PORT
	(empty string)
% make -C /usr/ports/security/cyrus-sasl2 -V OPENSSLBASE
/usr/local
	
>Fix:

	

--- diff begins here ---
Index: bsd.openssl.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.openssl.mk,v
retrieving revision 1.25
diff -u -r1.25 bsd.openssl.mk
--- bsd.openssl.mk	7 Nov 2005 20:58:17 -0000	1.25
+++ bsd.openssl.mk	8 Nov 2005 06:58:39 -0000
@@ -46,11 +46,13 @@
 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.
--- diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: