CVS commit: pkgsrc/ham/fldigi

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

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.

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)
+