CVS commit: pkgsrc/graphics/freetype2

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  9 19:49:45 UTC 2023

Modified Files:
        pkgsrc/graphics/freetype2: Makefile buildlink3.mk builtin.mk

Log Message:
freetype2: pkglint autofixes


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/graphics/freetype2/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/freetype2/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/freetype2/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/graphics/freetype2/Makefile
diff -u pkgsrc/graphics/freetype2/Makefile:1.129 pkgsrc/graphics/freetype2/Makefile:1.130
--- pkgsrc/graphics/freetype2/Makefile:1.129    Thu Feb  9 19:49:06 2023
+++ pkgsrc/graphics/freetype2/Makefile  Thu Feb  9 19:49:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2023/02/09 19:49:06 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2023/02/09 19:49:45 wiz Exp $
 
 DISTNAME=      freetype-2.13.0
 PKGNAME=       ${DISTNAME:S/-/2-/}
@@ -44,7 +44,7 @@ CFLAGS+=      -fno-strict-aliasing
 # tell configure not to use unix-specific version of ftsystem.c on OpenBSD
 CONFIGURE_ENV.OpenBSD+=        ac_cv_func_mmap_fixed_mapped=no
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ENV+=                CC_BUILD=${NATIVE_CC:Q}
 .endif
 

Index: pkgsrc/graphics/freetype2/buildlink3.mk
diff -u pkgsrc/graphics/freetype2/buildlink3.mk:1.51 pkgsrc/graphics/freetype2/buildlink3.mk:1.52
--- pkgsrc/graphics/freetype2/buildlink3.mk:1.51        Sun Jan 29 14:00:22 2023
+++ pkgsrc/graphics/freetype2/buildlink3.mk     Thu Feb  9 19:49:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2023/01/29 14:00:22 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2023/02/09 19:49:45 wiz Exp $
 
 BUILDLINK_TREE+=       freetype2
 
@@ -26,7 +26,7 @@ CHECK_BUILTIN.freetype2:=     yes
 .include "../../graphics/freetype2/builtin.mk"
 CHECK_BUILTIN.freetype2:=      no
 
-.  if empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
+.  if ${USE_BUILTIN.freetype2:tl} != yes
 .    include "../../graphics/png/buildlink3.mk"
 .  endif
 .endif

Index: pkgsrc/graphics/freetype2/builtin.mk
diff -u pkgsrc/graphics/freetype2/builtin.mk:1.19 pkgsrc/graphics/freetype2/builtin.mk:1.20
--- pkgsrc/graphics/freetype2/builtin.mk:1.19   Sat Nov  2 22:37:56 2019
+++ pkgsrc/graphics/freetype2/builtin.mk        Thu Feb  9 19:49:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2019/11/02 22:37:56 rillig Exp $
+# $NetBSD: builtin.mk,v 1.20 2023/02/09 19:49:45 wiz Exp $
 
 BUILTIN_PKG:=  freetype2
 
@@ -29,7 +29,7 @@ MAKEVARS+=            IS_BUILTIN.freetype2
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.freetype2) && \
-    !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.freetype2:tl} == yes && \
     empty(H_FREETYPE2:M__nonexistent__)
 BUILTIN_VERSION.freetype2!=                                            \
        ${AWK} 'BEGIN { p = ".0" }                                      \
@@ -52,10 +52,10 @@ USE_BUILTIN.freetype2=      no
 .  else
 USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2}
 .    if defined(BUILTIN_PKG.freetype2) && \
-        !empty(IS_BUILTIN.freetype2:M[yY][eE][sS])
+        ${IS_BUILTIN.freetype2:tl} == yes
 USE_BUILTIN.freetype2= yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
-.        if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
+.        if ${USE_BUILTIN.freetype2:tl} == yes
 USE_BUILTIN.freetype2!=                                                        \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2}; then \
                ${ECHO} yes;                                            \
@@ -77,9 +77,9 @@ MAKEVARS+=            USE_BUILTIN.freetype2
 .include "../../mk/x11.builtin.mk"
 
 CHECK_BUILTIN.freetype2?=      no
-.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
+.if ${CHECK_BUILTIN.freetype2:tl} == no
 
-.  if !empty(USE_BUILTIN.freetype2:M[nN][oO])
+.  if ${USE_BUILTIN.freetype2:tl} == no
 BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.1.3
 .  else
 .    if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \