svn commit: r396873 - in head/japanese: font-ipa font-ipa-uigothic font-ipaex font-ipaex/files font-ipamjm font-kochi font-kochi/files font-koruri font-koruri/files font-marumoji font-migmix font-m...
Hiroki Sato
hrs at FreeBSD.org
Sun Sep 13 23:36:55 UTC 2015
Author: hrs
Date: Sun Sep 13 23:36:45 2015
New Revision: 396873
URL: https://svnweb.freebsd.org/changeset/ports/396873
Log:
Fix fonts.dir by using fonts:fc and style consistency.
Modified:
head/japanese/font-ipa-uigothic/Makefile
head/japanese/font-ipa/Makefile
head/japanese/font-ipaex/Makefile
head/japanese/font-ipaex/files/pkg-install.in
head/japanese/font-ipamjm/Makefile
head/japanese/font-kochi/Makefile
head/japanese/font-kochi/files/pkg-install.in
head/japanese/font-koruri/Makefile
head/japanese/font-koruri/files/pkg-install.in
head/japanese/font-marumoji/Makefile
head/japanese/font-migmix/Makefile
head/japanese/font-migmix/files/pkg-install.in
head/japanese/font-migu/Makefile
head/japanese/font-migu/files/pkg-install.in
head/japanese/font-mona-ipa/Makefile
head/japanese/font-mona-ipa/files/pkg-install.in
head/japanese/font-motoya-al/Makefile
head/japanese/font-motoya-al/files/pkg-install.in
head/japanese/font-mplus-ipa/Makefile
head/japanese/font-mplus-ipa/files/pkg-install.in
head/japanese/font-ricty/Makefile
head/japanese/font-sazanami/Makefile
head/japanese/font-sazanami/files/pkg-install.in
head/japanese/font-shinonome/Makefile
head/japanese/font-takao/Makefile
head/japanese/font-takao/files/pkg-install.in
head/japanese/font-ume/Makefile
head/japanese/font-ume/files/pkg-install.in
head/japanese/font-vlgothic/Makefile
head/japanese/font-vlgothic/files/pkg-install.in
Modified: head/japanese/font-ipa-uigothic/Makefile
==============================================================================
--- head/japanese/font-ipa-uigothic/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ipa-uigothic/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= ipa-uigothic
PORTVERSION= 00203
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/old/
PKGNAMEPREFIX= ja-font-
@@ -15,7 +15,8 @@ COMMENT= IPA Japanese fonts, UIGothic
CONFLICTS= ja-font-mplus-ipa-1.0.20060520.p1 \
ja-ipa-ttfonts-[0-9]*
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -24,7 +25,6 @@ DATADIR= ${PREFIX}/share/font-${PORTNAME
PORTDOCS= enduser_license.txt \
Readme${PORTVERSION}.txt
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
Modified: head/japanese/font-ipa/Makefile
==============================================================================
--- head/japanese/font-ipa/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ipa/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= ipa
PORTVERSION= 00303
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/
PKGNAMEPREFIX= ja-font-
@@ -13,7 +13,8 @@ COMMENT= IPA Japanese fonts
CONFLICTS= ja-ipa-ttfonts-[0-9]*
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= OTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ DATADIR= ${PREFIX}/share/font-${PORTNAME
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
Readme_IPAfont${PORTVERSION}.txt
-FONTNAME= OTF
OPTIONS_DEFINE= DOCS
post-extract:
Modified: head/japanese/font-ipaex/Makefile
==============================================================================
--- head/japanese/font-ipaex/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ipaex/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= ipaex
PORTVERSION= 00201
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
PKGNAMEPREFIX= ja-font-
@@ -11,9 +11,8 @@ DISTNAME= IPAexfont${PORTVERSION}
MAINTAINER= hrs at FreeBSD.org
COMMENT= IPAex Japanese fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= OTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -22,7 +21,6 @@ PLIST_SUB= FONTSDIR=${FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
Readme_IPAexfont${PORTVERSION}.txt
-FONTNAME= OTF
OPTIONS_DEFINE= DOCS
Modified: head/japanese/font-ipaex/files/pkg-install.in
==============================================================================
--- head/japanese/font-ipaex/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ipaex/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
Modified: head/japanese/font-ipamjm/Makefile
==============================================================================
--- head/japanese/font-ipamjm/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ipamjm/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -16,14 +16,14 @@ LICENSE_NAME= IPA Font License Agreement
LICENSE_FILE= ${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= OTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= Readme_${PORTNAME}003.01.txt
-FONTNAME= OTF
OPTIONS_DEFINE= DOCS
Modified: head/japanese/font-kochi/Makefile
==============================================================================
--- head/japanese/font-kochi/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-kochi/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -3,7 +3,7 @@
PORTNAME= kochi
PORTVERSION= 20030809
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/efont/5411/
PKGNAMEPREFIX= ja-font-
@@ -12,16 +12,14 @@ DISTNAME= ${PORTNAME}-substitute-${PORTV
MAINTAINER= hrs at FreeBSD.org
COMMENT= Kochi Japanese TrueType font
-USES= fonts tar:bzip2
+USES= fonts:fc tar:bzip2
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PLIST_SUB= DATADIR=share/font-${PORTNAME}
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-FONTNAME= TTF
PORTDOCS= README.ja COPYING docs
OPTIONS_DEFINE= DOCS
Modified: head/japanese/font-kochi/files/pkg-install.in
==============================================================================
--- head/japanese/font-kochi/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-kochi/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -6,7 +6,7 @@ catfontsdir ()
while read _IN
do
case "${_IN}" in
- *-kochi-*|[0-9]*|"") ;;
+ kochi-*|*-kochi-*|[0-9]*|"") ;;
*-aliastt-*|[0-9]*|"") ;;
*) echo ${_IN} ;;
esac
Modified: head/japanese/font-koruri/Makefile
==============================================================================
--- head/japanese/font-koruri/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-koruri/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -4,7 +4,7 @@
PORTNAME= koruri
PORTVERSION= 20150701
DISTVERSIONPREFIX= Koruri-
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
PKGNAMEPREFIX= ja-font-
DISTNAME= Koruri-${PORTVERSION}
@@ -14,7 +14,8 @@ COMMENT= Koruri Japanese TrueType fonts
LICENSE= APACHE20
-USES= fonts tar:xz
+USES= fonts:fc tar:xz
+FONTNAME= TTF
USE_GITHUB= yes
GH_ACCOUNT= Koruri
GH_PROJECT= Koruri
@@ -26,7 +27,6 @@ SUB_FILES= pkg-install
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= README.md
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -44,6 +44,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
Modified: head/japanese/font-koruri/files/pkg-install.in
==============================================================================
--- head/japanese/font-koruri/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-koruri/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -78,7 +76,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -86,7 +84,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-marumoji/Makefile
==============================================================================
--- head/japanese/font-marumoji/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-marumoji/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -3,7 +3,7 @@
PORTNAME= marumoji
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL/hrs/${PORTNAME}
PKGNAMEPREFIX= ja-font-
@@ -17,7 +17,7 @@ LICENSE_FILES= ${WRKSRC}/LICENSE
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-USES= fonts
+USES= fonts:fc
FONTNAME= marumoji
MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
SUB_FILES= Makefile pkg-install
Modified: head/japanese/font-migmix/Makefile
==============================================================================
--- head/japanese/font-migmix/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-migmix/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= migmix
PORTVERSION= 1.0.20130617
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/mix-mplus-ipa/59021
PKGNAMEPREFIX= ja-font-
@@ -14,7 +14,8 @@ DISTFILES= ${PORTNAME}-1m-${PORTVERSION:
MAINTAINER= hrs at FreeBSD.org
COMMENT= Mixed Japanese font with IPA Gothic and M-plus outline
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -23,7 +24,6 @@ DATADIR= ${PREFIX}/share/font-${PORTNAME
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
migmix-README.txt
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -50,6 +50,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-migmix/files/pkg-install.in
==============================================================================
--- head/japanese/font-migmix/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-migmix/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/TTF
-
catfontsdir ()
{
while read _IN
@@ -89,7 +87,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -97,7 +95,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-migu/Makefile
==============================================================================
--- head/japanese/font-migu/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-migu/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= migu
PORTVERSION= 1.0.20130617
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/mix-mplus-ipa/59022
PKGNAMEPREFIX= ja-font-
@@ -14,7 +14,8 @@ DISTFILES= ${PORTNAME}-1p-${PORTVERSION:
MAINTAINER= hrs at FreeBSD.org
COMMENT= Another Japanese font set based on MigMix
-USES= fonts zip
+USES= fonts:fc zip
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -23,7 +24,6 @@ DATADIR= ${PREFIX}/share/font-${PORTNAME
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
migu-README.txt
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -50,6 +50,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-migu/files/pkg-install.in
==============================================================================
--- head/japanese/font-migu/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-migu/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/TTF
-
catfontsdir ()
{
while read _IN
@@ -91,7 +89,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -99,7 +97,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-mona-ipa/Makefile
==============================================================================
--- head/japanese/font-mona-ipa/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mona-ipa/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= mona-ipa
PORTVERSION= 1.0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www.geocities.jp/ipa_mona/
PKGNAMEPREFIX= ja-font-
@@ -11,7 +11,8 @@ DISTNAME= opfc-ModuleHP-1.1.1_withIPAMon
MAINTAINER= hrs at FreeBSD.org
COMMENT= IPA Japanese TrueType fonts with Mona font
-USES= fonts
+USES= fonts:fc
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
Modified: head/japanese/font-mona-ipa/files/pkg-install.in
==============================================================================
--- head/japanese/font-mona-ipa/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mona-ipa/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -75,7 +73,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -83,7 +81,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-motoya-al/Makefile
==============================================================================
--- head/japanese/font-motoya-al/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-motoya-al/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,23 +1,24 @@
# $FreeBSD$
-PORTNAME= font-motoya-al
+PORTNAME= motoya-al
PORTVERSION= 0.0.20100921
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL/hrs
-DISTNAME= motoya-al-fonts-${PORTVERSION:S,^0.0.,,}
+PKGNAMEPREFIX= ja-font-
+DISTNAME= ${PORTNAME}-fonts-${PORTVERSION:S,^0.0.,,}
MAINTAINER= hrs at FreeBSD.org
COMMENT= Free Japanese fonts by MOTOYA
-USES= fonts tar:bzip2
+USES= fonts:fc tar:bzip2
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
PORTDOCS= newsrelease20100921.pdf
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -35,6 +36,8 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf
${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-motoya-al/files/pkg-install.in
==============================================================================
--- head/japanese/font-motoya-al/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-motoya-al/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -76,7 +74,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +82,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-mplus-ipa/Makefile
==============================================================================
--- head/japanese/font-mplus-ipa/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-ipa/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= mplus-ipa
PORTVERSION= 1.0.20060520.p1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= ja-font-
@@ -13,7 +13,8 @@ COMMENT= Mixed Japanese font with IPA, M
CONFLICTS= ja-ipa-ttfonts-[0-9]*
-USES= fonts tar:bzip2
+USES= fonts:fc tar:bzip2
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ DATADIR= ${PREFIX}/share/font-${PORTNAME
PORTDOCS= Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
Mplus-LICENSE_J.txt README.txt
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -41,6 +41,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-mplus-ipa/files/pkg-install.in
==============================================================================
--- head/japanese/font-mplus-ipa/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-ipa/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/
-
catfontsdir ()
{
while read _IN
@@ -74,7 +72,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -82,7 +80,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-ricty/Makefile
==============================================================================
--- head/japanese/font-ricty/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ricty/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -3,20 +3,19 @@
PORTNAME= ricty
PORTVERSION= 3.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
PKGNAMEPREFIX= ja-font-
MAINTAINER?= meta+ports at vmeta.jp
COMMENT?= Ricty - fonts for programming
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
BUILD_DEPENDS= ${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \
${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \
${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \
fontforge:${PORTSDIR}/print/fontforge
-USES= fonts
+USES= fonts:fc
USE_GITHUB= yes
GH_ACCOUNT= yascentur
GH_PROJECT= Ricty
Modified: head/japanese/font-sazanami/Makefile
==============================================================================
--- head/japanese/font-sazanami/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-sazanami/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= sazanami
PORTVERSION= 20040629
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/efont/10087
PKGNAMEPREFIX= ja-font-
@@ -10,7 +10,8 @@ PKGNAMEPREFIX= ja-font-
MAINTAINER= hrs at FreeBSD.org
COMMENT= Sazanami Japanese TrueType fonts
-USES= fonts tar:bzip2
+USES= fonts:fc tar:bzip2
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -18,7 +19,6 @@ SUB_FILES= pkg-install
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= README doc
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -36,7 +36,8 @@ do-install:
${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
-post-install:
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-sazanami/files/pkg-install.in
==============================================================================
--- head/japanese/font-sazanami/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-sazanami/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/
-
catfontsdir ()
{
while read _IN
@@ -73,7 +71,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -81,7 +79,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-shinonome/Makefile
==============================================================================
--- head/japanese/font-shinonome/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-shinonome/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -16,6 +16,7 @@ COMMENT= Shinonome Japanese fonts, 12/14
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
USES= fonts tar:bzip2
+FONTNAME= misc
WRKSRC= ${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
SUB_FILES= pkg-install
@@ -44,7 +45,6 @@ FONTNAMES=\
shnmk16 shnmk16b shnmk16i shnmk16bi \
shnmk16min shnmk16minb shnmk16mini shnmk16minbi
-FONTNAME= misc
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
Modified: head/japanese/font-takao/Makefile
==============================================================================
--- head/japanese/font-takao/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-takao/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= takao
PORTVERSION= 003.02.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://launchpadlibrarian.net/40218948/
PKGNAMEPREFIX= ja-font-
@@ -11,7 +11,8 @@ DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVE
MAINTAINER= hrs at FreeBSD.org
COMMENT= Improved IPA Japanese fonts
-USES= fonts
+USES= fonts:fc
+FONTNAME= OTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -22,11 +23,8 @@ PORTDOCS= IPA_Font_License_Agreement_v1.
README.ja \
ChangeLog
-FONTNAME= OTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-extract:
cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
@@ -45,6 +43,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-takao/files/pkg-install.in
==============================================================================
--- head/japanese/font-takao/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-takao/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -76,7 +74,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +82,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
Modified: head/japanese/font-ume/Makefile
==============================================================================
--- head/japanese/font-ume/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ume/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -2,7 +2,7 @@
PORTNAME= ume
PORTVERSION= 0.0.470
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= SOURCEFORGE_JP/${PORTNAME}-font/22212
PKGNAMEPREFIX= ja-font-
@@ -11,7 +11,8 @@ DISTNAME= umefont_${PORTVERSION:E}
MAINTAINER= hrs at FreeBSD.org
COMMENT= Ume Japanese TrueType fonts
-USES= fonts tar:xz
+USES= fonts:fc tar:xz
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -19,11 +20,8 @@ SUB_FILES= pkg-install
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= license.html
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
@@ -39,6 +37,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-ume/files/pkg-install.in
==============================================================================
--- head/japanese/font-ume/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-ume/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/
-
catfontsdir ()
{
while read _IN
@@ -80,7 +78,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
exec < fonts.dir; rm -f fonts.dir
(catfontsdir; addentries) > fonts.dir
@@ -90,7 +88,7 @@ POST-INSTALL)
chmod 0444 fonts.dir
;;
DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
exec < fonts.dir; rm -f fonts.dir
catfontsdir > fonts.dir
_num=`nfonts fonts.dir`
Modified: head/japanese/font-vlgothic/Makefile
==============================================================================
--- head/japanese/font-vlgothic/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-vlgothic/Makefile Sun Sep 13 23:36:45 2015 (r396873)
@@ -3,7 +3,7 @@
PORTNAME= vlgothic
PORTVERSION= 20141206
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/vlgothic/62375
PKGNAMEPREFIX= ja-font-
@@ -12,7 +12,8 @@ DISTNAME= VLGothic-${PORTVERSION}
MAINTAINER= hrs at FreeBSD.org
COMMENT= VLGothic Japanese TrueType fonts
-USES= fonts tar:xz
+USES= fonts:fc tar:xz
+FONTNAME= TTF
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ PORTDOCS= Changelog LICENSE LICENSE.en L
README README.sazanami README_J.mplus
WRKSRC= ${WRKDIR}/VLGothic
-FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
@@ -40,6 +40,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/japanese/font-vlgothic/files/pkg-install.in
==============================================================================
--- head/japanese/font-vlgothic/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-vlgothic/files/pkg-install.in Sun Sep 13 23:36:45 2015 (r396873)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/TTF
-
catfontsdir ()
{
while read _IN
@@ -72,7 +70,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -80,7 +78,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
More information about the svn-ports-all
mailing list