Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2019 04:46:49 +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: r521448 - head/japanese/font-migu
Message-ID:  <201912300446.xBU4knYx079013@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Dec 30 04:46:49 2019
New Revision: 521448
URL: https://svnweb.freebsd.org/changeset/ports/521448

Log:
  - Add LICENSE.
  - Use FONTPATHSPEC.
  - Use FONTSDIR consistently.

Modified:
  head/japanese/font-migu/Makefile
  head/japanese/font-migu/pkg-plist

Modified: head/japanese/font-migu/Makefile
==============================================================================
--- head/japanese/font-migu/Makefile	Mon Dec 30 04:46:06 2019	(r521447)
+++ head/japanese/font-migu/Makefile	Mon Dec 30 04:46:49 2019	(r521448)
@@ -2,7 +2,7 @@
 
 PORTNAME=	migu
 PORTVERSION=	1.0.20130617
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/mix-mplus-ipa/59022
 PKGNAMEPREFIX=	ja-font-
@@ -14,16 +14,19 @@ DISTFILES=	${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SU
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Another Japanese font set based on MigMix
 
+LICENSE=	IPAFONTLICv1.0
+LICENSE_NAME=	IPA Font License Agreement v1.0
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/ipag00303/IPA_Font_License_Agreement_v1.0.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		fonts:fc zip
-FONTNAME=	TTF
+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_ipag00303.txt \
-		migu-README.txt
+PORTDOCS=	Readme_ipag00303.txt migu-README.txt
 
 OPTIONS_DEFINE=	DOCS
 
@@ -32,25 +35,22 @@ do-install:
 	    ${INSTALL_DATA} ipag00303/*.txt \
 		${PORTNAME}-README.txt \
 		${WRKDIR}
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} \
 	    ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-1c-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \
-	    ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/migu*.ttf .
+	    ${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}

Modified: head/japanese/font-migu/pkg-plist
==============================================================================
--- head/japanese/font-migu/pkg-plist	Mon Dec 30 04:46:06 2019	(r521447)
+++ head/japanese/font-migu/pkg-plist	Mon Dec 30 04:46:49 2019	(r521448)
@@ -1,15 +1,3 @@
-%%DATADIR%%/migu-1c-bold.ttf
-%%DATADIR%%/migu-1c-regular.ttf
-%%DATADIR%%/migu-1p-bold.ttf
-%%DATADIR%%/migu-1p-regular.ttf
-%%DATADIR%%/migu-1m-bold.ttf
-%%DATADIR%%/migu-1m-regular.ttf
-%%DATADIR%%/migu-2m-bold.ttf
-%%DATADIR%%/migu-2m-regular.ttf
-etc/fonts/conf.avail/20-unhint-migu.conf
-etc/fonts/conf.avail/62-fonts-migu.conf
-etc/fonts/conf.d/20-unhint-migu.conf
-etc/fonts/conf.d/62-fonts-migu.conf
 %%FONTSDIR%%/migu-1c-bold.ttf
 %%FONTSDIR%%/migu-1c-regular.ttf
 %%FONTSDIR%%/migu-1p-bold.ttf
@@ -18,3 +6,7 @@ etc/fonts/conf.d/62-fonts-migu.conf
 %%FONTSDIR%%/migu-1m-regular.ttf
 %%FONTSDIR%%/migu-2m-bold.ttf
 %%FONTSDIR%%/migu-2m-regular.ttf
+etc/fonts/conf.avail/20-unhint-migu.conf
+etc/fonts/conf.avail/62-fonts-migu.conf
+etc/fonts/conf.d/20-unhint-migu.conf
+etc/fonts/conf.d/62-fonts-migu.conf



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