CVS commit: pkgsrc/comms/asterisk18

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Mon Jun  2 03:33:52 UTC 2025

Modified Files:
        pkgsrc/comms/asterisk18: distinfo
        pkgsrc/comms/asterisk18/patches: patch-configure patch-configure.ac

Log Message:
PR/58978 -- comms/asterisk build fails if prefix is not /usr/pkg

Thanks to Taylor Campbell for the patch.  Ride recent version bump.
No pullup since branching will be soon.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/comms/asterisk18/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/comms/asterisk18/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk18/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/comms/asterisk18/distinfo
diff -u pkgsrc/comms/asterisk18/distinfo:1.79 pkgsrc/comms/asterisk18/distinfo:1.80
--- pkgsrc/comms/asterisk18/distinfo:1.79       Mon Jun  2 03:16:07 2025
+++ pkgsrc/comms/asterisk18/distinfo    Mon Jun  2 03:33:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2025/06/02 03:16:07 jnemeth Exp $
+$NetBSD: distinfo,v 1.80 2025/06/02 03:33:51 jnemeth Exp $
 
 BLAKE2s (asterisk-18.26.2/asterisk-18.26.2.tar.gz) = acedb758be5b149bf8545626ace49cac9bf0c94d79fd3573e9f6de191667c476
 SHA512 (asterisk-18.26.2/asterisk-18.26.2.tar.gz) = dff4a6cd5ac641f6c6c1f39e1a9d3ee5d02dd20c46c7e362130f7d5243ef9ca7e7cf887d6402c86e6644dd40777da38e3acbe18ba5280ff37abd8364c82e9f88
@@ -38,8 +38,8 @@ SHA1 (patch-channels_chan__pjsip.c) = ef
 SHA1 (patch-channels_chan__sip.c) = ed285612eae6cbfde19ded87db9360c0bca153c7
 SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67
 SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef
-SHA1 (patch-configure) = 05bf3fc647b79e282b39075079e84795067d9933
-SHA1 (patch-configure.ac) = b972730a2be3bf54502116f1f7e03afee76a02cc
+SHA1 (patch-configure) = 9efce299008a17ded9b2700641c126d52a3fd364
+SHA1 (patch-configure.ac) = e324df38078da811b4a9dd3b0c55332416835ec9
 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0
 SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e
 SHA1 (patch-funcs_func__channel.c) = 9d6ed8a2431fbde6879782d8228030467aabe7eb

Index: pkgsrc/comms/asterisk18/patches/patch-configure
diff -u pkgsrc/comms/asterisk18/patches/patch-configure:1.6 pkgsrc/comms/asterisk18/patches/patch-configure:1.7
--- pkgsrc/comms/asterisk18/patches/patch-configure:1.6 Mon Oct 21 04:53:15 2024
+++ pkgsrc/comms/asterisk18/patches/patch-configure     Mon Jun  2 03:33:52 2025
@@ -1,8 +1,33 @@
-$NetBSD: patch-configure,v 1.6 2024/10/21 04:53:15 jnemeth Exp $
+$NetBSD: patch-configure,v 1.7 2025/06/02 03:33:52 jnemeth Exp $
 
---- configure.orig     2024-10-17 16:03:29.000000000 +0000
+regen from configure.ac
+
+--- configure.orig     2025-05-22 15:50:16.000000000 +0000
 +++ configure
-@@ -10230,12 +10230,12 @@ else $as_nop
+@@ -5188,13 +5188,9 @@ esac
+ case "${host_os}" in
+      netbsd*)
+      ac_default_prefix=/usr/pkg
+-     CPPFLAGS=-I/usr/pkg/include
+-     LDFLAGS=-L/usr/pkg/lib
+      ;;
+      dragonfly*|freebsd*)
+      ac_default_prefix=/usr/local
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      openbsd*)
+      ac_default_prefix=/usr/local
+@@ -5206,8 +5202,6 @@ case "${host_os}" in
+            astmandir=/usr/share/man
+         fi
+      fi
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      darwin*)
+      ac_default_prefix=/usr/local
+@@ -10230,12 +10224,12 @@ else $as_nop
  
                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
  printf %s "checking for clang -fblocks... " >&6; }
@@ -17,7 +42,7 @@ $NetBSD: patch-configure,v 1.6 2024/10/2
                                AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
                                AST_CLANG_BLOCKS="-fblocks"
                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -22295,6 +22295,148 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -22295,6 +22289,148 @@ rm -f core conftest.err conftest.$ac_obj
  
  
  

Index: pkgsrc/comms/asterisk18/patches/patch-configure.ac
diff -u pkgsrc/comms/asterisk18/patches/patch-configure.ac:1.2 pkgsrc/comms/asterisk18/patches/patch-configure.ac:1.3
--- pkgsrc/comms/asterisk18/patches/patch-configure.ac:1.2      Sun Jun 13 07:57:53 2021
+++ pkgsrc/comms/asterisk18/patches/patch-configure.ac  Mon Jun  2 03:33:52 2025
@@ -1,8 +1,39 @@
-$NetBSD: patch-configure.ac,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
+$NetBSD: patch-configure.ac,v 1.3 2025/06/02 03:33:52 jnemeth Exp $
 
---- configure.ac.orig  2021-03-04 16:46:08.000000000 +0000
+1. Don't clear CPPFLAGS/LDFLAGS and impose /usr/pkg or /usr/local;
+   pkgsrc will handle its own prefix, which may not be /usr/pkg in
+   which case asterisk should absolutely never look at /usr/pkg.
+2. Ditto.
+3. Standard poll is in <poll.h> -- check for that, not <sys/poll.h>.
+4. Check for strftime_l.
+5. Standard poll is in <poll.h> -- check for that, not <sys/poll.h>.
+
+--- configure.ac.orig  2025-05-22 15:50:16.000000000 +0000
 +++ configure.ac
-@@ -751,7 +751,7 @@ AC_CHECK_HEADERS([xlocale.h])
+@@ -65,13 +65,9 @@ esac
+ case "${host_os}" in
+      netbsd*)
+      ac_default_prefix=/usr/pkg
+-     CPPFLAGS=-I/usr/pkg/include
+-     LDFLAGS=-L/usr/pkg/lib
+      ;;
+      dragonfly*|freebsd*)
+      ac_default_prefix=/usr/local
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      openbsd*)
+      ac_default_prefix=/usr/local
+@@ -83,8 +79,6 @@ case "${host_os}" in
+            astmandir=/usr/share/man
+         fi
+      fi
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      darwin*)
+      ac_default_prefix=/usr/local
+@@ -817,7 +811,7 @@ AC_CHECK_HEADERS([xlocale.h])
  
  AC_CHECK_HEADERS([winsock.h winsock2.h])
  
@@ -11,7 +42,7 @@ $NetBSD: patch-configure.ac,v 1.2 2021/0
         [],
       AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]))
  
-@@ -803,7 +803,7 @@ AC_FUNC_STRNLEN
+@@ -868,7 +862,7 @@ AC_FUNC_STRNLEN
  AC_FUNC_STRTOD
  AC_FUNC_UTIME_NULL
  AC_FUNC_VPRINTF
@@ -20,7 +51,7 @@ $NetBSD: patch-configure.ac,v 1.2 2021/0
  
  AC_MSG_CHECKING(for htonll)
  AC_LINK_IFELSE(
-@@ -872,9 +872,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
+@@ -937,9 +931,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
  LDFLAGS=${old_LDFLAGS}
  rm -f conftest.dynamics