Attachment 143707 Details for Bug 190967 – Stagify, update font-ricty

Stagify, update font-ricty

patch-ja-font-ricty.txt (text/plain), 8.29 KB, created by Koichiro Iwao on 2014-06-12 14:53:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2014-06-12 14:53:11 UTC

Size: 8.29 KB

patch

obsolete

>diff -ruN /usr/ports/japanese/font-ricty/Makefile japanese/font-ricty/Makefile
>--- /usr/ports/japanese/font-ricty/Makefile	2014-05-26 16:40:09.545864603 +0900
>+++ japanese/font-ricty/Makefile	2014-06-12 23:44:37.538543941 +0900
>@@ -2,13 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	ricty
>-PORTVERSION=	3.2.1b
>-PORTREVISION=	1
>+PORTVERSION=	3.2.3
> CATEGORIES=	japanese x11-fonts
> PKGNAMEPREFIX=	ja-font-
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Ricty - fonts for programming
>+MAINTAINER?=	meta+ports@vmeta.jp
>+COMMENT?=	Ricty - fonts for programming
> 
> RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
> BUILD_DEPENDS=	${LOCALBASE}/${X_FONTSDIR}/OTF/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \
>@@ -20,7 +19,7 @@
> GH_ACCOUNT=	yascentur
> GH_COMMIT=	${GH_TAGNAME}
> GH_PROJECT=	Ricty
>-GH_TAGNAME=	dfd3637
>+GH_TAGNAME=	0fd7047
> 
> NO_PACKAGE=	redistribution is not allowed
> PKGINSTALL=	${WRKDIR}/pkg-install
>@@ -29,25 +28,29 @@
> SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
> PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
> 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
>-PORTDOCS=	README.md
> 
> LOCAL_FONTSDIR=	share/fonts
> X_FONTSDIR=	lib/X11/fonts
> 
>+.if !defined(PKGNAMESUFFIX)
> OPTIONS_DEFINE=	DISCORD DOCS
> DISCORD_DESC=	Install Ricty-Discord
>-
> OPTIONS_DEFAULT=	DISCORD
>+PORTDOCS=	README.md
>+.endif
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
>+.if !defined(PKGNAMESUFFIX)
>+PLIST_SUB+=	DISCORD="@comment " RICTY=""
>+SUB_LIST+=	DISCORD=\# RICTY=""
>+.elif ${PKGNAMESUFFIX:S,-,,} == "discord"
>+PLIST_SUB+=	DISCORD="" RICTY="@comment "
>+SUB_LIST+=	DISCORD="" RICTY=\#
>+.endif
>+
> .if ${PORT_OPTIONS:MDISCORD}
>-PLIST_SUB+=	DISCORD=""
>-SUB_LIST+=	DISCORD=""
>-.else
>-PLIST_SUB+=	DISCORD="@comment "
>-SUB_LIST+=	DISCORD="#"
>+RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:${PORTSDIR}/japanese/font-ricty-discord
> .endif
> 
> do-build:
>@@ -58,42 +61,45 @@
> 			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf
> 
> do-install:
>-	${MKDIR} ${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${DATADIR}
>-.if ${PORT_OPTIONS:MDISCORD}
>-	${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${DATADIR}
>-.endif
>-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
>-	${LN} -s -f \
>-		${DATADIR}/*.ttf \
>-		${PREFIX}/${LOCAL_FONTSDIR}/TTF/
>-	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
>-	${LN} -s -f \
>-		${DATADIR}/*.ttf \
>-		${PREFIX}/${X_FONTSDIR}/TTF/
>-	${INSTALL_DATA} ${FILESDIR}/20-unhint-ricty.conf \
>-		${FILESDIR}/62-fonts-ricty.conf \
>-		${PREFIX}/etc/fonts/conf.avail
>-	${LN} -s -f ../conf.avail/20-unhint-ricty.conf \
>-		${PREFIX}/etc/fonts/conf.d/20-unhint-ricty.conf
>-	${LN} -s -f ../conf.avail/62-fonts-ricty.conf \
>-		${PREFIX}/etc/fonts/conf.d/62-fonts-ricty.conf
>-.if ${PORT_OPTIONS:MDISCORD}
>-	${INSTALL_DATA} ${FILESDIR}/20-unhint-rictydiscord.conf \
>-		${FILESDIR}/62-fonts-rictydiscord.conf \
>-		${PREFIX}/etc/fonts/conf.avail
>-	${LN} -s -f ../conf.avail/20-unhint-rictydiscord.conf \
>-		${PREFIX}/etc/fonts/conf.d/20-unhint-rictydiscord.conf
>-	${LN} -s -f ../conf.avail/62-fonts-rictydiscord.conf \
>-		${PREFIX}/etc/fonts/conf.d/62-fonts-rictydiscord.conf
>+	${MKDIR} ${STAGEDIR}${DATADIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
>+.if !defined(PKGNAMESUFFIX)
>+	${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${STAGEDIR}${DATADIR}
>+	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
>+	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf .
>+	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
>+	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf .
>+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
>+	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
>+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
>+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
>+.elif ${PKGNAMESUFFIX:S,-,,} == "discord"
>+	${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${STAGEDIR}${DATADIR}
>+	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
>+	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf .
>+	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
>+	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf .
>+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}discord.conf \
>+	    ${FILESDIR}/62-fonts-${PORTNAME}discord.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
>+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}discord.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}discord.conf
>+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}discord.conf \
>+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}discord.conf
> .endif
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>+.if ${PORT_OPTIONS:MDOCS} && defined(PORTDOCS)
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
> post-install:
> 	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
>-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>+	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/japanese/font-ricty/distinfo japanese/font-ricty/distinfo
>--- /usr/ports/japanese/font-ricty/distinfo	2013-03-13 20:05:20.091797589 +0900
>+++ japanese/font-ricty/distinfo	2014-06-10 22:16:10.920809051 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ricty-3.2.1b.tar.gz) = b31ba25e53af2f2aff2030e96521c31b2a59f5c9ae1387a8875767bb3d4eef0a
>-SIZE (ricty-3.2.1b.tar.gz) = 13763
>+SHA256 (ricty-3.2.3.tar.gz) = cd51e941c59a13a5b42302e5b135db7fead06ddf69ca700453bf16a4eeadb95d
>+SIZE (ricty-3.2.3.tar.gz) = 14708
>diff -ruN /usr/ports/japanese/font-ricty/files/pkg-install.in japanese/font-ricty/files/pkg-install.in
>--- /usr/ports/japanese/font-ricty/files/pkg-install.in	2013-06-28 11:44:41.418423830 +0900
>+++ japanese/font-ricty/files/pkg-install.in	2014-06-12 15:33:26.558060309 +0900
>@@ -70,8 +70,8 @@
> {
> 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
> 	do
>-		make_xlfd $ENC Ricty-Regular.ttf ipa "Ricty" p medium
>-		make_xlfd $ENC Ricty-Bold.ttf ipa "Ricty" p bold
>+		%%RICTY%%make_xlfd $ENC Ricty-Regular.ttf ipa "Ricty" p medium
>+		%%RICTY%%make_xlfd $ENC Ricty-Bold.ttf ipa "Ricty" p bold
> 
> 		%%DISCORD%%make_xlfd $ENC RictyDiscord-Regular.ttf ipa "Ricty Discord" p medium
> 		%%DISCORD%%make_xlfd $ENC RictyDiscord-Bold.ttf ipa "Ricty Discord" p bold
>diff -ruN /usr/ports/japanese/font-ricty/pkg-plist japanese/font-ricty/pkg-plist
>--- /usr/ports/japanese/font-ricty/pkg-plist	2013-03-13 20:05:20.092796437 +0900
>+++ japanese/font-ricty/pkg-plist	2014-06-12 17:29:47.692084898 +0900
>@@ -1,24 +1,24 @@
>-%%DATADIR%%/Ricty-Bold.ttf
>-%%DATADIR%%/Ricty-Regular.ttf
>+%%RICTY%%%%DATADIR%%/Ricty-Bold.ttf
>+%%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
> %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
> %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
> @dirrm %%DATADIR%%
>-%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
>-%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
>+%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
>+%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
> %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
> %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
> @dirrmtry %%LOCAL_FONTSDIR%%/TTF
> @dirrmtry %%LOCAL_FONTSDIR%%
>-etc/fonts/conf.avail/20-unhint-ricty.conf
>-etc/fonts/conf.avail/62-fonts-ricty.conf
>-etc/fonts/conf.d/20-unhint-ricty.conf
>-etc/fonts/conf.d/62-fonts-ricty.conf
>+%%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
>+%%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
>+%%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf
>+%%RICTY%%etc/fonts/conf.d/62-fonts-ricty.conf
> %%DISCORD%%etc/fonts/conf.avail/20-unhint-rictydiscord.conf
> %%DISCORD%%etc/fonts/conf.avail/62-fonts-rictydiscord.conf
> %%DISCORD%%etc/fonts/conf.d/20-unhint-rictydiscord.conf
> %%DISCORD%%etc/fonts/conf.d/62-fonts-rictydiscord.conf
>-%%X_FONTSDIR%%/TTF/Ricty-Bold.ttf
>-%%X_FONTSDIR%%/TTF/Ricty-Regular.ttf
>+%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Bold.ttf
>+%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Regular.ttf
> %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
> %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
> @exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true

Actions: View

Attachments on bug 190967: 143707 | 143708