Date: Sat, 21 Mar 2015 23:43:50 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381879 - head/japanese/font-ricty Message-ID: <201503212343.t2LNhotP012945@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Mar 21 23:43:49 2015 New Revision: 381879 URL: https://svnweb.freebsd.org/changeset/ports/381879 QAT: https://qat.redports.org/buildarchive/r381879/ Log: Fix after font changes Modified: head/japanese/font-ricty/Makefile head/japanese/font-ricty/pkg-plist Modified: head/japanese/font-ricty/Makefile ============================================================================== --- head/japanese/font-ricty/Makefile Sat Mar 21 23:13:24 2015 (r381878) +++ head/japanese/font-ricty/Makefile Sat Mar 21 23:43:49 2015 (r381879) @@ -3,7 +3,7 @@ PORTNAME= ricty PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts PKGNAMEPREFIX= ja-font- @@ -11,11 +11,12 @@ 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 \ - ${LOCALBASE}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \ - ${LOCALBASE}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \ +BUILD_DEPENDS= ${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \ + ${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \ + ${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \ fontforge:${PORTSDIR}/print/fontforge +USES= fonts USE_GITHUB= yes GH_ACCOUNT= yascentur GH_PROJECT= Ricty @@ -25,12 +26,8 @@ NO_PACKAGE= redistribution is not allowe PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install -SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} -PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ - LOCAL_FONTSDIR=${LOCAL_FONTSDIR} -LOCAL_FONTSDIR= share/fonts -X_FONTSDIR= share/fonts +FONTNAME= TTF .if !defined(PKGNAMESUFFIX) OPTIONS_DEFINE= DISCORD DOCS @@ -56,21 +53,19 @@ RUN_DEPENDS+= ${DATADIR}/RictyDiscord-Re do-build: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${SH} ${WRKSRC}/ricty_generator.sh \ - ${PREFIX}/${X_FONTSDIR}/OTF/Inconsolata.otf \ - ${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf + ${PREFIX}/share/fonts/inconsolata/Inconsolata.otf \ + ${PREFIX}/share/fonts/TTF/migu-1m-regular.ttf \ + ${PREFIX}/share/fonts/TTF/migu-1m-bold.ttf do-install: ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + ${MKDIR} ${STAGEDIR}${FONTSDIR} ${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 . + cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ + ../../../${DATADIR_REL}/Ricty-*.ttf . ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ ${FILESDIR}/62-fonts-${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail @@ -80,10 +75,8 @@ do-install: ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .else ${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 . + cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ + ../../../${DATADIR_REL}/RictyDiscord-*.ttf . ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}discord.conf \ ${FILESDIR}/62-fonts-${PORTNAME}discord.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail Modified: head/japanese/font-ricty/pkg-plist ============================================================================== --- head/japanese/font-ricty/pkg-plist Sat Mar 21 23:13:24 2015 (r381878) +++ head/japanese/font-ricty/pkg-plist Sat Mar 21 23:43:49 2015 (r381879) @@ -2,10 +2,6 @@ %%RICTY%%%%DATADIR%%/Ricty-Regular.ttf %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf %%DISCORD%%%%DATADIR%%/RictyDiscord-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 %%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 @@ -14,8 +10,7 @@ %%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 -%%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 -@fc %%X_FONTSDIR%%/TTF +%%RICTY%%%%FONTSDIR%%/Ricty-Bold.ttf +%%RICTY%%%%FONTSDIR%%/Ricty-Regular.ttf +%%DISCORD%%%%FONTSDIR%%/RictyDiscord-Bold.ttf +%%DISCORD%%%%FONTSDIR%%/RictyDiscord-Regular.ttf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503212343.t2LNhotP012945>