summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2005-11-07 20:58:17 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2005-11-07 20:58:17 +0000
commitfab6998c6de26dbff1c5670120b77baddfa4569e (patch)
tree939be18ed4647ea7df4bbb9d02ffaf1e7b67e5df /Mk
parentCFLAGS adjusted because sylpheed needs pthread if GnomeVFS is installed (diff)
- force FreeBSD 6.0 to use 0.9.7
- honor WITHOUT_OPENSSL_097
Notes
Notes: svn path=/head/; revision=147525
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.openssl.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index ca068f4b56bc..c5a460d4d9eb 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.24 2005-10-14 06:41:49 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.25 2005-11-07 20:58:17 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@@ -46,6 +46,12 @@ WITH_OPENSSL_PORT=yes
WITH_OPENSSL_STABLE=yes
.endif
+.if !defined(WITHOUT_OPENSSL_097) && !defined(WITH_OPENSSL_BETA)
+.if ( ${OSVERSION} >= 600000 ) && ( ${OSVERSION} < 600100 )
+WITH_OPENSSL_STABLE=yes
+.endif
+.endif
+
# if no preference was set, check for an installed base version
# but give an installed port preference over it.
.if !defined(WITH_OPENSSL_BASE) && \