Re: PR/59478 CVS commit: pkgsrc/comms/asterisk22

[Rob Whitlock <rwhitlock22%gmail.com@localhost>]

> On Aug 11, 2025, at 2:30 AM, John Nemeth <jnemeth%netbsd.org@localhost> wrote:
> 
> The following reply was made to PR pkg/59478; it has been noted by GNATS.
> 
> From: "John Nemeth" <jnemeth%netbsd.org@localhost>
> To: gnats-bugs%gnats.NetBSD.org@localhost
> Cc: 
> Subject: PR/59478 CVS commit: pkgsrc/comms/asterisk22
> Date: Mon, 11 Aug 2025 06:28:14 +0000
> 
> Module Name:	pkgsrc
> Committed By:	jnemeth
> Date:		Mon Aug 11 06:28:14 UTC 2025
> 
> Modified Files:
> 	pkgsrc/comms/asterisk22: Makefile PLIST distinfo
> 	pkgsrc/comms/asterisk22/patches: patch-configure patch-configure.ac
> 	    patch-include_asterisk_autoconfig.h.in patch-res_res__xmpp.c
> Removed Files:
> 	pkgsrc/comms/asterisk22/patches: patch-main_config.c
> 
> Log Message:
> Update Asterisk 22.5.1.  This catches up with multiple versions.
> 
> pkgsrc changes:
> - minor pkglint fixup
> - fix PR pkg/58978
> - fix PR pkg/59478
> 
> -----

This fixes the issues for asterisk22 but the issues for asterisk16,18,19,21
remain. Here are some patches that add CONFIG_SHELL where
needed and add the :run suffix to bash in USE_TOOLS where it is
missing, because there are installed scripts that require bash in
/usr/pkg/libdata/asterisk/scripts.



Add the :run suffix for bash in USE_TOOLS.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/asterisk16/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- Makefile	30 Aug 2025 22:44:44 -0000	1.122
+++ Makefile	31 Aug 2025 20:01:02 -0000
@@ -29,7 +29,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		bash bison gmake perl:run pkg-config tar
+USE_TOOLS+=		bash:run bison gmake perl:run pkg-config tar
 # sed: 1: "/^\s*(<[?]xml|<.DOCTYPE ...": RE error: trailing backslash (\)
 # not reported upstream because this version is EOL
 USE_TOOLS+=		gsed


Set CONFIG_SHELL to avoid build errors.

Fixes PR pkg/59478.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/asterisk18/Makefile,v
retrieving revision 1.173
diff -u -r1.173 Makefile
--- Makefile	30 Aug 2025 22:44:44 -0000	1.173
+++ Makefile	31 Aug 2025 19:07:50 -0000
@@ -45,6 +45,7 @@
 CHECK_INTERPRETER_SKIP+=	libdata/asterisk/scripts/refcounter.py
 
 GNU_CONFIGURE=		yes
+CONFIG_SHELL= 		${TOOLS_PATH.bash}
 CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/libdata
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-gtk2



Restore the :run suffix for bash in USE_TOOLS.

Fixes PR pkg/59478.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/asterisk19/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile	30 Aug 2025 22:44:44 -0000	1.45
+++ Makefile	31 Aug 2025 20:33:11 -0000
@@ -32,7 +32,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		bison gmake perl:run pkg-config tar bash
+USE_TOOLS+=		bash:run bison gmake perl:run pkg-config tar
 USE_LANGUAGES=		c c++
 REPLACE_BASH+=		contrib/scripts/astversion
 REPLACE_BASH+=		contrib/scripts/ast_coredumper


Set CONFIG_SHELL to avoid build errors.

Fixes PR pkg/59478.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/asterisk21/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	30 Aug 2025 22:44:44 -0000	1.18
+++ Makefile	31 Aug 2025 18:05:49 -0000
@@ -44,6 +44,7 @@
 CHECK_INTERPRETER_SKIP+=	libdata/asterisk/scripts/refcounter.py
 
 GNU_CONFIGURE=		yes
+CONFIG_SHELL=		${TOOLS_PATH.bash}
 CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/libdata
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-gtk2