CVS commit: pkgsrc/mk/check

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jan 20 23:39:48 UTC 2024

Modified Files:
        pkgsrc/mk/check: check-files.mk

Log Message:
mk/check-files: clean up redundant 'defined' and variable alignment


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/check/check-files.mk

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

Modified files:

Index: pkgsrc/mk/check/check-files.mk
diff -u pkgsrc/mk/check/check-files.mk:1.42 pkgsrc/mk/check/check-files.mk:1.43
--- pkgsrc/mk/check/check-files.mk:1.42 Sat Jan 20 23:22:33 2024
+++ pkgsrc/mk/check/check-files.mk      Sat Jan 20 23:39:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.42 2024/01/20 23:22:33 rillig Exp $
+# $NetBSD: check-files.mk,v 1.43 2024/01/20 23:39:48 rillig Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -25,20 +25,19 @@
 #      really handled by pkgsrc.
 #
 
-_VARGROUPS+=           check-files
-_USER_VARS.check-files=        CHECK_FILES CHECK_FILES_STRICT
-_PKG_VARS.check-files= CHECK_FILES_SUPPORTED CHECK_FILES_SKIP
-_USE_VARS.check-files= \
+_VARGROUPS+=                   check-files
+_USER_VARS.check-files=                CHECK_FILES CHECK_FILES_STRICT
+_PKG_VARS.check-files=         CHECK_FILES_SUPPORTED CHECK_FILES_SKIP
+_USE_VARS.check-files=         \
        DESTDIR PREFIX PKG_SYSCONFDIR VARBASE PKG_DBDIR DISTDIR PACKAGES \
        MAKE_DIRS MAKE_DIRS_PERMS OWN_DIRS OWN_DIRS_PERMS \
        FONTS_DIRS.x11 FONTS_DIRS.ttf FONTS_DIRS.type1 \
        PERL5_INSTALLARCHLIB \
        WRKDIR ERROR_DIR \
        PLIST INFO_FILES ICON_THEMES
-_IGN_VARS.check-files= PKGNAME _CHECK_FILES_*
-_LISTED_VARS.check-files= MAKE_DIRS MAKE_DIRS_PERMS OWN_DIRS OWN_DIRS_PERMS
-_SORTED_VARS.check-files= \
-       CHECK_FILES_SKIP
+_IGN_VARS.check-files=         PKGNAME _CHECK_FILES_*
+_LISTED_VARS.check-files=      MAKE_DIRS MAKE_DIRS_PERMS OWN_DIRS OWN_DIRS_PERMS
+_SORTED_VARS.check-files=      CHECK_FILES_SKIP
 
 
 CHECK_FILES?=          yes
@@ -91,17 +90,17 @@ CHECK_FILES_SKIP+=  ${dir:C|^([^/])|${PRE
 .endfor
 
 # Mutable X11 font database files
-.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
+.if !empty(FONTS_DIRS.x11:M*)
 CHECK_FILES_SKIP+=     ${PREFIX}/.*/encodings.dir
 CHECK_FILES_SKIP+=     ${PREFIX}/.*/fonts.dir
 .endif
-.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
-    (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*))
+.if !empty(FONTS_DIRS.ttf:M*) || \
+    !empty(FONTS_DIRS.type1:M*)
 CHECK_FILES_SKIP+=     ${PREFIX}/.*/fonts.scale
 .endif
-.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
-    (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \
-    (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
+.if !empty(FONTS_DIRS.ttf:M*) || \
+    !empty(FONTS_DIRS.type1:M*) || \
+    !empty(FONTS_DIRS.x11:M*)
 CHECK_FILES_SKIP+=     ${PREFIX}/.*/fonts.cache-1
 .endif