CVS commit: pkgsrc/comms

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 14 18:45:28 UTC 2023

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

Log Message:
asterisk*: Attempt to fix PLIST on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/comms/asterisk13/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/comms/asterisk16/Makefile
cvs rdiff -u -r1.154 -r1.155 pkgsrc/comms/asterisk18/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/comms/asterisk19/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk19/PLIST

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.89 pkgsrc/comms/asterisk13/Makefile:1.90
--- pkgsrc/comms/asterisk13/Makefile:1.89       Tue Nov 14 14:01:30 2023
+++ pkgsrc/comms/asterisk13/Makefile    Tue Nov 14 18:45:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2023/11/14 14:01:30 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2023/11/14 18:45:28 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -120,9 +120,11 @@ PLIST_VARS+=       kqueue
 PLIST.kqueue=  yes
 .endif
 
-PLIST_VARS+=   timerfd
+PLIST_VARS+=           timerfd
 .if defined(OPSYS_HAS_TIMERFD)
-PLIST.timerfd= yes
+PLIST.timerfd=         yes
+.else
+CONFIGURE_ARGS+=       --without-timerfd
 .endif
 
 PLIST_VARS+=   mgcp

Index: pkgsrc/comms/asterisk16/Makefile
diff -u pkgsrc/comms/asterisk16/Makefile:1.105 pkgsrc/comms/asterisk16/Makefile:1.106
--- pkgsrc/comms/asterisk16/Makefile:1.105      Tue Nov 14 14:01:31 2023
+++ pkgsrc/comms/asterisk16/Makefile    Tue Nov 14 18:45:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2023/11/14 14:01:31 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2023/11/14 18:45:28 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -141,9 +141,11 @@ PLIST.mgcp=        yes
 PLIST.mgcp=    yes
 .endif
 
-PLIST_VARS+=   timerfd
+PLIST_VARS+=           timerfd
 .if defined(OPSYS_HAS_TIMERFD)
-PLIST.timerfd= yes
+PLIST.timerfd=         yes
+.else
+CONFIGURE_ARGS+=       --without-timerfd
 .endif
 
 PLIST_VARS+=           unbound

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.154 pkgsrc/comms/asterisk18/Makefile:1.155
--- pkgsrc/comms/asterisk18/Makefile:1.154      Tue Nov 14 14:01:31 2023
+++ pkgsrc/comms/asterisk18/Makefile    Tue Nov 14 18:45:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2023/11/14 14:01:31 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2023/11/14 18:45:28 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -139,9 +139,11 @@ PLIST.mgcp=        yes
 PLIST.mgcp=    yes
 .endif
 
-PLIST_VARS+=   timerfd
+PLIST_VARS+=           timerfd
 .if defined(OPSYS_HAS_TIMERFD)
-PLIST.timerfd= yes
+PLIST.timerfd=         yes
+.else
+CONFIGURE_ARGS+=       --without-timerfd
 .endif
 
 PLIST_VARS+=   unbound

Index: pkgsrc/comms/asterisk19/Makefile
diff -u pkgsrc/comms/asterisk19/Makefile:1.21 pkgsrc/comms/asterisk19/Makefile:1.22
--- pkgsrc/comms/asterisk19/Makefile:1.21       Tue Nov 14 14:01:31 2023
+++ pkgsrc/comms/asterisk19/Makefile    Tue Nov 14 18:45:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/11/14 14:01:31 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/11/14 18:45:28 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -50,6 +50,7 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 CONFIGURE_ARGS+=       --without-gtk2
 # XXX remove when lang/lua gets builtin.mk
 CONFIGURE_ARGS+=       --without-lua
+CONFIGURE_ARGS+=       --without-unbound
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CONFIGURE_ARGS+=       --without-srtp
@@ -139,18 +140,11 @@ PLIST.mgcp=       yes
 PLIST.mgcp=    yes
 .endif
 
-PLIST_VARS+=   timerfd
+PLIST_VARS+=           timerfd
 .if defined(OPSYS_HAS_TIMERFD)
-PLIST.timerfd= yes
-.endif
-
-PLIST_VARS+=   unbound
-# unbound 1.5 or later is required.`
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
-    exists(/usr/include/unbound.h)
-CONFIGURE_ARGS+=       --without-unbound
+PLIST.timerfd=         yes
 .else
-PLIST.unbound= yes
+CONFIGURE_ARGS+=       --without-timerfd
 .endif
 
 .include "options.mk"

Index: pkgsrc/comms/asterisk19/PLIST
diff -u pkgsrc/comms/asterisk19/PLIST:1.2 pkgsrc/comms/asterisk19/PLIST:1.3
--- pkgsrc/comms/asterisk19/PLIST:1.2   Sun Dec 19 00:39:11 2021
+++ pkgsrc/comms/asterisk19/PLIST       Tue Nov 14 18:45:28 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/12/19 00:39:11 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/11/14 18:45:28 nia Exp $
 lib/asterisk/libasteriskpj.so
 lib/asterisk/libasteriskpj.so.2
 lib/asterisk/modules/app_adsiprog.so
@@ -292,7 +292,6 @@ lib/asterisk/modules/res_pjsip_xpidf_bod
 ${PLIST.mgcp}lib/asterisk/modules/res_pktccops.so
 lib/asterisk/modules/res_prometheus.so
 lib/asterisk/modules/res_realtime.so
-${PLIST.unbound}lib/asterisk/modules/res_resolver_unbound.so
 lib/asterisk/modules/res_rtp_asterisk.so
 lib/asterisk/modules/res_rtp_multicast.so
 lib/asterisk/modules/res_security_log.so