CVS commit: pkgsrc/fonts

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Aug  5 10:57:00 UTC 2019

Modified Files:
        pkgsrc/fonts/tex-merriweather: Makefile PLIST distinfo
        pkgsrc/fonts/tex-merriweather-doc: Makefile distinfo

Log Message:
tex-merriweather{,-doc}: update to 2019

changes unknown


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-merriweather/Makefile \
    pkgsrc/fonts/tex-merriweather/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-merriweather/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-merriweather-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-merriweather-doc/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/tex-merriweather/Makefile
diff -u pkgsrc/fonts/tex-merriweather/Makefile:1.1 pkgsrc/fonts/tex-merriweather/Makefile:1.2
--- pkgsrc/fonts/tex-merriweather/Makefile:1.1  Fri May  8 11:27:49 2015
+++ pkgsrc/fonts/tex-merriweather/Makefile      Mon Aug  5 10:57:00 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/05/08 11:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/05 10:57:00 markd Exp $
 
 DISTNAME=      merriweather
-PKGNAME=       tex-${DISTNAME}-2014
-TEXLIVE_REV=   34315
+PKGNAME=       tex-${DISTNAME}-2019
+TEXLIVE_REV=   51304
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://ctan.org/pkg/merriweather
+HOMEPAGE=      https://ctan.org/pkg/merriweather
 COMMENT=       Merriweather and MerriweatherSans fonts, with LaTeX support
 LICENSE=       ofl-v1.1
 
Index: pkgsrc/fonts/tex-merriweather/PLIST
diff -u pkgsrc/fonts/tex-merriweather/PLIST:1.1 pkgsrc/fonts/tex-merriweather/PLIST:1.2
--- pkgsrc/fonts/tex-merriweather/PLIST:1.1     Fri May  8 11:27:49 2015
+++ pkgsrc/fonts/tex-merriweather/PLIST Mon Aug  5 10:57:00 2019
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2015/05/08 11:27:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/08/05 10:57:00 markd Exp $
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc
 share/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc
+share/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc
 share/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
-share/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc
 share/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc
 share/texmf-dist/fonts/map/dvips/merriweather/merriweather.map
 share/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm
@@ -58,54 +62,86 @@ share/texmf-dist/fonts/tfm/sorkin/merriw
 share/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm
 share/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm
 share/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm
-share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm
+share/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm
 share/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf
 share/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf
 share/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf
@@ -154,28 +190,39 @@ share/texmf-dist/fonts/vf/sorkin/merriwe
 share/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf
 share/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf
 share/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf
-share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf
+share/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf
 share/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
-share/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd
+share/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
+share/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
 share/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
-share/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd
+share/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
+share/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
 share/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
-share/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd
+share/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
+share/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
 share/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
-share/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd
+share/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
 share/texmf-dist/tex/latex/merriweather/merriweather.sty

Index: pkgsrc/fonts/tex-merriweather/distinfo
diff -u pkgsrc/fonts/tex-merriweather/distinfo:1.2 pkgsrc/fonts/tex-merriweather/distinfo:1.3
--- pkgsrc/fonts/tex-merriweather/distinfo:1.2  Tue Nov  3 20:45:10 2015
+++ pkgsrc/fonts/tex-merriweather/distinfo      Mon Aug  5 10:57:00 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:45:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/08/05 10:57:00 markd Exp $
 
-SHA1 (tex-merriweather-34315/merriweather.tar.xz) = acb456e14c894097ca5fae66537b52d3c1a2c375
-RMD160 (tex-merriweather-34315/merriweather.tar.xz) = d47a3fcffc8676b7223dc71980197fd336ae280a
-SHA512 (tex-merriweather-34315/merriweather.tar.xz) = 99c1f328ad15b5cd92cffeeade37762e5871d2fc1b01f36cb001d55bae6e9e89a4f8e72d157f3695c6ddc9d3091366afdbe9796ddab2ad2c3823e75cfaeb5055
-Size (tex-merriweather-34315/merriweather.tar.xz) = 2268416 bytes
+SHA1 (tex-merriweather-51304/merriweather.tar.xz) = 6f32edb956c7730ae3225ada41c3b8b1781d987b
+RMD160 (tex-merriweather-51304/merriweather.tar.xz) = 36ab55a03147905eab90233f9dd6e04f9be245a8
+SHA512 (tex-merriweather-51304/merriweather.tar.xz) = 5f955cf054b7cccad4e3a15ab3c1a8e41bef87b30d90b5253a108c8da7351fca25e9321e6d6decc3a83dd5fe0f0e1f6edb5f8768cd1d5b7fe683184b40b67b76
+Size (tex-merriweather-51304/merriweather.tar.xz) = 2272236 bytes

Index: pkgsrc/fonts/tex-merriweather-doc/Makefile
diff -u pkgsrc/fonts/tex-merriweather-doc/Makefile:1.1 pkgsrc/fonts/tex-merriweather-doc/Makefile:1.2
--- pkgsrc/fonts/tex-merriweather-doc/Makefile:1.1      Fri May  8 11:27:49 2015
+++ pkgsrc/fonts/tex-merriweather-doc/Makefile  Mon Aug  5 10:57:00 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/05/08 11:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/05 10:57:00 markd Exp $
 
 DISTNAME=      merriweather.doc
-PKGNAME=       tex-${DISTNAME:S/./-/}-2014
-TEXLIVE_REV=   34315
+PKGNAME=       tex-${DISTNAME:S/./-/}-2019
+TEXLIVE_REV=   51304
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://ctan.org/pkg/merriweather
+HOMEPAGE=      https://ctan.org/pkg/merriweather
 COMMENT=       Documentation for tex-merriweather
 LICENSE=       ofl-v1.1
 

Index: pkgsrc/fonts/tex-merriweather-doc/distinfo
diff -u pkgsrc/fonts/tex-merriweather-doc/distinfo:1.2 pkgsrc/fonts/tex-merriweather-doc/distinfo:1.3
--- pkgsrc/fonts/tex-merriweather-doc/distinfo:1.2      Tue Nov  3 20:45:10 2015
+++ pkgsrc/fonts/tex-merriweather-doc/distinfo  Mon Aug  5 10:57:00 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:45:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/08/05 10:57:00 markd Exp $
 
-SHA1 (tex-merriweather-34315/merriweather.doc.tar.xz) = d0305fb148c5a7272765a993aab46fae9c1b23c1
-RMD160 (tex-merriweather-34315/merriweather.doc.tar.xz) = 75eaef720e430de11116d8c81b2dcd9d800ece22
-SHA512 (tex-merriweather-34315/merriweather.doc.tar.xz) = 0ab27a93918e855634c17a38213d7cbacf615aa610ab98e52ea91ff998a96c97898f0c94775f26d4d9872dfa4b414f3704b80a2debfa4ca10dc3710b9305488e
-Size (tex-merriweather-34315/merriweather.doc.tar.xz) = 112496 bytes
+SHA1 (tex-merriweather-51304/merriweather.doc.tar.xz) = 5ba19511afb37f12de5435a5db13a427478c84e3
+RMD160 (tex-merriweather-51304/merriweather.doc.tar.xz) = 4ef79727dcaf715cb3a9e30eed6724d0fb2e13b2
+SHA512 (tex-merriweather-51304/merriweather.doc.tar.xz) = 1380fab54fec1a839aa671d29c189faadd50dba4cdc0e4f1fadfad3d0b34393e7a515f62caceb91e308c171c4c56a3b2f70951e9d2983d01dac98a84dd34b46e
+Size (tex-merriweather-51304/merriweather.doc.tar.xz) = 112508 bytes