diff options
| -rw-r--r-- | mk/platform/SunOS.mk | 4 | ||||
| -rw-r--r-- | security/openssl/builtin.mk | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index ff494b90808..8f5ac5a5dac 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.mk,v 1.54 2013/08/16 12:10:31 jperkin Exp $ +# $NetBSD: SunOS.mk,v 1.55 2013/08/27 05:43:20 richard Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -43,7 +43,7 @@ KRB5_DEFAULT?= mit-krb5 # Builtin defaults which make sense for this platform. PREFER.libexecinfo?= native PREFER.mit-krb5?= native -PREFER.openssl?= pkgsrc +#PREFER.openssl?= pkgsrc PREFER.solaris-pam?= native _OPSYS_EMULDIR.solaris= # empty diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index 85ef49a9f76..64ed6b2ff15 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,8 +1,8 @@ -# $NetBSD: builtin.mk,v 1.33 2013/06/13 07:51:26 adam Exp $ +# $NetBSD: builtin.mk,v 1.34 2013/08/27 05:42:34 richard Exp $ BUILTIN_PKG:= openssl -BUILTIN_FIND_LIBS:= des +BUILTIN_FIND_LIBS:= crypto des ssl BUILTIN_FIND_FILES_VAR:= H_OPENSSLCONF H_OPENSSLV BUILTIN_FIND_FILES.H_OPENSSLCONF= /usr/include/openssl/opensslconf.h \ /usr/sfw/include/openssl/opensslconf.h \ @@ -34,7 +34,7 @@ MAKEVARS+= IS_BUILTIN.openssl empty(H_OPENSSLV:M__nonexistent__) BUILTIN_VERSION.openssl!= \ ${AWK} 'BEGIN { hex="0123456789abcdef"; \ - split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \ + alpha="abcdefghijklmnopqrstuvwxyz"; \ } \ /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ major = index(hex, substr($$3, 3, 1)) - 1; \ @@ -51,7 +51,7 @@ BUILTIN_VERSION.openssl!= \ } else if (i > 26) { \ patchlevel = "a"; \ } else { \ - patchlevel = alpha[i]; \ + patchlevel = substr(alpha,i,1); \ } \ printf "%s%s%s%s\n", \ major, minor, teeny, patchlevel; \ |