Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 May 2018 03:20:21 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r471075 - head/japanese/font-ricty
Message-ID:  <201805290320.w4T3KLTf023868@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: meta
Date: Tue May 29 03:20:20 2018
New Revision: 471075
URL: https://svnweb.freebsd.org/changeset/ports/471075

Log:
  japanese/font-ricty{,-discord}: Update to 4.1.1
  
  ricry_discord_converter.pe is no longer needed as everything's provided in
  one script.
  
  Also while here,
  - Adjust indents
  - Add NO_ARCH
  - Remove "Created by:" line credits myself and masaki
    (approved via private communications)
  
  Changes:	http://www.rs.tus.ac.jp/yyusa/ricty.html
  Approved by:	pi (mentor, initial version)
  Sponsored by:	HAW International, Inc.
  Differential Revision:	https://reviews.freebsd.org/D15474

Modified:
  head/japanese/font-ricty/Makefile
  head/japanese/font-ricty/distinfo
  head/japanese/font-ricty/pkg-plist

Modified: head/japanese/font-ricty/Makefile
==============================================================================
--- head/japanese/font-ricty/Makefile	Tue May 29 02:35:54 2018	(r471074)
+++ head/japanese/font-ricty/Makefile	Tue May 29 03:20:20 2018	(r471075)
@@ -1,26 +1,25 @@
-# Created by: masaki
 # $FreeBSD$
 
 PORTNAME=	ricty
-PORTVERSION=	3.2.4
-PORTREVISION=	5
+PORTVERSION=	4.1.1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.rs.tus.ac.jp/yyusa/ricty/
 PKGNAMEPREFIX=	ja-font-
-DISTFILES=	ricty_generator-${PORTVERSION}.sh ricty_discord_converter.pe
+DISTNAME=	ricty_generator-${PORTVERSION}.sh
+EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	# nothing
 
 MAINTAINER?=	meta@FreeBSD.org
 COMMENT?=	Ricty - fonts for programming
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:x11-fonts/inconsolata-ttf \
+BUILD_DEPENDS=	inconsolata-ttf>=2.000:x11-fonts/inconsolata-ttf \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:japanese/font-migu \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:japanese/font-migu \
 		fontforge:print/fontforge
 
+NO_ARCH=	yes
 USES=		fonts:fc
 
 NO_PACKAGE=	redistribution is not allowed
@@ -53,12 +52,12 @@ RUN_DEPENDS+=	${LOCALBASE}/${DATADIR_REL}/RictyDiscord
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/ricty_generator-${PORTVERSION}.sh ${WRKSRC}/ricty_generator.sh
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/ricty_discord_converter.pe ${WRKSRC}/ricty_discord_patch.pe
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${SH} ${WRKSRC}/ricty_generator.sh \
-			${PREFIX}/share/fonts/inconsolata/Inconsolata.otf \
+			${PREFIX}/share/fonts/inconsolata/Inconsolata-Regular.ttf \
+			${PREFIX}/share/fonts/inconsolata/Inconsolata-Bold.ttf \
 			${PREFIX}/share/fonts/TTF/migu-1m-regular.ttf \
 			${PREFIX}/share/fonts/TTF/migu-1m-bold.ttf
 
@@ -66,7 +65,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
+		 ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 .if !defined(PKGNAMESUFFIX)
 	${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${STAGEDIR}${DATADIR}
 	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \

Modified: head/japanese/font-ricty/distinfo
==============================================================================
--- head/japanese/font-ricty/distinfo	Tue May 29 02:35:54 2018	(r471074)
+++ head/japanese/font-ricty/distinfo	Tue May 29 03:20:20 2018	(r471075)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1467789963
-SHA256 (ricty/ricty_generator-3.2.4.sh) = ede28e1d10bce84c545ca24b7d609d16e178c9a62daad3e0164f520285509141
-SIZE (ricty/ricty_generator-3.2.4.sh) = 20237
-SHA256 (ricty/ricty_discord_converter.pe) = 1958e6920aab27715dbe7bb9708db28bc0909d4eefbfe5c8919ce2b843e3c59e
-SIZE (ricty/ricty_discord_converter.pe) = 12196
+TIMESTAMP = 1526626698
+SHA256 (ricty/ricty_generator-4.1.1.sh) = 86bf0fed84ef806690b213798419405d7ca2a1a4bed4f6a28b87c2e2d07ad60d
+SIZE (ricty/ricty_generator-4.1.1.sh) = 36173

Modified: head/japanese/font-ricty/pkg-plist
==============================================================================
--- head/japanese/font-ricty/pkg-plist	Tue May 29 02:35:54 2018	(r471074)
+++ head/japanese/font-ricty/pkg-plist	Tue May 29 03:20:20 2018	(r471075)
@@ -1,6 +1,10 @@
 %%RICTY%%%%DATADIR%%/Ricty-Bold.ttf
+%%RICTY%%%%DATADIR%%/Ricty-BoldOblique.ttf
+%%RICTY%%%%DATADIR%%/Ricty-Oblique.ttf
 %%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
+%%DISCORD%%%%DATADIR%%/RictyDiscord-BoldOblique.ttf
+%%DISCORD%%%%DATADIR%%/RictyDiscord-Oblique.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
 %%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
 %%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
@@ -11,6 +15,10 @@
 %%DISCORD%%etc/fonts/conf.d/20-unhint-rictydiscord.conf
 %%DISCORD%%etc/fonts/conf.d/62-fonts-rictydiscord.conf
 %%RICTY%%%%FONTSDIR%%/Ricty-Bold.ttf
+%%RICTY%%%%FONTSDIR%%/Ricty-BoldOblique.ttf
+%%RICTY%%%%FONTSDIR%%/Ricty-Oblique.ttf
 %%RICTY%%%%FONTSDIR%%/Ricty-Regular.ttf
 %%DISCORD%%%%FONTSDIR%%/RictyDiscord-Bold.ttf
+%%DISCORD%%%%FONTSDIR%%/RictyDiscord-BoldOblique.ttf
+%%DISCORD%%%%FONTSDIR%%/RictyDiscord-Oblique.ttf
 %%DISCORD%%%%FONTSDIR%%/RictyDiscord-Regular.ttf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805290320.w4T3KLTf023868>