CVS commit: [pkgsrc-2019Q2] pkgsrc/fonts/ricty-ttf

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jul 13 11:28:30 UTC 2019

Modified Files:
        pkgsrc/fonts/ricty-ttf [pkgsrc-2019Q2]: Makefile

Log Message:
Pullup ticket #5997 - requested by taca
fonts/ricty-ttf: build fix

Revisions pulled up:
- fonts/ricty-ttf/Makefile                                      1.24

---
   Module Name: pkgsrc
   Committed By:        tsutsui
   Date:                Fri Jul  5 16:24:08 UTC 2019

   Modified Files:
        pkgsrc/fonts/ricty-ttf: Makefile

   Log Message:
   ricty-ttf: follow move of inconsolata-ttf installation path.

   Also explicitly require moved version:
    http://mail-index.netbsd.org/pkgsrc-changes/2019/04/06/msg190085.html
    > inconsolata-ttf: update to 20090207nb2.
    > Use fonts.mk: Fixes installation path.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.18.1 pkgsrc/fonts/ricty-ttf/Makefile

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

Modified files:

Index: pkgsrc/fonts/ricty-ttf/Makefile
diff -u pkgsrc/fonts/ricty-ttf/Makefile:1.23 pkgsrc/fonts/ricty-ttf/Makefile:1.23.18.1
--- pkgsrc/fonts/ricty-ttf/Makefile:1.23        Tue Aug  1 17:40:11 2017
+++ pkgsrc/fonts/ricty-ttf/Makefile     Sat Jul 13 11:28:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/08/01 17:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23.18.1 2019/07/13 11:28:30 bsiegert Exp $
 
 DISTNAME=      Ricty-3.2.4
 PKGNAME=       ${DISTNAME:S/Ricty/ricty-ttf/}
@@ -15,7 +15,7 @@ LICENSE=      ipafont AND ofl-v1.1 AND 2-clau
 USE_TOOLS+=            bash
 BUILD_DEPENDS+=                fontforge-[0-9]*:../../fonts/fontforge
 BUILD_DEPENDS+=                migu-ttf-[0-9]*:../../fonts/migu-ttf
-BUILD_DEPENDS+=                inconsolata-ttf-[0-9]*:../../fonts/inconsolata-ttf
+BUILD_DEPENDS+=                inconsolata-ttf>=20090207nb2:../../fonts/inconsolata-ttf
 
 # LICESE of generated TTF fonts is "ipafont AND open-font-license",
 # but OPEN FONT LICENSE version 1.1 section 5) require to distribute entirely
@@ -43,7 +43,7 @@ do-build:
        cd ${WRKSRC}; \
        ${PKGSRC_SETENV} ${MAKE_ENV} \
        ${BASH} -x ./ricty_generator.sh \
-       ${LOCALBASE}/share/fonts/X11/TTF/Inconsolata.otf \
+       ${LOCALBASE}/share/fonts/X11/OTF/Inconsolata.otf \
        ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-regular.ttf \
        ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-bold.ttf