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 EF1651A9239 for ; Tue, 9 Nov 2021 12:05:59 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 33C8084F35; Tue, 9 Nov 2021 12:05:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E370B84E8C for ; Tue, 9 Nov 2021 12:04:45 +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 h-HYo6KwtqjY for ; Tue, 9 Nov 2021 12:04:44 +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 3C73584CE7 for ; Tue, 9 Nov 2021 12:04:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 360D9FAEC; Tue, 9 Nov 2021 12:04:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636459484114160" MIME-Version: 1.0 Date: Tue, 9 Nov 2021 12:04:44 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211109120444.360D9FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636459484114160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Nov 9 12:04:43 UTC 2021 Modified Files: pkgsrc/comms/asterisk13: Makefile pkgsrc/comms/asterisk16: Makefile pkgsrc/comms/asterisk18: Makefile pkgsrc/devel/libepoll-shim: Makefile pkgsrc/mail/dovecot2: options.mk pkgsrc/mk/platform: Bitrig.mk Darwin.mk DragonFly.mk FreeBSD.mk Linux.mk MidnightBSD.mk MirBSD.mk NetBSD.mk OpenBSD.mk README pkgsrc/sysutils/p5-IO-KQueue: Makefile pkgsrc/x11/xf86-video-intel: Makefile Log Message: mk: For consistency, rename PKG_HAS_ to OPSYS_HAVE_. Requested by jperkin. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 pkgsrc/comms/asterisk13/Makefile cvs rdiff -u -r1.83 -r1.84 pkgsrc/comms/asterisk16/Makefile cvs rdiff -u -r1.134 -r1.135 pkgsrc/comms/asterisk18/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libepoll-shim/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/dovecot2/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/platform/Bitrig.mk cvs rdiff -u -r1.106 -r1.107 pkgsrc/mk/platform/Darwin.mk cvs rdiff -u -r1.52 -r1.53 pkgsrc/mk/platform/DragonFly.mk cvs rdiff -u -r1.37 -r1.38 pkgsrc/mk/platform/FreeBSD.mk cvs rdiff -u -r1.85 -r1.86 pkgsrc/mk/platform/Linux.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/platform/MidnightBSD.mk cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/platform/MirBSD.mk cvs rdiff -u -r1.68 -r1.69 pkgsrc/mk/platform/NetBSD.mk cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/platform/OpenBSD.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/mk/platform/README cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/p5-IO-KQueue/Makefile cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/xf86-video-intel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636459484114160 Content-Disposition: inline Content-Length: 12834 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/asterisk13/Makefile diff -u pkgsrc/comms/asterisk13/Makefile:1.74 pkgsrc/comms/asterisk13/Makefile:1.75 --- pkgsrc/comms/asterisk13/Makefile:1.74 Tue Nov 9 11:11:08 2021 +++ pkgsrc/comms/asterisk13/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2021/11/09 11:11:08 nia Exp $ +# $NetBSD: Makefile,v 1.75 2021/11/09 12:04:43 nia Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -117,12 +117,12 @@ BUILDLINK_TRANSFORM+= rm:-march=i386 .endif PLIST_VARS+= kqueue -.if defined(PKG_HAVE_KQUEUE) +.if defined(OPSYS_HAS_KQUEUE) PLIST.kqueue= yes .endif PLIST_VARS+= timerfd -.if defined(PKG_HAVE_TIMERFD) +.if defined(OPSYS_HAS_TIMERFD) PLIST.timerfd= yes .endif Index: pkgsrc/comms/asterisk16/Makefile diff -u pkgsrc/comms/asterisk16/Makefile:1.83 pkgsrc/comms/asterisk16/Makefile:1.84 --- pkgsrc/comms/asterisk16/Makefile:1.83 Tue Nov 9 11:11:08 2021 +++ pkgsrc/comms/asterisk16/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2021/11/09 11:11:08 nia Exp $ +# $NetBSD: Makefile,v 1.84 2021/11/09 12:04:43 nia Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -120,7 +120,7 @@ BUILDLINK_TRANSFORM+= rm:-march=i386 .endif PLIST_VARS+= kqueue -.if defined(PKG_HAVE_KQUEUE) +.if defined(OPSYS_HAS_KQUEUE) PLIST.kqueue= yes .endif @@ -141,7 +141,7 @@ PLIST.mgcp= yes .endif PLIST_VARS+= timerfd -.if defined(PKG_HAVE_TIMERFD) +.if defined(OPSYS_HAS_TIMERFD) PLIST.timerfd= yes .endif Index: pkgsrc/comms/asterisk18/Makefile diff -u pkgsrc/comms/asterisk18/Makefile:1.134 pkgsrc/comms/asterisk18/Makefile:1.135 --- pkgsrc/comms/asterisk18/Makefile:1.134 Tue Nov 9 11:11:08 2021 +++ pkgsrc/comms/asterisk18/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.134 2021/11/09 11:11:08 nia Exp $ +# $NetBSD: Makefile,v 1.135 2021/11/09 12:04:43 nia Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -119,7 +119,7 @@ BUILDLINK_TRANSFORM+= rm:-march=i386 .endif PLIST_VARS+= kqueue -.if defined(PKG_HAVE_KQUEUE) +.if defined(OPSYS_HAS_KQUEUE) PLIST.kqueue= yes .endif @@ -140,7 +140,7 @@ PLIST.mgcp= yes .endif PLIST_VARS+= timerfd -.if defined(PKG_HAVE_TIMERFD) +.if defined(OPSYS_HAS_TIMERFD) PLIST.timerfd= yes .endif Index: pkgsrc/devel/libepoll-shim/Makefile diff -u pkgsrc/devel/libepoll-shim/Makefile:1.5 pkgsrc/devel/libepoll-shim/Makefile:1.6 --- pkgsrc/devel/libepoll-shim/Makefile:1.5 Tue Nov 9 11:09:04 2021 +++ pkgsrc/devel/libepoll-shim/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2021/11/09 11:09:04 nia Exp $ +# $NetBSD: Makefile,v 1.6 2021/11/09 12:04:43 nia Exp $ GITHUB_PROJECT= epoll-shim GITHUB_TAG= v${PKGVERSION_NOREV} @@ -20,15 +20,15 @@ CMAKE_ARGS+= -DBUILD_TESTING=OFF .include "../../mk/bsd.prefs.mk" -.if !defined(PKG_HAVE_KQUEUE) +.if !defined(OPSYS_HAS_KQUEUE) PKG_SKIP_REASON+= "Requires a kqueue implementation" .endif PLIST_VARS+= eventfd timerfd -.if !defined(PKG_HAVE_EVENTFD) +.if !defined(OPSYS_HAS_EVENTFD) PLIST.eventfd= YES .endif -.if !defined(PKG_HAVE_TIMERFD) +.if !defined(OPSYS_HAS_TIMERFD) PLIST.timerfd= YES .endif Index: pkgsrc/mail/dovecot2/options.mk diff -u pkgsrc/mail/dovecot2/options.mk:1.13 pkgsrc/mail/dovecot2/options.mk:1.14 --- pkgsrc/mail/dovecot2/options.mk:1.13 Sat Jan 25 10:45:11 2020 +++ pkgsrc/mail/dovecot2/options.mk Tue Nov 9 12:04:43 2021 @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.13 2020/01/25 10:45:11 jperkin Exp $ +# $NetBSD: options.mk,v 1.14 2021/11/09 12:04:43 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot PKG_SUPPORTED_OPTIONS= kqueue pam ssl tcpwrappers PKG_SUGGESTED_OPTIONS= pam ssl tcpwrappers -.if defined(PKG_HAVE_KQUEUE) +.if defined(OPSYS_HAS_KQUEUE) PKG_SUGGESTED_OPTIONS+= kqueue .endif PLIST_VARS+= ssl tcpwrappers Index: pkgsrc/mk/platform/Bitrig.mk diff -u pkgsrc/mk/platform/Bitrig.mk:1.3 pkgsrc/mk/platform/Bitrig.mk:1.4 --- pkgsrc/mk/platform/Bitrig.mk:1.3 Thu Mar 10 16:58:19 2016 +++ pkgsrc/mk/platform/Bitrig.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Bitrig.mk,v 1.3 2016/03/10 16:58:19 jperkin Exp $ +# $NetBSD: Bitrig.mk,v 1.4 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the Bitrig operating system. @@ -61,7 +61,7 @@ DEFAULT_SERIAL_DEVICE?= /dev/null SERIAL_DEVICES?= /dev/null .endif -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined _OPSYS_CAN_CHECK_SHLIBS= no Index: pkgsrc/mk/platform/Darwin.mk diff -u pkgsrc/mk/platform/Darwin.mk:1.106 pkgsrc/mk/platform/Darwin.mk:1.107 --- pkgsrc/mk/platform/Darwin.mk:1.106 Tue Sep 14 10:50:48 2021 +++ pkgsrc/mk/platform/Darwin.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.106 2021/09/14 10:50:48 schmonz Exp $ +# $NetBSD: Darwin.mk,v 1.107 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the Darwin operating system. @@ -220,7 +220,7 @@ CONFIGURE_ENV+= ac_cv_func_poll=no # check for kqueue(2) support .if exists(${_OPSYS_INCLUDE_DIRS}/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif # If the deployment target is not set explicitly, the linker in Tiger and prior Index: pkgsrc/mk/platform/DragonFly.mk diff -u pkgsrc/mk/platform/DragonFly.mk:1.52 pkgsrc/mk/platform/DragonFly.mk:1.53 --- pkgsrc/mk/platform/DragonFly.mk:1.52 Sat Sep 29 11:47:33 2018 +++ pkgsrc/mk/platform/DragonFly.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: DragonFly.mk,v 1.52 2018/09/29 11:47:33 sevan Exp $ +# $NetBSD: DragonFly.mk,v 1.53 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the DragonFly operating system. @@ -57,7 +57,7 @@ _OPSYS_CAN_CHECK_SHLIBS= yes # use reade # check for kqueue(2) support .if exists(/usr/include/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif # check for maximum command line length and set it in configure's environment, Index: pkgsrc/mk/platform/FreeBSD.mk diff -u pkgsrc/mk/platform/FreeBSD.mk:1.37 pkgsrc/mk/platform/FreeBSD.mk:1.38 --- pkgsrc/mk/platform/FreeBSD.mk:1.37 Mon Nov 12 14:22:58 2018 +++ pkgsrc/mk/platform/FreeBSD.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: FreeBSD.mk,v 1.37 2018/11/12 14:22:58 jperkin Exp $ +# $NetBSD: FreeBSD.mk,v 1.38 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the FreeBSD operating system. @@ -68,7 +68,7 @@ SERIAL_DEVICES?= /dev/cuaa0 # check for kqueue(2) support .if exists(/usr/include/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif # Register support for SSP on x86 architectures Index: pkgsrc/mk/platform/Linux.mk diff -u pkgsrc/mk/platform/Linux.mk:1.85 pkgsrc/mk/platform/Linux.mk:1.86 --- pkgsrc/mk/platform/Linux.mk:1.85 Tue Nov 9 11:05:07 2021 +++ pkgsrc/mk/platform/Linux.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.85 2021/11/09 11:05:07 nia Exp $ +# $NetBSD: Linux.mk,v 1.86 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the Linux operating system. @@ -185,5 +185,5 @@ GLIBC_VERSION= ${_GLIBC_VERSION_CMD:sh} MAKE_ENV+= NOGCCERROR=true .endif -PKG_HAVE_EVENTFD= # defined -PKG_HAVE_TIMERFD= # defined +OPSYS_HAS_EVENTFD= # defined +OPSYS_HAS_TIMERFD= # defined Index: pkgsrc/mk/platform/MidnightBSD.mk diff -u pkgsrc/mk/platform/MidnightBSD.mk:1.1 pkgsrc/mk/platform/MidnightBSD.mk:1.2 --- pkgsrc/mk/platform/MidnightBSD.mk:1.1 Mon Mar 15 16:21:02 2021 +++ pkgsrc/mk/platform/MidnightBSD.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: MidnightBSD.mk,v 1.1 2021/03/15 16:21:02 ryoon Exp $ +# $NetBSD: MidnightBSD.mk,v 1.2 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the MidnightBSD operating system. @@ -68,7 +68,7 @@ SERIAL_DEVICES?= /dev/cuaa0 # check for kqueue(2) support .if exists(/usr/include/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif # Register support for SSP on x86 architectures Index: pkgsrc/mk/platform/MirBSD.mk diff -u pkgsrc/mk/platform/MirBSD.mk:1.13 pkgsrc/mk/platform/MirBSD.mk:1.14 --- pkgsrc/mk/platform/MirBSD.mk:1.13 Tue Jan 17 22:57:39 2017 +++ pkgsrc/mk/platform/MirBSD.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: MirBSD.mk,v 1.13 2017/01/17 22:57:39 wiz Exp $ +# $NetBSD: MirBSD.mk,v 1.14 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the MirOS BSD operating system. @@ -64,7 +64,7 @@ DEFAULT_SERIAL_DEVICE?= /dev/null SERIAL_DEVICES?= /dev/null .endif -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined _OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk Index: pkgsrc/mk/platform/NetBSD.mk diff -u pkgsrc/mk/platform/NetBSD.mk:1.68 pkgsrc/mk/platform/NetBSD.mk:1.69 --- pkgsrc/mk/platform/NetBSD.mk:1.68 Tue Nov 9 11:05:07 2021 +++ pkgsrc/mk/platform/NetBSD.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.68 2021/11/09 11:05:07 nia Exp $ +# $NetBSD: NetBSD.mk,v 1.69 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the NetBSD operating system. @@ -123,17 +123,17 @@ FFLAGS+= -mieee # check for kqueue(2) support, added in NetBSD-1.6J .if exists(/usr/include/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif # check for eventfd(2) support, added in NetBSD-9.99.x .if exists(/usr/include/sys/eventfd.h) -PKG_HAVE_EVENTFD= # defined +OPSYS_HAS_EVENTFD= # defined .endif # check for timerfd(2) support, added in NetBSD-9.99.x .if exists(/usr/include/sys/timerfd.h) -PKG_HAVE_TIMERFD= # defined +OPSYS_HAS_TIMERFD= # defined .endif # Register support for FORTIFY (with GCC) Index: pkgsrc/mk/platform/OpenBSD.mk diff -u pkgsrc/mk/platform/OpenBSD.mk:1.42 pkgsrc/mk/platform/OpenBSD.mk:1.43 --- pkgsrc/mk/platform/OpenBSD.mk:1.42 Wed May 31 22:55:01 2017 +++ pkgsrc/mk/platform/OpenBSD.mk Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.mk,v 1.42 2017/05/31 22:55:01 jlam Exp $ +# $NetBSD: OpenBSD.mk,v 1.43 2021/11/09 12:04:43 nia Exp $ # # Variable definitions for the OpenBSD operating system. @@ -94,7 +94,7 @@ SERIAL_DEVICES?= /dev/null # check for kqueue(2) support, added in OpenBSD-2.9 .if exists(/usr/include/sys/event.h) -PKG_HAVE_KQUEUE= # defined +OPSYS_HAS_KQUEUE= # defined .endif _OPSYS_SUPPORTS_CWRAPPERS= yes Index: pkgsrc/mk/platform/README diff -u pkgsrc/mk/platform/README:1.6 pkgsrc/mk/platform/README:1.7 --- pkgsrc/mk/platform/README:1.6 Mon Aug 7 23:54:09 2017 +++ pkgsrc/mk/platform/README Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.6 2017/08/07 23:54:09 maya Exp $ +$NetBSD: README,v 1.7 2021/11/09 12:04:43 nia Exp $ These files contain platform-specific definitions that are used by the pkgsrc infrastructure. @@ -99,7 +99,11 @@ TODO: Document all these variables. SERIAL_DEVICES is list of supported serial devices - PKG_HAVE_KQUEUE is defined if kqueue(2) is supported. + OPSYS_HAS_EVENTFD is defined if eventfd(2) is supported. + + OPSYS_HAS_TIMERFD is defined if timerfd(2) is supported. + + OPSYS_HAS_KQUEUE is defined if kqueue(2) is supported. _OPSYS_CAN_CHECK_SHLIBS is "yes" if "check-shlibs" in check/check-shlibs.mk can be performed. Index: pkgsrc/sysutils/p5-IO-KQueue/Makefile diff -u pkgsrc/sysutils/p5-IO-KQueue/Makefile:1.18 pkgsrc/sysutils/p5-IO-KQueue/Makefile:1.19 --- pkgsrc/sysutils/p5-IO-KQueue/Makefile:1.18 Mon May 24 19:54:16 2021 +++ pkgsrc/sysutils/p5-IO-KQueue/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2021/05/24 19:54:16 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2021/11/09 12:04:43 nia Exp $ DISTNAME= IO-KQueue-0.39 PKGNAME= p5-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= p5-Devel-CheckLib-[0-9]*:../.. .include "../../mk/bsd.prefs.mk" -.if !defined(PKG_HAVE_KQUEUE) +.if !defined(OPSYS_HAS_KQUEUE) PKG_FAIL_REASON+= "Requires kqueue(2)" .endif Index: pkgsrc/x11/xf86-video-intel/Makefile diff -u pkgsrc/x11/xf86-video-intel/Makefile:1.47 pkgsrc/x11/xf86-video-intel/Makefile:1.48 --- pkgsrc/x11/xf86-video-intel/Makefile:1.47 Tue Nov 9 11:06:08 2021 +++ pkgsrc/x11/xf86-video-intel/Makefile Tue Nov 9 12:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2021/11/09 11:06:08 nia Exp $ +# $NetBSD: Makefile,v 1.48 2021/11/09 12:04:43 nia Exp $ PKGNAME= xf86-video-intel-2.99.917.20200515 COMMIT_ID= 5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc @@ -28,7 +28,7 @@ RELRO_SUPPORTED= partial .include "../../mk/bsd.prefs.mk" PLIST_VARS+= virtual -.if defined(PKG_HAVE_TIMERFD) +.if defined(OPSYS_HAS_TIMERFD) PLIST.virtual= yes .endif --_----------=_1636459484114160--