CVS commit: pkgsrc/devel/readline

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug  2 06:57:23 UTC 2025

Modified Files:
        pkgsrc/devel/readline: Makefile buildlink3.mk builtin.mk

Log Message:
readline: pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/readline/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/readline/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/readline/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/readline/Makefile
diff -u pkgsrc/devel/readline/Makefile:1.76 pkgsrc/devel/readline/Makefile:1.77
--- pkgsrc/devel/readline/Makefile:1.76 Sat Aug  2 06:56:14 2025
+++ pkgsrc/devel/readline/Makefile      Sat Aug  2 06:57:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2025/08/02 06:56:14 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2025/08/02 06:57:22 wiz Exp $
 
 DISTNAME=      readline-8.3
 CATEGORIES=    devel
@@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+=  readline.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ENV.NetBSD+= bash_cv_wcwidth_broken=no
 .endif
 

Index: pkgsrc/devel/readline/buildlink3.mk
diff -u pkgsrc/devel/readline/buildlink3.mk:1.35 pkgsrc/devel/readline/buildlink3.mk:1.36
--- pkgsrc/devel/readline/buildlink3.mk:1.35    Tue Dec  6 06:29:51 2022
+++ pkgsrc/devel/readline/buildlink3.mk Sat Aug  2 06:57:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2022/12/06 06:29:51 sekiya Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2025/08/02 06:57:22 wiz Exp $
 
 BUILDLINK_TREE+=       readline
 
@@ -31,7 +31,7 @@ CHECK_BUILTIN.readline:=      yes
 CHECK_BUILTIN.readline:=       no
 
 # A built-in readline is always going to use a built-in termcap.
-.if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
+.if ${USE_BUILTIN.readline:tl} == yes
 USE_BUILTIN.termcap=   yes
 .endif
 

Index: pkgsrc/devel/readline/builtin.mk
diff -u pkgsrc/devel/readline/builtin.mk:1.23 pkgsrc/devel/readline/builtin.mk:1.24
--- pkgsrc/devel/readline/builtin.mk:1.23       Mon Apr 21 16:33:08 2025
+++ pkgsrc/devel/readline/builtin.mk    Sat Aug  2 06:57:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.23 2025/04/21 16:33:08 wiz Exp $
+# $NetBSD: builtin.mk,v 1.24 2025/08/02 06:57:22 wiz Exp $
 
 BUILTIN_PKG:=  readline
 
@@ -29,7 +29,7 @@ MAKEVARS+=            IS_BUILTIN.readline
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.readline) && \
-    !empty(IS_BUILTIN.readline:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.readline:tl} == yes && \
     empty(H_READLINE:M__nonexistent__)
 BUILTIN_VERSION.readline!=                                             \
        ${AWK} '/\#define[      ]*RL_VERSION_MAJOR/ { M = $$3 }         \
@@ -50,10 +50,10 @@ USE_BUILTIN.readline=       no
 .  else
 USE_BUILTIN.readline=  ${IS_BUILTIN.readline}
 .    if defined(BUILTIN_PKG.readline) && \
-        !empty(IS_BUILTIN.readline:M[yY][eE][sS])
+        ${IS_BUILTIN.readline:tl} == yes
 USE_BUILTIN.readline=  yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.readline}
-.        if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
+.        if ${USE_BUILTIN.readline:tl} == yes
 USE_BUILTIN.readline!=                                                 \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.readline:Q}; then \
                ${ECHO} "yes";                                          \
@@ -68,7 +68,7 @@ USE_BUILTIN.readline!=                                                        \
 # replace GNU readline.
 #
 _INCOMPAT_READLINE?=   Darwin-[567].*-*
-.    if defined(OS_VARIANT) && empty(OS_VARIANT:MOmniOS)
+.    if defined(OS_VARIANT) && ${OS_VARIANT} != OmniOS
 _INCOMPAT_READLINE+=   SunOS-*-*
 .    endif
 .    for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE}
@@ -85,9 +85,9 @@ MAKEVARS+=            USE_BUILTIN.readline
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.readline?=       no
-.if !empty(CHECK_BUILTIN.readline:M[nN][oO])
+.if ${CHECK_BUILTIN.readline:tl} == no
 
-.  if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
+.  if ${USE_BUILTIN.readline:tl} == yes
 BUILDLINK_TRANSFORM+=  l:history:readline:${BUILTIN_LIBNAME.termcap}
 .  endif