CVS commit: pkgsrc/comms

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov  9 11:11:08 UTC 2021

Modified Files:
        pkgsrc/comms/asterisk13: Makefile PLIST
        pkgsrc/comms/asterisk16: Makefile
        pkgsrc/comms/asterisk18: Makefile

Log Message:
asterisk*: Detect kqueue/timerfd through pkgsrc infrastructure.

Fixes PLIST on NetBSD/current.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/comms/asterisk13/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/comms/asterisk13/PLIST
cvs rdiff -u -r1.82 -r1.83 pkgsrc/comms/asterisk16/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/comms/asterisk18/Makefile

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

Modified files:

Index: pkgsrc/comms/asterisk13/Makefile
diff -u pkgsrc/comms/asterisk13/Makefile:1.73 pkgsrc/comms/asterisk13/Makefile:1.74
--- pkgsrc/comms/asterisk13/Makefile:1.73       Wed Sep 29 19:00:24 2021
+++ pkgsrc/comms/asterisk13/Makefile    Tue Nov  9 11:11:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2021/09/29 19:00:24 adam Exp $
+# $NetBSD: Makefile,v 1.74 2021/11/09 11:11:08 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -117,10 +117,15 @@ BUILDLINK_TRANSFORM+=     rm:-march=i386
 .endif
 
 PLIST_VARS+=   kqueue
-.if exists(/usr/include/sys/event.h)
+.if defined(PKG_HAVE_KQUEUE)
 PLIST.kqueue=  yes
 .endif
 
+PLIST_VARS+=   timerfd
+.if defined(PKG_HAVE_TIMERFD)
+PLIST.timerfd= yes
+.endif
+
 PLIST_VARS+=   mgcp
 # NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
 # if the grep fails

Index: pkgsrc/comms/asterisk13/PLIST
diff -u pkgsrc/comms/asterisk13/PLIST:1.12 pkgsrc/comms/asterisk13/PLIST:1.13
--- pkgsrc/comms/asterisk13/PLIST:1.12  Sat Jan  2 22:45:43 2021
+++ pkgsrc/comms/asterisk13/PLIST       Tue Nov  9 11:11:08 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/01/02 22:45:43 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/11/09 11:11:08 nia Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -462,6 +462,7 @@ lib/asterisk/modules/res_statsd.so
 lib/asterisk/modules/res_stun_monitor.so
 ${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
+${PLIST.timerfd}lib/asterisk/modules/res_timing_timerfd.so
 ${PLIST.jabber}lib/asterisk/modules/res_xmpp.so
 lib/libasteriskssl.so
 lib/libasteriskssl.so.1

Index: pkgsrc/comms/asterisk16/Makefile
diff -u pkgsrc/comms/asterisk16/Makefile:1.82 pkgsrc/comms/asterisk16/Makefile:1.83
--- pkgsrc/comms/asterisk16/Makefile:1.82       Wed Sep 29 19:00:25 2021
+++ pkgsrc/comms/asterisk16/Makefile    Tue Nov  9 11:11:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2021/09/29 19:00:25 adam Exp $
+# $NetBSD: Makefile,v 1.83 2021/11/09 11:11:08 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 exists(/usr/include/sys/event.h)
+.if defined(PKG_HAVE_KQUEUE)
 PLIST.kqueue=  yes
 .endif
 
@@ -141,7 +141,7 @@ PLIST.mgcp= yes
 .endif
 
 PLIST_VARS+=   timerfd
-.if ${OPSYS} == "Linux"
+.if defined(PKG_HAVE_TIMERFD)
 PLIST.timerfd= yes
 .endif
 

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.133 pkgsrc/comms/asterisk18/Makefile:1.134
--- pkgsrc/comms/asterisk18/Makefile:1.133      Mon Nov  8 00:58:50 2021
+++ pkgsrc/comms/asterisk18/Makefile    Tue Nov  9 11:11:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2021/11/08 00:58:50 jnemeth Exp $
+# $NetBSD: Makefile,v 1.134 2021/11/09 11:11:08 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 exists(/usr/include/sys/event.h)
+.if defined(PKG_HAVE_KQUEUE)
 PLIST.kqueue=  yes
 .endif
 
@@ -140,7 +140,7 @@ PLIST.mgcp= yes
 .endif
 
 PLIST_VARS+=   timerfd
-.if ${OPSYS} == "Linux"
+.if defined(PKG_HAVE_TIMERFD)
 PLIST.timerfd= yes
 .endif