[pkgsrc/pkgsrc-2007Q4]: pkgsrc/security/openssl Pullup ticket 2257 - requeste...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a7060f12afe
branches:  pkgsrc-2007Q4
changeset: 537031:1a7060f12afe
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Jan 09 17:14:10 2008 +0000

description:
Pullup ticket 2257 - requested by joerg
build fix for openssl

- pkgsrc/security/openssl/builtin.mk                    1.24

   Module Name:         pkgsrc
   Committed By:        joerg
   Date:                Mon Jan  7 15:51:08 UTC 2008

   Modified Files:
           pkgsrc/security/openssl: builtin.mk

   Log Message:
   Fix builtin.mk logic for thread feature if no native OpenSSL exists.
   Fixes PR pkg/37699 from Aleksey Cheusov.

diffstat:

 security/openssl/builtin.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 2fd78eb0051f -r 1a7060f12afe security/openssl/builtin.mk
--- a/security/openssl/builtin.mk       Thu Jan 03 16:18:06 2008 +0000
+++ b/security/openssl/builtin.mk       Wed Jan 09 17:14:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.22 2007/09/07 17:26:23 jlam Exp $
+# $NetBSD: builtin.mk,v 1.22.4.1 2008/01/09 17:14:10 ghen Exp $
 
 BUILTIN_PKG:=  openssl
 
@@ -136,7 +136,8 @@
 .        endif
 .      endfor
 .    endif
-.    if defined(USE_FEATURES.openssl)
+.    if !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
+       defined(USE_FEATURES.openssl)
 .      if !empty(USE_FEATURES.openssl:Mthreads) && \
          !empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO])
 USE_BUILTIN.openssl=   no