Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 9FA091A921F for ; Tue, 8 Mar 2022 22:55:43 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0FBB884F34; Tue, 8 Mar 2022 22:55:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4A62B84F2F for ; Tue, 8 Mar 2022 22:55:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bOdnfEQkHqig for ; Tue, 8 Mar 2022 22:55:41 +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 9C0F084F31 for ; Tue, 8 Mar 2022 22:55:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95117FB24; Tue, 8 Mar 2022 22:55:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1646780141106810" MIME-Version: 1.0 Date: Tue, 8 Mar 2022 22:55:41 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/print/hplip To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20220308225541.95117FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1646780141106810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Tue Mar 8 22:55:41 UTC 2022 Modified Files: pkgsrc/print/hplip: Makefile Log Message: hplip: adjust a test condition for older NetBSD (NFC) Avoid the upper limit of 9.x, since 10.x will be branched soon and, as a bonus, simplify the statement. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 pkgsrc/print/hplip/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1646780141106810 Content-Disposition: inline Content-Length: 892 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/hplip/Makefile diff -u pkgsrc/print/hplip/Makefile:1.98 pkgsrc/print/hplip/Makefile:1.99 --- pkgsrc/print/hplip/Makefile:1.98 Wed Dec 8 16:06:13 2021 +++ pkgsrc/print/hplip/Makefile Tue Mar 8 22:55:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2021/12/08 16:06:13 adam Exp $ +# $NetBSD: Makefile,v 1.99 2022/03/08 22:55:41 gutteridge Exp $ DISTNAME= hplip-3.19.12 PKGREVISION= 13 @@ -152,7 +152,7 @@ SUBST_SED.fix-paths-6= -e 's,"-I/usr/sh SUBST_SED.fix-paths-6+= -e 's,"/usr/bin/gs","${PREFIX}/bin/gs",g' # NetBSD has strnlen(3) since 5.99.12 -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M5.99.*) && empty(OS_VERSION:M[6-9].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 059912 SUBST_CLASSES+= fix-strnlen SUBST_STAGE.fix-strnlen= post-configure SUBST_MESSAGE.fix-strnlen= Replacing strnlen() with strlen() in two C++ files. --_----------=_1646780141106810--