diff options
| -rw-r--r-- | fonts/Merriweather-ttf/Makefile | 15 | ||||
| -rw-r--r-- | fonts/Merriweather-ttf/PLIST | 10 | ||||
| -rw-r--r-- | fonts/Merriweather-ttf/distinfo | 10 |
3 files changed, 14 insertions, 21 deletions
diff --git a/fonts/Merriweather-ttf/Makefile b/fonts/Merriweather-ttf/Makefile index 494f05ceb73..387e598b118 100644 --- a/fonts/Merriweather-ttf/Makefile +++ b/fonts/Merriweather-ttf/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.1 2016/11/15 16:05:42 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2017/11/22 13:41:20 wiz Exp $ -DISTNAME= Merriweather-1.584 +DISTNAME= Merriweather-2.002 PKGNAME= ${DISTNAME:S/her/her-ttf/} CATEGORIES= fonts -MASTER_SITES= ${MASTER_SITE_GITHUB:=EbenSorkin/} -GITHUB_PROJECT= Merriweather -GITHUB_RELEASE= ${PKGVERSION_NOREV} +# does not provide distfile for versions > 1.584; 2.002 is from fontsquirrel +#MASTER_SITES= ${MASTER_SITE_GITHUB:=EbenSorkin/} +#GITHUB_PROJECT= Merriweather +#GITHUB_RELEASE= ${PKGVERSION_NOREV} EXTRACT_SUFX= .zip MAINTAINER= pkgsrc-users@NetBSD.org @@ -22,7 +23,7 @@ FONTS_DIRS.ttf+= ${PREFIX}/share/fonts/X11/OTF FONTS_DIRS.ttf+= ${PREFIX}/share/fonts/X11/TTF do-install: - ${INSTALL_DATA} ${WRKSRC}/OTF/*.otf ${DESTDIR}${PREFIX}/share/fonts/X11/OTF - ${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${DESTDIR}${PREFIX}/share/fonts/X11/TTF + ${INSTALL_DATA} ${WRKSRC}/*.otf ${DESTDIR}${PREFIX}/share/fonts/X11/OTF +# ${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${DESTDIR}${PREFIX}/share/fonts/X11/TTF .include "../../mk/bsd.pkg.mk" diff --git a/fonts/Merriweather-ttf/PLIST b/fonts/Merriweather-ttf/PLIST index 3f5c1ef94c2..2d382f0f29f 100644 --- a/fonts/Merriweather-ttf/PLIST +++ b/fonts/Merriweather-ttf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/11/15 16:05:42 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/11/22 13:41:20 wiz Exp $ share/fonts/X11/OTF/Merriweather-Black.otf share/fonts/X11/OTF/Merriweather-BlackItalic.otf share/fonts/X11/OTF/Merriweather-Bold.otf @@ -7,11 +7,3 @@ share/fonts/X11/OTF/Merriweather-Italic.otf share/fonts/X11/OTF/Merriweather-Light.otf share/fonts/X11/OTF/Merriweather-LightItalic.otf share/fonts/X11/OTF/Merriweather-Regular.otf -share/fonts/X11/TTF/Merriweather-Black.ttf -share/fonts/X11/TTF/Merriweather-BlackItalic.ttf -share/fonts/X11/TTF/Merriweather-Bold.ttf -share/fonts/X11/TTF/Merriweather-BoldItalic.ttf -share/fonts/X11/TTF/Merriweather-Italic.ttf -share/fonts/X11/TTF/Merriweather-Light.ttf -share/fonts/X11/TTF/Merriweather-LightItalic.ttf -share/fonts/X11/TTF/Merriweather-Regular.ttf diff --git a/fonts/Merriweather-ttf/distinfo b/fonts/Merriweather-ttf/distinfo index 7347c132549..98231e7c1ce 100644 --- a/fonts/Merriweather-ttf/distinfo +++ b/fonts/Merriweather-ttf/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2016/11/15 16:05:42 wiz Exp $ +$NetBSD: distinfo,v 1.2 2017/11/22 13:41:20 wiz Exp $ -SHA1 (Merriweather-1.584.zip) = 096f74e0209f365440ba3da99e7efbfd09a7d7ae -RMD160 (Merriweather-1.584.zip) = 6126cef28958d69cc3a84b2d201373c61aa2c4dc -SHA512 (Merriweather-1.584.zip) = a3585231f253aada0dcfcc1c80b350c4266e66f2bd1c9234ff22f3db96b206b5e2f90f0a5733e2ca4da895da2e375cd5e637b3d67fce801f525dbf6a56833423 -Size (Merriweather-1.584.zip) = 1138766 bytes +SHA1 (Merriweather-2.002.zip) = ee853dc5d0825fa623171f23119a0cef154b01be +RMD160 (Merriweather-2.002.zip) = 8f6aeca31358d07b33bb7c0894f5720c698c5e8a +SHA512 (Merriweather-2.002.zip) = 02585b5f35a0acb06ced5de9bebd5dfa56d72719e66fe04c013472e2806c464c2aff76c6529d9746fef8e72f2f290c9e8544fa212d02921e9a5a37a82b175f4c +Size (Merriweather-2.002.zip) = 625849 bytes |