aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED7
-rw-r--r--japanese/Makefile15
-rw-r--r--japanese/font-ipa/Makefile54
-rw-r--r--japanese/font-ipa/distinfo6
-rw-r--r--japanese/font-ipa/files/20-unhint-ipa.conf (renamed from japanese/kochi-ttfonts/files/20-unhint-kochittfonts.conf)6
-rw-r--r--japanese/font-ipa/files/62-fonts-ipa.conf (renamed from japanese/kochi-ttfonts/files/62-fonts-kochittfonts.conf)8
-rw-r--r--japanese/font-ipa/files/62-fonts-ipattfonts.conf31
-rw-r--r--japanese/font-ipa/files/pkg-install.in27
-rw-r--r--japanese/font-ipa/pkg-descr5
-rw-r--r--japanese/font-ipa/pkg-plist126
-rw-r--r--japanese/font-kochi/Makefile31
-rw-r--r--japanese/font-kochi/files/20-unhint-kochi.conf (renamed from japanese/font-kochi/files/20-unhint-kochittfonts.conf)0
-rw-r--r--japanese/font-kochi/files/62-fonts-kochi.conf (renamed from japanese/font-kochi/files/62-fonts-kochittfonts.conf)0
-rw-r--r--japanese/font-kochi/files/pkg-install.in2
-rw-r--r--japanese/font-kochi/pkg-descr2
-rw-r--r--japanese/font-kochi/pkg-plist32
-rw-r--r--japanese/font-mplus-ipa/Makefile40
-rw-r--r--japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf23
-rw-r--r--japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf (renamed from japanese/font-ipa/files/20-unhint-ipattfonts.conf)4
-rw-r--r--japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf31
-rw-r--r--japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf (renamed from japanese/ipa-ttfonts/files/62-fonts-ipattfonts.conf)9
-rw-r--r--japanese/font-mplus-ipa/files/pkg-install.in12
-rw-r--r--japanese/font-mplus-ipa/pkg-descr4
-rw-r--r--japanese/font-mplus-ipa/pkg-plist60
-rw-r--r--japanese/font-mplus/Makefile103
-rw-r--r--japanese/font-mplus/distinfo3
-rw-r--r--japanese/font-mplus/files/20-unhint-mplus.conf (renamed from japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf)9
-rw-r--r--japanese/font-mplus/files/62-fonts-mplus.conf (renamed from japanese/vlgothic/files/62-fonts-vlgothic.conf)9
-rw-r--r--japanese/font-mplus/files/patch-install_mplus_fonts41
-rw-r--r--japanese/font-mplus/files/pkg-install.in123
-rw-r--r--japanese/font-mplus/pkg-descr5
-rw-r--r--japanese/font-mplus/pkg-plist311
-rw-r--r--japanese/font-mplus/pkg-req45
-rw-r--r--japanese/font-sazanami/Makefile30
-rw-r--r--japanese/font-sazanami/files/20-unhint-sazanami.conf (renamed from japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf)0
-rw-r--r--japanese/font-sazanami/files/62-fonts-sazanami.conf (renamed from japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf)0
-rw-r--r--japanese/font-sazanami/files/pkg-install.in2
-rw-r--r--japanese/font-sazanami/pkg-plist32
-rw-r--r--japanese/font-shinonome/Makefile70
-rw-r--r--japanese/font-shinonome/files/pkg-install.in41
-rw-r--r--japanese/font-shinonome/pkg-plist281
-rw-r--r--japanese/font-shinonome/pkg-req43
-rw-r--r--japanese/font-ume/Makefile31
-rw-r--r--japanese/font-ume/files/20-unhint-ume.conf (renamed from japanese/font-ume/files/20-unhint-umefont.conf)0
-rw-r--r--japanese/font-ume/files/62-fonts-ume.conf (renamed from japanese/font-ume/files/62-fonts-umefont.conf)0
-rw-r--r--japanese/font-ume/files/pkg-install.in2
-rw-r--r--japanese/font-ume/pkg-plist72
-rw-r--r--japanese/font-vlgothic/Makefile19
-rw-r--r--japanese/font-vlgothic/distinfo6
-rw-r--r--japanese/font-vlgothic/files/pkg-install.in2
-rw-r--r--japanese/font-vlgothic/pkg-plist20
-rw-r--r--japanese/ipa-ttfonts/Makefile65
-rw-r--r--japanese/ipa-ttfonts/distinfo3
-rw-r--r--japanese/ipa-ttfonts/files/20-unhint-ipattfonts.conf23
-rw-r--r--japanese/ipa-ttfonts/files/pkg-install.in101
-rw-r--r--japanese/ipa-ttfonts/pkg-descr5
-rw-r--r--japanese/ipa-ttfonts/pkg-plist105
-rw-r--r--japanese/kochi-ttfonts/Makefile64
-rw-r--r--japanese/kochi-ttfonts/distinfo3
-rw-r--r--japanese/kochi-ttfonts/files/pkg-install.in94
-rw-r--r--japanese/kochi-ttfonts/pkg-descr3
-rw-r--r--japanese/kochi-ttfonts/pkg-plist21
-rw-r--r--japanese/mplusfonts/Makefile55
-rw-r--r--japanese/mplusfonts/distinfo3
-rw-r--r--japanese/mplusfonts/files/patch-install_mplus_fonts30
-rw-r--r--japanese/mplusfonts/pkg-descr7
-rw-r--r--japanese/mplusfonts/pkg-plist54
-rw-r--r--japanese/mplusfonts/pkg-req45
-rw-r--r--japanese/sazanami-ttf/Makefile61
-rw-r--r--japanese/sazanami-ttf/distinfo3
-rw-r--r--japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf24
-rw-r--r--japanese/sazanami-ttf/files/pkg-install.in90
-rw-r--r--japanese/sazanami-ttf/pkg-descr3
-rw-r--r--japanese/sazanami-ttf/pkg-plist21
-rw-r--r--japanese/shinonome/Makefile78
-rw-r--r--japanese/shinonome/distinfo3
-rw-r--r--japanese/shinonome/pkg-descr3
-rw-r--r--japanese/shinonome/pkg-plist84
-rw-r--r--japanese/shinonome/pkg-req43
-rw-r--r--japanese/umefont/Makefile58
-rw-r--r--japanese/umefont/distinfo3
-rw-r--r--japanese/umefont/files/20-unhint-umefont.conf24
-rw-r--r--japanese/umefont/files/62-fonts-umefont.conf39
-rw-r--r--japanese/umefont/files/pkg-install.in101
-rw-r--r--japanese/umefont/pkg-descr3
-rw-r--r--japanese/umefont/pkg-plist51
-rw-r--r--japanese/vlgothic/Makefile61
-rw-r--r--japanese/vlgothic/distinfo3
-rw-r--r--japanese/vlgothic/files/20-unhint-vlgothic.conf14
-rw-r--r--japanese/vlgothic/files/pkg-install.in89
-rw-r--r--japanese/vlgothic/pkg-descr3
-rw-r--r--japanese/vlgothic/pkg-plist21
92 files changed, 1047 insertions, 2352 deletions
diff --git a/MOVED b/MOVED
index fbc539ff0482..c680c8291849 100644
--- a/MOVED
+++ b/MOVED
@@ -3962,3 +3962,10 @@ net/ntp-rc|net/ntp|2009-05-22|NTP is no longer in release candidate status. Use
misc/sonytv||2009-05-28|Has expired: tcl8.3 support is going to be dropped
mail/postilion||2009-05-28|Has expired: tcl8.3 support is going to be dropped
x11-toolkits/p5-TclTk||2009-05-28|Has expired: replaced by x11-toolkits/p5-Tcl-Tk
+japanese/ipa-ttfonts|japanese/font-ipa|2009-05-30|Renamed
+japanese/sazanami-ttf|japanese/font-sazanami|2009-05-30|Renamed
+japanese/kochi-ttfonts|japanese/font-kochi|2009-05-30|Renamed
+japanese/umefont|japanese/font-ume|2009-05-30|Renamed
+japanese/mplusfonts|japanese/font-mplus|2009-05-30|Renamed
+japanese/vlgothic|japanese/font-vlgothic|2009-05-30|Renamed
+japanese/shinonome|japanese/font-shinonome|2009-05-30|Renamed
diff --git a/japanese/Makefile b/japanese/Makefile
index 2db2778ecbf6..fc13a4f95c8f 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -74,6 +74,14 @@
SUBDIR += flex-sdk
SUBDIR += flower-fpw
SUBDIR += foldoc-fpw
+ SUBDIR += font-ipa
+ SUBDIR += font-kochi
+ SUBDIR += font-mplus
+ SUBDIR += font-mplus-ipa
+ SUBDIR += font-sazanami
+ SUBDIR += font-shinonome
+ SUBDIR += font-ume
+ SUBDIR += font-vlgothic
SUBDIR += freepwing
SUBDIR += fumeikai-fpw
SUBDIR += gawk
@@ -95,7 +103,6 @@
SUBDIR += iiimf-le-canna
SUBDIR += iiimf-le-freewnn
SUBDIR += im-ja
- SUBDIR += ipa-ttfonts
SUBDIR += ipadic
SUBDIR += ircII
SUBDIR += ja6
@@ -132,7 +139,6 @@
SUBDIR += kde4-l10n
SUBDIR += kdrill
SUBDIR += kinput2
- SUBDIR += kochi-ttfonts
SUBDIR += koffice-i18n
SUBDIR += kon2-14dot
SUBDIR += kon2-16dot
@@ -177,7 +183,6 @@
SUBDIR += monafonts
SUBDIR += monafonts-ttf
SUBDIR += mozilla-jlp
- SUBDIR += mplusfonts
SUBDIR += mtools
SUBDIR += multiskkserv
SUBDIR += mutt
@@ -284,7 +289,6 @@
SUBDIR += rxvt
SUBDIR += ryaku-fpw
SUBDIR += samba3
- SUBDIR += sazanami-ttf
SUBDIR += scim-anthy
SUBDIR += scim-canna
SUBDIR += scim-honoka
@@ -297,7 +301,6 @@
SUBDIR += scim-uim
SUBDIR += seaside
SUBDIR += sed
- SUBDIR += shinonome
SUBDIR += sj3-lib
SUBDIR += sj3-server
SUBDIR += skk
@@ -339,11 +342,9 @@
SUBDIR += uim-canna
SUBDIR += uim-prime
SUBDIR += uim-tomoe-gtk
- SUBDIR += umefont
SUBDIR += vera-fpw
SUBDIR += vflib
SUBDIR += vftool
- SUBDIR += vlgothic
SUBDIR += w3m
SUBDIR += w3m-img
SUBDIR += waeijiro-fpw
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 6b7aea5a8407..a4d360edd81d 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -1,25 +1,21 @@
-# New ports collection makefile for: IPA TrueType fonts
-# Date created: 18 July 2004
-# Whom: NAKATA, Maho <maho@FreeBSD.org>
-#
+# New ports collection makefile for: font-ipa
+# Date created: 26 April 2009
+# Whom: hrs
# $FreeBSD$
#
-PORTNAME= ipa-ttfonts
-PORTVERSION= 1.0.20060520.p1
-PORTREVISION= 2
-PORTEPOCH= 2
+PORTNAME= font-ipa
+PORTVERSION= 00301
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
-DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1
+MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/
+DISTNAME= IPAfont${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= IPA Japanese TrueType fonts with M-plus outline font
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_BZIP2= yes
+USE_ZIP= yes
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@@ -27,39 +23,37 @@ SUB_FILES= pkg-install
SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS= Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
- Mplus-LICENSE_J.txt README.txt
+PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
+ Readme${PORTVERSION}.txt
LOCAL_FONTSDIR= share/fonts
X_FONTSDIR= lib/X11/fonts
do-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
- ${DATADIR}
- ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+ ${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR}
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF
${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${DATADIR}/ipa*.otf \
+ ${LOCALBASE}/${LOCAL_FONTSDIR}/OTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/OTF
${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
- ${FILESDIR}/62-fonts-ipattfonts.conf \
+ ${DATADIR}/ipa*.otf \
+ ${LOCALBASE}/${X_FONTSDIR}/OTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipa.conf \
+ ${FILESDIR}/62-fonts-ipa.conf \
${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
- ${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+ ${LN} -s -f ../conf.avail/20-unhint-ipa.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-ipa.conf
+ ${LN} -s -f ../conf.avail/62-fonts-ipa.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-ipa.conf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/OTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-ipa/distinfo b/japanese/font-ipa/distinfo
index 5d37643203d8..833f2562c89f 100644
--- a/japanese/font-ipa/distinfo
+++ b/japanese/font-ipa/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = fba1e3d9eed12c364ea56ec18025d826
-SHA256 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = c1cb93f64c1aa3287078ff7a7afa06d37279af83f7592a64dee669de7dd1f923
-SIZE (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = 16767116
+MD5 (IPAfont00301.zip) = 30507ad52137a0fe9fa29e90c349ff55
+SHA256 (IPAfont00301.zip) = f3df7527dec37e1d8fcd34c5e0b46797372321f4a0ba15b902a145f78bd7e4cc
+SIZE (IPAfont00301.zip) = 10255237
diff --git a/japanese/kochi-ttfonts/files/20-unhint-kochittfonts.conf b/japanese/font-ipa/files/20-unhint-ipa.conf
index 262064b7132d..e64965400774 100644
--- a/japanese/kochi-ttfonts/files/20-unhint-kochittfonts.conf
+++ b/japanese/font-ipa/files/20-unhint-ipa.conf
@@ -4,8 +4,10 @@
<fontconfig>
<match target="font">
<test name="family">
- <string>Kochi Mincho</string>
- <string>Kochi Gothic</string>
+ <string>IPAMincho</string>
+ <string>IPAGothic</string>
+ <string>IPAPMincho</string>
+ <string>IPAPGothic</string>
</test>
<edit name="autohint">
<bool>false</bool>
diff --git a/japanese/kochi-ttfonts/files/62-fonts-kochittfonts.conf b/japanese/font-ipa/files/62-fonts-ipa.conf
index 99f3ff0746bc..e6669158b188 100644
--- a/japanese/kochi-ttfonts/files/62-fonts-kochittfonts.conf
+++ b/japanese/font-ipa/files/62-fonts-ipa.conf
@@ -5,20 +5,20 @@
<alias>
<family>serif</family>
<prefer>
- <family>Kochi Mincho</family>
+ <family>IPAPMincho</family>
</prefer>
</alias>
<alias>
<family>sans-serif</family>
<prefer>
- <family>Kochi Gothic</family>
+ <family>IPAPGothic</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
- <family>Kochi Mincho</family>
- <family>Kochi Gothic</family>
+ <family>IPAGothic</family>
+ <family>IPAMincho</family>
</prefer>
</alias>
</fontconfig>
diff --git a/japanese/font-ipa/files/62-fonts-ipattfonts.conf b/japanese/font-ipa/files/62-fonts-ipattfonts.conf
deleted file mode 100644
index 6f433bc8d232..000000000000
--- a/japanese/font-ipa/files/62-fonts-ipattfonts.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>IPAPMincho</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>IPAPGothic</family>
- <family>IPAUIGothic</family>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>IPAGothic</family>
- <family>IPAMincho</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </prefer>
- </alias>
-</fontconfig>
diff --git a/japanese/font-ipa/files/pkg-install.in b/japanese/font-ipa/files/pkg-install.in
index 6a1cdc6f8554..5532f169b572 100644
--- a/japanese/font-ipa/files/pkg-install.in
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -1,13 +1,14 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/OTF
catfontsdir ()
{
while read _IN
do
case "${_IN}" in
+ *-ipa-IPAUI*|*-ipa-[MU]*) echo ${_IN} ;;
*-ipa-*|[0-9]*|"") ;;
*) echo ${_IN} ;;
esac
@@ -58,22 +59,14 @@ addentries ()
{
for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
do
- make_xlfd $ENC ipag.ttf ipa IPAGothic c
- make_xlfd $ENC ipag.ttf ipa gothic c
- make_xlfd $ENC ipagp.ttf ipa IPAPGothic p
- make_xlfd $ENC ipagp.ttf ipa gothic p
- make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
- make_xlfd $ENC ipagui.ttf ipa UIGothic c
- make_xlfd $ENC ipam.ttf ipa IPAMincho c
- make_xlfd $ENC ipam.ttf ipa mincho c
- make_xlfd $ENC ipamp.ttf ipa IPAPMincho p
- make_xlfd $ENC ipamp.ttf ipa mincho p
- make_xlfd $ENC M+2VM+IPAG-circle.ttf ipa M+2VM+IPAG_circle c
- make_xlfd $ENC M+1VM+IPAG-circle.ttf ipa M+1VM+IPAG_circle c
- make_xlfd $ENC M+1P+IPAG.ttf ipa M+1P+IPAG p
- make_xlfd $ENC M+1P+IPAG-circle.ttf ipa M+1P+IPAG_circle p
- make_xlfd $ENC M+2P+IPAG.ttf ipa M+2P+IPAG p
- make_xlfd $ENC M+2P+IPAG-circle.ttf ipa M+2P+IPAG_circle p
+ make_xlfd $ENC ipag.otf ipa IPAGothic c
+ make_xlfd $ENC ipag.otf ipa gothic c
+ make_xlfd $ENC ipagp.otf ipa IPAPGothic p
+ make_xlfd $ENC ipagp.otf ipa gothic p
+ make_xlfd $ENC ipam.otf ipa IPAMincho c
+ make_xlfd $ENC ipam.otf ipa mincho c
+ make_xlfd $ENC ipamp.otf ipa IPAPMincho p
+ make_xlfd $ENC ipamp.otf ipa mincho p
done
}
diff --git a/japanese/font-ipa/pkg-descr b/japanese/font-ipa/pkg-descr
index 6a4e55edc148..da48e72b8067 100644
--- a/japanese/font-ipa/pkg-descr
+++ b/japanese/font-ipa/pkg-descr
@@ -1,5 +1,4 @@
Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA) Japan. M+ outline font and Bitstream Vera Sans Mono font
-composite versions included.
+Agency (IPA) Japan.
-WWW: http://mix-mplus-ipa.sourceforge.jp/
+WWW: http://ossipedia.ipa.go.jp/ipafont/index.html
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index c759c2934668..42e35c74d8e1 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,105 +1,27 @@
@comment $FreeBSD$
-%%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
-@dirrm %%DATADIR%%/ppd
-@dirrm %%DATADIR%%/opvp
-@dirrm %%DATADIR%%/libopvp/doc
-@dirrm %%DATADIR%%/libopvp
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/doc
+%%DATADIR%%/ipamp.otf
+%%DATADIR%%/ipam.otf
+%%DATADIR%%/ipagp.otf
+%%DATADIR%%/ipag.otf
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/OTF/ipag.otf
+%%LOCAL_FONTSDIR%%/OTF/ipagp.otf
+%%LOCAL_FONTSDIR%%/OTF/ipam.otf
+%%LOCAL_FONTSDIR%%/OTF/ipamp.otf
+@dirrmtry %%LOCAL_FONTSDIR%%/OTF
@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-ipattfonts.conf
-etc/fonts/conf.avail/62-fonts-ipattfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-%%X_FONTSDIR%%/TrueType/ipag.ttf
-%%X_FONTSDIR%%/TrueType/ipagp.ttf
-%%X_FONTSDIR%%/TrueType/ipagui.ttf
-%%X_FONTSDIR%%/TrueType/ipam.ttf
-%%X_FONTSDIR%%/TrueType/ipamp.ttf
-%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+etc/fonts/conf.avail/20-unhint-ipa.conf
+etc/fonts/conf.avail/62-fonts-ipa.conf
+@exec ln -s -f ../conf.avail/20-unhint-ipa.conf %D/etc/fonts/conf.d/20-unhint-ipat.conf
+@exec ln -s -f ../conf.avail/62-fonts-ipa.conf %D/etc/fonts/conf.d/62-fonts-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipa.conf
+%%X_FONTSDIR%%/OTF/ipag.otf
+%%X_FONTSDIR%%/OTF/ipagp.otf
+%%X_FONTSDIR%%/OTF/ipam.otf
+%%X_FONTSDIR%%/OTF/ipamp.otf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/OTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/OTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/OTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/OTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/OTF ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/OTF || true; fi
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index d9889af7e169..b0e27728b581 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -5,22 +5,20 @@
# $FreeBSD$
#
-PORTNAME= kochi-ttfonts
+PORTNAME= font-kochi
PORTVERSION= 20030809
-PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \
${MASTER_SITE_PORTS_JP}
-DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2
+DISTNAME= kochi-substitute-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'Kochi'
+COMMENT= Kochi Japanese TrueType font
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
USE_BZIP2= yes
NO_BUILD= yes
-
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
@@ -37,28 +35,27 @@ PORTDOCS= README.ja COPYING docs
do-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+ ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-kochittfonts.conf \
- ${FILESDIR}/62-fonts-kochittfonts.conf \
+ ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-kochi.conf \
+ ${FILESDIR}/62-fonts-kochi.conf \
${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-kochittfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-kochittfonts.conf
- ${LN} -s -f ../conf.avail/62-fonts-kochittfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-kochittfonts.conf
+ ${LN} -s -f ../conf.avail/20-unhint-kochi.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-kochi.conf
+ ${LN} -s -f ../conf.avail/62-fonts-kochi.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-kochi.conf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-kochi/files/20-unhint-kochittfonts.conf b/japanese/font-kochi/files/20-unhint-kochi.conf
index 262064b7132d..262064b7132d 100644
--- a/japanese/font-kochi/files/20-unhint-kochittfonts.conf
+++ b/japanese/font-kochi/files/20-unhint-kochi.conf
diff --git a/japanese/font-kochi/files/62-fonts-kochittfonts.conf b/japanese/font-kochi/files/62-fonts-kochi.conf
index 99f3ff0746bc..99f3ff0746bc 100644
--- a/japanese/font-kochi/files/62-fonts-kochittfonts.conf
+++ b/japanese/font-kochi/files/62-fonts-kochi.conf
diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in
index e054af6696b9..97ab380f2c71 100644
--- a/japanese/font-kochi/files/pkg-install.in
+++ b/japanese/font-kochi/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
catfontsdir ()
{
diff --git a/japanese/font-kochi/pkg-descr b/japanese/font-kochi/pkg-descr
index ef9292d08935..e9231235661d 100644
--- a/japanese/font-kochi/pkg-descr
+++ b/japanese/font-kochi/pkg-descr
@@ -1,3 +1,3 @@
Free Japanese TrueType fonts named 'Kochi Mincho' and 'Kochi Gothic'.
-WWW: http://www.on.cs.keio.ac.jp/~yasu/jp_fonts.html
+WWW: http://wiki.fdiary.net/font/?kochi-alternative
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index abe8bc150fad..5bcd6a9bdd4c 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -2,20 +2,20 @@
%%DATADIR%%/kochi-mincho-subst.ttf
%%DATADIR%%/kochi-gothic-subst.ttf
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%LOCAL_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
+%%LOCAL_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-kochittfonts.conf
-etc/fonts/conf.avail/62-fonts-kochittfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-kochittfonts.conf %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-kochittfonts.conf %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-%%X_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%X_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+etc/fonts/conf.avail/20-unhint-kochi.conf
+etc/fonts/conf.avail/62-fonts-kochi.conf
+@exec ln -s -f ../conf.avail/20-unhint-kochi.conf %D/etc/fonts/conf.d/20-unhint-kochi.conf
+@exec ln -s -f ../conf.avail/62-fonts-kochi.conf %D/etc/fonts/conf.d/62-fonts-kochi.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochi.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochi.conf
+%%X_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
+%%X_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 6b7aea5a8407..5ffe0034af8c 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -1,21 +1,19 @@
-# New ports collection makefile for: IPA TrueType fonts
-# Date created: 18 July 2004
-# Whom: NAKATA, Maho <maho@FreeBSD.org>
+# New ports collection makefile for: font-mplus-ipa fonts
+# Date created: 26 April 2009
+# Whom: hrs
#
# $FreeBSD$
#
-PORTNAME= ipa-ttfonts
+PORTNAME= font-mplus-ipa
PORTVERSION= 1.0.20060520.p1
-PORTREVISION= 2
-PORTEPOCH= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hrs
DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1
MAINTAINER= hrs@FreeBSD.org
-COMMENT= IPA Japanese TrueType fonts with M-plus outline font
+COMMENT= Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
@@ -38,28 +36,26 @@ do-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
${DATADIR}
- ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
- ${FILESDIR}/62-fonts-ipattfonts.conf \
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+ ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+ ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus-ipa.conf \
+ ${FILESDIR}/62-fonts-mplus-ipa.conf \
${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
- ${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+ ${LN} -s -f ../conf.avail/20-unhint-mplus-ipa.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+ ${LN} -s -f ../conf.avail/62-fonts-mplus-ipa.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
deleted file mode 100644
index d5d14d634b35..000000000000
--- a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <match target="font">
- <test name="family">
- <string>IPAMincho</string>
- <string>IPAGothic</string>
- <string>IPAPMincho</string>
- <string>IPAPGothic</string>
- <string>IPAUIGothic</string>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </test>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- </match>
-</fontconfig>
diff --git a/japanese/font-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
index d5d14d634b35..1a1142a6f107 100644
--- a/japanese/font-ipa/files/20-unhint-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
@@ -4,10 +4,6 @@
<fontconfig>
<match target="font">
<test name="family">
- <string>IPAMincho</string>
- <string>IPAGothic</string>
- <string>IPAPMincho</string>
- <string>IPAPGothic</string>
<string>IPAUIGothic</string>
<family>M+1P+IPAG</family>
<family>M+2P+IPAG</family>
diff --git a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf b/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
deleted file mode 100644
index 6f433bc8d232..000000000000
--- a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>IPAPMincho</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>IPAPGothic</family>
- <family>IPAUIGothic</family>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>IPAGothic</family>
- <family>IPAMincho</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </prefer>
- </alias>
-</fontconfig>
diff --git a/japanese/ipa-ttfonts/files/62-fonts-ipattfonts.conf b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
index 6f433bc8d232..1c0bb82ef3d8 100644
--- a/japanese/ipa-ttfonts/files/62-fonts-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
@@ -3,15 +3,8 @@
<!-- $FreeBSD$ -->
<fontconfig>
<alias>
- <family>serif</family>
- <prefer>
- <family>IPAPMincho</family>
- </prefer>
- </alias>
- <alias>
<family>sans-serif</family>
<prefer>
- <family>IPAPGothic</family>
<family>IPAUIGothic</family>
<family>M+1P+IPAG</family>
<family>M+2P+IPAG</family>
@@ -22,8 +15,6 @@
<alias>
<family>monospace</family>
<prefer>
- <family>IPAGothic</family>
- <family>IPAMincho</family>
<family>M+1VM+IPAG circle</family>
<family>M+2VM+IPAG circle</family>
</prefer>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 6a1cdc6f8554..2f9a85233b1f 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,14 +1,14 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
catfontsdir ()
{
while read _IN
do
case "${_IN}" in
- *-ipa-*|[0-9]*|"") ;;
+ *-ipa-[MU]*|*-ipa-IPAUI*|[0-9]*|"") ;;
*) echo ${_IN} ;;
esac
done
@@ -58,16 +58,8 @@ addentries ()
{
for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
do
- make_xlfd $ENC ipag.ttf ipa IPAGothic c
- make_xlfd $ENC ipag.ttf ipa gothic c
- make_xlfd $ENC ipagp.ttf ipa IPAPGothic p
- make_xlfd $ENC ipagp.ttf ipa gothic p
make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
make_xlfd $ENC ipagui.ttf ipa UIGothic c
- make_xlfd $ENC ipam.ttf ipa IPAMincho c
- make_xlfd $ENC ipam.ttf ipa mincho c
- make_xlfd $ENC ipamp.ttf ipa IPAPMincho p
- make_xlfd $ENC ipamp.ttf ipa mincho p
make_xlfd $ENC M+2VM+IPAG-circle.ttf ipa M+2VM+IPAG_circle c
make_xlfd $ENC M+1VM+IPAG-circle.ttf ipa M+1VM+IPAG_circle c
make_xlfd $ENC M+1P+IPAG.ttf ipa M+1P+IPAG p
diff --git a/japanese/font-mplus-ipa/pkg-descr b/japanese/font-mplus-ipa/pkg-descr
index 6a4e55edc148..bdf364f64ab8 100644
--- a/japanese/font-mplus-ipa/pkg-descr
+++ b/japanese/font-mplus-ipa/pkg-descr
@@ -1,5 +1,5 @@
+This package includes a mixed font consisting of an old version of
Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA) Japan. M+ outline font and Bitstream Vera Sans Mono font
-composite versions included.
+Agency (IPA) Japan, M+ outline font, and Bitstream Vera Sans Mono font.
WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index c759c2934668..e11428640188 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -68,38 +68,30 @@
@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/ipagui.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-ipattfonts.conf
-etc/fonts/conf.avail/62-fonts-ipattfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-%%X_FONTSDIR%%/TrueType/ipag.ttf
-%%X_FONTSDIR%%/TrueType/ipagp.ttf
-%%X_FONTSDIR%%/TrueType/ipagui.ttf
-%%X_FONTSDIR%%/TrueType/ipam.ttf
-%%X_FONTSDIR%%/TrueType/ipamp.ttf
-%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+etc/fonts/conf.avail/20-unhint-mplus-ipa.conf
+etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
+@exec ln -s -f ../conf.avail/20-unhint-mplus-ipa.conf %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+@exec ln -s -f ../conf.avail/62-fonts-mplus-ipa.conf %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
+%%X_FONTSDIR%%/TTF/ipagui.ttf
+%%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi
diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index 607f4b443bd3..66d46acdb312 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -5,51 +5,84 @@
# $FreeBSD$
#
-PORTNAME= mplusfonts
-PORTVERSION= 2.2.4
-PORTREVISION= 2
+PORTNAME= font-mplus
+PORTVERSION= 2.2.4.023
CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \
+MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/:bitmap \
+ http://downloads.sourceforge.jp/mplus-fonts/6650/:outline \
http://wids.net/archive/mplusfonts/distfiles/
-DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
+DISTFILES= mplus_bitmap_fonts-2.2.4${EXTRACT_SUFX}:bitmap \
+ mplus-TESTFLIGHT-023${EXTRACT_SUFX}:outline
MAINTAINER= hrs@FreeBSD.org
-COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
+COMMENT= M+ Bitmap and Outline Fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
NO_BUILD= yes
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-install
+SUB_FILES= pkg-install
+SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+ FONTSALIAS=${DATADIR}/bitmap/fonts.alias
+PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
+ LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+PATCH_WRKSRC= ${WRKDIR}/mplus_bitmap_fonts-2.2.4
-.include <bsd.port.pre.mk>
-
-DOCS= INSTALL_E LICENSE_E README_E \
- INSTALL_J LICENSE_J README_J
-
-FONTSDIR= ${PREFIX}/lib/X11/fonts/local
-PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
-
-pre-install:
- @${MKDIR} ${DOCSDIR}
-.for i in e j
- @${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
- ${DOCSDIR}/fonts.alias.${i}
- @${CAT} ${DOCSDIR}/fonts.alias.${i} >> ${DOCSDIR}/fonts.alias
-.endfor
- @${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
- ${DOCSDIR}/fonts.alias.euro
- @${CAT} ${DOCSDIR}/fonts.alias.euro >> ${DOCSDIR}/fonts.alias
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-do-install:
- cd ${WRKSRC} && \
- DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
+PORTDOCS= INSTALL_E.bitmap LICENSE_E.bitmap README_E.bitmap \
+ INSTALL_J.bitmap LICENSE_J.bitmap README_J.bitmap \
+ LICENSE_E.outline README_E.outline \
+ LICENSE_J.outline README_J.outline
+
+LOCAL_FONTSDIR= share/fonts
+X_FONTSDIR= lib/X11/fonts
+
+post-extract:
+ cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+ ${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
+ fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias
+
+pre-su-install:
+ ${MKDIR} ${DATADIR}/TTF ${DATADIR}/bitmap
+
+do-install: do-install-bitmap do-install-outline
+
+do-install-bitmap:
+ cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+ ${SETENV} DESTDIR="${DATADIR}/bitmap" \
+ ${SH} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/install_mplus_fonts
+ ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/mplus/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+
+do-install-outline:
+ ${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-023/*.ttf ${DATADIR}/TTF
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus.conf \
+ ${FILESDIR}/62-fonts-mplus.conf \
+ ${PREFIX}/etc/fonts/conf.avail
+ ${LN} -s -f ../conf.avail/20-unhint-mplus.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-mplus.conf
+ ${LN} -s -f ../conf.avail/62-fonts-mplus.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-mplus.conf
+
+post-install:
+ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+ ${MKDIR} ${DOCSDIR}
+ for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
+ ${INSTALL_DATA} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/$${F} ${DOCSDIR}/$${F}.bitmap; \
+ done
+ for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
+ ${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-023/$${F} ${DOCSDIR}/$${F}.outline; \
+ done
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/font-mplus/distinfo b/japanese/font-mplus/distinfo
index c7690848d811..7a5e9329b1ef 100644
--- a/japanese/font-mplus/distinfo
+++ b/japanese/font-mplus/distinfo
@@ -1,3 +1,6 @@
MD5 (mplus_bitmap_fonts-2.2.4.tar.gz) = a97a99acbee54976407dec828d03850c
SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
+MD5 (mplus-TESTFLIGHT-023.tar.gz) = 5f76cea2fb1800ca3a7f3f6ec5f28131
+SHA256 (mplus-TESTFLIGHT-023.tar.gz) = b7f5e02b0a8ff2d16be25e7c35c0a3b90e025594c34d4b7b3c8e68f66616750b
+SIZE (mplus-TESTFLIGHT-023.tar.gz) = 12769898
diff --git a/japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf b/japanese/font-mplus/files/20-unhint-mplus.conf
index 74fb41ee209d..790a4e756b5f 100644
--- a/japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf
+++ b/japanese/font-mplus/files/20-unhint-mplus.conf
@@ -4,8 +4,13 @@
<fontconfig>
<match target="font">
<test name="family">
- <string>Sazanami Mincho</string>
- <string>Sazanami Gothic</string>
+ <string>M+ 1c</string>
+ <string>M+ 1m</string>
+ <string>M+ 1mn</string>
+ <string>M+ 1p</string>
+ <string>M+ 2c</string>
+ <string>M+ 2m</string>
+ <string>M+ 2p</string>
</test>
<edit name="autohint">
<bool>false</bool>
diff --git a/japanese/vlgothic/files/62-fonts-vlgothic.conf b/japanese/font-mplus/files/62-fonts-mplus.conf
index 8ca1fbfeb94d..29a6b0b14cdc 100644
--- a/japanese/vlgothic/files/62-fonts-vlgothic.conf
+++ b/japanese/font-mplus/files/62-fonts-mplus.conf
@@ -5,13 +5,18 @@
<alias>
<family>sans-serif</family>
<prefer>
- <family>VL PGothic</family>
+ <family>M+ 1c</family>
+ <family>M+ 1p</family>
+ <family>M+ 2c</family>
+ <family>M+ 2p</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
- <family>VL Gothic</family>
+ <family>M+ 1m</family>
+ <family>M+ 2m</family>
+ <family>M+ 1mn</family>
</prefer>
</alias>
</fontconfig>
diff --git a/japanese/font-mplus/files/patch-install_mplus_fonts b/japanese/font-mplus/files/patch-install_mplus_fonts
index 481050c7277b..99d35f7ed5fd 100644
--- a/japanese/font-mplus/files/patch-install_mplus_fonts
+++ b/japanese/font-mplus/files/patch-install_mplus_fonts
@@ -1,5 +1,5 @@
---- install_mplus_fonts.orig Mon Aug 18 13:26:45 2003
-+++ install_mplus_fonts Mon Aug 18 13:32:03 2003
+--- install_mplus_fonts.orig 2005-03-19 23:45:12.000000000 +0900
++++ install_mplus_fonts 2009-05-14 11:07:01.000000000 +0900
@@ -29,18 +29,6 @@
@@ -19,12 +19,43 @@
# Install M+ BITMAP FONTS E
echo -e "\nInstall M+ BITMAP FONTS E (iso8859-1)..."
cd fonts_e
-@@ -55,7 +43,7 @@
+@@ -54,8 +42,6 @@
+ echo "create: $b.pcf.gz"
bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
- echo "create: fonts.alias for M+ BITMAP FONTS E"
+-echo "create: fonts.alias for M+ BITMAP FONTS E"
-cat fonts.alias > $PREFIX/fonts.alias
-+cat fonts.alias >> $PREFIX/fonts.alias
cd -
# Install M+ BITMAP FONTS EURO
+@@ -79,8 +65,6 @@
+ | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
+
+ # rm $b-euro.bdf
+- echo "create: fonts.alias for M+ BITMAP FONTS EURO"
+- cat fonts.alias >> $PREFIX/fonts.alias
+ cd -
+ fi
+
+@@ -145,8 +129,6 @@
+ done
+
+ # rm mplus_j1*b.bdf
+- echo "create: fonts.alias for M+ BITMAP FONTS J"
+- cat fonts.alias >> $PREFIX/fonts.alias
+ cd -
+ fi
+
+@@ -166,12 +148,3 @@
+ echo "ERROR: No such file !"
+ fi
+ fi
+-
+-# Finish
+-echo -e "\ncreate: fonts.dir file"
+-mkfontdir $PREFIX
+-if [ -z $DESTDIR ]; then
+- echo -n "xset fp rehash..."
+- xset fp rehash &&
+- echo " done"
+-fi
diff --git a/japanese/font-mplus/files/pkg-install.in b/japanese/font-mplus/files/pkg-install.in
new file mode 100644
index 000000000000..0db369db75c4
--- /dev/null
+++ b/japanese/font-mplus/files/pkg-install.in
@@ -0,0 +1,123 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+catfontsdir ()
+{
+ while read _IN
+ do
+ case "${_IN}" in
+ *-mplus-*|[0-9]*|"") ;;
+ *) echo ${_IN} ;;
+ esac
+ done
+}
+
+ROMA=""
+ITAL="ai=0.15"
+OBLI="ai=0.15"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+ _enc=$1
+ _file=$2
+ _vendor=$3
+ _weight=$4
+ _fname=$5
+ _poc=$6
+
+ case "${_poc}:${_enc}" in
+ p:jisx0201.1976-*) PFIX="bw=0.5" ;;
+ c:jisx0201.1976-*) PFIX="bw=0.5" ;;
+ p:*) PFIX="" ;;
+ c:*) PFIX="" ;;
+ esac
+
+ set -- "${ROMA}" r \
+ ${ITAL} i \
+ ${OBLI} o \
+ ${RITA} ri \
+ ${ROBL} ro;
+ while [ $# != 0 ]; do
+ _prefix="${PFIX}:$1"; shift
+ _variant=$1; shift
+ printf "%s:%s -%s-%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+ $_prefix $_file $_vendor $_fname $_weight $_variant $_poc $_enc
+ done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries ()
+{
+ for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
+ do
+ for W in black bold heavy light medium regular thin
+ do
+ make_xlfd $ENC mplus-1c-${W}.ttf mplus $W 1c p
+ make_xlfd $ENC mplus-2c-${W}.ttf mplus $W 2c p
+ make_xlfd $ENC mplus-1p-${W}.ttf mplus $W 1p p
+ make_xlfd $ENC mplus-2p-${W}.ttf mplus $W 2p p
+ make_xlfd $ENC mplus-1m-${W}.ttf mplus $W 1m c
+ make_xlfd $ENC mplus-1mn-${W}.ttf mplus $W 1mn c
+ make_xlfd $ENC mplus-2m-${W}.ttf mplus $W 2m c
+ done
+ done
+}
+
+nfonts ()
+{
+ _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+case "$2" in
+POST-INSTALL)
+ %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/TTF ${X_FONTSDIR}/misc
+
+ cd ${X_FONTSDIR}/TTF
+ touch fonts.dir
+ (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
+ nfonts < fonts.dir.tmp > fonts.dir
+ cat fonts.dir.tmp >> fonts.dir
+ rm -f fonts.dir.tmp
+
+ cd ${X_FONTSDIR}/misc
+ %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+ touch fonts.alias
+ grep -v -- "mplus[_-]" fonts.alias > fonts.alias.tmp
+ cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
+ rm -f fonts.alias.tmp
+ ;;
+DEINSTALL)
+ %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/TTF ${X_FONTSDIR}/misc
+ rm -f ${X_FONTSDIR}/TTF/fonts.cache-1 ${X_FONTSDIR}/misc/fonts.cache-1
+
+ cd ${X_FONTSDIR}/TTF
+ catfontsdir < fonts.dir > fonts.dir.tmp
+ nfonts < fonts.dir.tmp > fonts.dir
+ cat fonts.dir.tmp >> fonts.dir
+ rm -f fonts.dir.tmp
+
+ cd ${X_FONTSDIR}/misc
+ %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+ if [ -r ${X_FONTSDIR}/misc/fonts.dir -a `/usr/bin/wc -l < ${X_FONTSDIR}/misc/fonts.dir` = 1 ]; then
+ rm -f ${X_FONTSDIR}/misc/fonts.dir
+ fi
+ touch fonts.alias
+ grep -v -- "mplus[_-]" fonts.alias > fonts.alias.tmp
+ if [ -s fonts.alias.tmp ]; then
+ mv fonts.alias.tmp fonts.alias
+ else
+ rm -f fonts.alias.tmp fonts.alias
+ fi
+
+ for D in TTF misc
+ do
+ rmdir ${X_FONTSDIR}/${D} > /dev/null 2>&1 || true
+ if [ -d ${X_FONTSDIR}/${D} ]; then
+ %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/${D} || true
+ fi
+ done
+ ;;
+esac
diff --git a/japanese/font-mplus/pkg-descr b/japanese/font-mplus/pkg-descr
index e230ac6bb8ea..612008f0e232 100644
--- a/japanese/font-mplus/pkg-descr
+++ b/japanese/font-mplus/pkg-descr
@@ -1,7 +1,4 @@
M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
-WWW: http://mplus-fonts.sourceforge.jp/
-
---
-H.Miyamoto <Ys@PixyGarden.net>
+WWW: http://mplus-fonts.sourceforge.jp/
diff --git a/japanese/font-mplus/pkg-plist b/japanese/font-mplus/pkg-plist
index 3b704b874050..5ce6bde6fda6 100644
--- a/japanese/font-mplus/pkg-plist
+++ b/japanese/font-mplus/pkg-plist
@@ -1,54 +1,257 @@
-%%FONTSDIR%%/mplus_f10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_f10b.pcf.gz
-%%FONTSDIR%%/mplus_f10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_f10r.pcf.gz
-%%FONTSDIR%%/mplus_f12b-euro.pcf.gz
-%%FONTSDIR%%/mplus_f12b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_f12b.pcf.gz
-%%FONTSDIR%%/mplus_f12r-euro.pcf.gz
-%%FONTSDIR%%/mplus_f12r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_f12r.pcf.gz
-%%FONTSDIR%%/mplus_h10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_h10b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h10b.pcf.gz
-%%FONTSDIR%%/mplus_h10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_h10r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h10r.pcf.gz
-%%FONTSDIR%%/mplus_h12b-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h12b.pcf.gz
-%%FONTSDIR%%/mplus_h12r-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h12r.pcf.gz
-%%FONTSDIR%%/mplus_h12rw-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12rw.pcf.gz
-%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
-%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_j10b.pcf.gz
-%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
-%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_j10r.pcf.gz
-%%FONTSDIR%%/mplus_j12b.pcf.gz
-%%FONTSDIR%%/mplus_j12r.pcf.gz
-%%FONTSDIR%%/mplus_q06r-euro.pcf.gz
-%%FONTSDIR%%/mplus_q06r.pcf.gz
-%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_s10b.pcf.gz
-%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_s10r.pcf.gz
-%%DOCSDIR%%/fonts.alias
-%%DOCSDIR%%/fonts.alias.e
-%%DOCSDIR%%/fonts.alias.j
-%%DOCSDIR%%/fonts.alias.euro
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_E
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_J
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_E
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
-%%PORTDOCS%%%%DOCSDIR%%/README_E
-%%PORTDOCS%%%%DOCSDIR%%/README_J
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
+@comment $FreeBSD$
+%%DATADIR%%/bitmap/mplus_f10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12rw-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12rw.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b-iso.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r-iso.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_j12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_j12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_q06r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_q06r.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10r.pcf.gz
+%%DATADIR%%/bitmap/fonts.alias
+%%DATADIR%%/TTF/mplus-1c-black.ttf
+%%DATADIR%%/TTF/mplus-1c-bold.ttf
+%%DATADIR%%/TTF/mplus-1c-heavy.ttf
+%%DATADIR%%/TTF/mplus-1c-light.ttf
+%%DATADIR%%/TTF/mplus-1c-medium.ttf
+%%DATADIR%%/TTF/mplus-1c-regular.ttf
+%%DATADIR%%/TTF/mplus-1c-thin.ttf
+%%DATADIR%%/TTF/mplus-1m-bold.ttf
+%%DATADIR%%/TTF/mplus-1m-light.ttf
+%%DATADIR%%/TTF/mplus-1m-medium.ttf
+%%DATADIR%%/TTF/mplus-1m-regular.ttf
+%%DATADIR%%/TTF/mplus-1m-thin.ttf
+%%DATADIR%%/TTF/mplus-1mn-bold.ttf
+%%DATADIR%%/TTF/mplus-1mn-light.ttf
+%%DATADIR%%/TTF/mplus-1mn-medium.ttf
+%%DATADIR%%/TTF/mplus-1mn-regular.ttf
+%%DATADIR%%/TTF/mplus-1mn-thin.ttf
+%%DATADIR%%/TTF/mplus-1p-black.ttf
+%%DATADIR%%/TTF/mplus-1p-bold.ttf
+%%DATADIR%%/TTF/mplus-1p-heavy.ttf
+%%DATADIR%%/TTF/mplus-1p-light.ttf
+%%DATADIR%%/TTF/mplus-1p-medium.ttf
+%%DATADIR%%/TTF/mplus-1p-regular.ttf
+%%DATADIR%%/TTF/mplus-1p-thin.ttf
+%%DATADIR%%/TTF/mplus-2c-black.ttf
+%%DATADIR%%/TTF/mplus-2c-bold.ttf
+%%DATADIR%%/TTF/mplus-2c-heavy.ttf
+%%DATADIR%%/TTF/mplus-2c-light.ttf
+%%DATADIR%%/TTF/mplus-2c-medium.ttf
+%%DATADIR%%/TTF/mplus-2c-regular.ttf
+%%DATADIR%%/TTF/mplus-2c-thin.ttf
+%%DATADIR%%/TTF/mplus-2m-bold.ttf
+%%DATADIR%%/TTF/mplus-2m-light.ttf
+%%DATADIR%%/TTF/mplus-2m-medium.ttf
+%%DATADIR%%/TTF/mplus-2m-regular.ttf
+%%DATADIR%%/TTF/mplus-2m-thin.ttf
+%%DATADIR%%/TTF/mplus-2p-black.ttf
+%%DATADIR%%/TTF/mplus-2p-bold.ttf
+%%DATADIR%%/TTF/mplus-2p-heavy.ttf
+%%DATADIR%%/TTF/mplus-2p-light.ttf
+%%DATADIR%%/TTF/mplus-2p-medium.ttf
+%%DATADIR%%/TTF/mplus-2p-regular.ttf
+%%DATADIR%%/TTF/mplus-2p-thin.ttf
+@dirrm %%DATADIR%%/bitmap
+@dirrm %%DATADIR%%/TTF
+@dirrm %%DATADIR%%
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12rw-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12rw.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b-iso.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r-iso.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_q06r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_q06r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10r.pcf.gz
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-thin.ttf
+@dirrm %%LOCAL_FONTSDIR%%/mplus
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
+@dirrmtry %%LOCAL_FONTSDIR%%
+etc/fonts/conf.avail/20-unhint-mplus.conf
+etc/fonts/conf.avail/62-fonts-mplus.conf
+@exec ln -s -f ../conf.avail/20-unhint-mplus.conf %D/etc/fonts/conf.d/20-unhint-mplust.conf
+@exec ln -s -f ../conf.avail/62-fonts-mplus.conf %D/etc/fonts/conf.d/62-fonts-mplus.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus.conf
+%%X_FONTSDIR%%/misc/mplus_f10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12rw-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12rw.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b-iso.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r-iso.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_q06r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_q06r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10r.pcf.gz
+%%X_FONTSDIR%%/TTF/mplus-1c-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-thin.ttf
diff --git a/japanese/font-mplus/pkg-req b/japanese/font-mplus/pkg-req
deleted file mode 100644
index db7c015cbf8b..000000000000
--- a/japanese/font-mplus/pkg-req
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
- exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
- exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
- echo '**********************************************************************'
- echo "****** ${FONTDIR}/ doesn't exist."
- echo "****** Creating ${FONTDIR}/"
- echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
- echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
- echo '**********************************************************************'
- mkdir ${FONTDIR}
-fi
-
-grepv() {
- awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
- # font alias entry here!
- TMPFILE=/tmp/install-fonts-alias-$$
- for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
- cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
- done
- echo "Updating ${FONTDIR}/fonts.alias"
- cd ${FONTDIR}
- touch fonts.alias
- cp fonts.alias fonts.alias.orig
- grepv ${TMPFILE} fonts.alias.orig > fonts.alias
- rm -f fonts.alias.orig ${TMPFILE}
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index 8b5814b6c5ce..eeea628b1b34 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -5,16 +5,15 @@
# $FreeBSD$
#
-PORTNAME= sazanami-ttf
+PORTNAME= font-sazanami
PORTVERSION= 20040629
-PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= efont/10087
-DISTNAME= ${PORTNAME:S/-ttf$//}-${PORTVERSION}
+DISTNAME= ${PORTNAME:C/font-//}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'Sazanami'
+COMMENT= Sazanami Japanese TrueType fonts
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
@@ -34,28 +33,27 @@ X_FONTSDIR= lib/X11/fonts
do-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+ ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami-ttf.conf \
- ${FILESDIR}/62-fonts-sazanami-ttf.conf \
+ ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami.conf \
+ ${FILESDIR}/62-fonts-sazanami.conf \
${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-sazanami-ttf.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
- ${LN} -s -f ../conf.avail/62-fonts-sazanami-ttf.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+ ${LN} -s -f ../conf.avail/20-unhint-sazanami.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami.conf
+ ${LN} -s -f ../conf.avail/62-fonts-sazanami.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami.conf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf b/japanese/font-sazanami/files/20-unhint-sazanami.conf
index 74fb41ee209d..74fb41ee209d 100644
--- a/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf
+++ b/japanese/font-sazanami/files/20-unhint-sazanami.conf
diff --git a/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf b/japanese/font-sazanami/files/62-fonts-sazanami.conf
index 741690d0e5fd..741690d0e5fd 100644
--- a/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf
+++ b/japanese/font-sazanami/files/62-fonts-sazanami.conf
diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in
index 957a4baf7298..2abccc27ac7e 100644
--- a/japanese/font-sazanami/files/pkg-install.in
+++ b/japanese/font-sazanami/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
catfontsdir ()
{
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index a18f0b83fe48..6440878a0cd3 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -2,20 +2,20 @@
%%DATADIR%%/sazanami-mincho.ttf
%%DATADIR%%/sazanami-gothic.ttf
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-mincho.ttf
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-gothic.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/sazanami-mincho.ttf
+%%LOCAL_FONTSDIR%%/TTF/sazanami-gothic.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-sazanami-ttf.conf
-etc/fonts/conf.avail/62-fonts-sazanami-ttf.conf
-@exec ln -s -f ../conf.avail/20-unhint-sazanami-ttf.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
-@exec ln -s -f ../conf.avail/62-fonts-sazanami-ttf.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
-%%X_FONTSDIR%%/TrueType/sazanami-mincho.ttf
-%%X_FONTSDIR%%/TrueType/sazanami-gothic.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+etc/fonts/conf.avail/20-unhint-sazanami.conf
+etc/fonts/conf.avail/62-fonts-sazanami.conf
+@exec ln -s -f ../conf.avail/20-unhint-sazanami.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/62-fonts-sazanami.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami.conf
+%%X_FONTSDIR%%/TTF/sazanami-mincho.ttf
+%%X_FONTSDIR%%/TTF/sazanami-gothic.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index d98501babfd5..284d2a10020d 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -5,28 +5,34 @@
# $FreeBSD$
#
-PORTNAME= shinonome
-PORTVERSION= 0.9.11p1
+PORTNAME= font-shinonome
+PORTVERSION= 0.9.11.p1
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
+DISTNAME= ${PORTNAME:C/^font-//}-${PORTVERSION:C/.p/p/}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Japanese 12,14,16 dot fonts
+MAINTAINER= hrs@FreeBSD.org
+COMMENT= Shinonome Japanese fonts, 12/14/16 dots
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/p.*$//}
-
+WRKSRC= ${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
USE_BZIP2= yes
+PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
+ LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+SUB_FILES= pkg-install
+SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+ FONTSALIAS=${DATADIR}/fonts.alias
+PKGINSTALL= pkg-install
+PKGDEINSTALL= pkg-install
-PLIST_SUB= FONTSDIR="${FONTSDIR_REL}"
-
-.include <bsd.port.pre.mk>
+PORTDOCS= AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
+ DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
-FONTSDIR= ${PREFIX}/lib/X11/fonts/local
-FONTSDIR_REL= ${FONTSDIR:S,^${PREFIX}/,,}
+LOCAL_FONTSDIR= share/fonts
+X_FONTSDIR= lib/X11/fonts
FONTNAMES=\
shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \
@@ -45,34 +51,28 @@ FONTNAMES=\
shnmk14min shnmk14minb shnmk14mini shnmk14minbi \
shnmk16 shnmk16b shnmk16i shnmk16bi \
shnmk16min shnmk16minb shnmk16mini shnmk16minbi
-DOCS= AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
- DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
do-build:
- @${ECHO_CMD} -n 'Compressing PCF fonts'
-.for i in ${FONTNAMES}
- @${ECHO_CMD} -n '.'
- @cd ${WRKSRC}; bdftopcf bdf/${i}.bdf | ${GZIP_CMD} > ${i}.pcf.gz
-.endfor
- @${ECHO_CMD} 'Done'
-
-pre-su-install:
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DOCSDIR}
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+ @${ECHO_CMD} -n "Compressing PCF fonts"
+ @cd ${WRKSRC} && for F in ${FONTNAMES}; do \
+ ${LOCALBASE}/bin/bdftopcf bdf/$${F}.bdf | ${GZIP_CMD} > $${F}.pcf.gz; \
+ ${ECHO_CMD} -n "."; \
+ done
+ @${ECHO_CMD} "Done"
do-install:
-# Do not use original install target since it forces to delete fonts.alias
-.for i in ${FONTNAMES}
- ${INSTALL_DATA} ${WRKSRC}/${i}.pcf.gz ${FONTSDIR}
-.endfor
- @mkfontdir ${FONTSDIR}
- @${CAT} ${DOCSDIR}/fonts.alias >> ${FONTSDIR}/fonts.alias
+ ${MKDIR} ${DATADIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias ${DATADIR}
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/shinonome
+ ${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/shinonome/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
+ ${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+
+post-install:
+ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+ ${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/font-shinonome/files/pkg-install.in b/japanese/font-shinonome/files/pkg-install.in
new file mode 100644
index 000000000000..fe75f621c96e
--- /dev/null
+++ b/japanese/font-shinonome/files/pkg-install.in
@@ -0,0 +1,41 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+case "$2" in
+POST-INSTALL)
+ %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/misc
+ cd ${X_FONTSDIR}/misc
+ %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+ touch fonts.alias
+ grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
+ cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
+ rm -f fonts.alias.tmp
+ ;;
+DEINSTALL)
+ %%LOCALBASE%%/bin/fc-cache -f -v ${X_FONTSDIR}/misc
+ rm -f ${X_FONTSDIR}/misc/fonts.cache-1
+
+ cd ${X_FONTSDIR}/misc
+ %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+ if [ -r ${X_FONTSDIR}/misc/fonts.dir -a `/usr/bin/wc -l < ${X_FONTSDIR}/misc/fonts.dir` = 1 ]; then
+ rm -f ${X_FONTSDIR}/misc/fonts.dir
+ fi
+ touch fonts.alias
+ grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
+ if [ -s fonts.alias.tmp ]; then
+ mv fonts.alias.tmp fonts.alias
+ else
+ rm -f fonts.alias.tmp fonts.alias
+ fi
+
+ for D in misc
+ do
+ rmdir ${X_FONTSDIR}/${D} > /dev/null 2>&1 || true
+ if [ -d ${X_FONTSDIR}/${D} ]; then
+ %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/${D} || true
+ fi
+ done
+ ;;
+esac
diff --git a/japanese/font-shinonome/pkg-plist b/japanese/font-shinonome/pkg-plist
index 281686a3dfbb..432c89ccde12 100644
--- a/japanese/font-shinonome/pkg-plist
+++ b/japanese/font-shinonome/pkg-plist
@@ -1,84 +1,197 @@
-%%FONTSDIR%%/shnm6x12a.pcf.gz
-%%FONTSDIR%%/shnm6x12ab.pcf.gz
-%%FONTSDIR%%/shnm6x12abi.pcf.gz
-%%FONTSDIR%%/shnm6x12ai.pcf.gz
-%%FONTSDIR%%/shnm6x12r.pcf.gz
-%%FONTSDIR%%/shnm6x12rb.pcf.gz
-%%FONTSDIR%%/shnm6x12rbi.pcf.gz
-%%FONTSDIR%%/shnm6x12ri.pcf.gz
-%%FONTSDIR%%/shnm7x14a.pcf.gz
-%%FONTSDIR%%/shnm7x14ab.pcf.gz
-%%FONTSDIR%%/shnm7x14abi.pcf.gz
-%%FONTSDIR%%/shnm7x14ai.pcf.gz
-%%FONTSDIR%%/shnm7x14r.pcf.gz
-%%FONTSDIR%%/shnm7x14rb.pcf.gz
-%%FONTSDIR%%/shnm7x14rbi.pcf.gz
-%%FONTSDIR%%/shnm7x14ri.pcf.gz
-%%FONTSDIR%%/shnm8x16a.pcf.gz
-%%FONTSDIR%%/shnm8x16ab.pcf.gz
-%%FONTSDIR%%/shnm8x16abi.pcf.gz
-%%FONTSDIR%%/shnm8x16ai.pcf.gz
-%%FONTSDIR%%/shnm8x16r.pcf.gz
-%%FONTSDIR%%/shnm8x16rb.pcf.gz
-%%FONTSDIR%%/shnm8x16rbi.pcf.gz
-%%FONTSDIR%%/shnm8x16ri.pcf.gz
-%%FONTSDIR%%/shnm9x18a.pcf.gz
-%%FONTSDIR%%/shnm9x18ab.pcf.gz
-%%FONTSDIR%%/shnm9x18abi.pcf.gz
-%%FONTSDIR%%/shnm9x18ai.pcf.gz
-%%FONTSDIR%%/shnm9x18r.pcf.gz
-%%FONTSDIR%%/shnm9x18rb.pcf.gz
-%%FONTSDIR%%/shnm9x18rbi.pcf.gz
-%%FONTSDIR%%/shnm9x18ri.pcf.gz
-%%FONTSDIR%%/shnmk12.pcf.gz
-%%FONTSDIR%%/shnmk12b.pcf.gz
-%%FONTSDIR%%/shnmk12bi.pcf.gz
-%%FONTSDIR%%/shnmk12i.pcf.gz
-%%FONTSDIR%%/shnmk12maru.pcf.gz
-%%FONTSDIR%%/shnmk12marub.pcf.gz
-%%FONTSDIR%%/shnmk12marubi.pcf.gz
-%%FONTSDIR%%/shnmk12marui.pcf.gz
-%%FONTSDIR%%/shnmk12min.pcf.gz
-%%FONTSDIR%%/shnmk12minb.pcf.gz
-%%FONTSDIR%%/shnmk12minbi.pcf.gz
-%%FONTSDIR%%/shnmk12mini.pcf.gz
-%%FONTSDIR%%/shnmk12p.pcf.gz
-%%FONTSDIR%%/shnmk12pb.pcf.gz
-%%FONTSDIR%%/shnmk12pbi.pcf.gz
-%%FONTSDIR%%/shnmk12pi.pcf.gz
-%%FONTSDIR%%/shnmk14.pcf.gz
-%%FONTSDIR%%/shnmk14b.pcf.gz
-%%FONTSDIR%%/shnmk14bi.pcf.gz
-%%FONTSDIR%%/shnmk14i.pcf.gz
-%%FONTSDIR%%/shnmk14min.pcf.gz
-%%FONTSDIR%%/shnmk14minb.pcf.gz
-%%FONTSDIR%%/shnmk14minbi.pcf.gz
-%%FONTSDIR%%/shnmk14mini.pcf.gz
-%%FONTSDIR%%/shnmk16.pcf.gz
-%%FONTSDIR%%/shnmk16b.pcf.gz
-%%FONTSDIR%%/shnmk16bi.pcf.gz
-%%FONTSDIR%%/shnmk16i.pcf.gz
-%%FONTSDIR%%/shnmk16min.pcf.gz
-%%FONTSDIR%%/shnmk16minb.pcf.gz
-%%FONTSDIR%%/shnmk16minbi.pcf.gz
-%%FONTSDIR%%/shnmk16mini.pcf.gz
-%%DOCSDIR%%/fonts.alias
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.12
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.14
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.16
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.18
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
+@comment $FreeBSD$
+%%DATADIR%%/shnm6x12a.pcf.gz
+%%DATADIR%%/shnm6x12ab.pcf.gz
+%%DATADIR%%/shnm6x12abi.pcf.gz
+%%DATADIR%%/shnm6x12ai.pcf.gz
+%%DATADIR%%/shnm6x12r.pcf.gz
+%%DATADIR%%/shnm6x12rb.pcf.gz
+%%DATADIR%%/shnm6x12rbi.pcf.gz
+%%DATADIR%%/shnm6x12ri.pcf.gz
+%%DATADIR%%/shnm7x14a.pcf.gz
+%%DATADIR%%/shnm7x14ab.pcf.gz
+%%DATADIR%%/shnm7x14abi.pcf.gz
+%%DATADIR%%/shnm7x14ai.pcf.gz
+%%DATADIR%%/shnm7x14r.pcf.gz
+%%DATADIR%%/shnm7x14rb.pcf.gz
+%%DATADIR%%/shnm7x14rbi.pcf.gz
+%%DATADIR%%/shnm7x14ri.pcf.gz
+%%DATADIR%%/shnm8x16a.pcf.gz
+%%DATADIR%%/shnm8x16ab.pcf.gz
+%%DATADIR%%/shnm8x16abi.pcf.gz
+%%DATADIR%%/shnm8x16ai.pcf.gz
+%%DATADIR%%/shnm8x16r.pcf.gz
+%%DATADIR%%/shnm8x16rb.pcf.gz
+%%DATADIR%%/shnm8x16rbi.pcf.gz
+%%DATADIR%%/shnm8x16ri.pcf.gz
+%%DATADIR%%/shnm9x18a.pcf.gz
+%%DATADIR%%/shnm9x18ab.pcf.gz
+%%DATADIR%%/shnm9x18abi.pcf.gz
+%%DATADIR%%/shnm9x18ai.pcf.gz
+%%DATADIR%%/shnm9x18r.pcf.gz
+%%DATADIR%%/shnm9x18rb.pcf.gz
+%%DATADIR%%/shnm9x18rbi.pcf.gz
+%%DATADIR%%/shnm9x18ri.pcf.gz
+%%DATADIR%%/shnmk12.pcf.gz
+%%DATADIR%%/shnmk12b.pcf.gz
+%%DATADIR%%/shnmk12bi.pcf.gz
+%%DATADIR%%/shnmk12i.pcf.gz
+%%DATADIR%%/shnmk12maru.pcf.gz
+%%DATADIR%%/shnmk12marub.pcf.gz
+%%DATADIR%%/shnmk12marubi.pcf.gz
+%%DATADIR%%/shnmk12marui.pcf.gz
+%%DATADIR%%/shnmk12min.pcf.gz
+%%DATADIR%%/shnmk12minb.pcf.gz
+%%DATADIR%%/shnmk12minbi.pcf.gz
+%%DATADIR%%/shnmk12mini.pcf.gz
+%%DATADIR%%/shnmk12p.pcf.gz
+%%DATADIR%%/shnmk12pb.pcf.gz
+%%DATADIR%%/shnmk12pbi.pcf.gz
+%%DATADIR%%/shnmk12pi.pcf.gz
+%%DATADIR%%/shnmk14.pcf.gz
+%%DATADIR%%/shnmk14b.pcf.gz
+%%DATADIR%%/shnmk14bi.pcf.gz
+%%DATADIR%%/shnmk14i.pcf.gz
+%%DATADIR%%/shnmk14min.pcf.gz
+%%DATADIR%%/shnmk14minb.pcf.gz
+%%DATADIR%%/shnmk14minbi.pcf.gz
+%%DATADIR%%/shnmk14mini.pcf.gz
+%%DATADIR%%/shnmk16.pcf.gz
+%%DATADIR%%/shnmk16b.pcf.gz
+%%DATADIR%%/shnmk16bi.pcf.gz
+%%DATADIR%%/shnmk16i.pcf.gz
+%%DATADIR%%/shnmk16min.pcf.gz
+%%DATADIR%%/shnmk16minb.pcf.gz
+%%DATADIR%%/shnmk16minbi.pcf.gz
+%%DATADIR%%/shnmk16mini.pcf.gz
+%%DATADIR%%/fonts.alias
+@dirrm %%DATADIR%%
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12maru.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marub.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marubi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marui.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12mini.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12p.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14mini.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16mini.pcf.gz
+@dirrm %%LOCAL_FONTSDIR%%/shinonome
+@dirrmtry %%LOCAL_FONTSDIR%%
+%%X_FONTSDIR%%/misc/shnm6x12a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12maru.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marub.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marubi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marui.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12mini.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12p.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14mini.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16mini.pcf.gz
diff --git a/japanese/font-shinonome/pkg-req b/japanese/font-shinonome/pkg-req
deleted file mode 100644
index 59fb70886e11..000000000000
--- a/japanese/font-shinonome/pkg-req
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
- exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
- exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
- echo '**********************************************************************'
- echo "****** ${FONTDIR}/ doesn't exist."
- echo "****** Creating ${FONTDIR}/"
- echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
- echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
- echo '**********************************************************************'
- mkdir ${FONTDIR}
-fi
-
-# font alias entry here!
-FONTS_ALIAS=${PKG_PREFIX}/share/doc/shinonome/fonts.alias
-
-grepv() {
- awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
- echo "Updating ${FONTDIR}/fonts.alias"
- cd ${FONTDIR}
- touch fonts.alias
- cp fonts.alias fonts.alias.orig
- grepv ${FONTS_ALIAS} fonts.alias.orig > fonts.alias
- rm -f fonts.alias.orig
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index 342b8172d11e..191caa4fa16d 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -5,15 +5,15 @@
# $FreeBSD$
#
-PORTNAME= umefont
+PORTNAME= font-ume
PORTVERSION= 0.0.401
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ume-font/22212
-DISTNAME= ${PORTNAME}-401
+DISTNAME= umefont-401
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Ume Font, A Free Japanese TrueType font
+COMMENT= Ume Japanese TrueType fonts
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
@@ -31,28 +31,27 @@ X_FONTSDIR= lib/X11/fonts
do-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+ ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-umefont.conf \
- ${FILESDIR}/62-fonts-umefont.conf \
+ ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${INSTALL_DATA} ${FILESDIR}/20-unhint-ume.conf \
+ ${FILESDIR}/62-fonts-ume.conf \
${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-umefont.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-umefont.conf
- ${LN} -s -f ../conf.avail/62-fonts-umefont.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-umefont.conf
+ ${LN} -s -f ../conf.avail/20-unhint-ume.conf \
+ ${PREFIX}/etc/fonts/conf.d/20-unhint-ume.conf
+ ${LN} -s -f ../conf.avail/62-fonts-ume.conf \
+ ${PREFIX}/etc/fonts/conf.d/62-fonts-ume.conf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-ume/files/20-unhint-umefont.conf b/japanese/font-ume/files/20-unhint-ume.conf
index 54b9796d27db..54b9796d27db 100644
--- a/japanese/font-ume/files/20-unhint-umefont.conf
+++ b/japanese/font-ume/files/20-unhint-ume.conf
diff --git a/japanese/font-ume/files/62-fonts-umefont.conf b/japanese/font-ume/files/62-fonts-ume.conf
index a9a6feaf2365..a9a6feaf2365 100644
--- a/japanese/font-ume/files/62-fonts-umefont.conf
+++ b/japanese/font-ume/files/62-fonts-ume.conf
diff --git a/japanese/font-ume/files/pkg-install.in b/japanese/font-ume/files/pkg-install.in
index 524cbf6befa7..ae681a45ad70 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
catfontsdir ()
{
diff --git a/japanese/font-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 2a02c72f553f..14788fa52ab2 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -12,40 +12,40 @@
%%DATADIR%%/ume-ugo4.ttf
%%DATADIR%%/ume-ugo5.ttf
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo5.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/ume-pgc4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgc5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgc4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgc5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-ugo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-ugo5.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-umefont.conf
-etc/fonts/conf.avail/62-fonts-umefont.conf
-@exec ln -s -f ../conf.avail/20-unhint-umefont.conf %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@exec ln -s -f ../conf.avail/62-fonts-umefont.conf %D/etc/fonts/conf.d/62-fonts-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-umefont.conf
-%%X_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo5.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+etc/fonts/conf.avail/20-unhint-ume.conf
+etc/fonts/conf.avail/62-fonts-ume.conf
+@exec ln -s -f ../conf.avail/20-unhint-ume.conf %D/etc/fonts/conf.d/20-unhint-ume.conf
+@exec ln -s -f ../conf.avail/62-fonts-ume.conf %D/etc/fonts/conf.d/62-fonts-ume.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ume.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ume.conf
+%%X_FONTSDIR%%/TTF/ume-pgc4.ttf
+%%X_FONTSDIR%%/TTF/ume-pgc5.ttf
+%%X_FONTSDIR%%/TTF/ume-pgo4.ttf
+%%X_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-tgc4.ttf
+%%X_FONTSDIR%%/TTF/ume-tgc5.ttf
+%%X_FONTSDIR%%/TTF/ume-tgo4.ttf
+%%X_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-ugo4.ttf
+%%X_FONTSDIR%%/TTF/ume-ugo5.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index fc519838fd5e..ef5630b6a522 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -5,15 +5,15 @@
# $FreeBSD$
#
-PORTNAME= vlgothic
-PORTVERSION= 20090204
+PORTNAME= font-vlgothic
+PORTVERSION= 20090422
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= vlgothic/37455
+MASTER_SITE_SUBDIR= vlgothic/38942
DISTNAME= VLGothic-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'VLGothic'
+COMMENT= VLGothic Japanese TrueType fonts
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
@@ -34,14 +34,13 @@ X_FONTSDIR= lib/X11/fonts
do-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f ${DATADIR}/*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
${LN} -s -f ${DATADIR}/*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TrueType/
+ ${LOCALBASE}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-vlgothic.conf \
${FILESDIR}/62-fonts-vlgothic.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -55,7 +54,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-vlgothic/distinfo b/japanese/font-vlgothic/distinfo
index abfe6963890b..a913d08da98c 100644
--- a/japanese/font-vlgothic/distinfo
+++ b/japanese/font-vlgothic/distinfo
@@ -1,3 +1,3 @@
-MD5 (VLGothic-20090204.tar.bz2) = 54298db27daf7b3ec92aff5cfab72f02
-SHA256 (VLGothic-20090204.tar.bz2) = 6e1adb064ef968f0d60e3a4934d1fdf05c37579ecb138e1876b1af1fefb62aec
-SIZE (VLGothic-20090204.tar.bz2) = 4662317
+MD5 (VLGothic-20090422.tar.bz2) = dcc9a788a47554344a47926211208473
+SHA256 (VLGothic-20090422.tar.bz2) = 3b61dfc15875626edb258574826de469753138ad1448bbb5fe6b9efe61433aa5
+SIZE (VLGothic-20090422.tar.bz2) = 4728873
diff --git a/japanese/font-vlgothic/files/pkg-install.in b/japanese/font-vlgothic/files/pkg-install.in
index 1a3298463a08..40a459d2bfbc 100644
--- a/japanese/font-vlgothic/files/pkg-install.in
+++ b/japanese/font-vlgothic/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
catfontsdir ()
{
diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist
index 0274e6aa12cf..52c587d869ee 100644
--- a/japanese/font-vlgothic/pkg-plist
+++ b/japanese/font-vlgothic/pkg-plist
@@ -2,9 +2,9 @@
%%DATADIR%%/VL-PGothic-Regular.ttf
%%DATADIR%%/VL-Gothic-Regular.ttf
@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%LOCAL_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-vlgothic.conf
etc/fonts/conf.avail/62-fonts-vlgothic.conf
@@ -12,10 +12,10 @@ etc/fonts/conf.avail/62-fonts-vlgothic.conf
@exec ln -s -f ../conf.avail/62-fonts-vlgothic.conf %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
@unexec rm -f %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
@unexec rm -f %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
-%%X_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%X_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+%%X_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
+%%X_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
deleted file mode 100644
index 6b7aea5a8407..000000000000
--- a/japanese/ipa-ttfonts/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for: IPA TrueType fonts
-# Date created: 18 July 2004
-# Whom: NAKATA, Maho <maho@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ipa-ttfonts
-PORTVERSION= 1.0.20060520.p1
-PORTREVISION= 2
-PORTEPOCH= 2
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
-DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= IPA Japanese TrueType fonts with M-plus outline font
-
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USE_BZIP2= yes
-NO_BUILD= yes
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS= Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
- Mplus-LICENSE_J.txt README.txt
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
-do-install:
- ${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
- ${DATADIR}
- ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f \
- ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
- ${FILESDIR}/62-fonts-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
- ${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/japanese/ipa-ttfonts/distinfo b/japanese/ipa-ttfonts/distinfo
deleted file mode 100644
index 5d37643203d8..000000000000
--- a/japanese/ipa-ttfonts/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = fba1e3d9eed12c364ea56ec18025d826
-SHA256 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = c1cb93f64c1aa3287078ff7a7afa06d37279af83f7592a64dee669de7dd1f923
-SIZE (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = 16767116
diff --git a/japanese/ipa-ttfonts/files/20-unhint-ipattfonts.conf b/japanese/ipa-ttfonts/files/20-unhint-ipattfonts.conf
deleted file mode 100644
index d5d14d634b35..000000000000
--- a/japanese/ipa-ttfonts/files/20-unhint-ipattfonts.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <match target="font">
- <test name="family">
- <string>IPAMincho</string>
- <string>IPAGothic</string>
- <string>IPAPMincho</string>
- <string>IPAPGothic</string>
- <string>IPAUIGothic</string>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </test>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- </match>
-</fontconfig>
diff --git a/japanese/ipa-ttfonts/files/pkg-install.in b/japanese/ipa-ttfonts/files/pkg-install.in
deleted file mode 100644
index 6a1cdc6f8554..000000000000
--- a/japanese/ipa-ttfonts/files/pkg-install.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
-
-catfontsdir ()
-{
- while read _IN
- do
- case "${_IN}" in
- *-ipa-*|[0-9]*|"") ;;
- *) echo ${_IN} ;;
- esac
- done
-}
-
-ROMA=""
-BOLD="ds=y"
-ITAL="ai=0.15"
-OBLI="ai=0.15"
-RITA="ai=0.08"
-ROBL="ai=0.08"
-
-make_xlfd()
-{
- _enc=$1
- _file=$2
- _vendor=$3
- _fname=$4
- _poc=$5
-
- case "${_poc}:${_enc}" in
- p:jisx0201.1976-*) PFIX="bw=0.5" ;;
- c:jisx0201.1976-*) PFIX="bw=0.5" ;;
- p:*) PFIX="" ;;
- c:*) PFIX="" ;;
- esac
-
- set -- "${ROMA}" medium-r \
- ${BOLD} bold-r \
- ${ITAL} medium-i \
- ${ITAL}:${BOLD} bold-i \
- ${OBLI} medium-o \
- ${OBLI}:${BOLD} bold-o \
- ${RITA} medium-ri \
- ${RITA}:${BOLD} bold-ri \
- ${ROBL} medium-ro \
- ${ROBL}:${BOLD} bold-ro
- while [ $# != 0 ]; do
- _prefix="${PFIX}:$1"; shift
- _variant=$1; shift
- printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
- $_prefix $_file $_vendor $_fname $_variant $_poc $_enc
- done | sed -e 's,::,:,g' -e 's,^:,,'
-}
-
-addentries ()
-{
- for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
- do
- make_xlfd $ENC ipag.ttf ipa IPAGothic c
- make_xlfd $ENC ipag.ttf ipa gothic c
- make_xlfd $ENC ipagp.ttf ipa IPAPGothic p
- make_xlfd $ENC ipagp.ttf ipa gothic p
- make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
- make_xlfd $ENC ipagui.ttf ipa UIGothic c
- make_xlfd $ENC ipam.ttf ipa IPAMincho c
- make_xlfd $ENC ipam.ttf ipa mincho c
- make_xlfd $ENC ipamp.ttf ipa IPAPMincho p
- make_xlfd $ENC ipamp.ttf ipa mincho p
- make_xlfd $ENC M+2VM+IPAG-circle.ttf ipa M+2VM+IPAG_circle c
- make_xlfd $ENC M+1VM+IPAG-circle.ttf ipa M+1VM+IPAG_circle c
- make_xlfd $ENC M+1P+IPAG.ttf ipa M+1P+IPAG p
- make_xlfd $ENC M+1P+IPAG-circle.ttf ipa M+1P+IPAG_circle p
- make_xlfd $ENC M+2P+IPAG.ttf ipa M+2P+IPAG p
- make_xlfd $ENC M+2P+IPAG-circle.ttf ipa M+2P+IPAG_circle p
- done
-}
-
-nfonts ()
-{
- _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
-}
-
-case "$2" in
-POST-INSTALL)
- cd ${X_FONTSDIR}
- touch fonts.dir
- (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-DEINSTALL)
- cd ${X_FONTSDIR}
- catfontsdir < fonts.dir > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-esac
diff --git a/japanese/ipa-ttfonts/pkg-descr b/japanese/ipa-ttfonts/pkg-descr
deleted file mode 100644
index 6a4e55edc148..000000000000
--- a/japanese/ipa-ttfonts/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA) Japan. M+ outline font and Bitstream Vera Sans Mono font
-composite versions included.
-
-WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist
deleted file mode 100644
index c759c2934668..000000000000
--- a/japanese/ipa-ttfonts/pkg-plist
+++ /dev/null
@@ -1,105 +0,0 @@
-@comment $FreeBSD$
-%%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
-@dirrm %%DATADIR%%/ppd
-@dirrm %%DATADIR%%/opvp
-@dirrm %%DATADIR%%/libopvp/doc
-@dirrm %%DATADIR%%/libopvp
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
-@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-ipattfonts.conf
-etc/fonts/conf.avail/62-fonts-ipattfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-%%X_FONTSDIR%%/TrueType/ipag.ttf
-%%X_FONTSDIR%%/TrueType/ipagp.ttf
-%%X_FONTSDIR%%/TrueType/ipagui.ttf
-%%X_FONTSDIR%%/TrueType/ipam.ttf
-%%X_FONTSDIR%%/TrueType/ipamp.ttf
-%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
diff --git a/japanese/kochi-ttfonts/Makefile b/japanese/kochi-ttfonts/Makefile
deleted file mode 100644
index d9889af7e169..000000000000
--- a/japanese/kochi-ttfonts/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for: Kochi TrueType fonts
-# Date created: 6 January 2001
-# Whom: KANOU Hiroki <kanou@mil.allnet.ne.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME= kochi-ttfonts
-PORTVERSION= 20030809
-PORTREVISION= 4
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \
- ${MASTER_SITE_PORTS_JP}
-DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'Kochi'
-
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USE_BZIP2= yes
-NO_BUILD= yes
-
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
- DATADIR=share/${PORTNAME}
-WRKSRC= ${WRKDIR}/kochi-substitute-${PORTVERSION}
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
-PORTDOCS= README.ja COPYING docs
-
-do-install:
- ${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-kochittfonts.conf \
- ${FILESDIR}/62-fonts-kochittfonts.conf \
- ${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-kochittfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-kochittfonts.conf
- ${LN} -s -f ../conf.avail/62-fonts-kochittfonts.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/japanese/kochi-ttfonts/distinfo b/japanese/kochi-ttfonts/distinfo
deleted file mode 100644
index 4bd4cb17c50e..000000000000
--- a/japanese/kochi-ttfonts/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kochi-substitute-20030809.tar.bz2) = c4b14e287cf2b1688c649e2274e128b3
-SHA256 (kochi-substitute-20030809.tar.bz2) = f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c
-SIZE (kochi-substitute-20030809.tar.bz2) = 8675822
diff --git a/japanese/kochi-ttfonts/files/pkg-install.in b/japanese/kochi-ttfonts/files/pkg-install.in
deleted file mode 100644
index e054af6696b9..000000000000
--- a/japanese/kochi-ttfonts/files/pkg-install.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
-
-catfontsdir ()
-{
- while read _IN
- do
- case "${_IN}" in
- *-kochi-*|[0-9]*|"") ;;
- *-aliastt-*|[0-9]*|"") ;;
- *) echo ${_IN} ;;
- esac
- done
-}
-
-ROMA=""
-BOLD="ds=y"
-ITAL="ai=0.15"
-OBLI="ai=0.15"
-RITA="ai=0.08"
-ROBL="ai=0.08"
-
-make_xlfd()
-{
- _enc=$1
- _file=$2
- _vendor=$3
- _fname=$4
- _poc=$5
-
- case "${_poc}:${_enc}" in
- p:jisx0201.1976-*) PFIX="bw=0.5" ;;
- c:jisx0201.1976-*) PFIX="bw=0.5" ;;
- p:*) PFIX="" ;;
- c:*) PFIX="" ;;
- esac
-
- set -- "${ROMA}" medium-r \
- ${BOLD} bold-r \
- ${ITAL} medium-i \
- ${ITAL}:${BOLD} bold-i \
- ${OBLI} medium-o \
- ${OBLI}:${BOLD} bold-o \
- ${RITA} medium-ri \
- ${RITA}:${BOLD} bold-ri \
- ${ROBL} medium-ro \
- ${ROBL}:${BOLD} bold-ro
- while [ $# != 0 ]; do
- _prefix="${PFIX}:$1"; shift
- _variant=$1; shift
- printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
- $_prefix $_file $_vendor $_fname $_variant $_poc $_enc
- done | sed -e 's,::,:,g' -e 's,^:,,'
-}
-
-addentries ()
-{
- for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
- do
- make_xlfd $ENC kochi-mincho-subst.ttf kochi mincho c
- make_xlfd $ENC kochi-mincho-subst.ttf kochi mincho p
- make_xlfd $ENC kochi-mincho-subst.ttf aliastt mincho c
- make_xlfd $ENC kochi-mincho-subst.ttf aliastt mincho p
- make_xlfd $ENC kochi-gothic-subst.ttf kochi gothic c
- make_xlfd $ENC kochi-gothic-subst.ttf kochi gothic p
- make_xlfd $ENC kochi-gothic-subst.ttf aliastt gothic c
- make_xlfd $ENC kochi-gothic-subst.ttf aliastt gothic p
- done
-}
-
-nfonts ()
-{
- _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
-}
-
-case "$2" in
-POST-INSTALL)
- cd ${X_FONTSDIR}
- touch fonts.dir
- (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-DEINSTALL)
- cd ${X_FONTSDIR}
- catfontsdir < fonts.dir > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-esac
diff --git a/japanese/kochi-ttfonts/pkg-descr b/japanese/kochi-ttfonts/pkg-descr
deleted file mode 100644
index ef9292d08935..000000000000
--- a/japanese/kochi-ttfonts/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Free Japanese TrueType fonts named 'Kochi Mincho' and 'Kochi Gothic'.
-
-WWW: http://www.on.cs.keio.ac.jp/~yasu/jp_fonts.html
diff --git a/japanese/kochi-ttfonts/pkg-plist b/japanese/kochi-ttfonts/pkg-plist
deleted file mode 100644
index abe8bc150fad..000000000000
--- a/japanese/kochi-ttfonts/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $FreeBSD$
-%%DATADIR%%/kochi-mincho-subst.ttf
-%%DATADIR%%/kochi-gothic-subst.ttf
-@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%LOCAL_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
-@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-kochittfonts.conf
-etc/fonts/conf.avail/62-fonts-kochittfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-kochittfonts.conf %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-kochittfonts.conf %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-%%X_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%X_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile
deleted file mode 100644
index 607f4b443bd3..000000000000
--- a/japanese/mplusfonts/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for: M+ Fonts
-# Date created: July 17 2002
-# Whom: The 244th namelessness at 2ch.net
-#
-# $FreeBSD$
-#
-
-PORTNAME= mplusfonts
-PORTVERSION= 2.2.4
-PORTREVISION= 2
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \
- http://wids.net/archive/mplusfonts/distfiles/
-DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
-
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-NO_BUILD= yes
-
-.include <bsd.port.pre.mk>
-
-DOCS= INSTALL_E LICENSE_E README_E \
- INSTALL_J LICENSE_J README_J
-
-FONTSDIR= ${PREFIX}/lib/X11/fonts/local
-PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
-
-pre-install:
- @${MKDIR} ${DOCSDIR}
-.for i in e j
- @${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
- ${DOCSDIR}/fonts.alias.${i}
- @${CAT} ${DOCSDIR}/fonts.alias.${i} >> ${DOCSDIR}/fonts.alias
-.endfor
- @${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
- ${DOCSDIR}/fonts.alias.euro
- @${CAT} ${DOCSDIR}/fonts.alias.euro >> ${DOCSDIR}/fonts.alias
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-do-install:
- cd ${WRKSRC} && \
- DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/mplusfonts/distinfo b/japanese/mplusfonts/distinfo
deleted file mode 100644
index c7690848d811..000000000000
--- a/japanese/mplusfonts/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mplus_bitmap_fonts-2.2.4.tar.gz) = a97a99acbee54976407dec828d03850c
-SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
-SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
diff --git a/japanese/mplusfonts/files/patch-install_mplus_fonts b/japanese/mplusfonts/files/patch-install_mplus_fonts
deleted file mode 100644
index 481050c7277b..000000000000
--- a/japanese/mplusfonts/files/patch-install_mplus_fonts
+++ /dev/null
@@ -1,30 +0,0 @@
---- install_mplus_fonts.orig Mon Aug 18 13:26:45 2003
-+++ install_mplus_fonts Mon Aug 18 13:32:03 2003
-@@ -29,18 +29,6 @@
-
-
-
--# Backup/Create mplus directory
--if [ -d ${PREFIX}.BAK ]; then
-- echo "remove: '${PREFIX}.BAK' directory"
-- rm -rf ${PREFIX}.BAK
--fi
--if [ -d $PREFIX ]; then
-- echo "backup: present '${PREFIX##/*/}' directory to '${PREFIX##/*/}.BAK'"
-- mv ${PREFIX} ${PREFIX}.BAK
--fi
--echo "create: new '$PREFIX' directory"
--mkdir -p $PREFIX
--
- # Install M+ BITMAP FONTS E
- echo -e "\nInstall M+ BITMAP FONTS E (iso8859-1)..."
- cd fonts_e
-@@ -55,7 +43,7 @@
- bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
- done
- echo "create: fonts.alias for M+ BITMAP FONTS E"
--cat fonts.alias > $PREFIX/fonts.alias
-+cat fonts.alias >> $PREFIX/fonts.alias
- cd -
-
- # Install M+ BITMAP FONTS EURO
diff --git a/japanese/mplusfonts/pkg-descr b/japanese/mplusfonts/pkg-descr
deleted file mode 100644
index e230ac6bb8ea..000000000000
--- a/japanese/mplusfonts/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
-This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
-
-WWW: http://mplus-fonts.sourceforge.jp/
-
---
-H.Miyamoto <Ys@PixyGarden.net>
diff --git a/japanese/mplusfonts/pkg-plist b/japanese/mplusfonts/pkg-plist
deleted file mode 100644
index 3b704b874050..000000000000
--- a/japanese/mplusfonts/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-%%FONTSDIR%%/mplus_f10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_f10b.pcf.gz
-%%FONTSDIR%%/mplus_f10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_f10r.pcf.gz
-%%FONTSDIR%%/mplus_f12b-euro.pcf.gz
-%%FONTSDIR%%/mplus_f12b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_f12b.pcf.gz
-%%FONTSDIR%%/mplus_f12r-euro.pcf.gz
-%%FONTSDIR%%/mplus_f12r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_f12r.pcf.gz
-%%FONTSDIR%%/mplus_h10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_h10b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h10b.pcf.gz
-%%FONTSDIR%%/mplus_h10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_h10r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h10r.pcf.gz
-%%FONTSDIR%%/mplus_h12b-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h12b.pcf.gz
-%%FONTSDIR%%/mplus_h12r-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_h12r.pcf.gz
-%%FONTSDIR%%/mplus_h12rw-euro.pcf.gz
-%%FONTSDIR%%/mplus_h12rw.pcf.gz
-%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
-%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_j10b.pcf.gz
-%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
-%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
-%%FONTSDIR%%/mplus_j10r.pcf.gz
-%%FONTSDIR%%/mplus_j12b.pcf.gz
-%%FONTSDIR%%/mplus_j12r.pcf.gz
-%%FONTSDIR%%/mplus_q06r-euro.pcf.gz
-%%FONTSDIR%%/mplus_q06r.pcf.gz
-%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
-%%FONTSDIR%%/mplus_s10b.pcf.gz
-%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
-%%FONTSDIR%%/mplus_s10r.pcf.gz
-%%DOCSDIR%%/fonts.alias
-%%DOCSDIR%%/fonts.alias.e
-%%DOCSDIR%%/fonts.alias.j
-%%DOCSDIR%%/fonts.alias.euro
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_E
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_J
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_E
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
-%%PORTDOCS%%%%DOCSDIR%%/README_E
-%%PORTDOCS%%%%DOCSDIR%%/README_J
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
diff --git a/japanese/mplusfonts/pkg-req b/japanese/mplusfonts/pkg-req
deleted file mode 100644
index db7c015cbf8b..000000000000
--- a/japanese/mplusfonts/pkg-req
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
- exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
- exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
- echo '**********************************************************************'
- echo "****** ${FONTDIR}/ doesn't exist."
- echo "****** Creating ${FONTDIR}/"
- echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
- echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
- echo '**********************************************************************'
- mkdir ${FONTDIR}
-fi
-
-grepv() {
- awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
- # font alias entry here!
- TMPFILE=/tmp/install-fonts-alias-$$
- for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
- cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
- done
- echo "Updating ${FONTDIR}/fonts.alias"
- cd ${FONTDIR}
- touch fonts.alias
- cp fonts.alias fonts.alias.orig
- grepv ${TMPFILE} fonts.alias.orig > fonts.alias
- rm -f fonts.alias.orig ${TMPFILE}
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;
diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile
deleted file mode 100644
index 8b5814b6c5ce..000000000000
--- a/japanese/sazanami-ttf/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: Sazanami TrueType fonts
-# Date created: 19 June 2004
-# Whom: hrs
-#
-# $FreeBSD$
-#
-
-PORTNAME= sazanami-ttf
-PORTVERSION= 20040629
-PORTREVISION= 5
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= efont/10087
-DISTNAME= ${PORTNAME:S/-ttf$//}-${PORTVERSION}
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'Sazanami'
-
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USE_BZIP2= yes
-NO_BUILD= yes
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS= README doc
-WRKSRC= ${WRKDIR}/sazanami-${PORTVERSION}
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
-do-install:
- ${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami-ttf.conf \
- ${FILESDIR}/62-fonts-sazanami-ttf.conf \
- ${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-sazanami-ttf.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
- ${LN} -s -f ../conf.avail/62-fonts-sazanami-ttf.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/japanese/sazanami-ttf/distinfo b/japanese/sazanami-ttf/distinfo
deleted file mode 100644
index d87fdffb41fc..000000000000
--- a/japanese/sazanami-ttf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (sazanami-20040629.tar.bz2) = ceef10579a75c92483171f3bd7f77df2
-SHA256 (sazanami-20040629.tar.bz2) = 3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
-SIZE (sazanami-20040629.tar.bz2) = 8622710
diff --git a/japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf b/japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf
deleted file mode 100644
index 741690d0e5fd..000000000000
--- a/japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>Sazanami Mincho</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>Sazanami Gothic</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>Sazanami Gothic</family>
- <family>Sazanami Mincho</family>
- </prefer>
- </alias>
-</fontconfig>
diff --git a/japanese/sazanami-ttf/files/pkg-install.in b/japanese/sazanami-ttf/files/pkg-install.in
deleted file mode 100644
index 957a4baf7298..000000000000
--- a/japanese/sazanami-ttf/files/pkg-install.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
-
-catfontsdir ()
-{
- while read _IN
- do
- case "${_IN}" in
- *-sazanami-*|[0-9]*|"") ;;
- *) echo ${_IN} ;;
- esac
- done
-}
-
-ROMA=""
-BOLD="ds=y"
-ITAL="ai=0.15"
-OBLI="ai=0.15"
-RITA="ai=0.08"
-ROBL="ai=0.08"
-
-make_xlfd()
-{
- _enc=$1
- _file=$2
- _vendor=$3
- _fname=$4
- _poc=$5
-
- case "${_poc}:${_enc}" in
- p:jisx0201.1976-*) PFIX="bw=0.5" ;;
- c:jisx0201.1976-*) PFIX="bw=0.5" ;;
- p:*) PFIX="" ;;
- c:*) PFIX="" ;;
- esac
-
- set -- "${ROMA}" medium-r \
- ${BOLD} bold-r \
- ${ITAL} medium-i \
- ${ITAL}:${BOLD} bold-i \
- ${OBLI} medium-o \
- ${OBLI}:${BOLD} bold-o \
- ${RITA} medium-ri \
- ${RITA}:${BOLD} bold-ri \
- ${ROBL} medium-ro \
- ${ROBL}:${BOLD} bold-ro
- while [ $# != 0 ]; do
- _prefix="${PFIX}:$1"; shift
- _variant=$1; shift
- printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
- $_prefix $_file $_vendor $_fname $_variant $_poc $_enc
- done | sed -e 's,::,:,g' -e 's,^:,,'
-}
-
-addentries ()
-{
- for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
- do
- make_xlfd $ENC sazanami-mincho.ttf sazanami mincho c
- make_xlfd $ENC sazanami-mincho.ttf sazanami mincho p
- make_xlfd $ENC sazanami-gothic.ttf sazanami gothic c
- make_xlfd $ENC sazanami-gothic.ttf sazanami gothic p
-
- done
-}
-
-nfonts ()
-{
- _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
-}
-
-case "$2" in
-POST-INSTALL)
- cd ${X_FONTSDIR}
- touch fonts.dir
- (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-DEINSTALL)
- cd ${X_FONTSDIR}
- catfontsdir < fonts.dir > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-esac
diff --git a/japanese/sazanami-ttf/pkg-descr b/japanese/sazanami-ttf/pkg-descr
deleted file mode 100644
index aab3a06208b5..000000000000
--- a/japanese/sazanami-ttf/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Free Japanese TrueType fonts named 'Sazanami Mincho' and 'Sazanami Gothic'.
-
-WWW: http://wiki.fdiary.net/font/?sazanami
diff --git a/japanese/sazanami-ttf/pkg-plist b/japanese/sazanami-ttf/pkg-plist
deleted file mode 100644
index a18f0b83fe48..000000000000
--- a/japanese/sazanami-ttf/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $FreeBSD$
-%%DATADIR%%/sazanami-mincho.ttf
-%%DATADIR%%/sazanami-gothic.ttf
-@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-mincho.ttf
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-gothic.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
-@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-sazanami-ttf.conf
-etc/fonts/conf.avail/62-fonts-sazanami-ttf.conf
-@exec ln -s -f ../conf.avail/20-unhint-sazanami-ttf.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
-@exec ln -s -f ../conf.avail/62-fonts-sazanami-ttf.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
-%%X_FONTSDIR%%/TrueType/sazanami-mincho.ttf
-%%X_FONTSDIR%%/TrueType/sazanami-gothic.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
diff --git a/japanese/shinonome/Makefile b/japanese/shinonome/Makefile
deleted file mode 100644
index d98501babfd5..000000000000
--- a/japanese/shinonome/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# New ports collection makefile for: shinonome
-# Date created: June 15 2001
-# Whom: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME= shinonome
-PORTVERSION= 0.9.11p1
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Japanese 12,14,16 dot fonts
-
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/p.*$//}
-
-USE_BZIP2= yes
-
-PLIST_SUB= FONTSDIR="${FONTSDIR_REL}"
-
-.include <bsd.port.pre.mk>
-
-FONTSDIR= ${PREFIX}/lib/X11/fonts/local
-FONTSDIR_REL= ${FONTSDIR:S,^${PREFIX}/,,}
-
-FONTNAMES=\
- shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \
- shnm6x12r shnm6x12rb shnm6x12ri shnm6x12rbi \
- shnm7x14a shnm7x14ab shnm7x14ai shnm7x14abi \
- shnm7x14r shnm7x14rb shnm7x14ri shnm7x14rbi \
- shnm8x16a shnm8x16ab shnm8x16ai shnm8x16abi \
- shnm8x16r shnm8x16rb shnm8x16ri shnm8x16rbi \
- shnm9x18a shnm9x18ab shnm9x18ai shnm9x18abi \
- shnm9x18r shnm9x18rb shnm9x18ri shnm9x18rbi \
- shnmk12 shnmk12b shnmk12i shnmk12bi \
- shnmk12p shnmk12pb shnmk12pi shnmk12pbi \
- shnmk12min shnmk12minb shnmk12mini shnmk12minbi \
- shnmk12maru shnmk12marub shnmk12marui shnmk12marubi \
- shnmk14 shnmk14b shnmk14i shnmk14bi \
- shnmk14min shnmk14minb shnmk14mini shnmk14minbi \
- shnmk16 shnmk16b shnmk16i shnmk16bi \
- shnmk16min shnmk16minb shnmk16mini shnmk16minbi
-DOCS= AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
- DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
-
-do-build:
- @${ECHO_CMD} -n 'Compressing PCF fonts'
-.for i in ${FONTNAMES}
- @${ECHO_CMD} -n '.'
- @cd ${WRKSRC}; bdftopcf bdf/${i}.bdf | ${GZIP_CMD} > ${i}.pcf.gz
-.endfor
- @${ECHO_CMD} 'Done'
-
-pre-su-install:
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DOCSDIR}
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-do-install:
-# Do not use original install target since it forces to delete fonts.alias
-.for i in ${FONTNAMES}
- ${INSTALL_DATA} ${WRKSRC}/${i}.pcf.gz ${FONTSDIR}
-.endfor
- @mkfontdir ${FONTSDIR}
- @${CAT} ${DOCSDIR}/fonts.alias >> ${FONTSDIR}/fonts.alias
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/shinonome/distinfo b/japanese/shinonome/distinfo
deleted file mode 100644
index 77d1b6f63013..000000000000
--- a/japanese/shinonome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (shinonome-0.9.11p1.tar.bz2) = 5fb94de9a9971ac67a4d53d62f77bc1d
-SHA256 (shinonome-0.9.11p1.tar.bz2) = 95663c95c92ba5765f63ccbdf033eb93b707be01812a989c548db943479c838f
-SIZE (shinonome-0.9.11p1.tar.bz2) = 4814008
diff --git a/japanese/shinonome/pkg-descr b/japanese/shinonome/pkg-descr
deleted file mode 100644
index 070d1bcecf0c..000000000000
--- a/japanese/shinonome/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-shinonome fonts - japanese public domain fonts
-
-WWW: http://openlab.jp/efont/shinonome/
diff --git a/japanese/shinonome/pkg-plist b/japanese/shinonome/pkg-plist
deleted file mode 100644
index 281686a3dfbb..000000000000
--- a/japanese/shinonome/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-%%FONTSDIR%%/shnm6x12a.pcf.gz
-%%FONTSDIR%%/shnm6x12ab.pcf.gz
-%%FONTSDIR%%/shnm6x12abi.pcf.gz
-%%FONTSDIR%%/shnm6x12ai.pcf.gz
-%%FONTSDIR%%/shnm6x12r.pcf.gz
-%%FONTSDIR%%/shnm6x12rb.pcf.gz
-%%FONTSDIR%%/shnm6x12rbi.pcf.gz
-%%FONTSDIR%%/shnm6x12ri.pcf.gz
-%%FONTSDIR%%/shnm7x14a.pcf.gz
-%%FONTSDIR%%/shnm7x14ab.pcf.gz
-%%FONTSDIR%%/shnm7x14abi.pcf.gz
-%%FONTSDIR%%/shnm7x14ai.pcf.gz
-%%FONTSDIR%%/shnm7x14r.pcf.gz
-%%FONTSDIR%%/shnm7x14rb.pcf.gz
-%%FONTSDIR%%/shnm7x14rbi.pcf.gz
-%%FONTSDIR%%/shnm7x14ri.pcf.gz
-%%FONTSDIR%%/shnm8x16a.pcf.gz
-%%FONTSDIR%%/shnm8x16ab.pcf.gz
-%%FONTSDIR%%/shnm8x16abi.pcf.gz
-%%FONTSDIR%%/shnm8x16ai.pcf.gz
-%%FONTSDIR%%/shnm8x16r.pcf.gz
-%%FONTSDIR%%/shnm8x16rb.pcf.gz
-%%FONTSDIR%%/shnm8x16rbi.pcf.gz
-%%FONTSDIR%%/shnm8x16ri.pcf.gz
-%%FONTSDIR%%/shnm9x18a.pcf.gz
-%%FONTSDIR%%/shnm9x18ab.pcf.gz
-%%FONTSDIR%%/shnm9x18abi.pcf.gz
-%%FONTSDIR%%/shnm9x18ai.pcf.gz
-%%FONTSDIR%%/shnm9x18r.pcf.gz
-%%FONTSDIR%%/shnm9x18rb.pcf.gz
-%%FONTSDIR%%/shnm9x18rbi.pcf.gz
-%%FONTSDIR%%/shnm9x18ri.pcf.gz
-%%FONTSDIR%%/shnmk12.pcf.gz
-%%FONTSDIR%%/shnmk12b.pcf.gz
-%%FONTSDIR%%/shnmk12bi.pcf.gz
-%%FONTSDIR%%/shnmk12i.pcf.gz
-%%FONTSDIR%%/shnmk12maru.pcf.gz
-%%FONTSDIR%%/shnmk12marub.pcf.gz
-%%FONTSDIR%%/shnmk12marubi.pcf.gz
-%%FONTSDIR%%/shnmk12marui.pcf.gz
-%%FONTSDIR%%/shnmk12min.pcf.gz
-%%FONTSDIR%%/shnmk12minb.pcf.gz
-%%FONTSDIR%%/shnmk12minbi.pcf.gz
-%%FONTSDIR%%/shnmk12mini.pcf.gz
-%%FONTSDIR%%/shnmk12p.pcf.gz
-%%FONTSDIR%%/shnmk12pb.pcf.gz
-%%FONTSDIR%%/shnmk12pbi.pcf.gz
-%%FONTSDIR%%/shnmk12pi.pcf.gz
-%%FONTSDIR%%/shnmk14.pcf.gz
-%%FONTSDIR%%/shnmk14b.pcf.gz
-%%FONTSDIR%%/shnmk14bi.pcf.gz
-%%FONTSDIR%%/shnmk14i.pcf.gz
-%%FONTSDIR%%/shnmk14min.pcf.gz
-%%FONTSDIR%%/shnmk14minb.pcf.gz
-%%FONTSDIR%%/shnmk14minbi.pcf.gz
-%%FONTSDIR%%/shnmk14mini.pcf.gz
-%%FONTSDIR%%/shnmk16.pcf.gz
-%%FONTSDIR%%/shnmk16b.pcf.gz
-%%FONTSDIR%%/shnmk16bi.pcf.gz
-%%FONTSDIR%%/shnmk16i.pcf.gz
-%%FONTSDIR%%/shnmk16min.pcf.gz
-%%FONTSDIR%%/shnmk16minb.pcf.gz
-%%FONTSDIR%%/shnmk16minbi.pcf.gz
-%%FONTSDIR%%/shnmk16mini.pcf.gz
-%%DOCSDIR%%/fonts.alias
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.12
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.14
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.16
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.18
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
diff --git a/japanese/shinonome/pkg-req b/japanese/shinonome/pkg-req
deleted file mode 100644
index 59fb70886e11..000000000000
--- a/japanese/shinonome/pkg-req
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
- exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
- exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
- echo '**********************************************************************'
- echo "****** ${FONTDIR}/ doesn't exist."
- echo "****** Creating ${FONTDIR}/"
- echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
- echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
- echo '**********************************************************************'
- mkdir ${FONTDIR}
-fi
-
-# font alias entry here!
-FONTS_ALIAS=${PKG_PREFIX}/share/doc/shinonome/fonts.alias
-
-grepv() {
- awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
- echo "Updating ${FONTDIR}/fonts.alias"
- cd ${FONTDIR}
- touch fonts.alias
- cp fonts.alias fonts.alias.orig
- grepv ${FONTS_ALIAS} fonts.alias.orig > fonts.alias
- rm -f fonts.alias.orig
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;
diff --git a/japanese/umefont/Makefile b/japanese/umefont/Makefile
deleted file mode 100644
index 342b8172d11e..000000000000
--- a/japanese/umefont/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# New ports collection makefile for: umefont
-# Date created: 25 May 2008
-# Whom: hrs
-#
-# $FreeBSD$
-#
-
-PORTNAME= umefont
-PORTVERSION= 0.0.401
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ume-font/22212
-DISTNAME= ${PORTNAME}-401
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Ume Font, A Free Japanese TrueType font
-
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-NO_BUILD= yes
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS= readme.html
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
-do-install:
- ${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-umefont.conf \
- ${FILESDIR}/62-fonts-umefont.conf \
- ${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-umefont.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-umefont.conf
- ${LN} -s -f ../conf.avail/62-fonts-umefont.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-umefont.conf
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/japanese/umefont/distinfo b/japanese/umefont/distinfo
deleted file mode 100644
index 828059d94614..000000000000
--- a/japanese/umefont/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (umefont-401.tar.gz) = ecf9517d8603578562cd5cc3335e025b
-SHA256 (umefont-401.tar.gz) = ea7e0bec4a6728bd63953e7429f5b1e3e26c50191ca73318b4872fc282e22a76
-SIZE (umefont-401.tar.gz) = 29760555
diff --git a/japanese/umefont/files/20-unhint-umefont.conf b/japanese/umefont/files/20-unhint-umefont.conf
deleted file mode 100644
index 54b9796d27db..000000000000
--- a/japanese/umefont/files/20-unhint-umefont.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <match target="font">
- <test name="family">
- <string>Ume Mincho</string>
- <string>Ume P Mincho</string>
- <string>Ume Gothic</string>
- <string>Ume Gothic C4</string>
- <string>Ume Gothic C5</string>
- <string>Ume Gothic O5</string>
- <string>Ume P Gothic</string>
- <string>Ume P Gothic C4</string>
- <string>Ume P Gothic C5</string>
- <string>Ume P Gothic O5</string>
- <string>Ume UI Gothic</string>
- <string>Ume UI Gothic O5</string>
- </test>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- </match>
-</fontconfig>
diff --git a/japanese/umefont/files/62-fonts-umefont.conf b/japanese/umefont/files/62-fonts-umefont.conf
deleted file mode 100644
index a9a6feaf2365..000000000000
--- a/japanese/umefont/files/62-fonts-umefont.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>Ume Mincho</family>
- <family>Ume P Mincho</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>Ume Gothic</family>
- <family>Ume Gothic C4</family>
- <family>Ume Gothic C5</family>
- <family>Ume Gothic O5</family>
- <family>Ume P Gothic</family>
- <family>Ume P Gothic C4</family>
- <family>Ume P Gothic C5</family>
- <family>Ume P Gothic O5</family>
- <family>Ume UI Gothic</family>
- <family>Ume UI Gothic O5</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>Ume Mincho</family>
- <family>Ume Gothic</family>
- <family>Ume Gothic C4</family>
- <family>Ume Gothic C5</family>
- <family>Ume Gothic O5</family>
- <family>Ume UI Gothic</family>
- <family>Ume UI Gothic O5</family>
- </prefer>
- </alias>
-</fontconfig>
diff --git a/japanese/umefont/files/pkg-install.in b/japanese/umefont/files/pkg-install.in
deleted file mode 100644
index 524cbf6befa7..000000000000
--- a/japanese/umefont/files/pkg-install.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
-
-catfontsdir ()
-{
- while read _IN
- do
- case "${_IN}" in
- *-ume-*|[0-9]*|"") ;;
- *) echo ${_IN} ;;
- esac
- done
-}
-
-ROMA=""
-BOLD="ds=y"
-ITAL="ai=0.15"
-OBLI="ai=0.15"
-RITA="ai=0.08"
-ROBL="ai=0.08"
-
-make_xlfd()
-{
- _enc=$1
- _file=$2
- _vendor=$3
- _fname=$4
- _poc=$5
-
- case "${_poc}:${_enc}" in
- p:jisx0201.1976-*) PFIX="bw=0.5" ;;
- c:jisx0201.1976-*) PFIX="bw=0.5" ;;
- p:*) PFIX="" ;;
- c:*) PFIX="" ;;
- esac
-
- set -- "${ROMA}" medium-r \
- ${BOLD} bold-r \
- ${ITAL} medium-i \
- ${ITAL}:${BOLD} bold-i \
- ${OBLI} medium-o \
- ${OBLI}:${BOLD} bold-o \
- ${RITA} medium-ri \
- ${RITA}:${BOLD} bold-ri \
- ${ROBL} medium-ro \
- ${ROBL}:${BOLD} bold-ro
- while [ $# != 0 ]; do
- _prefix="${PFIX}:$1"; shift
- _variant=$1; shift
- printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
- $_prefix $_file $_vendor $_fname $_variant $_poc $_enc
- done | sed -e 's,::,:,g' -e 's,^:,,'
-}
-
-addentries ()
-{
- for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
- do
- make_xlfd $ENC ume-pgc4.ttf ume gothic_c4 p
- make_xlfd $ENC ume-pgc5.ttf ume gothic_c5 p
- make_xlfd $ENC ume-pgo5.ttf ume gothic_o5 p
- make_xlfd $ENC ume-pgo4.ttf ume gothic p
- make_xlfd $ENC ume-tgc4.ttf ume gothic_c4 c
- make_xlfd $ENC ume-tgc5.ttf ume gothic_c5 c
- make_xlfd $ENC ume-tgo5.ttf ume gothic_o5 c
- make_xlfd $ENC ume-tgo4.ttf ume gothic c
- make_xlfd $ENC ume-ugo4.ttf ume ui_gothic c
- make_xlfd $ENC ume-ugo5.ttf ume ui_gothic_o5 c
- make_xlfd $ENC ume-tmo3.ttf ume mincho c
- make_xlfd $ENC ume-pmo3.ttf ume mincho p
- done
-}
-
-nfonts ()
-{
- _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
-}
-
-case "$2" in
-POST-INSTALL)
- cd ${X_FONTSDIR}
- touch fonts.dir
- exec < fonts.dir; rm -f fonts.dir
- (catfontsdir; addentries) > fonts.dir
- _num=`nfonts fonts.dir`
- exec < fonts.dir; rm -f fonts.dir
- (echo "${_num}"; cat) > fonts.dir
- chmod 0444 fonts.dir
- ;;
-DEINSTALL)
- cd ${X_FONTSDIR}
- exec < fonts.dir; rm -f fonts.dir
- catfontsdir > fonts.dir
- _num=`nfonts fonts.dir`
- exec < fonts.dir; rm -f fonts.dir
- (echo "${_num}"; cat) > fonts.dir
- chmod 0444 fonts.dir
- ;;
-esac
diff --git a/japanese/umefont/pkg-descr b/japanese/umefont/pkg-descr
deleted file mode 100644
index 3903150c0d6f..000000000000
--- a/japanese/umefont/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-UmeFont is a free Japanese TrueType font.
-
-WWW: http://sourceforge.jp/projects/ume-font/wiki/FrontPage
diff --git a/japanese/umefont/pkg-plist b/japanese/umefont/pkg-plist
deleted file mode 100644
index 2a02c72f553f..000000000000
--- a/japanese/umefont/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $FreeBSD$
-%%DATADIR%%/ume-pgc4.ttf
-%%DATADIR%%/ume-pgc5.ttf
-%%DATADIR%%/ume-pgo4.ttf
-%%DATADIR%%/ume-pgo5.ttf
-%%DATADIR%%/ume-pmo3.ttf
-%%DATADIR%%/ume-tgc4.ttf
-%%DATADIR%%/ume-tgc5.ttf
-%%DATADIR%%/ume-tgo4.ttf
-%%DATADIR%%/ume-tgo5.ttf
-%%DATADIR%%/ume-tmo3.ttf
-%%DATADIR%%/ume-ugo4.ttf
-%%DATADIR%%/ume-ugo5.ttf
-@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo5.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
-@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-umefont.conf
-etc/fonts/conf.avail/62-fonts-umefont.conf
-@exec ln -s -f ../conf.avail/20-unhint-umefont.conf %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@exec ln -s -f ../conf.avail/62-fonts-umefont.conf %D/etc/fonts/conf.d/62-fonts-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-umefont.conf
-%%X_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo5.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
diff --git a/japanese/vlgothic/Makefile b/japanese/vlgothic/Makefile
deleted file mode 100644
index fc519838fd5e..000000000000
--- a/japanese/vlgothic/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: VLGothic fotns
-# Date created: 31 Oct 2006
-# Whom: NIIMI Satoshi <sa2c@sa2c.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= vlgothic
-PORTVERSION= 20090204
-CATEGORIES= japanese x11-fonts
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= vlgothic/37455
-DISTNAME= VLGothic-${PORTVERSION}
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Free Japanese TrueType fonts named 'VLGothic'
-
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USE_BZIP2= yes
-NO_BUILD= yes
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS= Changelog LICENSE LICENSE.en LICENSE_E.mplus LICENSE_J.mplus \
- README README.sazanami README_J.mplus
-WRKSRC= ${WRKDIR}/VLGothic
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
-do-install:
- ${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
- ${LN} -s -f ${DATADIR}/*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${LN} -s -f ${DATADIR}/*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TrueType/
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-vlgothic.conf \
- ${FILESDIR}/62-fonts-vlgothic.conf \
- ${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-vlgothic.conf \
- ${PREFIX}/etc/fonts/conf.d/20-unhint-vlgothic.conf
- ${LN} -s -f ../conf.avail/62-fonts-vlgothic.conf \
- ${PREFIX}/etc/fonts/conf.d/62-fonts-vlgothic.conf
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/japanese/vlgothic/distinfo b/japanese/vlgothic/distinfo
deleted file mode 100644
index abfe6963890b..000000000000
--- a/japanese/vlgothic/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (VLGothic-20090204.tar.bz2) = 54298db27daf7b3ec92aff5cfab72f02
-SHA256 (VLGothic-20090204.tar.bz2) = 6e1adb064ef968f0d60e3a4934d1fdf05c37579ecb138e1876b1af1fefb62aec
-SIZE (VLGothic-20090204.tar.bz2) = 4662317
diff --git a/japanese/vlgothic/files/20-unhint-vlgothic.conf b/japanese/vlgothic/files/20-unhint-vlgothic.conf
deleted file mode 100644
index 30b3395591c7..000000000000
--- a/japanese/vlgothic/files/20-unhint-vlgothic.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD$ -->
-<fontconfig>
- <match target="font">
- <test name="family">
- <string>VL Gothic</string>
- <string>VL PGothic</string>
- </test>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- </match>
-</fontconfig>
diff --git a/japanese/vlgothic/files/pkg-install.in b/japanese/vlgothic/files/pkg-install.in
deleted file mode 100644
index 1a3298463a08..000000000000
--- a/japanese/vlgothic/files/pkg-install.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
-
-catfontsdir ()
-{
- while read _IN
- do
- case "${_IN}" in
- *-vlgothic-*|[0-9]*|"") ;;
- *) echo ${_IN} ;;
- esac
- done
-}
-
-ROMA=""
-BOLD="ds=y"
-ITAL="ai=0.15"
-OBLI="ai=0.15"
-RITA="ai=0.08"
-ROBL="ai=0.08"
-
-make_xlfd()
-{
- _enc=$1
- _file=$2
- _vendor=$3
- _fname=$4
- _poc=$5
-
- case "${_poc}:${_enc}" in
- p:jisx0201.1976-*) PFIX="bw=0.5" ;;
- c:jisx0201.1976-*) PFIX="bw=0.5" ;;
- p:*) PFIX="" ;;
- c:*) PFIX="" ;;
- esac
-
- set -- "${ROMA}" medium-r \
- ${BOLD} bold-r \
- ${ITAL} medium-i \
- ${ITAL}:${BOLD} bold-i \
- ${OBLI} medium-o \
- ${OBLI}:${BOLD} bold-o \
- ${RITA} medium-ri \
- ${RITA}:${BOLD} bold-ri \
- ${ROBL} medium-ro \
- ${ROBL}:${BOLD} bold-ro
- while [ $# != 0 ]; do
- _prefix="${PFIX}:$1"; shift
- _variant=$1; shift
- printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
- $_prefix $_file $_vendor $_fname $_variant $_poc $_enc
- done | sed -e 's,::,:,g' -e 's,^:,,'
-}
-
-addentries ()
-{
- for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
- do
- make_xlfd $ENC VL-PGothic-Regular.ttf vlgothic "VL_PGothic" p
- make_xlfd $ENC VL-PGothic-Regular.ttf vlgothic gothic p
- make_xlfd $ENC VL-Gothic-Regular.ttf vlgothic "VL_Gothic" c
- make_xlfd $ENC VL-Gothic-Regular.ttf vlgothic gothic c
- done
-}
-
-nfonts ()
-{
- _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
-}
-
-case "$2" in
-POST-INSTALL)
- cd ${X_FONTSDIR}
- touch fonts.dir
- (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-DEINSTALL)
- cd ${X_FONTSDIR}
- catfontsdir < fonts.dir > fonts.dir.tmp
- nfonts < fonts.dir.tmp > fonts.dir
- cat fonts.dir.tmp >> fonts.dir
- rm -f fonts.dir.tmp
- ;;
-esac
diff --git a/japanese/vlgothic/pkg-descr b/japanese/vlgothic/pkg-descr
deleted file mode 100644
index ee455d807460..000000000000
--- a/japanese/vlgothic/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Free Japanese TrueType fonts named 'VLGothic'.
-
-WWW: http://dicey.org/vlgothic/
diff --git a/japanese/vlgothic/pkg-plist b/japanese/vlgothic/pkg-plist
deleted file mode 100644
index 0274e6aa12cf..000000000000
--- a/japanese/vlgothic/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $FreeBSD$
-%%DATADIR%%/VL-PGothic-Regular.ttf
-%%DATADIR%%/VL-Gothic-Regular.ttf
-@dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%LOCAL_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
-@dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-vlgothic.conf
-etc/fonts/conf.avail/62-fonts-vlgothic.conf
-@exec ln -s -f ../conf.avail/20-unhint-vlgothic.conf %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
-@exec ln -s -f ../conf.avail/62-fonts-vlgothic.conf %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
-%%X_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%X_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi