From owner-svn-ports-head@freebsd.org Mon Dec 30 04:46:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DB4E91D4E39; Mon, 30 Dec 2019 04:46:06 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47mPyQ5YKYz4XnY; Mon, 30 Dec 2019 04:46:06 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B581424962; Mon, 30 Dec 2019 04:46:06 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBU4k6Xk078867; Mon, 30 Dec 2019 04:46:06 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBU4k6Xc078865; Mon, 30 Dec 2019 04:46:06 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201912300446.xBU4k6Xc078865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 30 Dec 2019 04:46:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521447 - head/japanese/font-migmix X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: head/japanese/font-migmix X-SVN-Commit-Revision: 521447 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2019 04:46:06 -0000 Author: hrs Date: Mon Dec 30 04:46:06 2019 New Revision: 521447 URL: https://svnweb.freebsd.org/changeset/ports/521447 Log: - Add LICENSE. - Use FONTPATHSPEC. - Use FONTSDIR consistently. Modified: head/japanese/font-migmix/Makefile head/japanese/font-migmix/pkg-plist Modified: head/japanese/font-migmix/Makefile ============================================================================== --- head/japanese/font-migmix/Makefile Mon Dec 30 04:44:22 2019 (r521446) +++ head/japanese/font-migmix/Makefile Mon Dec 30 04:46:06 2019 (r521447) @@ -2,7 +2,7 @@ PORTNAME= migmix PORTVERSION= 1.0.20130617 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= OSDN/mix-mplus-ipa/59021 PKGNAMEPREFIX= ja-font- @@ -14,16 +14,19 @@ DISTFILES= ${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SU MAINTAINER= hrs@FreeBSD.org COMMENT= Mixed Japanese font with IPA Gothic and M-plus outline +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 \ - migmix-README.txt +PORTDOCS= Readme_ipag00303.txt migmix-README.txt OPTIONS_DEFINE= DOCS @@ -32,28 +35,25 @@ do-install: ${INSTALL_DATA} ipag00303/*.txt \ migmix-README.txt \ ${WRKDIR} - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} \ ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \ ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \ ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \ ${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \ - ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ - ../../../${DATADIR_REL}/migmix*.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} + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/japanese/font-migmix/pkg-plist ============================================================================== --- head/japanese/font-migmix/pkg-plist Mon Dec 30 04:44:22 2019 (r521446) +++ head/japanese/font-migmix/pkg-plist Mon Dec 30 04:46:06 2019 (r521447) @@ -1,15 +1,3 @@ -%%DATADIR%%/migmix-1m-bold.ttf -%%DATADIR%%/migmix-1m-regular.ttf -%%DATADIR%%/migmix-1p-bold.ttf -%%DATADIR%%/migmix-1p-regular.ttf -%%DATADIR%%/migmix-2m-bold.ttf -%%DATADIR%%/migmix-2m-regular.ttf -%%DATADIR%%/migmix-2p-bold.ttf -%%DATADIR%%/migmix-2p-regular.ttf -etc/fonts/conf.avail/20-unhint-migmix.conf -etc/fonts/conf.avail/62-fonts-migmix.conf -etc/fonts/conf.d/20-unhint-migmix.conf -etc/fonts/conf.d/62-fonts-migmix.conf %%FONTSDIR%%/migmix-1m-bold.ttf %%FONTSDIR%%/migmix-1m-regular.ttf %%FONTSDIR%%/migmix-1p-bold.ttf @@ -18,3 +6,7 @@ etc/fonts/conf.d/62-fonts-migmix.conf %%FONTSDIR%%/migmix-2m-regular.ttf %%FONTSDIR%%/migmix-2p-bold.ttf %%FONTSDIR%%/migmix-2p-regular.ttf +etc/fonts/conf.avail/20-unhint-migmix.conf +etc/fonts/conf.avail/62-fonts-migmix.conf +etc/fonts/conf.d/20-unhint-migmix.conf +etc/fonts/conf.d/62-fonts-migmix.conf