Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1706B84F4E for ; Fri, 15 Dec 2023 14:18:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mUc_tWxi1wNg for ; Fri, 15 Dec 2023 14:18:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 304C784EEF for ; Fri, 15 Dec 2023 14:18:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 279D9FA42; Fri, 15 Dec 2023 14:18:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1702649897248220" MIME-Version: 1.0 Date: Fri, 15 Dec 2023 14:18:17 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/comms/asterisk20 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20231215141817.279D9FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1702649897248220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Fri Dec 15 14:18:17 UTC 2023 Modified Files: pkgsrc/comms/asterisk20: DESCR Makefile distinfo Added Files: pkgsrc/comms/asterisk20/patches: patch-build__tools_make__xml__documentation Log Message: comms/asterisk20: Patch out use of GNU sed extensions Relace \b with [:space:], as specified by POSIX. Resolves failure to build with BSD sed, so drop the USE_TOOLS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk20/DESCR \ pkgsrc/comms/asterisk20/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk20/Makefile cvs rdiff -u -r0 -r1.1 \ pkgsrc/comms/asterisk20/patches/patch-build__tools_make__xml__documentation Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1702649897248220 Content-Disposition: inline Content-Length: 4075 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/asterisk20/DESCR diff -u pkgsrc/comms/asterisk20/DESCR:1.1 pkgsrc/comms/asterisk20/DESCR:1.2 --- pkgsrc/comms/asterisk20/DESCR:1.1 Sun Dec 10 06:40:20 2023 +++ pkgsrc/comms/asterisk20/DESCR Fri Dec 15 14:18:16 2023 @@ -9,7 +9,7 @@ Interactive Voice Response, Call Queuing three-way calling, caller ID services, ADSI, SIP and H.323 (as both client and gateway). -This is a long term support version, 20. It is scheduled to go to +This is a Long Term Support version, 20. It is scheduled to go to security fixes only on 2026-10-19, and EOL on 2027-10-19. For more information about Asterisk versions, see https://docs.asterisk.org/About-the-Project/Asterisk-Versions/ Index: pkgsrc/comms/asterisk20/distinfo diff -u pkgsrc/comms/asterisk20/distinfo:1.1 pkgsrc/comms/asterisk20/distinfo:1.2 --- pkgsrc/comms/asterisk20/distinfo:1.1 Sun Dec 10 06:40:20 2023 +++ pkgsrc/comms/asterisk20/distinfo Fri Dec 15 14:18:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2023/12/10 06:40:20 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2023/12/15 14:18:16 gdt Exp $ BLAKE2s (asterisk-20.5.0/asterisk-20.5.0.tar.gz) = 7c735f257956737dffaf6fe434f291dacb1c6b38c930502cbe35fd4657250e23 SHA512 (asterisk-20.5.0/asterisk-20.5.0.tar.gz) = 4490ceff4fa5f455f2b4ed15e4c58fdc9b4da275006190b7e7e027b5fcc6a96d018574e6f68e69e05090af8303054ad243d34bbbeb0633bb91f253a9963a2a8b @@ -13,6 +13,7 @@ BLAKE2s (asterisk-20.5.0/pjproject-2.13. SHA512 (asterisk-20.5.0/pjproject-2.13.1.tar.bz2) = 2f1eb3cb8f52a5536c355b02b1abfa24c7d2263b5338568a7cd8167d349e007c34afafcdd7ed510bfc4fc859494383fac05e8325e46fd66219dbead86c5c3562 Size (asterisk-20.5.0/pjproject-2.13.1.tar.bz2) = 7825201 bytes SHA1 (patch-Makefile) = 7d278c52ace3e972ee0e17b0aec137549d4b8d7c +SHA1 (patch-build__tools_make__xml__documentation) = 9ee091af60ea480a88ce036dad2be7b257142ae0 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23 SHA1 (patch-configure) = 262036a7bcdf6e8e8431212a99dbcd65a7be8329 SHA1 (patch-configure.ac) = 98690ecc0e1cc99b6d7a0cd13412bd1b2b05397a Index: pkgsrc/comms/asterisk20/Makefile diff -u pkgsrc/comms/asterisk20/Makefile:1.2 pkgsrc/comms/asterisk20/Makefile:1.3 --- pkgsrc/comms/asterisk20/Makefile:1.2 Fri Dec 15 13:31:55 2023 +++ pkgsrc/comms/asterisk20/Makefile Fri Dec 15 14:18:16 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2023/12/15 13:31:55 gdt Exp $ +# $NetBSD: Makefile,v 1.3 2023/12/15 14:18:16 gdt Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -29,9 +29,6 @@ CONFLICTS+= asterisk-sounds-extra-[0-9]* .include "../../mk/bsd.prefs.mk" USE_TOOLS+= bash bison gmake perl:run pkg-config tar -# sed: 1: "/^\s*(<[?]xml|<.DOCTYPE ...": RE error: trailing backslash (\) -# To be reported upstream, which does not seem to document a gsed dependency. -USE_TOOLS+= gsed USE_LANGUAGES= c c++ REPLACE_BASH+= contrib/scripts/astversion REPLACE_BASH+= contrib/scripts/ast_coredumper Added files: Index: pkgsrc/comms/asterisk20/patches/patch-build__tools_make__xml__documentation diff -u /dev/null pkgsrc/comms/asterisk20/patches/patch-build__tools_make__xml__documentation:1.1 --- /dev/null Fri Dec 15 14:18:17 2023 +++ pkgsrc/comms/asterisk20/patches/patch-build__tools_make__xml__documentation Fri Dec 15 14:18:16 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-build__tools_make__xml__documentation,v 1.1 2023/12/15 14:18:16 gdt Exp $ + +Fix non-POSIX \b in sed to POSIX character class. + +Not yet reported upstream. + +--- build_tools/make_xml_documentation.orig 2023-12-15 13:33:05.565768402 +0000 ++++ build_tools/make_xml_documentation +@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do + ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; } + fi + fi +- ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}" ++ ${SED} -r "/^[:space:]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}" + done + done + echo "" >> "${output_file}" --_----------=_1702649897248220--