Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id ED0201A9217 for ; Sun, 6 Dec 2020 00:27:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4E66B850CA; Sun, 6 Dec 2020 00:27:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8934684DE7 for ; Sun, 6 Dec 2020 00:27:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nSUxaphixtkB for ; Sun, 6 Dec 2020 00:27:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id ED90884D32 for ; Sun, 6 Dec 2020 00:27:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E11A4FA9D; Sun, 6 Dec 2020 00:27:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160721447181780" MIME-Version: 1.0 Date: Sun, 6 Dec 2020 00:27:51 +0000 From: "Darrin B. Jewell" Subject: CVS commit: pkgsrc/ham/fldigi To: pkgsrc-changes@NetBSD.org Reply-To: dbj@netbsd.org X-Mailer: log_accum Message-Id: <20201206002751.E11A4FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_160721447181780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dbj Date: Sun Dec 6 00:27:51 UTC 2020 Modified Files: pkgsrc/ham/fldigi: distinfo Added Files: pkgsrc/ham/fldigi/patches: patch-doc_Makefile.am patch-doc_Makefile.in Log Message: ham/fldigi: hack around asciidoc bug asciidoc 9.0.4 appears to ignore the newline conf directive in the table of contents To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/ham/fldigi/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/ham/fldigi/patches/patch-doc_Makefile.am \ pkgsrc/ham/fldigi/patches/patch-doc_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160721447181780 Content-Disposition: inline Content-Length: 2988 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/fldigi/distinfo diff -u pkgsrc/ham/fldigi/distinfo:1.67 pkgsrc/ham/fldigi/distinfo:1.68 --- pkgsrc/ham/fldigi/distinfo:1.67 Sun Dec 6 00:22:04 2020 +++ pkgsrc/ham/fldigi/distinfo Sun Dec 6 00:27:51 2020 @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.67 2020/12/06 00:22:04 dbj Exp $ +$NetBSD: distinfo,v 1.68 2020/12/06 00:27:51 dbj Exp $ SHA1 (fldigi-4.1.01.tar.gz) = 79bd6fbd28d7dd63de450e63de993dd230fabae2 RMD160 (fldigi-4.1.01.tar.gz) = 598158a8367a821265893812cec496f0d1fdefaa SHA512 (fldigi-4.1.01.tar.gz) = f0fa33714b56d396dea59511083546765a34c645aa03875d0c6bb38af89ff79ecad6b5556895a6615d18b6340d50d94beb69e92c4a488fed346863fa1e378633 Size (fldigi-4.1.01.tar.gz) = 3916445 bytes +SHA1 (patch-doc_Makefile.am) = 956c440c30c0fbca6df3cb50f4aa5efe2ad28063 +SHA1 (patch-doc_Makefile.in) = cf1e4cb4041e4cf63bfdea55d17b2fd42d03442e SHA1 (patch-scripts_mkappbundle.sh) = e5029f71ce2474b2781c891faffd74c572d3f3eb SHA1 (patch-src_misc_configuration.cxx) = 6eb188f479f2586d5aee9f919832703a9d6fa86a SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c Added files: Index: pkgsrc/ham/fldigi/patches/patch-doc_Makefile.am diff -u /dev/null pkgsrc/ham/fldigi/patches/patch-doc_Makefile.am:1.1 --- /dev/null Sun Dec 6 00:27:51 2020 +++ pkgsrc/ham/fldigi/patches/patch-doc_Makefile.am Sun Dec 6 00:27:51 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_Makefile.am,v 1.1 2020/12/06 00:27:51 dbj Exp $ + +asciidoc 9.0.4 asppears to ignore newline directive in conf file for table of contents +Issue reported upstream at https://github.com/asciidoc/asciidoc-py3/issues/154 + +--- doc/Makefile.am.orig 2020-11-23 13:49:49.000000000 +0000 ++++ doc/Makefile.am +@@ -63,6 +63,7 @@ ASCIIDOC_ARGS = --unsafe -a toc -a data- + false; \ + fi + $(call silent,ADOC ,$@)TZ=0 $(ASCIIDOC) $(ASCIIDOC_ARGS) --out-file $@ $< ++ @mv $@ $@.bak && tr -d '\r' < $@.bak > $@ # asciidoc 9.0.4 TOC ignored conf file. + + all-local: $(ASCIIDOC_MAN_DIST) $(ASCIIDOC_HTML) + Index: pkgsrc/ham/fldigi/patches/patch-doc_Makefile.in diff -u /dev/null pkgsrc/ham/fldigi/patches/patch-doc_Makefile.in:1.1 --- /dev/null Sun Dec 6 00:27:51 2020 +++ pkgsrc/ham/fldigi/patches/patch-doc_Makefile.in Sun Dec 6 00:27:51 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_Makefile.in,v 1.1 2020/12/06 00:27:51 dbj Exp $ + +asciidoc 9.0.4 asppears to ignore newline directive in conf file for table of contents +Issue reported upstream at https://github.com/asciidoc/asciidoc-py3/issues/154 + +--- doc/Makefile.in.orig 2020-11-23 13:49:49.000000000 +0000 ++++ doc/Makefile.in +@@ -643,6 +643,7 @@ uninstall-man: uninstall-man1 + @HAVE_ASCIIDOC_TRUE@ false; \ + @HAVE_ASCIIDOC_TRUE@ fi + @HAVE_ASCIIDOC_TRUE@ $(call silent,ADOC ,$@)TZ=0 $(ASCIIDOC) $(ASCIIDOC_ARGS) --out-file $@ $< ++@HAVE_ASCIIDOC_TRUE@ @mv $@ $@.bak && tr -d '\r' < $@.bak > $@ # asciidoc 9.0.4 TOC ignored conf file. + + @HAVE_ASCIIDOC_TRUE@all-local: $(ASCIIDOC_MAN_DIST) $(ASCIIDOC_HTML) + --_----------=_160721447181780--