pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/openssl Fix detection of openssl configuratio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/056cbc18988e
branches:  trunk
changeset: 541787:056cbc18988e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Apr 25 20:06:15 2008 +0000

description:
Fix detection of openssl configuration directory on NetBSD so it's
/etc/openssl only if USE_BUILTIN.openssl is "yes".

diffstat:

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

diffs (24 lines):

diff -r 2b421742df77 -r 056cbc18988e security/openssl/builtin.mk
--- a/security/openssl/builtin.mk       Fri Apr 25 20:06:04 2008 +0000
+++ b/security/openssl/builtin.mk       Fri Apr 25 20:06:15 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.25 2008/01/17 06:42:47 tnn Exp $
+# $NetBSD: builtin.mk,v 1.26 2008/04/25 20:06:15 jlam Exp $
 
 BUILTIN_PKG:=  openssl
 
@@ -230,10 +230,12 @@
 
 .  if defined(PKG_SYSCONFDIR.openssl)
 SSLDIR=        ${PKG_SYSCONFDIR.openssl}
-.  elif ${OPSYS} == "NetBSD"
+.  elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+.    if ${OPSYS} == "NetBSD"
 SSLDIR=        /etc/openssl
-.  elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+.    else
 SSLDIR=        /etc/ssl                # most likely place
+.    endif
 .  else
 SSLDIR=        ${PKG_SYSCONFBASEDIR}/openssl
 .  endif



Home | Main Index | Thread Index | Old Index