Tue Nov 9 11:11:08 2021 UTC ()
asterisk*: Detect kqueue/timerfd through pkgsrc infrastructure.

Fixes PLIST on NetBSD/current.


(nia)
diff -r1.73 -r1.74 pkgsrc/comms/asterisk13/Makefile
diff -r1.12 -r1.13 pkgsrc/comms/asterisk13/PLIST
diff -r1.82 -r1.83 pkgsrc/comms/asterisk16/Makefile
diff -r1.133 -r1.134 pkgsrc/comms/asterisk18/Makefile
cvs diff -r1.73 -r1.74 pkgsrc/comms/asterisk13/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk13/Makefile 2021/09/29 19:00:24 1.73
+++ pkgsrc/comms/asterisk13/Makefile 2021/11/09 11:11:08 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.73 2021/09/29 19:00:24 adam Exp $ 1# $NetBSD: Makefile,v 1.74 2021/11/09 11:11:08 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6 6
7DISTNAME= asterisk-13.38.3 7DISTNAME= asterisk-13.38.3
8#PKGREVISION= 1 8#PKGREVISION= 1
9PKGREVISION= 1 9PKGREVISION= 1
10CATEGORIES= comms net audio 10CATEGORIES= comms net audio
11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
14DIST_SUBDIR= ${PKGNAME_NOREV} 14DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -107,30 +107,35 @@ MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR} @@ -107,30 +107,35 @@ MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR}
107MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin 107MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin
108MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR} 108MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
109MAKE_FLAGS+= WRKSRC=${WRKSRC} 109MAKE_FLAGS+= WRKSRC=${WRKSRC}
110MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} 110MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
111MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs 111MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
112MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin 112MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
113MAKE_FLAGS+= OPTIMIZE=-O3 113MAKE_FLAGS+= OPTIMIZE=-O3
114 114
115.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) 115.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
116BUILDLINK_TRANSFORM+= rm:-march=i386 116BUILDLINK_TRANSFORM+= rm:-march=i386
117.endif 117.endif
118 118
119PLIST_VARS+= kqueue 119PLIST_VARS+= kqueue
120.if exists(/usr/include/sys/event.h) 120.if defined(PKG_HAVE_KQUEUE)
121PLIST.kqueue= yes 121PLIST.kqueue= yes
122.endif 122.endif
123 123
 124PLIST_VARS+= timerfd
 125.if defined(PKG_HAVE_TIMERFD)
 126PLIST.timerfd= yes
 127.endif
 128
124PLIST_VARS+= mgcp 129PLIST_VARS+= mgcp
125# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined 130# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
126# if the grep fails 131# if the grep fails
127NOSIGPIPE!= ${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo "" 132NOSIGPIPE!= ${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo ""
128.if ${NOSIGPIPE} != "" 133.if ${NOSIGPIPE} != ""
129PLIST.mgcp= yes 134PLIST.mgcp= yes
130.endif 135.endif
131 136
132.if ${OPSYS} == "SunOS" 137.if ${OPSYS} == "SunOS"
133PLIST.mgcp= yes 138PLIST.mgcp= yes
134.endif 139.endif
135 140
136.include "options.mk" 141.include "options.mk"
cvs diff -r1.12 -r1.13 pkgsrc/comms/asterisk13/PLIST (expand / switch to unified diff)

--- pkgsrc/comms/asterisk13/PLIST 2021/01/02 22:45:43 1.12
+++ pkgsrc/comms/asterisk13/PLIST 2021/11/09 11:11:08 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2021/01/02 22:45:43 jnemeth Exp $ 1@comment $NetBSD: PLIST,v 1.13 2021/11/09 11:11:08 nia Exp $
2include/asterisk.h 2include/asterisk.h
3include/asterisk/_private.h 3include/asterisk/_private.h
4include/asterisk/abstract_jb.h 4include/asterisk/abstract_jb.h
5include/asterisk/acl.h 5include/asterisk/acl.h
6include/asterisk/adsi.h 6include/asterisk/adsi.h
7include/asterisk/ael_structs.h 7include/asterisk/ael_structs.h
8include/asterisk/agi.h 8include/asterisk/agi.h
9include/asterisk/alaw.h 9include/asterisk/alaw.h
10include/asterisk/alertpipe.h 10include/asterisk/alertpipe.h
11include/asterisk/aoc.h 11include/asterisk/aoc.h
12include/asterisk/app.h 12include/asterisk/app.h
13include/asterisk/ari.h 13include/asterisk/ari.h
14include/asterisk/ast_expr.h 14include/asterisk/ast_expr.h
@@ -452,26 +452,27 @@ lib/asterisk/modules/res_sorcery_memory_ @@ -452,26 +452,27 @@ lib/asterisk/modules/res_sorcery_memory_
452lib/asterisk/modules/res_sorcery_realtime.so 452lib/asterisk/modules/res_sorcery_realtime.so
453lib/asterisk/modules/res_speech.so 453lib/asterisk/modules/res_speech.so
454${PLIST.srtp}lib/asterisk/modules/res_srtp.so 454${PLIST.srtp}lib/asterisk/modules/res_srtp.so
455lib/asterisk/modules/res_stasis.so 455lib/asterisk/modules/res_stasis.so
456lib/asterisk/modules/res_stasis_answer.so 456lib/asterisk/modules/res_stasis_answer.so
457lib/asterisk/modules/res_stasis_device_state.so 457lib/asterisk/modules/res_stasis_device_state.so
458lib/asterisk/modules/res_stasis_playback.so 458lib/asterisk/modules/res_stasis_playback.so
459lib/asterisk/modules/res_stasis_recording.so 459lib/asterisk/modules/res_stasis_recording.so
460lib/asterisk/modules/res_stasis_snoop.so 460lib/asterisk/modules/res_stasis_snoop.so
461lib/asterisk/modules/res_statsd.so 461lib/asterisk/modules/res_statsd.so
462lib/asterisk/modules/res_stun_monitor.so 462lib/asterisk/modules/res_stun_monitor.so
463${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so 463${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
464lib/asterisk/modules/res_timing_pthread.so 464lib/asterisk/modules/res_timing_pthread.so
 465${PLIST.timerfd}lib/asterisk/modules/res_timing_timerfd.so
465${PLIST.jabber}lib/asterisk/modules/res_xmpp.so 466${PLIST.jabber}lib/asterisk/modules/res_xmpp.so
466lib/libasteriskssl.so 467lib/libasteriskssl.so
467lib/libasteriskssl.so.1 468lib/libasteriskssl.so.1
468lib/pkgconfig/asterisk.pc 469lib/pkgconfig/asterisk.pc
469libdata/asterisk/documentation/appdocsxml.dtd 470libdata/asterisk/documentation/appdocsxml.dtd
470libdata/asterisk/documentation/appdocsxml.xslt 471libdata/asterisk/documentation/appdocsxml.xslt
471libdata/asterisk/documentation/core-en_US.xml 472libdata/asterisk/documentation/core-en_US.xml
472libdata/asterisk/images/asterisk-intro.jpg 473libdata/asterisk/images/asterisk-intro.jpg
473libdata/asterisk/images/kpad2.jpg 474libdata/asterisk/images/kpad2.jpg
474libdata/asterisk/moh/.asterisk-moh-opsound-wav-2.03 475libdata/asterisk/moh/.asterisk-moh-opsound-wav-2.03
475libdata/asterisk/moh/CHANGES-asterisk-moh-opsound-wav 476libdata/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
476libdata/asterisk/moh/CREDITS-asterisk-moh-opsound-wav 477libdata/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
477libdata/asterisk/moh/LICENSE-asterisk-moh-opsound-wav 478libdata/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
cvs diff -r1.82 -r1.83 pkgsrc/comms/asterisk16/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk16/Makefile 2021/09/29 19:00:25 1.82
+++ pkgsrc/comms/asterisk16/Makefile 2021/11/09 11:11:08 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.82 2021/09/29 19:00:25 adam Exp $ 1# $NetBSD: Makefile,v 1.83 2021/11/09 11:11:08 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6 6
7DISTNAME= asterisk-16.19.0 7DISTNAME= asterisk-16.19.0
8PKGREVISION= 1 8PKGREVISION= 1
9CATEGORIES= comms net audio 9CATEGORIES= comms net audio
10MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 10MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
11MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 11MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
13DIST_SUBDIR= ${PKGNAME_NOREV} 13DIST_SUBDIR= ${PKGNAME_NOREV}
14DISTFILES= ${DEFAULT_DISTFILES} 14DISTFILES= ${DEFAULT_DISTFILES}
@@ -110,48 +110,48 @@ MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/ @@ -110,48 +110,48 @@ MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/
110MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR} 110MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
111MAKE_FLAGS+= WRKSRC=${WRKSRC} 111MAKE_FLAGS+= WRKSRC=${WRKSRC}
112MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} 112MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
113MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs 113MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
114MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin 114MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
115MAKE_FLAGS+= OPTIMIZE= 115MAKE_FLAGS+= OPTIMIZE=
116MAKE_FLAGS+= DEBUG= 116MAKE_FLAGS+= DEBUG=
117 117
118.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) 118.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
119BUILDLINK_TRANSFORM+= rm:-march=i386 119BUILDLINK_TRANSFORM+= rm:-march=i386
120.endif 120.endif
121 121
122PLIST_VARS+= kqueue 122PLIST_VARS+= kqueue
123.if exists(/usr/include/sys/event.h) 123.if defined(PKG_HAVE_KQUEUE)
124PLIST.kqueue= yes 124PLIST.kqueue= yes
125.endif 125.endif
126 126
127PLIST_VARS+= mgcp 127PLIST_VARS+= mgcp
128# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined 128# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
129# if the grep fails 129# if the grep fails
130.for dir in ${COMPILER_INCLUDE_DIRS} 130.for dir in ${COMPILER_INCLUDE_DIRS}
131. if (exists(${dir}/sys/socket.h)) 131. if (exists(${dir}/sys/socket.h))
132NOSIGPIPE!= ${GREP} SO_NOSIGPIPE ${dir}/sys/socket.h || echo "" 132NOSIGPIPE!= ${GREP} SO_NOSIGPIPE ${dir}/sys/socket.h || echo ""
133. if ${NOSIGPIPE} != "" 133. if ${NOSIGPIPE} != ""
134PLIST.mgcp= yes 134PLIST.mgcp= yes
135. endif 135. endif
136. endif 136. endif
137.endfor 137.endfor
138 138
139.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 139.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
140PLIST.mgcp= yes 140PLIST.mgcp= yes
141.endif 141.endif
142 142
143PLIST_VARS+= timerfd 143PLIST_VARS+= timerfd
144.if ${OPSYS} == "Linux" 144.if defined(PKG_HAVE_TIMERFD)
145PLIST.timerfd= yes 145PLIST.timerfd= yes
146.endif 146.endif
147 147
148PLIST_VARS+= unbound 148PLIST_VARS+= unbound
149# unbound 1.5 or later is required.` 149# unbound 1.5 or later is required.`
150.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*) 150.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*)
151PLIST.unbound= yes 151PLIST.unbound= yes
152.else 152.else
153CONFIGURE_ARGS+= --without-unbound 153CONFIGURE_ARGS+= --without-unbound
154.endif 154.endif
155 155
156.include "options.mk" 156.include "options.mk"
157 157
cvs diff -r1.133 -r1.134 pkgsrc/comms/asterisk18/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/Makefile 2021/11/08 00:58:50 1.133
+++ pkgsrc/comms/asterisk18/Makefile 2021/11/09 11:11:08 1.134
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.133 2021/11/08 00:58:50 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.134 2021/11/09 11:11:08 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject 6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject
7 7
8DISTNAME= asterisk-18.8.0 8DISTNAME= asterisk-18.8.0
9#PKGREVISION= 24 9#PKGREVISION= 24
10CATEGORIES= comms net audio 10CATEGORIES= comms net audio
11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
14DIST_SUBDIR= ${PKGNAME_NOREV} 14DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -109,48 +109,48 @@ MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR} @@ -109,48 +109,48 @@ MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR}
109MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin 109MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin
110MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR} 110MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
111MAKE_FLAGS+= WRKSRC=${WRKSRC} 111MAKE_FLAGS+= WRKSRC=${WRKSRC}
112MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} 112MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
113MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs 113MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
114MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin 114MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
115MAKE_FLAGS+= OPTIMIZE=-O3 115MAKE_FLAGS+= OPTIMIZE=-O3
116 116
117.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) 117.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
118BUILDLINK_TRANSFORM+= rm:-march=i386 118BUILDLINK_TRANSFORM+= rm:-march=i386
119.endif 119.endif
120 120
121PLIST_VARS+= kqueue 121PLIST_VARS+= kqueue
122.if exists(/usr/include/sys/event.h) 122.if defined(PKG_HAVE_KQUEUE)
123PLIST.kqueue= yes 123PLIST.kqueue= yes
124.endif 124.endif
125 125
126PLIST_VARS+= mgcp 126PLIST_VARS+= mgcp
127# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined 127# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
128# if the grep fails 128# if the grep fails
129.for dir in ${COMPILER_INCLUDE_DIRS} 129.for dir in ${COMPILER_INCLUDE_DIRS}
130. if (exists(${dir}/sys/socket.h)) 130. if (exists(${dir}/sys/socket.h))
131NOSIGPIPE!= ${GREP} SO_NOSIGPIPE ${dir}/sys/socket.h || echo "" 131NOSIGPIPE!= ${GREP} SO_NOSIGPIPE ${dir}/sys/socket.h || echo ""
132. if ${NOSIGPIPE} != "" 132. if ${NOSIGPIPE} != ""
133PLIST.mgcp= yes 133PLIST.mgcp= yes
134. endif 134. endif
135. endif 135. endif
136.endfor 136.endfor
137 137
138.if ${OPSYS} == "SunOS" 138.if ${OPSYS} == "SunOS"
139PLIST.mgcp= yes 139PLIST.mgcp= yes
140.endif 140.endif
141 141
142PLIST_VARS+= timerfd 142PLIST_VARS+= timerfd
143.if ${OPSYS} == "Linux" 143.if defined(PKG_HAVE_TIMERFD)
144PLIST.timerfd= yes 144PLIST.timerfd= yes
145.endif 145.endif
146 146
147PLIST_VARS+= unbound 147PLIST_VARS+= unbound
148# unbound 1.5 or later is required.` 148# unbound 1.5 or later is required.`
149.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*) 149.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*)
150CONFIGURE_ARGS+= --without-unbound 150CONFIGURE_ARGS+= --without-unbound
151.else 151.else
152PLIST.unbound= yes 152PLIST.unbound= yes
153.endif 153.endif
154 154
155.include "options.mk" 155.include "options.mk"
156 156