go-md2man: Update to 2.0.1. Switch to go-module build.

"This release has a number of rendering bugs resolved.
I’d hoped to squash a few more but the fixes were a little more tricky and need more time to get right."

5 files changed, 22 insertions, 120 deletions

diff --git a/textproc/go-md2man/DESCR b/textproc/go-md2man/DESCR
index 751c9d53656..1d1cc86337b 100644
--- a/textproc/go-md2man/DESCR
+++ b/textproc/go-md2man/DESCR
@@ -1,10 +1,7 @@
-go-md2man
-
-** Work in Progress ** This still needs a lot of help to be complete, or even
-usable!
+Converts markdown into roff (man pages).
 
 Uses blackfriday to process markdown into man pages.
 
-Usage
+Usage:
 
 ./md2man -in /path/to/markdownfile.md -out /manfile/output/path
diff --git a/textproc/go-md2man/Makefile b/textproc/go-md2man/Makefile
index 3120475307c..c058e958eba 100644
--- a/textproc/go-md2man/Makefile
+++ b/textproc/go-md2man/Makefile
@@ -1,25 +1,15 @@
-# $NetBSD: Makefile,v 1.37 2021/08/11 19:35:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.38 2021/08/27 07:14:41 nia Exp $
 
-DISTNAME=	go-md2man-1.0.8
+DISTNAME=	go-md2man-2.0.1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cpuguy83/}
-PKGREVISION=	28
 CATEGORIES=	textproc
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/cpuguy83/go-md2man/
-COMMENT=	Uses blackfriday to process markdown into man pages
+HOMEPAGE=	https://github.com/cpuguy83/go-md2man
+COMMENT=	Converts markdown into roff (man pages)
 LICENSE=	mit
 
-GO_DIST_BASE=	${DISTNAME}
-GO_SRCPATH=	github.com/cpuguy83/go-md2man
-
-REPLACE_SH=	script/setup/dev-tools script/validate/vendor
-
-post-install:
-	${RM} -rf ${DESTDIR}${PREFIX}/gopkg/pkg/${GO_PLATFORM}/${GO_SRCPATH}/vendor
-
-.include "../../devel/go-blackfriday/buildlink3.mk"
-.include "../../devel/go-sanitized_anchor_name/buildlink3.mk"
-.include "../../lang/go/go-package.mk"
+.include "go-modules.mk"
+.include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/go-md2man/PLIST b/textproc/go-md2man/PLIST
index 8905d2a3e45..fbbb12c3fef 100644
--- a/textproc/go-md2man/PLIST
+++ b/textproc/go-md2man/PLIST
@@ -1,77 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2018/07/18 07:20:21 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/08/27 07:14:41 nia Exp $
 bin/go-md2man
-gopkg/pkg/${GO_PLATFORM}/github.com/cpuguy83/go-md2man/md2man.a
-gopkg/src/github.com/cpuguy83/go-md2man/Dockerfile
-gopkg/src/github.com/cpuguy83/go-md2man/Gopkg.lock
-gopkg/src/github.com/cpuguy83/go-md2man/Gopkg.toml
-gopkg/src/github.com/cpuguy83/go-md2man/LICENSE.md
-gopkg/src/github.com/cpuguy83/go-md2man/Makefile
-gopkg/src/github.com/cpuguy83/go-md2man/README.md
-gopkg/src/github.com/cpuguy83/go-md2man/go-md2man.1.md
-gopkg/src/github.com/cpuguy83/go-md2man/md2man.go
-gopkg/src/github.com/cpuguy83/go-md2man/md2man/md2man.go
-gopkg/src/github.com/cpuguy83/go-md2man/md2man/roff.go
-gopkg/src/github.com/cpuguy83/go-md2man/md2man/roff_test.go
-gopkg/src/github.com/cpuguy83/go-md2man/script/setup/dev-tools
-gopkg/src/github.com/cpuguy83/go-md2man/script/validate/vendor
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/.gitignore
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/.travis.yml
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/LICENSE.txt
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/README.md
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/block.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/block_test.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/doc.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/html.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/inline.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/inline_test.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/latex.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/markdown.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/markdown_test.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/ref_test.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/smartypants.go
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Amps and angle encoding.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Amps and angle encoding.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Auto links.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Auto links.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Backslash escapes.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Backslash escapes.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Blockquotes with code blocks.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Blockquotes with code blocks.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Code Blocks.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Code Blocks.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Code Spans.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Code Spans.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines no empty line before block.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines no empty line before block.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Horizontal rules.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Horizontal rules.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML (Advanced).html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML (Advanced).text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML (Simple).html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML (Simple).text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML comments.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Inline HTML comments.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, inline style.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, inline style.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, reference style.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, reference style.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, shortcut references.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Links, shortcut references.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Literal quotes in titles.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Literal quotes in titles.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Markdown Documentation - Basics.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Markdown Documentation - Basics.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Markdown Documentation - Syntax.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Markdown Documentation - Syntax.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Nested blockquotes.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Nested blockquotes.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Ordered and unordered lists.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Ordered and unordered lists.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Strong and em together.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Strong and em together.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Tabs.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Tabs.text
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Tidyness.html
-gopkg/src/github.com/cpuguy83/go-md2man/vendor/github.com/russross/blackfriday/testdata/Tidyness.text
diff --git a/textproc/go-md2man/buildlink3.mk b/textproc/go-md2man/buildlink3.mk
deleted file mode 100644
index 3e4dc3e88b9..00000000000
--- a/textproc/go-md2man/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
-
-BUILDLINK_TREE+=	go-md2man
-
-.if !defined(GO_MD2MAN_BUILDLINK3_MK)
-GO_MD2MAN_BUILDLINK3_MK:=
-
-BUILDLINK_CONTENTS_FILTER.go-md2man=	${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-md2man?=		build
-
-BUILDLINK_API_DEPENDS.go-md2man+=	go-md2man>=1.0.6
-BUILDLINK_PKGSRCDIR.go-md2man?=		../../textproc/go-md2man
-
-.include "../../devel/go-blackfriday/buildlink3.mk"
-.include "../../devel/go-sanitized_anchor_name/buildlink3.mk"
-.endif  # GO_MD2MAN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-go-md2man
diff --git a/textproc/go-md2man/distinfo b/textproc/go-md2man/distinfo
index 1ca33c671c0..8fb2dcada57 100644
--- a/textproc/go-md2man/distinfo
+++ b/textproc/go-md2man/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.2 2018/07/18 07:20:21 minskim Exp $
+$NetBSD: distinfo,v 1.3 2021/08/27 07:14:41 nia Exp $
 
-SHA1 (go-md2man-1.0.8.tar.gz) = f0b5fd9fd70209fad2459b06894dea9717a4f3ac
-RMD160 (go-md2man-1.0.8.tar.gz) = 49ee68fb1c8dfbd630d1843ffc627a14cedd1846
-SHA512 (go-md2man-1.0.8.tar.gz) = 4c52e01c9b07582b5d55d1e94935378a676bd284a3e8230a8a191d4678b1b6ae92b704a249117c542832170069a70c649e58a1752fb2973709259b5bc108db91
-Size (go-md2man-1.0.8.tar.gz) = 79284 bytes
+SHA1 (github.com_russross_blackfriday_v2_@v_v2.1.0.mod) = 4a99686742fcd5a5bd047fcf949114a803079a09
+RMD160 (github.com_russross_blackfriday_v2_@v_v2.1.0.mod) = bd1adae049feb16b318a94439ab5d4220d7f66db
+SHA512 (github.com_russross_blackfriday_v2_@v_v2.1.0.mod) = ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+Size (github.com_russross_blackfriday_v2_@v_v2.1.0.mod) = 42 bytes
+SHA1 (github.com_russross_blackfriday_v2_@v_v2.1.0.zip) = b733cda2c795193ad2a65e13dcd7529b93bf04e9
+RMD160 (github.com_russross_blackfriday_v2_@v_v2.1.0.zip) = 1674b58bf3cf1818476d88fbf3802aa86993d0ad
+SHA512 (github.com_russross_blackfriday_v2_@v_v2.1.0.zip) = 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
+Size (github.com_russross_blackfriday_v2_@v_v2.1.0.zip) = 122358 bytes
+SHA1 (go-md2man-2.0.1.tar.gz) = fac69591920b9281bd2723aaf0a1344e303763bd
+RMD160 (go-md2man-2.0.1.tar.gz) = 5408749a514684d928f724fe11f38905f5da0a53
+SHA512 (go-md2man-2.0.1.tar.gz) = 293141da791cddd56e9b92d936cbd6105675e8c1ebf6fa95e79a3651ff28d050596b31d48256414e2a8e70d8054ee163885808635b8bb029ec49f5f81678d390
+Size (go-md2man-2.0.1.tar.gz) = 64220 bytes