Update go-mmark to 2.2.10, now a Go module

Lots of changes, too many to list.

4 files changed, 61 insertions, 65 deletions

diff --git a/textproc/go-mmark/Makefile b/textproc/go-mmark/Makefile
index 3e35ffc2bb9..adb0384410e 100644
--- a/textproc/go-mmark/Makefile
+++ b/textproc/go-mmark/Makefile
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.31 2021/05/08 15:02:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2021/05/15 17:39:05 bsiegert Exp $
 
-DISTNAME=	mmark-1.3.6
+DISTNAME=	mmark-2.2.10
 PKGNAME=	go-${DISTNAME}
-PKGREVISION=	28
-MASTER_SITES=	${MASTER_SITE_GITHUB:=miekg/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mmarkdown/}
 CATEGORIES=	textproc
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 GITHUB_PROJECT=	${PKGBASE:S/^go-//}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/miekg/mmark
-COMMENT=	Mmark: a powerful markdown processor in Go geared towards the IETF
+COMMENT=	Powerful markdown processor in Go geared towards the IETF
 LICENSE=	2-clause-bsd
 
-GO_DIST_BASE=	${DISTNAME}
-GO_SRCPATH=	github.com/miekg/mmark
+GO_BUILD_PATTERN=	.
+INSTALLATION_DIRS+=	man/man1
 
-.include "../../www/go-toml-burntsushi/buildlink3.mk"
-.include "../../lang/go/go-package.mk"
+.include "go-modules.mk"
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/mmark.1 ${DESTDIR}${PREFIX}/man/man1
+
+.include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/go-mmark/PLIST b/textproc/go-mmark/PLIST
index ce21feca019..259829f2be5 100644
--- a/textproc/go-mmark/PLIST
+++ b/textproc/go-mmark/PLIST
@@ -1,52 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2017/09/10 11:05:46 gavan Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/05/15 17:39:05 bsiegert Exp $
 bin/mmark
-gopkg/pkg/${GO_PLATFORM}/github.com/miekg/mmark.a
-gopkg/src/github.com/miekg/mmark/CONVERSION_RFC7328.md
-gopkg/src/github.com/miekg/mmark/COPYRIGHT
-gopkg/src/github.com/miekg/mmark/LICENSE
-gopkg/src/github.com/miekg/mmark/Makefile
-gopkg/src/github.com/miekg/mmark/Makefile.release
-gopkg/src/github.com/miekg/mmark/README.md
-gopkg/src/github.com/miekg/mmark/block.go
-gopkg/src/github.com/miekg/mmark/block_test.go
-gopkg/src/github.com/miekg/mmark/cm_test.go
-gopkg/src/github.com/miekg/mmark/code.go
-gopkg/src/github.com/miekg/mmark/common_render.go
-gopkg/src/github.com/miekg/mmark/doc_test.go
-gopkg/src/github.com/miekg/mmark/html.go
-gopkg/src/github.com/miekg/mmark/ial.go
-gopkg/src/github.com/miekg/mmark/ial_test.go
-gopkg/src/github.com/miekg/mmark/inline.go
-gopkg/src/github.com/miekg/mmark/inline_test.go
-gopkg/src/github.com/miekg/mmark/issue_test.go
-gopkg/src/github.com/miekg/mmark/log.go
-gopkg/src/github.com/miekg/mmark/logo/mmark1024px.png
-gopkg/src/github.com/miekg/mmark/logo/mmark120px.png
-gopkg/src/github.com/miekg/mmark/logo/mmark640px.png
-gopkg/src/github.com/miekg/mmark/markdown.go
-gopkg/src/github.com/miekg/mmark/mmark/Makefile
-gopkg/src/github.com/miekg/mmark/mmark/main.go
-gopkg/src/github.com/miekg/mmark/mmark/titleblock.go
-gopkg/src/github.com/miekg/mmark/quote.go
-gopkg/src/github.com/miekg/mmark/rfc/Makefile
-gopkg/src/github.com/miekg/mmark/rfc/rfc1149.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc1149.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc/rfc2100.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc2100.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc/rfc3514.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc3514.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc/rfc5841.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc5841.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc/rfc748.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc748.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc/rfc7511.md
-gopkg/src/github.com/miekg/mmark/rfc/rfc7511.orig.txt
-gopkg/src/github.com/miekg/mmark/rfc7328.go
-gopkg/src/github.com/miekg/mmark/rfc7328_test.go
-gopkg/src/github.com/miekg/mmark/smartypants.go
-gopkg/src/github.com/miekg/mmark/table_test.go
-gopkg/src/github.com/miekg/mmark/toml.go
-gopkg/src/github.com/miekg/mmark/xml2rfc.go
-gopkg/src/github.com/miekg/mmark/xml2rfcv2.go
-gopkg/src/github.com/miekg/mmark/xml2rfcv3.go
-gopkg/src/github.com/miekg/mmark/xml2rfcv3.rnc
+man/man1/mmark.1
diff --git a/textproc/go-mmark/distinfo b/textproc/go-mmark/distinfo
index aa1e7ebfa2f..b51ff22dc2a 100644
--- a/textproc/go-mmark/distinfo
+++ b/textproc/go-mmark/distinfo
@@ -1,6 +1,38 @@
-$NetBSD: distinfo,v 1.1 2017/08/17 01:55:54 gavan Exp $
+$NetBSD: distinfo,v 1.2 2021/05/15 17:39:05 bsiegert Exp $
 
-SHA1 (mmark-1.3.6.tar.gz) = 5ed4d25b40f6d2e72f316007c5ebbc9ce126a4fd
-RMD160 (mmark-1.3.6.tar.gz) = 2a2b4ce2611fe53b88591b5170b26e86de164a8e
-SHA512 (mmark-1.3.6.tar.gz) = 38f668c54de18eb134ddf19840d00102ea6c7e8d11d971db4562bceb7f039c9fe94f181edb49cbd95de08f4e1cb28c6d7c0bccbdcf9faeb2a07767812b15c4e8
-Size (mmark-1.3.6.tar.gz) = 198696 bytes
+SHA1 (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 0937ac1d493b480c07bf48073bffe60c2ba902f1
+RMD160 (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 722a12078a5d845bfcf238c63a7b7d3a563b48be
+SHA512 (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+Size (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 34 bytes
+SHA1 (github.com__burnt_sushi_toml_@v_v0.3.1.zip) = 5c870c5cbf65bb55d76313cdd27933198b37a582
+RMD160 (github.com__burnt_sushi_toml_@v_v0.3.1.zip) = e626b6d983287297f9bd907c23fcd3f040798eeb
+SHA512 (github.com__burnt_sushi_toml_@v_v0.3.1.zip) = 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+Size (github.com__burnt_sushi_toml_@v_v0.3.1.zip) = 56132 bytes
+SHA1 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.mod) = 268004a43422408f9e88b355940fb02504775109
+RMD160 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.mod) = 833375df78eca5c46358c1ee14003d4cf4475ad7
+SHA512 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.mod) = 63263cc150ee2227348efd3b40bc03855bed69eedc25795edf5f33e419b0c70ec348c6970e87ffe5dc045f533f8b0e2ad1910214f34cf0a022ec53626c862669
+Size (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.mod) = 117 bytes
+SHA1 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.zip) = 24f2dabde463a991349a7225bef59fce365ca5aa
+RMD160 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.zip) = d3ea649e1da24c61ad96a3c375bd8bc28ca81cc7
+SHA512 (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.zip) = 57e3ce5975c4eebc72a309d589ffd754fbc9612bd7d304a6c4b620620ac485fb7b0f9369b308374f68705e6dd5f8ff8598842bf0ff7a3d2921b3f10f927221aa
+Size (github.com_gomarkdown_markdown_@v_v0.0.0-20200817091206-6efd7696db82.zip) = 181182 bytes
+SHA1 (github.com_google_go-cmp_@v_v0.2.0.mod) = 857ec0fe76866897233b45d6bbe3b67d9d40f9df
+RMD160 (github.com_google_go-cmp_@v_v0.2.0.mod) = acd8cccfa8020baef946aa608ad0320c4eb1b964
+SHA512 (github.com_google_go-cmp_@v_v0.2.0.mod) = 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+Size (github.com_google_go-cmp_@v_v0.2.0.mod) = 32 bytes
+SHA1 (github.com_google_go-cmp_@v_v0.2.0.zip) = 90d310c3c8640c6c8637912fa171e1f1ae3e2b18
+RMD160 (github.com_google_go-cmp_@v_v0.2.0.zip) = dd87634edd7eb8445c030adb7f993bf6dc3059c1
+SHA512 (github.com_google_go-cmp_@v_v0.2.0.zip) = 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
+Size (github.com_google_go-cmp_@v_v0.2.0.zip) = 74164 bytes
+SHA1 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.mod) = 1a33e6310125fe7ae7d5456f26404fb5cbeed641
+RMD160 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.mod) = db55b20722e78c5c9af10d16ad0aae66d5926acc
+SHA512 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.mod) = 56b93febe493806b2048bcade992b0bae3f8d79c6c4eaf953eefeffb5b36c8b75adf8b9376bd61b16ffb921f6a3ec3b3485f977eff0a35ee9ce5eea8676102e3
+Size (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.mod) = 30 bytes
+SHA1 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.zip) = 375942602a6b92d0cd143685205f8282730e272e
+RMD160 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.zip) = 7564b8e872b5804612661fc8be52d6135b313483
+SHA512 (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.zip) = 231b0ce25c1df21f7f6f1985d4428d59fa58b992b8060caab019ba9ba50253db13a5576ffdb73d310a86c72a7168a7d6c8fd840df5f23ee60e3bb61e3de8847c
+Size (golang.org_dl_@v_v0.0.0-20190829154251-82a15e2f2ead.zip) = 52920 bytes
+SHA1 (mmark-2.2.10.tar.gz) = c485e1890a7e91efbce12b374146d23e685dc77d
+RMD160 (mmark-2.2.10.tar.gz) = 7bd4b9c00266a5ecbdc47853b4f3f8fabe6139cd
+SHA512 (mmark-2.2.10.tar.gz) = 08b89b62998659aa647450ca760192f16c1d8a4fadee708412fda8e3a11583e5d2d7fa8dce4c41a0c343c6ec2d10d966f5f95547b32de128523a0be62ad92ad4
+Size (mmark-2.2.10.tar.gz) = 179663 bytes
diff --git a/textproc/go-mmark/go-modules.mk b/textproc/go-mmark/go-modules.mk
new file mode 100644
index 00000000000..c30c90a7dca
--- /dev/null
+++ b/textproc/go-mmark/go-modules.mk
@@ -0,0 +1,10 @@
+# $NetBSD: go-modules.mk,v 1.1 2021/05/15 17:39:05 bsiegert Exp $
+
+GO_MODULE_FILES+=	github.com/!burnt!sushi/toml/@v/v0.3.1.mod
+GO_MODULE_FILES+=	github.com/!burnt!sushi/toml/@v/v0.3.1.zip
+GO_MODULE_FILES+=	github.com/gomarkdown/markdown/@v/v0.0.0-20200817091206-6efd7696db82.mod
+GO_MODULE_FILES+=	github.com/gomarkdown/markdown/@v/v0.0.0-20200817091206-6efd7696db82.zip
+GO_MODULE_FILES+=	github.com/google/go-cmp/@v/v0.2.0.mod
+GO_MODULE_FILES+=	github.com/google/go-cmp/@v/v0.2.0.zip
+GO_MODULE_FILES+=	golang.org/dl/@v/v0.0.0-20190829154251-82a15e2f2ead.mod
+GO_MODULE_FILES+=	golang.org/dl/@v/v0.0.0-20190829154251-82a15e2f2ead.zip