tex-*: update to texlive 2020 versions

tex-adforn{,-doc} to 1.1b
tex-adfsymbols{,-doc} to 1.2b
tex-adobemapping to 2020
tex-alegreya{,-doc} to 2020
tex-baskervaldx{,-doc} to 1.073
tex-cabin{,-doc} to 2020
tex-ccfonts{,-doc} to 1.2
tex-cinzel{,-doc} to 2020
tex-clearsans{,-doc} to 2020
tex-countriesofeurope{,-doc} to 0.23
tex-ebgaramond{,-doc} to 2020
tex-ebgaramond-maths{,-doc} to 1.2
tex-erewhon{,-doc} to 1.104
tex-esint{,-doc} to 1.2d
tex-fira{,-doc} to 4.3.54512
tex-fontinst{,-doc} to 1.933.53562
tex-fontname{,-doc} to 2020
tex-fontools{,-doc} to 2020
tex-fontspec{,-doc} to 2.7i
tex-fourier{,-doc} to 2.2
tex-ipaex{,-doc} to 2020
tex-junicode{,-doc} to 1.0.2
tex-libertine{,-doc} to 5.3.0.54583
tex-librecaslon{,-doc} to 2020
tex-luaotfload{,-doc} to 3.12
tex-mathalpha{,-doc} to 1.13
tex-mathpazo{,-doc} to 1.003.52663
tex-merriweather{,-doc} to 2020
tex-newpx{,-doc} to 1.410
tex-newtx{,-doc} to 1.625
tex-newtxtt{,-doc} to 1.056
tex-oldstandard{,-doc} to 2.5
tex-overlock{,-doc} to 2020
tex-playfair{,-doc} to 2020
tex-psnfss{,-doc} to 9.3
tex-pxtxalfa{,-doc} to 1.54080
tex-quattrocento{,-doc} to 2020
tex-roboto{,-doc} to 2020
tex-sansmathaccent{,-doc} to 2020
tex-skull to 0.1.51907
tex-superiors{,-doc} to 1.06
tex-txfontsb{,-doc} to 1.1.1
tex-universa{,-doc} to 2.1
tex-wasy{,-doc} to 2.5
tex-wasysym{,-doc} to 2.4
tex-xcharter{,-doc} to 1.205
tex-xits{,-doc} to 1.301
tex-wasy-type1 to 001.002

4 files changed, 75 insertions, 19 deletions

diff --git a/fonts/tex-fourier/DESCR b/fonts/tex-fourier/DESCR
index 27d80a27567..49850322055 100644
--- a/fonts/tex-fourier/DESCR
+++ b/fonts/tex-fourier/DESCR
@@ -1,8 +1,9 @@
-Fourier-GUTenberg is a LaTeX typesetting system which uses Adobe Utopia
-as its standard base font. Fourier-GUTenberg provides all complementary
-typefaces needed to allow Utopia based TeX typesetting, including an
-extensive mathematics set and several other symbols. The system is
-absolutely stand- alone: apart from Utopia and Fourier, no other
-typefaces are required. The fourier fonts will also work with Adobe
-Utopia Expert fonts, which are only available for purchase. Utopia is a
-registered trademark of Adobe Systems Incorporated
+Fourier-GUTenberg is a LaTeX typesetting system which uses
+Adobe Utopia as its standard base font. Fourier-GUTenberg
+provides all complementary typefaces needed to allow Utopia
+based TeX typesetting, including an extensive mathematics set
+and several other symbols. The system is absolutely
+stand-alone: apart from Utopia and Fourier, no other typefaces
+are required. The fourier fonts will also work with Adobe
+Utopia Expert fonts, which are only available for purchase.
+Utopia is a registered trademark of Adobe Systems Incorporated
diff --git a/fonts/tex-fourier/Makefile b/fonts/tex-fourier/Makefile
index 279363a88b3..55bab91c62a 100644
--- a/fonts/tex-fourier/Makefile
+++ b/fonts/tex-fourier/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/12/06 19:30:01 markd Exp $
+# $NetBSD: Makefile,v 1.5 2020/04/26 12:21:15 markd Exp $
 
 DISTNAME=	fourier
-PKGNAME=	tex-${DISTNAME}-1.3
-PKGREVISION=	1
-TEXLIVE_REV=	15878
+PKGNAME=	tex-${DISTNAME}-2.2
+TEXLIVE_REV=	54090
 
 MAINTAINER=	minskim@NetBSD.org
+HOMEPAGE=	https://ctan.org/pkg/fourier
 COMMENT=	Using Utopia fonts in LaTeX documents
 LICENSE=	lppl-1.3c
 
@@ -15,6 +15,5 @@ DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 TEX_MAP_FILES+=	fourier.map
 TEX_MAP_FILES+=	fourier-utopia-expert.map
 
-TEXLIVE_UNVERSIONED=	yes
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-fourier/PLIST b/fonts/tex-fourier/PLIST
index 1587a2d7313..86a927dfb5f 100644
--- a/fonts/tex-fourier/PLIST
+++ b/fonts/tex-fourier/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/03/13 23:30:47 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/26 12:21:15 markd Exp $
 share/texmf-dist/fonts/afm/public/fourier/fourier-alt-black.afm
 share/texmf-dist/fonts/afm/public/fourier/fourier-alt-bold.afm
 share/texmf-dist/fonts/afm/public/fourier/fourier-alt-boldita.afm
@@ -17,6 +17,10 @@ share/texmf-dist/fonts/afm/public/fourier/fourier-ms.afm
 share/texmf-dist/fonts/afm/public/fourier/fourier-orns.afm
 share/texmf-dist/fonts/map/dvips/fourier/fourier-utopia-expert.map
 share/texmf-dist/fonts/map/dvips/fourier/fourier.map
+share/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf
+share/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf
+share/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf
+share/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf
 share/texmf-dist/fonts/tfm/public/fourier/fourier-alt-black.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-alt-bold-sl.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-alt-bold.tfm
@@ -28,6 +32,8 @@ share/texmf-dist/fonts/tfm/public/fourier/fourier-alt-semiita.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-alt-sl.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-alt.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-bb.tfm
+share/texmf-dist/fonts/tfm/public/fourier/fourier-ligs-it.tfm
+share/texmf-dist/fonts/tfm/public/fourier/fourier-ligs.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-mcl.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-mex.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-ml.tfm
@@ -36,6 +42,9 @@ share/texmf-dist/fonts/tfm/public/fourier/fourier-mlit.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-mlitb.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-ms.tfm
 share/texmf-dist/fonts/tfm/public/fourier/fourier-orns.tfm
+share/texmf-dist/fonts/tfm/public/fourier/fut-oldlatin-it.tfm
+share/texmf-dist/fonts/tfm/public/fourier/fut-oldlatin.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futb-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futb8c.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futb8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futb8t.tfm
@@ -44,6 +53,7 @@ share/texmf-dist/fonts/tfm/public/fourier/futb9c.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futb9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futb9e.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futbc8t.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futbi-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futbi8c.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futbi8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futbi8t.tfm
@@ -60,6 +70,7 @@ share/texmf-dist/fonts/tfm/public/fourier/futbo9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futbo9e.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futboorn.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futborn.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futc-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futc8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futc8x.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futc9c.tfm
@@ -70,6 +81,7 @@ share/texmf-dist/fonts/tfm/public/fourier/futmi.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futmib.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futmii.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futmiib.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futr-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futr8c.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futr8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futr8t.tfm
@@ -81,8 +93,13 @@ share/texmf-dist/fonts/tfm/public/fourier/futrc8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrc8t.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrc9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrc9e.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futrci9d.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futrci9e.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futrco8r.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futrco9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrd8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrd8t.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futri-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futri8c.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futri8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futri8t.tfm
@@ -99,6 +116,7 @@ share/texmf-dist/fonts/tfm/public/fourier/futro9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futro9e.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futroorn.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futrorn.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futs-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futs8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futs8x.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futs9c.tfm
@@ -107,6 +125,10 @@ share/texmf-dist/fonts/tfm/public/fourier/futs9e.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsc8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsc9d.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsc9e.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futsci9d.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futsci9e.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futsco8r.tfm
+share/texmf-dist/fonts/tfm/public/fourier/futsi-sup.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsi8r.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsi8x.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsi9c.tfm
@@ -120,6 +142,26 @@ share/texmf-dist/fonts/tfm/public/fourier/futso9e.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsoorn.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsorn.tfm
 share/texmf-dist/fonts/tfm/public/fourier/futsy.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putb8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putb8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putbi8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putbi8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putbo8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putc8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putc8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putr8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putr8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putrc8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putrd8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putri8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putri8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putro8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/puts8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/puts8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putsc8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putsi8a.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putsi8x.tfm
+share/texmf-dist/fonts/tfm/public/fourier/putso8x.tfm
 share/texmf-dist/fonts/type1/public/fourier/fourier-alt-black.pfb
 share/texmf-dist/fonts/type1/public/fourier/fourier-alt-bold.pfb
 share/texmf-dist/fonts/type1/public/fourier/fourier-alt-boldita.pfb
@@ -136,12 +178,14 @@ share/texmf-dist/fonts/type1/public/fourier/fourier-mlit.pfb
 share/texmf-dist/fonts/type1/public/fourier/fourier-mlitb.pfb
 share/texmf-dist/fonts/type1/public/fourier/fourier-ms.pfb
 share/texmf-dist/fonts/type1/public/fourier/fourier-orns.pfb
+share/texmf-dist/fonts/vf/public/fourier/futb-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futb8c.vf
 share/texmf-dist/fonts/vf/public/fourier/futb8t.vf
 share/texmf-dist/fonts/vf/public/fourier/futb9c.vf
 share/texmf-dist/fonts/vf/public/fourier/futb9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futb9e.vf
 share/texmf-dist/fonts/vf/public/fourier/futbc8t.vf
+share/texmf-dist/fonts/vf/public/fourier/futbi-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futbi8c.vf
 share/texmf-dist/fonts/vf/public/fourier/futbi8t.vf
 share/texmf-dist/fonts/vf/public/fourier/futbi9c.vf
@@ -154,6 +198,7 @@ share/texmf-dist/fonts/vf/public/fourier/futbo9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futbo9e.vf
 share/texmf-dist/fonts/vf/public/fourier/futboorn.vf
 share/texmf-dist/fonts/vf/public/fourier/futborn.vf
+share/texmf-dist/fonts/vf/public/fourier/futc-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futc9c.vf
 share/texmf-dist/fonts/vf/public/fourier/futc9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futc9e.vf
@@ -162,6 +207,7 @@ share/texmf-dist/fonts/vf/public/fourier/futmi.vf
 share/texmf-dist/fonts/vf/public/fourier/futmib.vf
 share/texmf-dist/fonts/vf/public/fourier/futmii.vf
 share/texmf-dist/fonts/vf/public/fourier/futmiib.vf
+share/texmf-dist/fonts/vf/public/fourier/futr-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futr8c.vf
 share/texmf-dist/fonts/vf/public/fourier/futr8t.vf
 share/texmf-dist/fonts/vf/public/fourier/futr9c.vf
@@ -170,7 +216,11 @@ share/texmf-dist/fonts/vf/public/fourier/futr9e.vf
 share/texmf-dist/fonts/vf/public/fourier/futrc8t.vf
 share/texmf-dist/fonts/vf/public/fourier/futrc9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futrc9e.vf
+share/texmf-dist/fonts/vf/public/fourier/futrci9d.vf
+share/texmf-dist/fonts/vf/public/fourier/futrci9e.vf
+share/texmf-dist/fonts/vf/public/fourier/futrco9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futrd8t.vf
+share/texmf-dist/fonts/vf/public/fourier/futri-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futri8c.vf
 share/texmf-dist/fonts/vf/public/fourier/futri8t.vf
 share/texmf-dist/fonts/vf/public/fourier/futri9c.vf
@@ -183,11 +233,16 @@ share/texmf-dist/fonts/vf/public/fourier/futro9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futro9e.vf
 share/texmf-dist/fonts/vf/public/fourier/futroorn.vf
 share/texmf-dist/fonts/vf/public/fourier/futrorn.vf
+share/texmf-dist/fonts/vf/public/fourier/futs-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futs9c.vf
 share/texmf-dist/fonts/vf/public/fourier/futs9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futs9e.vf
 share/texmf-dist/fonts/vf/public/fourier/futsc9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futsc9e.vf
+share/texmf-dist/fonts/vf/public/fourier/futsci9d.vf
+share/texmf-dist/fonts/vf/public/fourier/futsci9e.vf
+share/texmf-dist/fonts/vf/public/fourier/futsco9d.vf
+share/texmf-dist/fonts/vf/public/fourier/futsi-sup.vf
 share/texmf-dist/fonts/vf/public/fourier/futsi9c.vf
 share/texmf-dist/fonts/vf/public/fourier/futsi9d.vf
 share/texmf-dist/fonts/vf/public/fourier/futsi9e.vf
@@ -203,6 +258,7 @@ share/texmf-dist/tex/latex/fourier/fmsfutm.fd
 share/texmf-dist/tex/latex/fourier/fmxfutm.fd
 share/texmf-dist/tex/latex/fourier/fourier-orns.sty
 share/texmf-dist/tex/latex/fourier/fourier.sty
+share/texmf-dist/tex/latex/fourier/t1fut-sup.fd
 share/texmf-dist/tex/latex/fourier/t1futj.fd
 share/texmf-dist/tex/latex/fourier/t1futs.fd
 share/texmf-dist/tex/latex/fourier/t1futx.fd
diff --git a/fonts/tex-fourier/distinfo b/fonts/tex-fourier/distinfo
index fa73b93e9c7..846fb2bf63b 100644
--- a/fonts/tex-fourier/distinfo
+++ b/fonts/tex-fourier/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:45:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/04/26 12:21:15 markd Exp $
 
-SHA1 (tex-fourier-15878/fourier.tar.xz) = dbe40c5ba4ef637527bb8ec0b70bbd040f5c3ff4
-RMD160 (tex-fourier-15878/fourier.tar.xz) = 131c6d60158dfbf2cecc4c65aa49bb80ecee9cc8
-SHA512 (tex-fourier-15878/fourier.tar.xz) = 12cec6553a505f55ba1314599f14e70eb54773c114061102d3f6a4d71047f092221b0d2dd9ecde86fae2e2e09142fda655093b072cd951a8d4c9f02d29b01050
-Size (tex-fourier-15878/fourier.tar.xz) = 237244 bytes
+SHA1 (fourier.r54090.tar.xz) = 5b260d7bcf41879574ab0df27e139ef95fdc64dd
+RMD160 (fourier.r54090.tar.xz) = 2c038668cdc96033e23f7575676e59291491f56d
+SHA512 (fourier.r54090.tar.xz) = 4e4e5bad7ce25c67ec925145531e1a27344735e32e2c7053fa73ddd1559ad3d2f5fce00c92c5dc09731a90666fb5c80aa9702adc7bc4469239ca5ae62c23644c
+Size (fourier.r54090.tar.xz) = 265236 bytes