Update to ricty-ttf-4.1.1

The official repository on GitHub has been removed, and has moved to
another web site.

Changes from 4.1.0 to 4.1.1:
- Integrated the script to generate Ricty Oblique to the main
  generator script.

Changes from 4.0.1 to 4.1.0:
- Integrated the script to generate Ricty Discord to the main
  generator script.
- Ricty now depends on Inconsolata 2.000 or later.

Changes from 4.0.0 to 4.0.1:
- Added hinting information.

Changes from 3.2.4 to 4.0.0:
- Ricty now uses Inconsolata-Regular/Bold.ttf instead of
  Inconsolata.otf.
- Removed the option to generate a bold variant of Inconsolata.

3 files changed, 41 insertions, 35 deletions

diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile
index b1ff5d5f24d..7d49e94aebe 100644
--- a/fonts/ricty-ttf/Makefile
+++ b/fonts/ricty-ttf/Makefile
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.26 2019/11/02 22:24:42 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/05 08:59:12 pho Exp $
 
-DISTNAME=	Ricty-3.2.4
-PKGNAME=	${DISTNAME:S/Ricty/ricty-ttf/}
-GITHUB_PROJECT=	Ricty
-GITHUB_TAG=	${PKGVERSION_NOREV}
+DISTNAME=	# empty
+PKGNAME=	ricty-ttf-4.1.1
 CATEGORIES=	fonts japanese
-MASTER_SITES=	${MASTER_SITE_GITHUB:=yascentur/}
+
+# The official distribution of Ricty is unfortunately not versioned.
+DIST_SUBDIR=	${PKGBASE}
+DISTFILES=	ricty_generator.sh os2version_reviser.sh
+MASTER_SITES=	http://www.yusa.lab.uec.ac.jp/~yusa/ricty/
+EXTRACT_CMD=	${CP} -f "$$extract_file" "${WRKSRC}"
+WRKSRC=		${WRKDIR}
 
 MAINTAINER=	ryoon@NetBSD.org
-#HOMEPAGE=	https://github.com/yascentur/Ricty
+HOMEPAGE=	http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html
 COMMENT=	Migu 1M and Inconsolata based TrueType fonts for programming
 LICENSE=	ipafont AND ofl-v1.1 AND 2-clause-bsd
 
 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+=		migu-ttf>=20150712:../../fonts/migu-ttf
+BUILD_DEPENDS+=		inconsolata-ttf>=2.000:../../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
@@ -24,37 +28,32 @@ RESTRICTED=		Redistribution not permitted per open-font-license PERMISSION & CON
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-NO_CONFIGURE=	YES
-
-INSTALLATION_DIRS=	share/fonts/X11/TTF
-
-FONTDIR=	${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=	${FONTDIR}
+USE_LANGUAGES=	# none
 
-INSTALL_FONTS=	Ricty-Bold.ttf \
-		Ricty-Regular.ttf \
-		RictyDiscord-Bold.ttf \
-		RictyDiscord-Regular.ttf
+NO_CONFIGURE=	YES
 
-USE_LANGUAGES=	# none
+# We can't use ../../mk/fonts.mk because it defines NO_BUILD.
+TTF_FONTS_DIR=		${PREFIX}/share/fonts/X11/TTF
+INSTALLATION_DIRS=	${TTF_FONTS_DIR}
 
 do-build:
 	set -e; \
 	cd ${WRKSRC}; \
 	${PKGSRC_SETENV} ${MAKE_ENV} \
-	${BASH} -x ./ricty_generator.sh \
-	${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
+		${BASH} -x ./ricty_generator.sh \
+		${TTF_FONTS_DIR}/Inconsolata-Regular.ttf \
+		${TTF_FONTS_DIR}/Inconsolata-Bold.ttf \
+		${TTF_FONTS_DIR}/migu-1m-regular.ttf \
+		${TTF_FONTS_DIR}/migu-1m-bold.ttf
 
 post-build:
 	set -e; \
 	cd ${WRKSRC}; \
-	./misc/os2version_reviser.sh Ricty*.ttf
+	${BASH} -x ./os2version_reviser.sh Ricty*.ttf
 
 do-install:
-.for f in ${INSTALL_FONTS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${FONTDIR}
-.endfor
+	@${STEP_MSG} "Installing all .ttf files from ${WRKSRC}"
+	${FIND} ${WRKSRC} -name ${DESTDIR:T} -prune -o -iname '*.ttf' -exec \
+		${INSTALL_DATA} "{}" ${DESTDIR}${TTF_FONTS_DIR} ";"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ricty-ttf/PLIST b/fonts/ricty-ttf/PLIST
index 54c689e4f66..52a24b677c4 100644
--- a/fonts/ricty-ttf/PLIST
+++ b/fonts/ricty-ttf/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/11/05 08:59:12 pho Exp $
 share/fonts/X11/TTF/Ricty-Bold.ttf
+share/fonts/X11/TTF/Ricty-BoldOblique.ttf
+share/fonts/X11/TTF/Ricty-Oblique.ttf
 share/fonts/X11/TTF/Ricty-Regular.ttf
 share/fonts/X11/TTF/RictyDiscord-Bold.ttf
+share/fonts/X11/TTF/RictyDiscord-BoldOblique.ttf
+share/fonts/X11/TTF/RictyDiscord-Oblique.ttf
 share/fonts/X11/TTF/RictyDiscord-Regular.ttf
-@pkgdir share/doc/ricty-ttf
diff --git a/fonts/ricty-ttf/distinfo b/fonts/ricty-ttf/distinfo
index 0d3bee10b2b..71755a65c92 100644
--- a/fonts/ricty-ttf/distinfo
+++ b/fonts/ricty-ttf/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 20:44:39 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/11/05 08:59:12 pho Exp $
 
-SHA1 (Ricty-3.2.4.tar.gz) = 7fc8adcc74656d9e2e1acd325de82f0f08a6d222
-RMD160 (Ricty-3.2.4.tar.gz) = aab65f2d871fcb76c57152b6ad922668197617d6
-SHA512 (Ricty-3.2.4.tar.gz) = f6e08cbb84fd25f8ec4c235c664ce67143c7692d4aad9709ee3195a8d8f7dcac9ac437d771e72d47eee5e841ba4717ec81c8d6700691dcd3e3d5dea6d30425a8
-Size (Ricty-3.2.4.tar.gz) = 256796 bytes
+SHA1 (ricty-ttf/os2version_reviser.sh) = 1d7601fad347eb98bb9c2a146ff522d81de2e5ae
+RMD160 (ricty-ttf/os2version_reviser.sh) = 1b8bb49c8233432eb1cffda29155f3d5befdaf9f
+SHA512 (ricty-ttf/os2version_reviser.sh) = bd62df29db53b50356f61176707c97baafd39e731b965e223430b083a2675f037bdc155abbbbf42e73206c41126048211aa4092aa3add1f174c1538dad2f020c
+Size (ricty-ttf/os2version_reviser.sh) = 1309 bytes
+SHA1 (ricty-ttf/ricty_generator.sh) = 421ec900136fbce542d34af5662958ebfb9e0c7b
+RMD160 (ricty-ttf/ricty_generator.sh) = 88079063db557800b08e79b32cf4fc9a8c7b84c1
+SHA512 (ricty-ttf/ricty_generator.sh) = aa5bb3391000a12217500d7e11f950a587abe0d3f59f68e81770d594b9f7ec4755cf7354a059ee9b9260c81dce8fa7ab442d9e4471f5e9b726bd056d1dfe17e2
+Size (ricty-ttf/ricty_generator.sh) = 36173 bytes