From owner-svn-ports-all@freebsd.org Mon Dec 30 05:04:20 2019 Return-Path: Delivered-To: svn-ports-all@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 67A1B1D59B4; Mon, 30 Dec 2019 05:04:20 +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 47mQMS20LQz4Zsn; Mon, 30 Dec 2019 05:04:20 +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 3FA9224CE6; Mon, 30 Dec 2019 05:04:20 +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 xBU54KPi092287; Mon, 30 Dec 2019 05:04:20 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBU54JMZ092286; Mon, 30 Dec 2019 05:04:19 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201912300504.xBU54JMZ092286@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 05:04:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521463 - head/japanese/font-vlgothic X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: head/japanese/font-vlgothic X-SVN-Commit-Revision: 521463 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2019 05:04:20 -0000 Author: hrs Date: Mon Dec 30 05:04:19 2019 New Revision: 521463 URL: https://svnweb.freebsd.org/changeset/ports/521463 Log: - Use FONTPATHSPEC. - Use FONTSDIR consistently. Modified: head/japanese/font-vlgothic/Makefile head/japanese/font-vlgothic/pkg-plist Modified: head/japanese/font-vlgothic/Makefile ============================================================================== --- head/japanese/font-vlgothic/Makefile Mon Dec 30 05:03:45 2019 (r521462) +++ head/japanese/font-vlgothic/Makefile Mon Dec 30 05:04:19 2019 (r521463) @@ -3,7 +3,7 @@ PORTNAME= vlgothic PORTVERSION= 20141206 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= OSDN/vlgothic/62375 PKGNAMEPREFIX= ja-font- @@ -16,13 +16,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.en USES= fonts:fc tar:xz -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= Changelog LICENSE_E.mplus LICENSE_J.mplus \ README README.sazanami README_J.mplus WRKSRC= ${WRKDIR}/VLGothic @@ -30,23 +29,20 @@ WRKSRC= ${WRKDIR}/VLGothic OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ - ../../../${DATADIR_REL}/*.ttf . - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.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 ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/japanese/font-vlgothic/pkg-plist ============================================================================== --- head/japanese/font-vlgothic/pkg-plist Mon Dec 30 05:03:45 2019 (r521462) +++ head/japanese/font-vlgothic/pkg-plist Mon Dec 30 05:04:19 2019 (r521463) @@ -1,8 +1,6 @@ -%%DATADIR%%/VL-PGothic-Regular.ttf -%%DATADIR%%/VL-Gothic-Regular.ttf +%%FONTSDIR%%/VL-PGothic-Regular.ttf +%%FONTSDIR%%/VL-Gothic-Regular.ttf etc/fonts/conf.avail/20-unhint-vlgothic.conf etc/fonts/conf.avail/62-fonts-vlgothic.conf etc/fonts/conf.d/20-unhint-vlgothic.conf etc/fonts/conf.d/62-fonts-vlgothic.conf -%%FONTSDIR%%/VL-PGothic-Regular.ttf -%%FONTSDIR%%/VL-Gothic-Regular.ttf