CVS commit: pkgsrc/comms

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/comms
From: "Gavan Fantom" <gavan%netbsd.org@localhost>
Date: Fri, 17 Jan 2025 22:39:53 +0000

Module Name:    pkgsrc
Committed By:   gavan
Date:           Fri Jan 17 22:39:53 UTC 2025

Modified Files:
        pkgsrc/comms/asterisk19: Makefile distinfo
        pkgsrc/comms/asterisk19/patches:
            patch-build__tools_make__xml__documentation
        pkgsrc/comms/asterisk21: Makefile distinfo
        pkgsrc/comms/asterisk21/patches:
            patch-build__tools_make__xml__documentation
        pkgsrc/comms/asterisk22: Makefile distinfo
        pkgsrc/comms/asterisk22/patches:
            patch-build__tools_make__xml__documentation

Log Message:
asterisk[19,21,22]: Fix invalid XML documentation building


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/comms/asterisk19/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/asterisk19/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation
cvs rdiff -u -r1.9 -r1.10 pkgsrc/comms/asterisk21/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/asterisk21/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/asterisk22/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk22/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/comms/asterisk22/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.

Modified files:

Index: pkgsrc/comms/asterisk19/Makefile
diff -u pkgsrc/comms/asterisk19/Makefile:1.38 pkgsrc/comms/asterisk19/Makefile:1.39
--- pkgsrc/comms/asterisk19/Makefile:1.38       Mon Jan  6 21:49:02 2025
+++ pkgsrc/comms/asterisk19/Makefile    Fri Jan 17 22:39:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/01/06 21:49:02 ktnb Exp $
+# $NetBSD: Makefile,v 1.39 2025/01/17 22:39:52 gavan Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -6,7 +6,7 @@
 #       Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 
 DISTNAME=      asterisk-19.8.1
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    comms net audio
 MASTER_SITES=  https://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+= https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Index: pkgsrc/comms/asterisk19/distinfo
diff -u pkgsrc/comms/asterisk19/distinfo:1.4 pkgsrc/comms/asterisk19/distinfo:1.5
--- pkgsrc/comms/asterisk19/distinfo:1.4        Mon Dec 16 05:00:42 2024
+++ pkgsrc/comms/asterisk19/distinfo    Fri Jan 17 22:39:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/12/16 05:00:42 jnemeth Exp $
+$NetBSD: distinfo,v 1.5 2025/01/17 22:39:52 gavan Exp $
 
 BLAKE2s (asterisk-19.8.1/asterisk-19.8.1.tar.gz) = f364feff8ef0d9cc0efe33ff45327c3875e5b6e450ef7e0bdb0b8a98289adcb7
 SHA512 (asterisk-19.8.1/asterisk-19.8.1.tar.gz) = cad372034d6e6e76e223aa641b9068294cc2411a7c63241812954cc8989559d7c78f50eafcdeddf1da7c6f385ae3e5e5398ea547b4f4ffa36718cca5d76120b3
@@ -24,7 +24,7 @@ SHA1 (patch-apps_app__minivm.c) = 22ee6e
 SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602
 SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f
 SHA1 (patch-apps_app__voicemail.c) = bee10453a86039a99db9df644585800f347aaace
-SHA1 (patch-build__tools_make__xml__documentation) = b909cac9a847e8d0a0c30d9ee97d6d8de5f43a12
+SHA1 (patch-build__tools_make__xml__documentation) = 2c617cfdc96b1ddf51736205b83e1b737c110ad9
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f

Index: pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation
diff -u pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation:1.1 pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation:1.2
--- pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation:1.1     Mon Jul  8 05:03:01 2024
+++ pkgsrc/comms/asterisk19/patches/patch-build__tools_make__xml__documentation Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-build__tools_make__xml__documentation,v 1.1 2024/07/08 05:03:01 jnemeth Exp $
+$NetBSD: patch-build__tools_make__xml__documentation,v 1.2 2025/01/17 22:39:53 gavan Exp $
 
 --- build_tools/make_xml_documentation.orig    2022-04-14 22:16:42.000000000 +0000
 +++ build_tools/make_xml_documentation
@@ -7,7 +7,7 @@ $NetBSD: patch-build__tools_make__xml__d
                        fi
                fi
 -              ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
-+              ${SED} -r "/^\[[:space:]](<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++              ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
        done
  done
  echo "</docs>" >> "${output_file}"

Index: pkgsrc/comms/asterisk21/Makefile
diff -u pkgsrc/comms/asterisk21/Makefile:1.9 pkgsrc/comms/asterisk21/Makefile:1.10
--- pkgsrc/comms/asterisk21/Makefile:1.9        Thu Nov 14 22:18:55 2024
+++ pkgsrc/comms/asterisk21/Makefile    Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/11/14 22:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/01/17 22:39:53 gavan Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -6,7 +6,7 @@
 #       Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 
 DISTNAME=      asterisk-21.5.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    comms net audio
 MASTER_SITES=  https://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+= https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Index: pkgsrc/comms/asterisk21/distinfo
diff -u pkgsrc/comms/asterisk21/distinfo:1.3 pkgsrc/comms/asterisk21/distinfo:1.4
--- pkgsrc/comms/asterisk21/distinfo:1.3        Mon Oct 21 05:09:55 2024
+++ pkgsrc/comms/asterisk21/distinfo    Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/10/21 05:09:55 jnemeth Exp $
+$NetBSD: distinfo,v 1.4 2025/01/17 22:39:53 gavan Exp $
 
 BLAKE2s (asterisk-21.5.0/asterisk-21.5.0.tar.gz) = 2999afc285612b2df96f5425c134a16091169f5df9ea50bcd814fe0fead974ed
 SHA512 (asterisk-21.5.0/asterisk-21.5.0.tar.gz) = 4c8200d1e5eba1a3005dc9709be5893ef395c7635df9e64769f4e30c39b8b82be4332a829c0516bd22748f37f5be506d8f3f886381d7d0ea772d0648166c4942
@@ -23,7 +23,7 @@ SHA1 (patch-apps_app__minivm.c) = 22ee6e
 SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602
 SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f
 SHA1 (patch-apps_app__voicemail.c) = 5276457466fde27494bf43fd6d306397bc4ff97f
-SHA1 (patch-build__tools_make__xml__documentation) = b909cac9a847e8d0a0c30d9ee97d6d8de5f43a12
+SHA1 (patch-build__tools_make__xml__documentation) = 2c617cfdc96b1ddf51736205b83e1b737c110ad9
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f

Index: pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation
diff -u pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation:1.1 pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation:1.2
--- pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation:1.1     Mon Apr  8 03:20:07 2024
+++ pkgsrc/comms/asterisk21/patches/patch-build__tools_make__xml__documentation Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-build__tools_make__xml__documentation,v 1.1 2024/04/08 03:20:07 jnemeth Exp $
+$NetBSD: patch-build__tools_make__xml__documentation,v 1.2 2025/01/17 22:39:53 gavan Exp $
 
 --- build_tools/make_xml_documentation.orig    2022-04-14 22:16:42.000000000 +0000
 +++ build_tools/make_xml_documentation
@@ -7,7 +7,7 @@ $NetBSD: patch-build__tools_make__xml__d
                        fi
                fi
 -              ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
-+              ${SED} -r "/^\[[:space:]](<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++              ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
        done
  done
  echo "</docs>" >> "${output_file}"

Index: pkgsrc/comms/asterisk22/Makefile
diff -u pkgsrc/comms/asterisk22/Makefile:1.4 pkgsrc/comms/asterisk22/Makefile:1.5
--- pkgsrc/comms/asterisk22/Makefile:1.4        Thu Nov 14 22:18:55 2024
+++ pkgsrc/comms/asterisk22/Makefile    Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/11/14 22:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/01/17 22:39:53 gavan Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -6,7 +6,7 @@
 #       Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 
 DISTNAME=      asterisk-22.0.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    comms net audio
 MASTER_SITES=  https://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+= https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Index: pkgsrc/comms/asterisk22/distinfo
diff -u pkgsrc/comms/asterisk22/distinfo:1.1 pkgsrc/comms/asterisk22/distinfo:1.2
--- pkgsrc/comms/asterisk22/distinfo:1.1        Mon Oct 21 05:12:44 2024
+++ pkgsrc/comms/asterisk22/distinfo    Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/10/21 05:12:44 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2025/01/17 22:39:53 gavan Exp $
 
 BLAKE2s (asterisk-22.0.0/asterisk-22.0.0.tar.gz) = 2447fca0966c8d19d71c11a9271c6a4aa28fbba36aaff0afacc0fa778fc643ee
 SHA512 (asterisk-22.0.0/asterisk-22.0.0.tar.gz) = fa2c530a81f7351369229b2a36ac229a75d7a1ce8c3cdae0340be331979246ecee1e4f90c31fb6bc645cc2066280d40e2385027aedc6bd2c205426b2164e1fc5
@@ -23,7 +23,7 @@ SHA1 (patch-apps_app__minivm.c) = 22ee6e
 SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602
 SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f
 SHA1 (patch-apps_app__voicemail.c) = 5276457466fde27494bf43fd6d306397bc4ff97f
-SHA1 (patch-build__tools_make__xml__documentation) = b909cac9a847e8d0a0c30d9ee97d6d8de5f43a12
+SHA1 (patch-build__tools_make__xml__documentation) = 2c617cfdc96b1ddf51736205b83e1b737c110ad9
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f

Index: pkgsrc/comms/asterisk22/patches/patch-build__tools_make__xml__documentation
diff -u pkgsrc/comms/asterisk22/patches/patch-build__tools_make__xml__documentation:1.1 pkgsrc/comms/asterisk22/patches/patch-build__tools_make__xml__documentation:1.2
--- pkgsrc/comms/asterisk22/patches/patch-build__tools_make__xml__documentation:1.1     Mon Oct 21 05:12:45 2024
+++ pkgsrc/comms/asterisk22/patches/patch-build__tools_make__xml__documentation Fri Jan 17 22:39:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-build__tools_make__xml__documentation,v 1.1 2024/10/21 05:12:45 jnemeth Exp $
+$NetBSD: patch-build__tools_make__xml__documentation,v 1.2 2025/01/17 22:39:53 gavan Exp $
 
 --- build_tools/make_xml_documentation.orig    2022-04-14 22:16:42.000000000 +0000
 +++ build_tools/make_xml_documentation
@@ -7,7 +7,7 @@ $NetBSD: patch-build__tools_make__xml__d
                        fi
                fi
 -              ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
-+              ${SED} -r "/^\[[:space:]](<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++              ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
        done
  done
  echo "</docs>" >> "${output_file}"

Prev by Date: CVS commit: pkgsrc/math/R
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/math/R
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index