ham/fldigi: remove ascidoc 9.0.4 bug workarounds

4 files changed, 3 insertions, 35 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index da7975aff20..dd80f6c88f3 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2021/01/01 09:52:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.126 2021/02/06 15:15:08 dbj Exp $
 
 DISTNAME=	fldigi-4.1.01
 PKGREVISION=	13
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 # NetBSD 5.1 fails to find strip - install: exec of strip failed:
 CONFIGURE_ENV+=		STRIP=${STRIP}
 
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+BUILD_DEPENDS+=	asciidoc>=9.0.5:../../textproc/asciidoc
 
 SUBST_CLASSES+=		asciidoc
 SUBST_STAGE.asciidoc=	post-configure
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 686d496d033..07dbce62b99 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.68 2020/12/06 00:27:51 dbj Exp $
+$NetBSD: distinfo,v 1.69 2021/02/06 15:15:08 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
diff --git a/ham/fldigi/patches/patch-doc_Makefile.am b/ham/fldigi/patches/patch-doc_Makefile.am
deleted file mode 100644
index 8734278c415..00000000000
--- a/ham/fldigi/patches/patch-doc_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
- 
diff --git a/ham/fldigi/patches/patch-doc_Makefile.in b/ham/fldigi/patches/patch-doc_Makefile.in
deleted file mode 100644
index 3a9a9b21a64..00000000000
--- a/ham/fldigi/patches/patch-doc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
-