pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openssl3: fix pkglint
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Thu Mar 23 07:25:23 2023 +0100
Changeset: b400dba7f3d2f226e7f2eeb340a586006fa28028
Modified Files:
openssl3/builtin.mk
Log Message:
openssl3: fix pkglint
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b400dba7f3d2f226e7f2eeb340a586006fa28028
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openssl3/builtin.mk | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diffs:
diff --git a/openssl3/builtin.mk b/openssl3/builtin.mk
index 35792be6a4..d93eaf648e 100644
--- a/openssl3/builtin.mk
+++ b/openssl3/builtin.mk
@@ -26,7 +26,7 @@ MAKEVARS+= IS_BUILTIN.openssl
### a package name to represent the built-in package.
###
.if !defined(BUILTIN_PKG.openssl) && \
- !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
+ ${IS_BUILTIN.openssl:tl} == yes && \
empty(H_OPENSSLV:M__nonexistent__)
BUILTIN_VERSION.openssl!= \
${AWK} 'BEGIN { hex="0123456789abcdef"; \
@@ -61,7 +61,7 @@ MAKEVARS+= BUILTIN_PKG.openssl
MAKEVARS+= BUILTIN_VERSION.openssl
.if !defined(BUILTIN_OPENSSL_HAS_THREADS) && \
- !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
+ ${IS_BUILTIN.openssl:tl} == yes && \
empty(H_OPENSSLCONF:M__nonexistent__)
BUILTIN_OPENSSL_HAS_THREADS!= \
${AWK} 'BEGIN { ans = "no" } \
@@ -82,15 +82,15 @@ USE_BUILTIN.openssl= no
. else
USE_BUILTIN.openssl= ${IS_BUILTIN.openssl}
. if defined(BUILTIN_PKG.openssl) && \
- !empty(IS_BUILTIN.openssl:M[yY][eE][sS])
+ ${IS_BUILTIN.openssl:tl} == yes
USE_BUILTIN.openssl= yes
### take care builtin check case, BUILDLINK_API_DEPENDS may not be defined yet.
CHECK_BUILTIN.openssl?= no
-. if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS])
+. if ${CHECK_BUILTIN.openssl:tl} == yes
BUILDLINK_API_DEPENDS.openssl?= openssl>=1.1.1
. endif
. for dep_ in ${BUILDLINK_API_DEPENDS.openssl}
-. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+. if ${USE_BUILTIN.openssl:tl} == yes
USE_BUILTIN.openssl!= \
if ${PKG_ADMIN} pmatch ${dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \
${ECHO} yes; \
@@ -100,7 +100,7 @@ USE_BUILTIN.openssl!= \
. endif
. endfor
. endif
-. if !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
+. if ${IS_BUILTIN.openssl:tl} == yes && \
defined(USE_FEATURES.openssl)
. if !empty(USE_FEATURES.openssl:Mthreads) && \
!empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO])
@@ -116,9 +116,9 @@ MAKEVARS+= USE_BUILTIN.openssl
### solely to determine whether a built-in implementation exists.
###
CHECK_BUILTIN.openssl?= no
-.if !empty(CHECK_BUILTIN.openssl:M[nN][oO])
+.if ${CHECK_BUILTIN.openssl:tl} == no
-. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+. if ${USE_BUILTIN.openssl:tl} == yes
. if empty(H_OPENSSLV:M__nonexistent__)
. if !empty(H_OPENSSLV:M/usr/sfw/*)
BUILDLINK_PREFIX.openssl= /usr/sfw
@@ -135,7 +135,7 @@ BUILDLINK_PREFIX.openssl= /boot/common
. if defined(PKG_SYSCONFDIR.openssl)
SSLDIR= ${PKG_SYSCONFDIR.openssl}
-. elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+. elif ${USE_BUILTIN.openssl:tl} == yes
. if ${OPSYS} == "NetBSD"
SSLDIR= /etc/openssl
. elif ${OPSYS} == "Linux"
@@ -174,7 +174,7 @@ BUILD_DEFS+= SSLDIR SSLCERTS SSLCERTBUNDLE SSLKEYS
# create pc files for builtin version; other versions assumed to contain them
# If we are using the builtin version, check whether it has a *.pc
# files or not. If the latter, generate fake ones.
-. if !empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
+. if ${USE_BUILTIN.openssl:tl} == yes
BUILDLINK_TARGETS+= openssl-fake-pc
. if !defined(HAS_OPENSSL_FAKE_PC)
Home |
Main Index |
Thread Index |
Old Index