Date: Mon, 30 Dec 2019 04:32:21 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521437 - head/japanese/font-ipa Message-ID: <201912300432.xBU4WLFf068466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Mon Dec 30 04:32:21 2019 New Revision: 521437 URL: https://svnweb.freebsd.org/changeset/ports/521437 Log: - Use FONTPATHSPEC and nuke pkg-message for adding FontPath manually. - Add LICENSE. - Update MASTER_SITES. - Use FONTSDIR consistently. Modified: head/japanese/font-ipa/Makefile head/japanese/font-ipa/pkg-plist Modified: head/japanese/font-ipa/Makefile ============================================================================== --- head/japanese/font-ipa/Makefile Mon Dec 30 04:28:12 2019 (r521436) +++ head/japanese/font-ipa/Makefile Mon Dec 30 04:32:21 2019 (r521437) @@ -2,27 +2,28 @@ PORTNAME= ipa PORTVERSION= 00303 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese x11-fonts -MASTER_SITES= http://dl.ipafont.ipa.go.jp/IPAfont/ +MASTER_SITES= https://ipafont.ipa.go.jp/IPAfont/ PKGNAMEPREFIX= ja-font- DISTNAME= IPAfont${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= IPA Japanese fonts -CONFLICTS= ja-ipa-ttfonts-[0-9]* +LICENSE= IPAFONTLICv1.0 +LICENSE_NAME= IPA Font License Agreement v1.0 +LICENSE_FILE= ${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= fonts:fc zip -FONTNAME= OTF +FONTPATHSPEC= ${FONTNAME}:pri=60 NO_ARCH= yes NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install -DATADIR= ${PREFIX}/share/font-${PORTNAME} -PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \ - Readme_IPAfont${PORTVERSION}.txt +PORTDOCS= Readme_IPAfont${PORTVERSION}.txt OPTIONS_DEFINE= DOCS @@ -30,23 +31,20 @@ post-extract: cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR}/ && ${LN} -s -f \ - ../../../${DATADIR_REL}/ipa*.otf . - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.d - ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \ + ${FILESDIR}/62-fonts-${FONTNAME}.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 + ${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf + ${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/japanese/font-ipa/pkg-plist ============================================================================== --- head/japanese/font-ipa/pkg-plist Mon Dec 30 04:28:12 2019 (r521436) +++ head/japanese/font-ipa/pkg-plist Mon Dec 30 04:32:21 2019 (r521437) @@ -1,12 +1,8 @@ -%%DATADIR%%/ipamp.otf -%%DATADIR%%/ipam.otf -%%DATADIR%%/ipagp.otf -%%DATADIR%%/ipag.otf -etc/fonts/conf.avail/20-unhint-ipa.conf -etc/fonts/conf.avail/62-fonts-ipa.conf -etc/fonts/conf.d/20-unhint-ipa.conf -etc/fonts/conf.d/62-fonts-ipa.conf %%FONTSDIR%%/ipag.otf %%FONTSDIR%%/ipagp.otf %%FONTSDIR%%/ipam.otf %%FONTSDIR%%/ipamp.otf +etc/fonts/conf.avail/20-unhint-ipa.conf +etc/fonts/conf.avail/62-fonts-ipa.conf +etc/fonts/conf.d/20-unhint-ipa.conf +etc/fonts/conf.d/62-fonts-ipa.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912300432.xBU4WLFf068466>