Update to 3.0.1

The generated ttf files are almost as same as 2.0.1.
Version 3.0.1 or later, only generating script is provided.
DO NOT DISTRIBUTE GENERATED TRUETYPE TTF FILE.

3 files changed, 31 insertions, 29 deletions

diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile
index 21a8e650199..6f74bdd28c3 100644
--- a/fonts/ricty-ttf/Makefile
+++ b/fonts/ricty-ttf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2011/05/19 13:13:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/28 11:15:24 ryoon Exp $
 #
 
-DISTNAME=	Ricty-2.0.1
+DISTNAME=	Ricty-3.0.1
 PKGNAME=	${DISTNAME:tl:S/-/-ttf-/}
 CATEGORIES=	fonts japanese
 MASTER_SITES=	http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/
@@ -9,44 +9,47 @@ MASTER_SITES=	http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
 COMMENT=	Migu 1M and Inconsolata based TrueType fonts for programming
-LICENSE=	ipafont AND open-font-license AND mplusfont
-
-RESTRICTED=	Violation of open-font-license PERMISSION & CONDITIONS 5)
+LICENSE=	ipafont AND open-font-license AND mplusfont AND public-domain
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
+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
+
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
-NO_BUILD=	YES
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
-INSTALLATION_DIRS=	lib/X11/fonts/TTF \
-			${DOCSDIR}
+INSTALLATION_DIRS=	lib/X11/fonts/TTF
 
 FONTDIR=	${PREFIX}/lib/X11/fonts/TTF
 FONTS_DIRS.ttf=	${FONTDIR}
 
 INSTALL_FONTS=	Ricty-Bold.ttf \
-		Ricty-Regular.ttf
-INSTALL_DOCS=	README \
-		Licenses/IPA_Font_License_Agreement_v1.0.txt \
-		Licenses/LICENSE_J \
-		Licenses/OFL.txt
+		Ricty-Regular.ttf \
+		RictyDiscord-Bold.ttf \
+		RictyDiscord-Regular.ttf
 
 USE_LANGUAGES=	# none
 
+FIND_PREFIX:=	INCONSOLATADIR=inconsolata-ttf
+FIND_PREFIX+=	MIGUDIR=migu-ttf
+.include "../../mk/find-prefix.mk"
+
+do-build:
+	set -e; \
+	cd ${WRKSRC}; \
+	./ricty_generator.sh \
+	${INCONSOLATADIR}/lib/X11/fonts/TTF/Inconsolata.otf \
+	${MIGUDIR}/lib/X11/fonts/TTF/Migu-1M-regular.ttf \
+	${MIGUDIR}/lib/X11/fonts/TTF/Migu-1M-bold.ttf
+
 do-install:
 .for f in ${INSTALL_FONTS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${FONTDIR}
 .endfor
-.for f in ${INSTALL_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCSDIR}
-.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ricty-ttf/PLIST b/fonts/ricty-ttf/PLIST
index 95f43bebbb2..4fc378083f5 100644
--- a/fonts/ricty-ttf/PLIST
+++ b/fonts/ricty-ttf/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/08 11:05:31 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/05/28 11:15:25 ryoon Exp $
 lib/X11/fonts/TTF/Ricty-Bold.ttf
 lib/X11/fonts/TTF/Ricty-Regular.ttf
-share/doc/ricty-ttf/IPA_Font_License_Agreement_v1.0.txt
-share/doc/ricty-ttf/LICENSE_J
-share/doc/ricty-ttf/OFL.txt
-share/doc/ricty-ttf/README
+lib/X11/fonts/TTF/RictyDiscord-Bold.ttf
+lib/X11/fonts/TTF/RictyDiscord-Regular.ttf
+@pkgdir share/doc/ricty-ttf
diff --git a/fonts/ricty-ttf/distinfo b/fonts/ricty-ttf/distinfo
index f4fe7926328..e42169721eb 100644
--- a/fonts/ricty-ttf/distinfo
+++ b/fonts/ricty-ttf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/05/08 11:05:31 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2011/05/28 11:15:25 ryoon Exp $
 
-SHA1 (Ricty-2.0.1.tar.gz) = 04d706b41289739e02f9caa41416a9757657bf6e
-RMD160 (Ricty-2.0.1.tar.gz) = de326ec62976cd3603ec58ccea872243fd8cf1cb
-Size (Ricty-2.0.1.tar.gz) = 4316124 bytes
+SHA1 (Ricty-3.0.1.tar.gz) = 7138bf8d328290ee82ed1c8e846b31d41b9e1d17
+RMD160 (Ricty-3.0.1.tar.gz) = aa50029c9d2ff5cf0ee7758aac4fe527b8b47ff3
+Size (Ricty-3.0.1.tar.gz) = 3884 bytes