diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 5a6d1484a1aa..2829acaf41ff 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2020/01/11 10:05:46 pho Exp $
+# $NetBSD: Makefile,v 1.20 2021/04/24 17:05:02 pho Exp $
 
-DISTNAME=	pandoc-types-1.20
+DISTNAME=	pandoc-types-1.22
 CATEGORIES=	textproc
 
 MAINTAINER=	szptvlfn@NetBSD.org
 COMMENT=	Types for representing a structured document
 LICENSE=	gnu-gpl-v2
 
-.include "../../mk/haskell.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-QuickCheck/buildlink3.mk"
 .include "../../devel/hs-syb/buildlink3.mk"
+.include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hs-pandoc-types/PLIST b/textproc/hs-pandoc-types/PLIST
index f647318f0868..ea8ef3d87747 100644
--- a/textproc/hs-pandoc-types/PLIST
+++ b/textproc/hs-pandoc-types/PLIST
@@ -1,71 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:17 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.4 2021/04/24 17:05:02 pho Exp $
+lib/pandoc-types-${PKGVERSION}/${HS_VERSION}/package-description
+lib/pandoc-types-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Paths_pandoc_types.dyn_hi
-${HS_IMPL}/Paths_pandoc_types.hi
-${HS_IMPL}/Paths_pandoc_types.p_hi
-${HS_IMPL}/Text/Pandoc/Arbitrary.dyn_hi
-${HS_IMPL}/Text/Pandoc/Arbitrary.hi
-${HS_IMPL}/Text/Pandoc/Arbitrary.p_hi
-${HS_IMPL}/Text/Pandoc/Builder.dyn_hi
-${HS_IMPL}/Text/Pandoc/Builder.hi
-${HS_IMPL}/Text/Pandoc/Builder.p_hi
-${HS_IMPL}/Text/Pandoc/Definition.dyn_hi
-${HS_IMPL}/Text/Pandoc/Definition.hi
-${HS_IMPL}/Text/Pandoc/Definition.p_hi
-${HS_IMPL}/Text/Pandoc/Generic.dyn_hi
-${HS_IMPL}/Text/Pandoc/Generic.hi
-${HS_IMPL}/Text/Pandoc/Generic.p_hi
-${HS_IMPL}/Text/Pandoc/JSON.dyn_hi
-${HS_IMPL}/Text/Pandoc/JSON.hi
-${HS_IMPL}/Text/Pandoc/JSON.p_hi
-${HS_IMPL}/Text/Pandoc/Legacy/Builder.dyn_hi
-${HS_IMPL}/Text/Pandoc/Legacy/Builder.hi
-${HS_IMPL}/Text/Pandoc/Legacy/Builder.p_hi
-${HS_IMPL}/Text/Pandoc/Legacy/Definition.dyn_hi
-${HS_IMPL}/Text/Pandoc/Legacy/Definition.hi
-${HS_IMPL}/Text/Pandoc/Legacy/Definition.p_hi
-${HS_IMPL}/Text/Pandoc/Walk.dyn_hi
-${HS_IMPL}/Text/Pandoc/Walk.hi
-${HS_IMPL}/Text/Pandoc/Walk.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Text-Pandoc-Arbitrary.html
-${HS_DOCS}/html/Text-Pandoc-Builder.html
-${HS_DOCS}/html/Text-Pandoc-Definition.html
-${HS_DOCS}/html/Text-Pandoc-Generic.html
-${HS_DOCS}/html/Text-Pandoc-JSON.html
-${HS_DOCS}/html/Text-Pandoc-Legacy-Builder.html
-${HS_DOCS}/html/Text-Pandoc-Legacy-Definition.html
-${HS_DOCS}/html/Text-Pandoc-Walk.html
-${HS_DOCS}/html/doc-index-60.html
-${HS_DOCS}/html/doc-index-A.html
-${HS_DOCS}/html/doc-index-All.html
-${HS_DOCS}/html/doc-index-B.html
-${HS_DOCS}/html/doc-index-C.html
-${HS_DOCS}/html/doc-index-D.html
-${HS_DOCS}/html/doc-index-E.html
-${HS_DOCS}/html/doc-index-F.html
-${HS_DOCS}/html/doc-index-H.html
-${HS_DOCS}/html/doc-index-I.html
-${HS_DOCS}/html/doc-index-L.html
-${HS_DOCS}/html/doc-index-M.html
-${HS_DOCS}/html/doc-index-N.html
-${HS_DOCS}/html/doc-index-O.html
-${HS_DOCS}/html/doc-index-P.html
-${HS_DOCS}/html/doc-index-Q.html
-${HS_DOCS}/html/doc-index-R.html
-${HS_DOCS}/html/doc-index-S.html
-${HS_DOCS}/html/doc-index-T.html
-${HS_DOCS}/html/doc-index-U.html
-${HS_DOCS}/html/doc-index-W.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/pandoc-types.haddock
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Arbitrary.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Builder.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Definition.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Generic.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-JSON.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Walk.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-60.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-A.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-All.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-B.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-C.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-D.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-E.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-F.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-H.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-I.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-L.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-M.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-N.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-O.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-P.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-Q.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-R.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-S.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-T.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-U.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-W.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/pandoc-types.haddock
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-pandoc-types/buildlink3.mk b/textproc/hs-pandoc-types/buildlink3.mk
index 30d77ed46492..ec91abc9c9c1 100644
--- a/textproc/hs-pandoc-types/buildlink3.mk
+++ b/textproc/hs-pandoc-types/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2020/01/11 10:05:46 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2021/04/24 17:05:02 pho Exp $
 
 BUILDLINK_TREE+=	hs-pandoc-types
 
 .if !defined(HS_PANDOC_TYPES_BUILDLINK3_MK)
 HS_PANDOC_TYPES_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.20
-BUILDLINK_ABI_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.20
+BUILDLINK_API_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.22
+BUILDLINK_ABI_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.22
 BUILDLINK_PKGSRCDIR.hs-pandoc-types?=	../../textproc/hs-pandoc-types
 
 .include "../../converters/hs-aeson/buildlink3.mk"
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index cab15ccdd4c2..7720a25bfad3 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/01/11 10:05:46 pho Exp $
+$NetBSD: distinfo,v 1.5 2021/04/24 17:05:02 pho Exp $
 
-SHA1 (pandoc-types-1.20.tar.gz) = d36120b3c3f3122d16884eefeb3a54e16d7490d4
-RMD160 (pandoc-types-1.20.tar.gz) = d4f7b60ba3bef2c0f725e43a90d6d109dba4a9dc
-SHA512 (pandoc-types-1.20.tar.gz) = 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
-Size (pandoc-types-1.20.tar.gz) = 29505 bytes
+SHA1 (pandoc-types-1.22.tar.gz) = 8f1e4c2650e7cfaaaa5ea20af6031600da42944d
+RMD160 (pandoc-types-1.22.tar.gz) = 1b4f8b7b02b805295a62d9aadb634c4254635df8
+SHA512 (pandoc-types-1.22.tar.gz) = b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0
+Size (pandoc-types-1.22.tar.gz) = 34702 bytes