Received: by mail.netbsd.org (Postfix, from userid 605) id 42BF384F86; Wed, 16 Nov 2022 11:56:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7360684F85 for ; Wed, 16 Nov 2022 11:56:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5FAuF7UeHjFC for ; Wed, 16 Nov 2022 11:56:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EC41984F83 for ; Wed, 16 Nov 2022 11:56:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E975BFA90; Wed, 16 Nov 2022 11:56:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1668599775258820" MIME-Version: 1.0 Date: Wed, 16 Nov 2022 11:56:15 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/libXft To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221116115615.E975BFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1668599775258820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 16 11:56:15 UTC 2022 Modified Files: pkgsrc/x11/libXft: builtin.mk Log Message: libXft: pkglint cleanup To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXft/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1668599775258820 Content-Disposition: inline Content-Length: 1629 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/libXft/builtin.mk diff -u pkgsrc/x11/libXft/builtin.mk:1.4 pkgsrc/x11/libXft/builtin.mk:1.5 --- pkgsrc/x11/libXft/builtin.mk:1.4 Mon Aug 2 10:47:05 2021 +++ pkgsrc/x11/libXft/builtin.mk Wed Nov 16 11:56:15 2022 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2021/08/02 10:47:05 wiz Exp $ +# $NetBSD: builtin.mk,v 1.5 2022/11/16 11:56:15 wiz Exp $ BUILTIN_PKG:= libXft @@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.libXft ### a package name to represent the built-in package. ### .if !defined(BUILTIN_PKG.libXft) && \ - !empty(IS_BUILTIN.libXft:M[yY][eE][sS]) && \ + ${IS_BUILTIN.libXft:M[yY][eE][sS]} && \ empty(H_XFT2:M__nonexistent__) # # Extract the version number from the header file, but if it's not @@ -53,10 +53,10 @@ USE_BUILTIN.libXft= no . else USE_BUILTIN.libXft= ${IS_BUILTIN.libXft} . if defined(BUILTIN_PKG.libXft) && \ - !empty(IS_BUILTIN.libXft:M[yY][eE][sS]) + ${IS_BUILTIN.libXft:M[yY][eE][sS]} USE_BUILTIN.libXft= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.libXft} -. if !empty(USE_BUILTIN.libXft:M[yY][eE][sS]) +. if ${USE_BUILTIN.libXft:M[yY][eE][sS]} USE_BUILTIN.libXft!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXft:Q}; then \ ${ECHO} yes; \ @@ -78,9 +78,9 @@ MAKEVARS+= USE_BUILTIN.libXft .include "../../mk/x11.builtin.mk" CHECK_BUILTIN.libXft?= no -.if !empty(CHECK_BUILTIN.libXft:M[nN][oO]) +.if ${CHECK_BUILTIN.libXft:M[nN][oO]} -. if !empty(USE_BUILTIN.libXft:M[nN][oO]) +. if ${USE_BUILTIN.libXft:M[nN][oO]} BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10 . endif --_----------=_1668599775258820--