svn commit: r397494 - in head: . japanese japanese/font-mplus japanese/font-mplus-bitmap japanese/font-mplus-bitmap/files japanese/font-mplus-outline japanese/font-mplus-outline/files
Hiroki Sato
hrs at FreeBSD.org
Mon Sep 21 14:39:23 UTC 2015
Author: hrs
Date: Mon Sep 21 14:39:18 2015
New Revision: 397494
URL: https://svnweb.freebsd.org/changeset/ports/397494
Log:
- Split japanese/font-mplus into font-mplus-outline and
font-mplus-bitmap. Currently mplus-bitmap and mplus-outline use
share/fonts/misc and mplus-outline as the installation directory,
respectively.
- Convert them to use Uses=fonts.
Added:
head/japanese/font-mplus-bitmap/
- copied from r396872, head/japanese/font-mplus/
head/japanese/font-mplus-outline/
- copied from r396872, head/japanese/font-mplus/
Deleted:
head/japanese/font-mplus/
head/japanese/font-mplus-bitmap/files/20-unhint-mplus.conf
head/japanese/font-mplus-bitmap/files/62-fonts-mplus.conf
head/japanese/font-mplus-outline/files/patch-install_mplus_fonts
Modified:
head/MOVED
head/japanese/Makefile
head/japanese/font-mplus-bitmap/Makefile
head/japanese/font-mplus-bitmap/distinfo
head/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts
head/japanese/font-mplus-bitmap/files/pkg-install.in
head/japanese/font-mplus-bitmap/pkg-descr
head/japanese/font-mplus-bitmap/pkg-plist
head/japanese/font-mplus-outline/Makefile
head/japanese/font-mplus-outline/distinfo
head/japanese/font-mplus-outline/files/pkg-install.in
head/japanese/font-mplus-outline/pkg-descr
head/japanese/font-mplus-outline/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Mon Sep 21 13:24:24 2015 (r397493)
+++ head/MOVED Mon Sep 21 14:39:18 2015 (r397494)
@@ -7873,3 +7873,4 @@ textproc/py-xml||2015-09-16|Remove: this
x11-toolkits/wxgtk28-unicode|x11-toolkits/wxgtk28|2015-09-16|Make wxGTK now only unicode
x11-toolkits/wxgtk28-unicode-contrib|x11-toolkits/wxgtk28-contrib|2015-09-16|Make wxGTK now only unicode
x11-toolkits/py-wxPython28-unicode|x11-toolkits/py-wxPython28|2015-09-16|Make wxGTK now only unicode
+japanese/font-mplus|japanese/font-mplus-outline|2015-09-21|Renamed
Modified: head/japanese/Makefile
==============================================================================
--- head/japanese/Makefile Mon Sep 21 13:24:24 2015 (r397493)
+++ head/japanese/Makefile Mon Sep 21 14:39:18 2015 (r397494)
@@ -73,8 +73,9 @@
SUBDIR += font-migu
SUBDIR += font-mona-ipa
SUBDIR += font-motoya-al
- SUBDIR += font-mplus
+ SUBDIR += font-mplus-bitmap
SUBDIR += font-mplus-ipa
+ SUBDIR += font-mplus-outline
SUBDIR += font-ricty
SUBDIR += font-ricty-discord
SUBDIR += font-sazanami
Modified: head/japanese/font-mplus-bitmap/Makefile
==============================================================================
--- head/japanese/font-mplus/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/Makefile Mon Sep 21 14:39:18 2015 (r397494)
@@ -2,93 +2,50 @@
# $FreeBSD$
PORTNAME= mplus
-PORTVERSION= 2.2.4.055
-PORTREVISION= 2
+PORTVERSION= 2.2.4
CATEGORIES= japanese x11-fonts
-MASTER_SITES= SFJP/${PORTNAME}-fonts/5030:bitmap \
- SFJP/${PORTNAME}-fonts/6650:outline
+MASTER_SITES= SFJP/${PORTNAME}-fonts/5030/
PKGNAMEPREFIX= ja-font-
-DISTFILES= ${PORTNAME}_bitmap_fonts-2.2.4.tar.gz:bitmap \
- ${PORTNAME}-TESTFLIGHT-055.tar.xz:outline
+PKGNAMESUFFIX= -bitmap
+DISTNAME= ${PORTNAME}_bitmap_fonts-2.2.4
MAINTAINER= hrs at FreeBSD.org
-COMMENT= M+ Bitmap and Outline Fonts
+COMMENT= M+ Bitmap fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USES= tar:xz
+USES= fonts
+FONTNAME= misc
NO_BUILD= yes
NO_ARCH= 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}/${PORTNAME}_bitmap_fonts-2.2.4
-DATADIR= ${PREFIX}/share/font-${PORTNAME}
-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
+SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias"
+DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PORTDOCS= INSTALL_E LICENSE_E README_E \
+ INSTALL_J LICENSE_J README_J
OPTIONS_DEFINE= DOCS
post-extract:
- cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
+ cd ${WRKSRC} && \
${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias
-pre-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}/TTF ${STAGEDIR}${DATADIR}/bitmap
-
-do-install: do-install-bitmap do-install-outline
-
-do-install-bitmap:
- cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
- ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}/bitmap" \
- ${SH} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/install_mplus_fonts
- ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}/bitmap
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME}
- cd ${STAGEDIR}/${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME} && \
- ${LN} -s -f ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc && \
- ${LN} -s -f ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz .
-
-do-install-outline:
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/*.ttf \
- ${STAGEDIR}${DATADIR}/TTF
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
- ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
- ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
- ${FILESDIR}/62-fonts-${PORTNAME}.conf \
- ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
- ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
- ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
- ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
- ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+do-install:
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ cd ${WRKSRC} && \
+ ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}" \
+ ${SH} ${WRKSRC}/install_mplus_fonts
+ ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && \
+ ${LN} -s -f ../../../${DATADIR_REL}/*.pcf.gz .
post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.bitmap; \
- done
- for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.outline; \
- done
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/japanese/font-mplus-bitmap/distinfo
==============================================================================
--- head/japanese/font-mplus/distinfo Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/distinfo Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,4 +1,2 @@
SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
-SHA256 (mplus-TESTFLIGHT-055.tar.xz) = 19b2139d69c7bf4397920767affa01d2bad200610147abbcd1e2d91b10017f4d
-SIZE (mplus-TESTFLIGHT-055.tar.xz) = 8853404
Modified: head/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts
==============================================================================
--- head/japanese/font-mplus/files/patch-install_mplus_fonts Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,6 +1,6 @@
---- 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 @@
+--- install_mplus_fonts.orig 2005-03-19 14:45:12 UTC
++++ install_mplus_fonts
+@@ -29,18 +29,6 @@ CURPTH=/usr/X11R6/lib/X11/fonts/misc
@@ -19,7 +19,7 @@
# Install M+ BITMAP FONTS E
echo -e "\nInstall M+ BITMAP FONTS E (iso8859-1)..."
cd fonts_e
-@@ -54,8 +42,6 @@
+@@ -54,8 +42,6 @@ do
echo "create: $b.pcf.gz"
bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
@@ -28,7 +28,7 @@
cd -
# Install M+ BITMAP FONTS EURO
-@@ -79,8 +65,6 @@
+@@ -79,8 +65,6 @@ if [ "$EURO15" != "NO" ]; then
| gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
# rm $b-euro.bdf
@@ -37,7 +37,7 @@
cd -
fi
-@@ -145,8 +129,6 @@
+@@ -145,8 +129,6 @@ if [ "$MPLUSJ" != "NO" ]; then
done
# rm mplus_j1*b.bdf
@@ -46,7 +46,7 @@
cd -
fi
-@@ -166,12 +148,3 @@
+@@ -166,12 +148,3 @@ if [ "$CURSOR" != "NO" ]; then
echo "ERROR: No such file !"
fi
fi
Modified: head/japanese/font-mplus-bitmap/files/pkg-install.in
==============================================================================
--- head/japanese/font-mplus/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/files/pkg-install.in Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,112 +1,16 @@
#!/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
+ cd %%FONTSDIR%%
touch fonts.alias
grep -v -- "mplus[_-]" fonts.alias > fonts.alias.tmp
cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
rm -f fonts.alias.tmp
- ;;
-POST-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
- if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
- rm -f fonts.dir
- fi
-
- 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
+;;
+DEINSTALL)
+ cd %%FONTSDIR%%
touch fonts.alias
grep -v -- "mplus[_-]" fonts.alias > fonts.alias.tmp
if [ -s fonts.alias.tmp ]; then
@@ -114,13 +18,5 @@ POST-DEINSTALL)
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
Modified: head/japanese/font-mplus-bitmap/pkg-descr
==============================================================================
--- head/japanese/font-mplus/pkg-descr Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/pkg-descr Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,4 +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/
+WWW: http://mplus-fonts.osdn.jp/mplus-bitmap-fonts/index.html
Modified: head/japanese/font-mplus-bitmap/pkg-plist
==============================================================================
--- head/japanese/font-mplus/pkg-plist Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-bitmap/pkg-plist Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,248 +1,77 @@
-%%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
-%%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
-etc/fonts/conf.avail/20-unhint-mplus.conf
-etc/fonts/conf.avail/62-fonts-mplus.conf
-etc/fonts/conf.d/20-unhint-mplus.conf
-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
+%%DATADIR%%/mplus_f10b-euro.pcf.gz
+%%DATADIR%%/mplus_f10b.pcf.gz
+%%DATADIR%%/mplus_f10r-euro.pcf.gz
+%%DATADIR%%/mplus_f10r.pcf.gz
+%%DATADIR%%/mplus_f12b-euro.pcf.gz
+%%DATADIR%%/mplus_f12b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_f12b.pcf.gz
+%%DATADIR%%/mplus_f12r-euro.pcf.gz
+%%DATADIR%%/mplus_f12r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_f12r.pcf.gz
+%%DATADIR%%/mplus_h10b-euro.pcf.gz
+%%DATADIR%%/mplus_h10b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h10b.pcf.gz
+%%DATADIR%%/mplus_h10r-euro.pcf.gz
+%%DATADIR%%/mplus_h10r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h10r.pcf.gz
+%%DATADIR%%/mplus_h12b-euro.pcf.gz
+%%DATADIR%%/mplus_h12b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h12b.pcf.gz
+%%DATADIR%%/mplus_h12r-euro.pcf.gz
+%%DATADIR%%/mplus_h12r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h12r.pcf.gz
+%%DATADIR%%/mplus_h12rw-euro.pcf.gz
+%%DATADIR%%/mplus_h12rw.pcf.gz
+%%DATADIR%%/mplus_j10b-iso.pcf.gz
+%%DATADIR%%/mplus_j10b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_j10b.pcf.gz
+%%DATADIR%%/mplus_j10r-iso.pcf.gz
+%%DATADIR%%/mplus_j10r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_j10r.pcf.gz
+%%DATADIR%%/mplus_j12b.pcf.gz
+%%DATADIR%%/mplus_j12r.pcf.gz
+%%DATADIR%%/mplus_q06r-euro.pcf.gz
+%%DATADIR%%/mplus_q06r.pcf.gz
+%%DATADIR%%/mplus_s10b-euro.pcf.gz
+%%DATADIR%%/mplus_s10b.pcf.gz
+%%DATADIR%%/mplus_s10r-euro.pcf.gz
+%%DATADIR%%/mplus_s10r.pcf.gz
+%%DATADIR%%/fonts.alias
+%%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
Modified: head/japanese/font-mplus-outline/Makefile
==============================================================================
--- head/japanese/font-mplus/Makefile Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-outline/Makefile Mon Sep 21 14:39:18 2015 (r397494)
@@ -2,76 +2,37 @@
# $FreeBSD$
PORTNAME= mplus
-PORTVERSION= 2.2.4.055
-PORTREVISION= 2
+PORTVERSION= 0.6.0
CATEGORIES= japanese x11-fonts
-MASTER_SITES= SFJP/${PORTNAME}-fonts/5030:bitmap \
- SFJP/${PORTNAME}-fonts/6650:outline
+MASTER_SITES= SFJP/${PORTNAME}-fonts/62344/
PKGNAMEPREFIX= ja-font-
-DISTFILES= ${PORTNAME}_bitmap_fonts-2.2.4.tar.gz:bitmap \
- ${PORTNAME}-TESTFLIGHT-055.tar.xz:outline
+PKGNAMESUFFIX= -outline
+DISTNAME= ${PORTNAME}-TESTFLIGHT-060
MAINTAINER= hrs at FreeBSD.org
-COMMENT= M+ Bitmap and Outline Fonts
+COMMENT= M+ Outline Fonts
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-USES= tar:xz
+USES= fonts:fc tar:xz
NO_BUILD= yes
NO_ARCH= 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}/${PORTNAME}_bitmap_fonts-2.2.4
-DATADIR= ${PREFIX}/share/font-${PORTNAME}
-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
+DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PORTDOCS= LICENSE_E README_E LICENSE_J README_J
OPTIONS_DEFINE= DOCS
-post-extract:
- cd ${WRKDIR}/${PORTNAME}_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-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}/TTF ${STAGEDIR}${DATADIR}/bitmap
-
-do-install: do-install-bitmap do-install-outline
-
-do-install-bitmap:
- cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
- ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}/bitmap" \
- ${SH} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/install_mplus_fonts
- ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}/bitmap
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME}
- cd ${STAGEDIR}/${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME} && \
- ${LN} -s -f ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc && \
- ${LN} -s -f ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz .
-
-do-install-outline:
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/*.ttf \
- ${STAGEDIR}${DATADIR}/TTF
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf .
+do-install:
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -83,12 +44,7 @@ do-install-outline:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.bitmap; \
- done
- for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.outline; \
- done
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/japanese/font-mplus-outline/distinfo
==============================================================================
--- head/japanese/font-mplus/distinfo Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-outline/distinfo Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,4 +1,2 @@
-SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
-SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
-SHA256 (mplus-TESTFLIGHT-055.tar.xz) = 19b2139d69c7bf4397920767affa01d2bad200610147abbcd1e2d91b10017f4d
-SIZE (mplus-TESTFLIGHT-055.tar.xz) = 8853404
+SHA256 (mplus-TESTFLIGHT-060.tar.xz) = b6914650caa86b9a8cfd682ae643bfb174690513a5aa01b3d75830a6761ae753
+SIZE (mplus-TESTFLIGHT-060.tar.xz) = 9795300
Modified: head/japanese/font-mplus-outline/files/pkg-install.in
==============================================================================
--- head/japanese/font-mplus/files/pkg-install.in Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-outline/files/pkg-install.in Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -73,27 +71,15 @@ nfonts ()
case "$2" in
POST-INSTALL)
- %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/TTF ${X_FONTSDIR}/misc
-
- cd ${X_FONTSDIR}/TTF
+ cd %%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
-
- 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
- ;;
-POST-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
+;;
+DEINSTALL)
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -101,26 +87,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
-
- 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
Modified: head/japanese/font-mplus-outline/pkg-descr
==============================================================================
--- head/japanese/font-mplus/pkg-descr Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-outline/pkg-descr Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,4 +1,5 @@
-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.
+M+ Outline fonts include proportional Latin (4 variations),
+fixed-halfwidth Latin (3 variations) and fixed-fullwidth Japanese
+(2 Kana variations) character set.
-WWW: http://mplus-fonts.sourceforge.jp/
+WWW: http://mplus-fonts.osdn.jp/mplus-outline-fonts/index-en.html
Modified: head/japanese/font-mplus-outline/pkg-plist
==============================================================================
--- head/japanese/font-mplus/pkg-plist Sun Sep 13 23:30:21 2015 (r396872)
+++ head/japanese/font-mplus-outline/pkg-plist Mon Sep 21 14:39:18 2015 (r397494)
@@ -1,248 +1,90 @@
-%%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
-%%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
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list