Sat Jul 13 11:28:30 2019 UTC ()
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.


(bsiegert)
diff -r1.23 -r1.23.18.1 pkgsrc/fonts/ricty-ttf/Makefile
cvs diff -r1.23 -r1.23.18.1 pkgsrc/fonts/ricty-ttf/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/ricty-ttf/Makefile 2017/08/01 17:40:11 1.23
+++ pkgsrc/fonts/ricty-ttf/Makefile 2019/07/13 11:28:30 1.23.18.1
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.23 2017/08/01 17:40:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.23.18.1 2019/07/13 11:28:30 bsiegert Exp $
2 2
3DISTNAME= Ricty-3.2.4 3DISTNAME= Ricty-3.2.4
4PKGNAME= ${DISTNAME:S/Ricty/ricty-ttf/} 4PKGNAME= ${DISTNAME:S/Ricty/ricty-ttf/}
5GITHUB_PROJECT= Ricty 5GITHUB_PROJECT= Ricty
6GITHUB_TAG= ${PKGVERSION_NOREV} 6GITHUB_TAG= ${PKGVERSION_NOREV}
7CATEGORIES= fonts japanese 7CATEGORIES= fonts japanese
8MASTER_SITES= ${MASTER_SITE_GITHUB:=yascentur/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=yascentur/}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11#HOMEPAGE= https://github.com/yascentur/Ricty 11#HOMEPAGE= https://github.com/yascentur/Ricty
12COMMENT= Migu 1M and Inconsolata based TrueType fonts for programming 12COMMENT= Migu 1M and Inconsolata based TrueType fonts for programming
13LICENSE= ipafont AND ofl-v1.1 AND 2-clause-bsd 13LICENSE= ipafont AND ofl-v1.1 AND 2-clause-bsd
14 14
15USE_TOOLS+= bash 15USE_TOOLS+= bash
16BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge 16BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
17BUILD_DEPENDS+= migu-ttf-[0-9]*:../../fonts/migu-ttf 17BUILD_DEPENDS+= migu-ttf-[0-9]*:../../fonts/migu-ttf
18BUILD_DEPENDS+= inconsolata-ttf-[0-9]*:../../fonts/inconsolata-ttf 18BUILD_DEPENDS+= inconsolata-ttf>=20090207nb2:../../fonts/inconsolata-ttf
19 19
20# LICESE of generated TTF fonts is "ipafont AND open-font-license", 20# LICESE of generated TTF fonts is "ipafont AND open-font-license",
21# but OPEN FONT LICENSE version 1.1 section 5) require to distribute entirely 21# but OPEN FONT LICENSE version 1.1 section 5) require to distribute entirely
22# under the license. 22# under the license.
23RESTRICTED= Redistribution not permitted per open-font-license PERMISSION & CONDITIONS point 5 23RESTRICTED= Redistribution not permitted per open-font-license PERMISSION & CONDITIONS point 5
24NO_BIN_ON_CDROM= ${RESTRICTED} 24NO_BIN_ON_CDROM= ${RESTRICTED}
25NO_BIN_ON_FTP= ${RESTRICTED} 25NO_BIN_ON_FTP= ${RESTRICTED}
26 26
27NO_CONFIGURE= YES 27NO_CONFIGURE= YES
28 28
29INSTALLATION_DIRS= share/fonts/X11/TTF 29INSTALLATION_DIRS= share/fonts/X11/TTF
30 30
31FONTDIR= ${PREFIX}/share/fonts/X11/TTF 31FONTDIR= ${PREFIX}/share/fonts/X11/TTF
@@ -33,27 +33,27 @@ FONTS_DIRS.ttf= ${FONTDIR} @@ -33,27 +33,27 @@ FONTS_DIRS.ttf= ${FONTDIR}
33 33
34INSTALL_FONTS= Ricty-Bold.ttf \ 34INSTALL_FONTS= Ricty-Bold.ttf \
35 Ricty-Regular.ttf \ 35 Ricty-Regular.ttf \
36 RictyDiscord-Bold.ttf \ 36 RictyDiscord-Bold.ttf \
37 RictyDiscord-Regular.ttf 37 RictyDiscord-Regular.ttf
38 38
39USE_LANGUAGES= # none 39USE_LANGUAGES= # none
40 40
41do-build: 41do-build:
42 set -e; \ 42 set -e; \
43 cd ${WRKSRC}; \ 43 cd ${WRKSRC}; \
44 ${PKGSRC_SETENV} ${MAKE_ENV} \ 44 ${PKGSRC_SETENV} ${MAKE_ENV} \
45 ${BASH} -x ./ricty_generator.sh \ 45 ${BASH} -x ./ricty_generator.sh \
46 ${LOCALBASE}/share/fonts/X11/TTF/Inconsolata.otf \ 46 ${LOCALBASE}/share/fonts/X11/OTF/Inconsolata.otf \
47 ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-regular.ttf \ 47 ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-regular.ttf \
48 ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-bold.ttf 48 ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-bold.ttf
49 49
50post-build: 50post-build:
51 set -e; \ 51 set -e; \
52 cd ${WRKSRC}; \ 52 cd ${WRKSRC}; \
53 ./misc/os2version_reviser.sh Ricty*.ttf 53 ./misc/os2version_reviser.sh Ricty*.ttf
54 54
55do-install: 55do-install:
56.for f in ${INSTALL_FONTS} 56.for f in ${INSTALL_FONTS}
57 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${FONTDIR} 57 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${FONTDIR}
58.endfor 58.endfor
59 59