tex-doclicense{,-doc}: update to 2.2.1

2.2.1
Fix compatibility issue with newer versions of hyperxmp (bug confirmed
with Tex Live 2020) resulting in an compile error by loading hyperxmp
and hyperref in the order the packages expect it.

2.2.0
* Add Japanese and Bulgarian translation.
* Add hint how to use Chinese to docs.
* Load hyperxmp by default when it is installed. Before, doclicense just
  suggested to load it and made use of the package when the user did.

2.1.0
* Fix regression: Proper language default image variants (Euro variants
  for example) was broken and the US variant was always used. This bug
  was introduced in v2.0.0.
* Documentation fixes.
* Added Marathi translation.

2.0.1
* Fix backwards compatibility by still accepting imagemodifier={-eu} and
  imagemodifier={-us}. Thanks to Jürgen Spitzmüller for reporting.
* Fix ability to modify money unit of \doclicenseIcon macro using
  imagemodifier to Japan currency JP without breaking \doclicenseImage.

2.0.0
* Add 80x15 version of CC images which can be used with the
  imagemodifier option.
* Fix slight color offset for all CC images caused by bad image
  conversion. Thanks to rodrigoalcarazdelaosa for reporting.
* Fix \doclicenseThis support for twocolumn layouts. Thanks to Nao
  Pross.
* Soft require package options "type", "modifier" and "version" now.
  Defaults are deprecated. This will become a package error in an
  upcoming major version of the package, with the earliest release in
  2021-07 to give people time to migrate. Remove Creative Commons PD
  which has been replaced by CC-zero as of 2010-10-11.

5 files changed, 82 insertions, 28 deletions

diff --git a/devel/tex-doclicense-doc/Makefile b/devel/tex-doclicense-doc/Makefile
index bf412dd3046..6c223925172 100644
--- a/devel/tex-doclicense-doc/Makefile
+++ b/devel/tex-doclicense-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2020/04/27 03:26:38 markd Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/20 10:05:02 markd Exp $
 
 DISTNAME=	doclicense.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-1.10.1
-TEXLIVE_REV=	54758
+PKGNAME=	tex-${DISTNAME:S/./-/}-2.2.1
+TEXLIVE_REV=	56445
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ctan.org/pkg/doclicense
diff --git a/devel/tex-doclicense-doc/distinfo b/devel/tex-doclicense-doc/distinfo
index f29b6b4f490..eca61bb4fa6 100644
--- a/devel/tex-doclicense-doc/distinfo
+++ b/devel/tex-doclicense-doc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/04/27 03:26:38 markd Exp $
+$NetBSD: distinfo,v 1.7 2021/02/20 10:05:02 markd Exp $
 
-SHA1 (doclicense.doc.r54758.tar.xz) = 59b2cdae295d3de3e79b50351e5ceced54aab8b0
-RMD160 (doclicense.doc.r54758.tar.xz) = 57e68358c21cca5bb463d72054b8127f6eced778
-SHA512 (doclicense.doc.r54758.tar.xz) = 00768077bb428d01b4aa33a93f9444c571a9b044a325bfd17be91c4ba1f8ddc4eb0f6e6e92c892d8ea6b3a6b2e93e7083e1cb4acef60b3877403770a0924c4ef
-Size (doclicense.doc.r54758.tar.xz) = 357864 bytes
+SHA1 (doclicense.doc.r56445.tar.xz) = 8bfbc829d17297c201834d72adf87cb29944028f
+RMD160 (doclicense.doc.r56445.tar.xz) = 416ab94e125a9bc277cb3f2e9e88092f9242ddb7
+SHA512 (doclicense.doc.r56445.tar.xz) = 7190733ec4f6f5987936a4bd23ffb42ae2e1aee4d1d7066885dcd8ce2383e4e32f704b82493d1b36c99ad4bd540864e760e9ed084ffbea0ea7b89e2bae523519
+Size (doclicense.doc.r56445.tar.xz) = 216476 bytes
diff --git a/devel/tex-doclicense/Makefile b/devel/tex-doclicense/Makefile
index d659b3cb1d5..d2762d06e70 100644
--- a/devel/tex-doclicense/Makefile
+++ b/devel/tex-doclicense/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2020/04/27 03:26:38 markd Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/20 10:05:02 markd Exp $
 
 DISTNAME=	doclicense
-PKGNAME=	tex-${DISTNAME}-1.10.1
-TEXLIVE_REV=	54758
+PKGNAME=	tex-${DISTNAME}-2.2.1
+TEXLIVE_REV=	56445
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ctan.org/pkg/doclicense
diff --git a/devel/tex-doclicense/PLIST b/devel/tex-doclicense/PLIST
index 42afe30aef8..4c7e3c6836b 100644
--- a/devel/tex-doclicense/PLIST
+++ b/devel/tex-doclicense/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/08/05 11:14:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/02/20 10:05:02 markd Exp $
 share/texmf-dist/tex/latex/doclicense/doclicense-UKenglish.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-USenglish.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-acadian.ldf
@@ -6,6 +6,7 @@ share/texmf-dist/tex/latex/doclicense/doclicense-american.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-australian.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-british.ldf
+share/texmf-dist/tex/latex/doclicense/doclicense-bulgarian.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-canadian.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-canadien.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf
@@ -16,6 +17,8 @@ share/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
+share/texmf-dist/tex/latex/doclicense/doclicense-japanese.ldf
+share/texmf-dist/tex/latex/doclicense/doclicense-marathi.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-newzealand.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-ngerman.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf
@@ -23,17 +26,68 @@ share/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
 share/texmf-dist/tex/latex/doclicense/doclicense.sty
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-eu.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-eu.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-eu.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-pd.pdf
-share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-eu-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-eu-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-80x15.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-80x15.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-88x31.pdf
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.eps
+share/texmf-dist/tex/latex/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.pdf
 share/texmf-dist/tex/latex/doclicense/license-texts/doclicense-CC-by-3.0-latex.tex
 share/texmf-dist/tex/latex/doclicense/license-texts/doclicense-CC-by-3.0-plaintext.tex
 share/texmf-dist/tex/latex/doclicense/license-texts/doclicense-CC-by-4.0-latex.tex
diff --git a/devel/tex-doclicense/distinfo b/devel/tex-doclicense/distinfo
index 0271a9b66f9..97a7010a4c1 100644
--- a/devel/tex-doclicense/distinfo
+++ b/devel/tex-doclicense/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/04/27 03:26:38 markd Exp $
+$NetBSD: distinfo,v 1.7 2021/02/20 10:05:02 markd Exp $
 
-SHA1 (doclicense.r54758.tar.xz) = f20cb31248db147ce4c03e0f453d57d00cf43b70
-RMD160 (doclicense.r54758.tar.xz) = 7a2ab45b9486f28dcefc6a97b498bc2932dcd7e9
-SHA512 (doclicense.r54758.tar.xz) = c451d3ee28a5d5b1c51850a80616d156860644d51164ad5855873f00492573a9b30816231a35b96eee13d0ad283275446ab5fc430de479fa869f9a4e2f16bff2
-Size (doclicense.r54758.tar.xz) = 75108 bytes
+SHA1 (doclicense.r56445.tar.xz) = 2d52f82ca11ba9ae8e58f4c678e2457f88eedd6c
+RMD160 (doclicense.r56445.tar.xz) = b2d5e9d5a3dcbbb9bac992e6da1c94981e12da7a
+SHA512 (doclicense.r56445.tar.xz) = 598d81321880bc9c2c3a732644a9933f4f92af76ab483ed988f67a643736e3d3a0dca6e25c262f1935ceedbb888a271b7d16fac3a90b8bec8bc13d5745d68cbc
+Size (doclicense.r56445.tar.xz) = 226900 bytes