Received: by mail.netbsd.org (Postfix, from userid 605) id 939C184FA9; Thu, 5 May 2022 08:29:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CE82B84EC3 for ; Thu, 5 May 2022 08:29:37 +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 f-cfpzUNfl6F for ; Thu, 5 May 2022 08:29:37 +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 2C55E84E82 for ; Thu, 5 May 2022 08:29:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2AA11FB1A; Thu, 5 May 2022 08:29:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1651739377108110" MIME-Version: 1.0 Date: Thu, 5 May 2022 08:29:37 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/fswebcam To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220505082937.2AA11FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1651739377108110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu May 5 08:29:37 UTC 2022 Modified Files: pkgsrc/graphics/fswebcam: Makefile Log Message: fswebcam: Use OPSYS_VERSION to numerically compare NetBSD versions To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/fswebcam/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1651739377108110 Content-Disposition: inline Content-Length: 860 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/fswebcam/Makefile diff -u pkgsrc/graphics/fswebcam/Makefile:1.3 pkgsrc/graphics/fswebcam/Makefile:1.4 --- pkgsrc/graphics/fswebcam/Makefile:1.3 Thu Sep 2 12:01:30 2021 +++ pkgsrc/graphics/fswebcam/Makefile Thu May 5 08:29:37 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2021/09/02 12:01:30 nia Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/05 08:29:37 nia Exp $ DISTNAME= fswebcam-20200725 CATEGORIES= graphics @@ -18,8 +18,7 @@ CONFIGURE_ARGS+= --disable-v4l1 pre-configure: .if exists(/usr/include/sys/videoio.h) # Older NetBSD versions need a newer videoio.h. -. if ${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[56789].*) && empty(OS_VERSION:M9.99.*)) +. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099970 ${CP} ${.CURDIR}/../../graphics/libv4l/files/videoio.h \ ${WRKSRC}/videodev2.h . else --_----------=_1651739377108110--