From owner-svn-ports-all@freebsd.org Mon Dec 30 04:54:03 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 9F8001D52B0; Mon, 30 Dec 2019 04:54:03 +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 47mQ7b3lx3z4Ykw; Mon, 30 Dec 2019 04:54:03 +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 7C2DF24B20; Mon, 30 Dec 2019 04:54:03 +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 xBU4s3wA085278; Mon, 30 Dec 2019 04:54:03 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBU4s3ru085277; Mon, 30 Dec 2019 04:54:03 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201912300454.xBU4s3ru085277@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:54:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521454 - head/japanese/font-mplus-ipa X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: head/japanese/font-mplus-ipa X-SVN-Commit-Revision: 521454 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 04:54:03 -0000 Author: hrs Date: Mon Dec 30 04:54:02 2019 New Revision: 521454 URL: https://svnweb.freebsd.org/changeset/ports/521454 Log: - Add LICENSE. - Use FONTPATHSPEC. - Use FONTSDIR consistently. Modified: head/japanese/font-mplus-ipa/Makefile head/japanese/font-mplus-ipa/pkg-plist Modified: head/japanese/font-mplus-ipa/Makefile ============================================================================== --- head/japanese/font-mplus-ipa/Makefile Mon Dec 30 04:53:05 2019 (r521453) +++ head/japanese/font-mplus-ipa/Makefile Mon Dec 30 04:54:02 2019 (r521454) @@ -1,49 +1,52 @@ # $FreeBSD$ -PORTNAME= mplus-ipa +PORTNAME= mplus PORTVERSION= 1.0.20060520.p1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese x11-fonts MASTER_SITES= LOCAL/hrs PKGNAMEPREFIX= ja-font- +PKGNAMESUFFIX= -ipa DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1 MAINTAINER= hrs@FreeBSD.org COMMENT= Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera -CONFLICTS= ja-ipa-ttfonts-[0-9]* +LICENSE= NOTPARTIAL +LICENSE_NAME= Whole not partial +LICENSE_TEXT= Free redistribution of the whole package allowed, not partial +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= fonts:fc tar:bzip2 -FONTNAME= TTF +FONTNAME= ${PORTNAME}${PKGNAMESUFFIX} +FONTPATHSPEC= ${FONTNAME}:pri=60 +FONTSDIR= ${PREFIX}/share/fonts/${FONTNAME}/fonts NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install -DATADIR= ${PREFIX}/share/font-${PORTNAME} +PLIST_SUB= FONTSDIR=${FONTSDIR:S,/fonts$,,} PORTDOCS= Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \ Mplus-LICENSE_J.txt README.txt OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} cd ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus && \ - ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ - ../../../${DATADIR_REL}/fonts/M+*.ttf . - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${COPYTREE_SHARE} . ${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-mplus-ipa/pkg-plist ============================================================================== --- head/japanese/font-mplus-ipa/pkg-plist Mon Dec 30 04:53:05 2019 (r521453) +++ head/japanese/font-mplus-ipa/pkg-plist Mon Dec 30 04:54:02 2019 (r521454) @@ -1,72 +1,66 @@ -%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd -%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd -%%DATADIR%%/ppd/Makefile.in -%%DATADIR%%/ppd/Makefile.am -%%DATADIR%%/opvp/Makefile.in -%%DATADIR%%/opvp/Makefile.am -%%DATADIR%%/opvp/HPPageColor.c -%%DATADIR%%/opfc-ModuleHP.spec -%%DATADIR%%/mkinstalldirs -%%DATADIR%%/missing -%%DATADIR%%/ltmain.sh -%%DATADIR%%/libopvp/pdapi.h -%%DATADIR%%/libopvp/opvp_rpc_server.h -%%DATADIR%%/libopvp/opvp_rpc_server.c -%%DATADIR%%/libopvp/opvp_rpc_reqno.h -%%DATADIR%%/libopvp/opvp_rpc_core.h -%%DATADIR%%/libopvp/opvp_rpc_core.c -%%DATADIR%%/libopvp/opvp_driver.h -%%DATADIR%%/libopvp/opvp_common.h -%%DATADIR%%/libopvp/doc/rpc040223.pdf -%%DATADIR%%/libopvp/doc/Makefile.in -%%DATADIR%%/libopvp/doc/Makefile.am -%%DATADIR%%/libopvp/README.jp -%%DATADIR%%/libopvp/Makefile.in -%%DATADIR%%/libopvp/Makefile.am -%%DATADIR%%/libopvp/COPYING -%%DATADIR%%/install-sh -%%DATADIR%%/fonts/ipamp.ttf -%%DATADIR%%/fonts/ipam.ttf -%%DATADIR%%/fonts/ipagui.ttf -%%DATADIR%%/fonts/ipagp.ttf -%%DATADIR%%/fonts/ipag.ttf -%%DATADIR%%/fonts/Makefile.in -%%DATADIR%%/fonts/Makefile.am -%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf -%%DATADIR%%/fonts/M+2P+IPAG.ttf -%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf -%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf -%%DATADIR%%/fonts/M+1P+IPAG.ttf -%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf -%%DATADIR%%/fonts/COPYING.font.ja -%%DATADIR%%/doc/ProjectOverview.pdf -%%DATADIR%%/doc/Makefile.in -%%DATADIR%%/doc/Makefile.am -%%DATADIR%%/depcomp -%%DATADIR%%/configure.in -%%DATADIR%%/configure -%%DATADIR%%/config.sub -%%DATADIR%%/config.h.in -%%DATADIR%%/config.guess -%%DATADIR%%/compile -%%DATADIR%%/aclocal.m4 -%%DATADIR%%/VERSION -%%DATADIR%%/README.jp -%%DATADIR%%/README -%%DATADIR%%/NEWS -%%DATADIR%%/Makefile.in -%%DATADIR%%/Makefile.am -%%DATADIR%%/INSTALL -%%DATADIR%%/ChangeLog -%%DATADIR%%/COPYING -%%DATADIR%%/AUTHORS +%%FONTSDIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd +%%FONTSDIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd +%%FONTSDIR%%/ppd/Makefile.in +%%FONTSDIR%%/ppd/Makefile.am +%%FONTSDIR%%/opvp/Makefile.in +%%FONTSDIR%%/opvp/Makefile.am +%%FONTSDIR%%/opvp/HPPageColor.c +%%FONTSDIR%%/opfc-ModuleHP.spec +%%FONTSDIR%%/mkinstalldirs +%%FONTSDIR%%/missing +%%FONTSDIR%%/ltmain.sh +%%FONTSDIR%%/libopvp/pdapi.h +%%FONTSDIR%%/libopvp/opvp_rpc_server.h +%%FONTSDIR%%/libopvp/opvp_rpc_server.c +%%FONTSDIR%%/libopvp/opvp_rpc_reqno.h +%%FONTSDIR%%/libopvp/opvp_rpc_core.h +%%FONTSDIR%%/libopvp/opvp_rpc_core.c +%%FONTSDIR%%/libopvp/opvp_driver.h +%%FONTSDIR%%/libopvp/opvp_common.h +%%FONTSDIR%%/libopvp/doc/rpc040223.pdf +%%FONTSDIR%%/libopvp/doc/Makefile.in +%%FONTSDIR%%/libopvp/doc/Makefile.am +%%FONTSDIR%%/libopvp/README.jp +%%FONTSDIR%%/libopvp/Makefile.in +%%FONTSDIR%%/libopvp/Makefile.am +%%FONTSDIR%%/libopvp/COPYING +%%FONTSDIR%%/install-sh +%%FONTSDIR%%/fonts/ipamp.ttf +%%FONTSDIR%%/fonts/ipam.ttf +%%FONTSDIR%%/fonts/ipagui.ttf +%%FONTSDIR%%/fonts/ipagp.ttf +%%FONTSDIR%%/fonts/ipag.ttf +%%FONTSDIR%%/fonts/Makefile.in +%%FONTSDIR%%/fonts/Makefile.am +%%FONTSDIR%%/fonts/M+2VM+IPAG-circle.ttf +%%FONTSDIR%%/fonts/M+2P+IPAG.ttf +%%FONTSDIR%%/fonts/M+2P+IPAG-circle.ttf +%%FONTSDIR%%/fonts/M+1VM+IPAG-circle.ttf +%%FONTSDIR%%/fonts/M+1P+IPAG.ttf +%%FONTSDIR%%/fonts/M+1P+IPAG-circle.ttf +%%FONTSDIR%%/fonts/COPYING.font.ja +%%FONTSDIR%%/doc/ProjectOverview.pdf +%%FONTSDIR%%/doc/Makefile.in +%%FONTSDIR%%/doc/Makefile.am +%%FONTSDIR%%/depcomp +%%FONTSDIR%%/configure.in +%%FONTSDIR%%/configure +%%FONTSDIR%%/config.sub +%%FONTSDIR%%/config.h.in +%%FONTSDIR%%/config.guess +%%FONTSDIR%%/compile +%%FONTSDIR%%/aclocal.m4 +%%FONTSDIR%%/VERSION +%%FONTSDIR%%/README.jp +%%FONTSDIR%%/README +%%FONTSDIR%%/NEWS +%%FONTSDIR%%/Makefile.in +%%FONTSDIR%%/Makefile.am +%%FONTSDIR%%/INSTALL +%%FONTSDIR%%/ChangeLog +%%FONTSDIR%%/COPYING +%%FONTSDIR%%/AUTHORS etc/fonts/conf.avail/20-unhint-mplus-ipa.conf etc/fonts/conf.avail/62-fonts-mplus-ipa.conf etc/fonts/conf.d/20-unhint-mplus-ipa.conf etc/fonts/conf.d/62-fonts-mplus-ipa.conf -%%FONTSDIR%%/M+2VM+IPAG-circle.ttf -%%FONTSDIR%%/M+2P+IPAG.ttf -%%FONTSDIR%%/M+2P+IPAG-circle.ttf -%%FONTSDIR%%/M+1VM+IPAG-circle.ttf -%%FONTSDIR%%/M+1P+IPAG.ttf -%%FONTSDIR%%/M+1P+IPAG-circle.ttf