tex-lobster2{,-doc}: update to 2020

[pdf]latex support has been restored by re-naming the type1 fonts
in compliance with the Reserved Font Name provision of the OFL license.

3 files changed, 88 insertions, 92 deletions

diff --git a/fonts/tex-lobster2/Makefile b/fonts/tex-lobster2/Makefile
index 2efe4bb9f9b..f5f339d17fc 100644
--- a/fonts/tex-lobster2/Makefile
+++ b/fonts/tex-lobster2/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2020/05/10 04:31:48 markd Exp $
+# $NetBSD: Makefile,v 1.5 2021/02/20 00:19:56 markd Exp $
 
 DISTNAME=	lobster2
-PKGNAME=	tex-${DISTNAME}-2014
-PKGREVISION=	1
-TEXLIVE_REV=	32617
+PKGNAME=	tex-${DISTNAME}-2020
+TEXLIVE_REV=	56019
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ctan.org/pkg/lobster2
 COMMENT=	Lobster Two fonts, with support for all LaTeX engines
-LICENSE=	ofl-v1.1
+LICENSE=	ofl-v1.1 AND lppl-1.3c
 
 TEX_MAP_FILES+=	LobsterTwo.map
 
-TEXLIVE_UNVERSIONED=	yes
+# catalogue-contact-repository https://github.com/impallari/The-Lobster-Font
+
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-lobster2/PLIST b/fonts/tex-lobster2/PLIST
index 20c0557a3ad..83c35278ccd 100644
--- a/fonts/tex-lobster2/PLIST
+++ b/fonts/tex-lobster2/PLIST
@@ -1,87 +1,83 @@
-@comment $NetBSD: PLIST,v 1.1 2015/05/08 11:27:48 wiz Exp $
-share/texmf-dist/fonts/enc/dvips/lobster2/lbst2_2vl4dw.enc
-share/texmf-dist/fonts/enc/dvips/lobster2/lbst2_5uiiua.enc
-share/texmf-dist/fonts/enc/dvips/lobster2/lbst2_lyobxw.enc
-share/texmf-dist/fonts/enc/dvips/lobster2/lbst2_xn7u5r.enc
+@comment $NetBSD: PLIST,v 1.2 2021/02/20 00:19:56 markd Exp $
+share/texmf-dist/fonts/enc/dvips/lobster2/lbstr_2rydtx.enc
+share/texmf-dist/fonts/enc/dvips/lobster2/lbstr_bucufw.enc
+share/texmf-dist/fonts/enc/dvips/lobster2/lbstr_pvoz5h.enc
+share/texmf-dist/fonts/enc/dvips/lobster2/lbstr_t7yaon.enc
 share/texmf-dist/fonts/map/dvips/lobster2/LobsterTwo.map
 share/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Bold.otf
 share/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-BoldItalic.otf
 share/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Italic.otf
 share/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Regular.otf
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ly1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ly1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ly1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ot1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ot1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ot1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-t1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-t1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-t1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Bold-lf-ts1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ly1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ly1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ly1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ot1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ot1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ot1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-t1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-t1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-t1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-BoldItalic-lf-ts1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ly1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ly1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ly1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ot1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ot1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ot1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-t1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-t1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-t1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-Italic-lf-ts1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ly1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ly1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ly1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ot1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ot1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ot1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-t1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-t1--lcdfj.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-t1.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/impallari/lobster2/LobsterTwo-lf-ts1.tfm
-share/texmf-dist/fonts/truetype/impallari/lobster2/LobsterTwo-Bold.ttf
-share/texmf-dist/fonts/truetype/impallari/lobster2/LobsterTwo-BoldItalic.ttf
-share/texmf-dist/fonts/truetype/impallari/lobster2/LobsterTwo-Italic.ttf
-share/texmf-dist/fonts/truetype/impallari/lobster2/LobsterTwo-Regular.ttf
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-Bold.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-BoldItalic.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-BoldItalicLCDFJ.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-BoldLCDFJ.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-Italic.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo-ItalicLCDFJ.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwo.pfb
-share/texmf-dist/fonts/type1/impallari/lobster2/LobsterTwoLCDFJ.pfb
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Bold-lf-ly1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Bold-lf-ot1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Bold-lf-t1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Bold-lf-ts1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-BoldItalic-lf-ly1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-BoldItalic-lf-ot1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-BoldItalic-lf-t1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-BoldItalic-lf-ts1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Italic-lf-ly1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Italic-lf-ot1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Italic-lf-t1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-Italic-lf-ts1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-lf-ly1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-lf-ot1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-lf-t1.vf
-share/texmf-dist/fonts/vf/impallari/lobster2/LobsterTwo-lf-ts1.vf
-share/texmf-dist/tex/latex/lobster2/LY1LobsterTwo-LF.fd
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ly1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ly1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ly1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ot1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ot1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ot1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-t1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-t1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-t1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Bold-lf-ts1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ly1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ly1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ly1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ot1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ot1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ot1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-t1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-t1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-t1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-BoldItalic-lf-ts1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ly1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ly1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ly1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ot1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ot1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ot1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-t1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-t1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-t1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Italic-lf-ts1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ly1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ly1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ly1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ot1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ot1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ot1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-t1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-t1--lcdfj.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-t1.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/impallari/lobster2/Lbstr-Regular-lf-ts1.tfm
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-Bold.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-BoldItalic.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-BoldItalicLCDFJ.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-BoldLCDFJ.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-Italic.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-ItalicLCDFJ.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-Regular.pfb
+share/texmf-dist/fonts/type1/impallari/lobster2/Lbstr-RegularLCDFJ.pfb
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Bold-lf-ly1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Bold-lf-ot1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Bold-lf-t1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Bold-lf-ts1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-BoldItalic-lf-ly1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-BoldItalic-lf-ot1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-BoldItalic-lf-t1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-BoldItalic-lf-ts1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Italic-lf-ly1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Italic-lf-ot1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Italic-lf-t1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Italic-lf-ts1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Regular-lf-ly1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Regular-lf-ot1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Regular-lf-t1.vf
+share/texmf-dist/fonts/vf/impallari/lobster2/Lbstr-Regular-lf-ts1.vf
+share/texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd
 share/texmf-dist/tex/latex/lobster2/LobsterTwo.sty
-share/texmf-dist/tex/latex/lobster2/OT1LobsterTwo-LF.fd
-share/texmf-dist/tex/latex/lobster2/T1LobsterTwo-LF.fd
-share/texmf-dist/tex/latex/lobster2/TS1LobsterTwo-LF.fd
+share/texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd
+share/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd
+share/texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd
diff --git a/fonts/tex-lobster2/distinfo b/fonts/tex-lobster2/distinfo
index 2293b4237d2..3390d2547c5 100644
--- a/fonts/tex-lobster2/distinfo
+++ b/fonts/tex-lobster2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:45:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2021/02/20 00:19:56 markd Exp $
 
-SHA1 (tex-lobster2-32617/lobster2.tar.xz) = 41c646bb1bf83d02a89abc4a83f9a050df296062
-RMD160 (tex-lobster2-32617/lobster2.tar.xz) = 1493465e30fe4ec82620fbea14af0e1de15352b9
-SHA512 (tex-lobster2-32617/lobster2.tar.xz) = f84dea9860d329919e57cfa272cbb80890327184fc67f325a8c2b0d3f8a34a0950f24eeb309ad3c46ffa9a1f8033a8f80465e2d78e3b1f6dfc9d517290a2aa16
-Size (tex-lobster2-32617/lobster2.tar.xz) = 777824 bytes
+SHA1 (lobster2.r56019.tar.xz) = e63d1e166b43f227eaf314c86d95101c16be9c77
+RMD160 (lobster2.r56019.tar.xz) = ec2a5df4dc15ad431b29f21af0a56b1d1eb06c0b
+SHA512 (lobster2.r56019.tar.xz) = d104589256496cab2cd55625f9ea252d21971eb2bb97ec91a9515ea8fd8d749ad02d1234c16bc3bd378f2a509df510951fc2764a73d839d982b630505ef44041
+Size (lobster2.r56019.tar.xz) = 514092 bytes