Wed Feb 12 19:49:23 2020 UTC ()
openssl: Spell x86_64 correctly.


(jperkin)
diff -r1.253 -r1.254 pkgsrc/security/openssl/Makefile
cvs diff -r1.253 -r1.254 pkgsrc/security/openssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2020/02/12 15:14:57 1.253
+++ pkgsrc/security/openssl/Makefile 2020/02/12 19:49:23 1.254
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.253 2020/02/12 15:14:57 rillig Exp $ 1# $NetBSD: Makefile,v 1.254 2020/02/12 19:49:23 jperkin Exp $
2 2
3DISTNAME= openssl-1.1.1d 3DISTNAME= openssl-1.1.1d
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= https://www.openssl.org/source/ 6MASTER_SITES= https://www.openssl.org/source/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.openssl.org/ 9HOMEPAGE= https://www.openssl.org/
10COMMENT= Secure Socket Layer and cryptographic library 10COMMENT= Secure Socket Layer and cryptographic library
11LICENSE= openssl 11LICENSE= openssl
12 12
13USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
14 14
@@ -20,27 +20,27 @@ HAS_CONFIGURE= yes @@ -20,27 +20,27 @@ HAS_CONFIGURE= yes
20CONFIGURE_SCRIPT= ./config 20CONFIGURE_SCRIPT= ./config
21CONFIGURE_ARGS+= --prefix=${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX}
22CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR} 22CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR}
23CONFIGURE_ARGS+= shared 23CONFIGURE_ARGS+= shared
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} 27CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
28CONFIGURE_ENV+= PERL=${PERL5:Q} 28CONFIGURE_ENV+= PERL=${PERL5:Q}
29 29
30# If the config script cannot guess the host system correctly then we need to 30# If the config script cannot guess the host system correctly then we need to
31# specify it manually and call the Configure script directly. 31# specify it manually and call the Configure script directly.
32OPENSSL_HOST.SunOS-i386= solaris-x86-gcc 32OPENSSL_HOST.SunOS-i386= solaris-x86-gcc
33OPENSSL_HOST.SunOS-x86_64= solaris64-x86-gcc 33OPENSSL_HOST.SunOS-x86_64= solaris64-x86_64-gcc
34 34
35.if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}) 35.if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH})
36CONFIG_SHELL= ${PERL5} 36CONFIG_SHELL= ${PERL5}
37CONFIGURE_SCRIPT= ./Configure 37CONFIGURE_SCRIPT= ./Configure
38CONFIGURE_ARGS+= ${OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}} 38CONFIGURE_ARGS+= ${OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}}
39.endif 39.endif
40 40
41PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc 41PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc
42PKGCONFIG_OVERRIDE_STAGE= post-build 42PKGCONFIG_OVERRIDE_STAGE= post-build
43 43
44PKG_SYSCONFSUBDIR= openssl 44PKG_SYSCONFSUBDIR= openssl
45CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 45CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
46 ${PKG_SYSCONFDIR}/openssl.cnf 46 ${PKG_SYSCONFDIR}/openssl.cnf