From owner-svn-ports-all@FreeBSD.ORG Wed Sep 19 15:33:10 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17A6B106564A; Wed, 19 Sep 2012 15:33:10 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 03B898FC15; Wed, 19 Sep 2012 15:33:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8JFX9OE018042; Wed, 19 Sep 2012 15:33:09 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8JFX9Bf018040; Wed, 19 Sep 2012 15:33:09 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201209191533.q8JFX9Bf018040@svn.freebsd.org> From: Dirk Meyer Date: Wed, 19 Sep 2012 15:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304533 - head/Mk X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2012 15:33:10 -0000 Author: dinoex Date: Wed Sep 19 15:33:09 2012 New Revision: 304533 URL: http://svn.freebsd.org/changeset/ports/304533 Log: - new option WITH_OPENSSL_HACK7=yes Modified: head/Mk/bsd.openssl.mk (contents, props changed) Modified: head/Mk/bsd.openssl.mk ============================================================================== --- head/Mk/bsd.openssl.mk Wed Sep 19 15:19:59 2012 (r304532) +++ head/Mk/bsd.openssl.mk Wed Sep 19 15:33:09 2012 (r304533) @@ -1,5 +1,5 @@ # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.48 2012-04-18 11:38:20 bapt Exp $ +# $FreeBSD$ # bsd.openssl.mk - Support for OpenSSL based ports. # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk @@ -8,6 +8,7 @@ # # WITH_OPENSSL_BASE=yes - Use the version in the base system. # WITH_OPENSSL_PORT=yes - Use the port, even if base is up to date +# WITH_OPENSSL_HACK7=yes - Use not the version in the base system on FreeBSD 7.x # # USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS, # needed for ports who don't use LDFLAGS @@ -39,6 +40,13 @@ WITH_OPENSSL_BASE=yes WITH_OPENSSL_PORT=yes .endif +.if defined(WITH_OPENSSL_HACK7) +.if ${OSVERSION} < 800000 +# the openssl in base of FreeBSD 7.x is too old +WITH_OPENSSL_PORT?= 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) && \