aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--japanese/font-ipa/Makefile83
-rw-r--r--japanese/font-ipa/distinfo2
-rw-r--r--japanese/font-ipa/files/fonts.alias.ipa60
-rw-r--r--japanese/font-ipa/files/pkg-install.in (renamed from japanese/font-mplus-ipa/files/fonts.dir.ipa)45
-rw-r--r--japanese/font-ipa/pkg-deinstall15
-rw-r--r--japanese/font-ipa/pkg-descr7
-rw-r--r--japanese/font-ipa/pkg-install20
-rw-r--r--japanese/font-ipa/pkg-plist45
-rw-r--r--japanese/font-mplus-ipa/Makefile83
-rw-r--r--japanese/font-mplus-ipa/distinfo2
-rw-r--r--japanese/font-mplus-ipa/files/fonts.alias.ipa60
-rw-r--r--japanese/font-mplus-ipa/files/pkg-install.in (renamed from japanese/ipa-ttfonts/files/fonts.dir.ipa)45
-rw-r--r--japanese/font-mplus-ipa/pkg-deinstall15
-rw-r--r--japanese/font-mplus-ipa/pkg-descr7
-rw-r--r--japanese/font-mplus-ipa/pkg-install20
-rw-r--r--japanese/font-mplus-ipa/pkg-plist45
-rw-r--r--japanese/ipa-ttfonts/Makefile83
-rw-r--r--japanese/ipa-ttfonts/distinfo2
-rw-r--r--japanese/ipa-ttfonts/files/fonts.alias.ipa60
-rw-r--r--japanese/ipa-ttfonts/files/pkg-install.in (renamed from japanese/font-ipa/files/fonts.dir.ipa)45
-rw-r--r--japanese/ipa-ttfonts/pkg-deinstall15
-rw-r--r--japanese/ipa-ttfonts/pkg-descr7
-rw-r--r--japanese/ipa-ttfonts/pkg-install20
-rw-r--r--japanese/ipa-ttfonts/pkg-plist45
24 files changed, 306 insertions, 525 deletions
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 225b262b8cee..8b9fd51b305f 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -6,67 +6,48 @@
#
PORTNAME= ipa-ttfonts
-PORTVERSION= 20040718
+PORTVERSION= 1.0.20040814
CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://www.grass-japan.org/FOSS4G/ipafonts/
-DISTNAME= grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin
-DIST_SUBDIR= ipa-fonts
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Freely available Japanese TrueType fonts by Infomation-technology Promotion Agency (IPA)
+COMMENT= Japanese TrueType fonts distributed by IPA
-USE_X_PREFIX= yes
-NO_BUILD= yes
-NO_PACKAGE= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-NO_CDROM= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-
-FONTSDIR= lib/X11/fonts/TrueType
-LOCALFONTSDIR= share/fonts/TrueType
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR} \
- LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
+RUN_DEPENDS= ${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
-WRKSRC= ${WRKDIR}
-
-DOC_FILES= license-ipafonts.eucjp
+NO_BUILD= yes
+NO_WRKSUBDIR= yes
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-install
+
+LOCAL_FONTSDIR= share/fonts/TrueType
+X_FONTSDIR= lib/X11/fonts/TrueType
+GRASS_FONTSDIR= grass5/fonts
+
+PKGINSTALL_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
+PLIST_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
+ FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
+ LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+ GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+
+pre-install:
+ @${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/pkg-install.in \
+ > ${WRKDIR}/pkg-install
+ ${CHMOD} +x ${WRKDIR}/pkg-install
do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
- @${ECHO} "*********************************************************"
- @${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
- @${ECHO} "and load 'xtt' module in /etc/XF86Config."
- @${ECHO} "*********************************************************"
- ${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
- ${INSTALL_DATA} ${WRKSRC}/fonts/ipag.ttf \
- ${WRKSRC}/fonts/ipagp.ttf \
- ${WRKSRC}/fonts/ipagui.ttf \
- ${WRKSRC}/fonts/ipam.ttf \
- ${WRKSRC}/fonts/ipamp.ttf \
- ${FILESDIR}/fonts.dir.ipa \
- ${FILESDIR}/fonts.alias.ipa \
- ${PREFIX}/${FONTSDIR}
- ${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipag.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipag.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagp.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagui.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagui.ttf
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+ ${MKDIR} ${X11BASE}/${X_FONTSDIR}
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipam.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipam.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${PREFIX}/${LOCAL_FONTSDIR}/
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipamp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipamp.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${X11BASE}/${X_FONTSDIR}/
-.for F in ${DOC_FILES}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
-.endfor
+post-install:
${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
deleted file mode 100644
index 048852d217e8..000000000000
--- a/japanese/font-ipa/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 38358c8d9e083f5e68dd403113b849ef
-SIZE (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 47275548
diff --git a/japanese/font-ipa/files/fonts.alias.ipa b/japanese/font-ipa/files/fonts.alias.ipa
deleted file mode 100644
index bad932d28ccb..000000000000
--- a/japanese/font-ipa/files/fonts.alias.ipa
+++ /dev/null
@@ -1,60 +0,0 @@
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-mplus-ipa/files/fonts.dir.ipa b/japanese/font-ipa/files/pkg-install.in
index 3bd5caa99da1..5c33ba4d34c0 100644
--- a/japanese/font-mplus-ipa/files/fonts.dir.ipa
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -1,4 +1,22 @@
-150
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+catfontsdir ()
+{
+ while read _IN
+ do
+ case "${_IN}" in
+ *-ipa-*|[0-9]*|"") ;;
+ *) echo ${_IN} ;;
+ esac
+ done
+}
+
+addentries ()
+{
+ (while read _IN; do echo ${_IN}; done) <<EOT
ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
@@ -149,3 +167,28 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+EOT
+}
+
+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/font-ipa/pkg-deinstall b/japanese/font-ipa/pkg-deinstall
deleted file mode 100644
index b294b8f64f4f..000000000000
--- a/japanese/font-ipa/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
- exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/font-ipa/pkg-descr b/japanese/font-ipa/pkg-descr
index 731094c05994..d1f17977e37c 100644
--- a/japanese/font-ipa/pkg-descr
+++ b/japanese/font-ipa/pkg-descr
@@ -1,5 +1,2 @@
-Freely available Japanese TrueType fonts by
-Infomation-technology Promotion Agency (IPA) with
-http://www.grass-japan.org/FOSS4G/
-
-WWW: http://www.grass-japan.org/FOSS4G/readme-grass-i18n-ipafonts.eucjp.htm
+Japanese TrueType fonts distributed by Infomation-technology Promotion
+Agency (IPA).
diff --git a/japanese/font-ipa/pkg-install b/japanese/font-ipa/pkg-install
deleted file mode 100644
index 5b261cfa9f60..000000000000
--- a/japanese/font-ipa/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
- echo "Please add ${FONTDIR} to your /etc/XF86Config file"
- exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.ipa | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.ipa >> fonts.dir
-touch fonts.alias
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.ipa >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index 5baadebe9034..c59b506e5b15 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,22 +1,25 @@
@comment $FreeBSD$
-%%FONTSDIR%%/fonts.alias.ipa
-%%FONTSDIR%%/fonts.dir.ipa
-%%FONTSDIR%%/ipag.ttf
-%%FONTSDIR%%/ipagp.ttf
-%%FONTSDIR%%/ipagui.ttf
-%%FONTSDIR%%/ipam.ttf
-%%FONTSDIR%%/ipamp.ttf
-%%PORTDOCS%%/license-ipafonts.eucjp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %%LOCALFONTSDIR%%
-@exec ln -s -f %D/%%FONTSDIR%%/ipag.ttf %%LOCALFONTSDIR%%/ipag.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagp.ttf %%LOCALFONTSDIR%%/ipagp.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagui.ttf %%LOCALFONTSDIR%%/ipagui.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipam.ttf %%LOCALFONTSDIR%%/ipam.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipamp.ttf %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rmdir %%LOCALFONTSDIR%% 2> /dev/null || true
+@exec mkdir -p %%LOCAL_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%LOCAL_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%LOCAL_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%LOCAL_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%X_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%X_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%X_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%X_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%X_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
+@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 225b262b8cee..8b9fd51b305f 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -6,67 +6,48 @@
#
PORTNAME= ipa-ttfonts
-PORTVERSION= 20040718
+PORTVERSION= 1.0.20040814
CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://www.grass-japan.org/FOSS4G/ipafonts/
-DISTNAME= grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin
-DIST_SUBDIR= ipa-fonts
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Freely available Japanese TrueType fonts by Infomation-technology Promotion Agency (IPA)
+COMMENT= Japanese TrueType fonts distributed by IPA
-USE_X_PREFIX= yes
-NO_BUILD= yes
-NO_PACKAGE= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-NO_CDROM= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-
-FONTSDIR= lib/X11/fonts/TrueType
-LOCALFONTSDIR= share/fonts/TrueType
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR} \
- LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
+RUN_DEPENDS= ${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
-WRKSRC= ${WRKDIR}
-
-DOC_FILES= license-ipafonts.eucjp
+NO_BUILD= yes
+NO_WRKSUBDIR= yes
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-install
+
+LOCAL_FONTSDIR= share/fonts/TrueType
+X_FONTSDIR= lib/X11/fonts/TrueType
+GRASS_FONTSDIR= grass5/fonts
+
+PKGINSTALL_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
+PLIST_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
+ FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
+ LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+ GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+
+pre-install:
+ @${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/pkg-install.in \
+ > ${WRKDIR}/pkg-install
+ ${CHMOD} +x ${WRKDIR}/pkg-install
do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
- @${ECHO} "*********************************************************"
- @${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
- @${ECHO} "and load 'xtt' module in /etc/XF86Config."
- @${ECHO} "*********************************************************"
- ${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
- ${INSTALL_DATA} ${WRKSRC}/fonts/ipag.ttf \
- ${WRKSRC}/fonts/ipagp.ttf \
- ${WRKSRC}/fonts/ipagui.ttf \
- ${WRKSRC}/fonts/ipam.ttf \
- ${WRKSRC}/fonts/ipamp.ttf \
- ${FILESDIR}/fonts.dir.ipa \
- ${FILESDIR}/fonts.alias.ipa \
- ${PREFIX}/${FONTSDIR}
- ${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipag.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipag.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagp.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagui.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagui.ttf
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+ ${MKDIR} ${X11BASE}/${X_FONTSDIR}
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipam.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipam.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${PREFIX}/${LOCAL_FONTSDIR}/
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipamp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipamp.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${X11BASE}/${X_FONTSDIR}/
-.for F in ${DOC_FILES}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
-.endfor
+post-install:
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/distinfo b/japanese/font-mplus-ipa/distinfo
deleted file mode 100644
index 048852d217e8..000000000000
--- a/japanese/font-mplus-ipa/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 38358c8d9e083f5e68dd403113b849ef
-SIZE (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 47275548
diff --git a/japanese/font-mplus-ipa/files/fonts.alias.ipa b/japanese/font-mplus-ipa/files/fonts.alias.ipa
deleted file mode 100644
index bad932d28ccb..000000000000
--- a/japanese/font-mplus-ipa/files/fonts.alias.ipa
+++ /dev/null
@@ -1,60 +0,0 @@
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/ipa-ttfonts/files/fonts.dir.ipa b/japanese/font-mplus-ipa/files/pkg-install.in
index 3bd5caa99da1..5c33ba4d34c0 100644
--- a/japanese/ipa-ttfonts/files/fonts.dir.ipa
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,4 +1,22 @@
-150
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+catfontsdir ()
+{
+ while read _IN
+ do
+ case "${_IN}" in
+ *-ipa-*|[0-9]*|"") ;;
+ *) echo ${_IN} ;;
+ esac
+ done
+}
+
+addentries ()
+{
+ (while read _IN; do echo ${_IN}; done) <<EOT
ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
@@ -149,3 +167,28 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+EOT
+}
+
+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/font-mplus-ipa/pkg-deinstall b/japanese/font-mplus-ipa/pkg-deinstall
deleted file mode 100644
index b294b8f64f4f..000000000000
--- a/japanese/font-mplus-ipa/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
- exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/font-mplus-ipa/pkg-descr b/japanese/font-mplus-ipa/pkg-descr
index 731094c05994..d1f17977e37c 100644
--- a/japanese/font-mplus-ipa/pkg-descr
+++ b/japanese/font-mplus-ipa/pkg-descr
@@ -1,5 +1,2 @@
-Freely available Japanese TrueType fonts by
-Infomation-technology Promotion Agency (IPA) with
-http://www.grass-japan.org/FOSS4G/
-
-WWW: http://www.grass-japan.org/FOSS4G/readme-grass-i18n-ipafonts.eucjp.htm
+Japanese TrueType fonts distributed by Infomation-technology Promotion
+Agency (IPA).
diff --git a/japanese/font-mplus-ipa/pkg-install b/japanese/font-mplus-ipa/pkg-install
deleted file mode 100644
index 5b261cfa9f60..000000000000
--- a/japanese/font-mplus-ipa/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
- echo "Please add ${FONTDIR} to your /etc/XF86Config file"
- exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.ipa | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.ipa >> fonts.dir
-touch fonts.alias
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.ipa >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index 5baadebe9034..c59b506e5b15 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -1,22 +1,25 @@
@comment $FreeBSD$
-%%FONTSDIR%%/fonts.alias.ipa
-%%FONTSDIR%%/fonts.dir.ipa
-%%FONTSDIR%%/ipag.ttf
-%%FONTSDIR%%/ipagp.ttf
-%%FONTSDIR%%/ipagui.ttf
-%%FONTSDIR%%/ipam.ttf
-%%FONTSDIR%%/ipamp.ttf
-%%PORTDOCS%%/license-ipafonts.eucjp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %%LOCALFONTSDIR%%
-@exec ln -s -f %D/%%FONTSDIR%%/ipag.ttf %%LOCALFONTSDIR%%/ipag.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagp.ttf %%LOCALFONTSDIR%%/ipagp.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagui.ttf %%LOCALFONTSDIR%%/ipagui.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipam.ttf %%LOCALFONTSDIR%%/ipam.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipamp.ttf %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rmdir %%LOCALFONTSDIR%% 2> /dev/null || true
+@exec mkdir -p %%LOCAL_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%LOCAL_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%LOCAL_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%LOCAL_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%X_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%X_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%X_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%X_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%X_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
+@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index 225b262b8cee..8b9fd51b305f 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -6,67 +6,48 @@
#
PORTNAME= ipa-ttfonts
-PORTVERSION= 20040718
+PORTVERSION= 1.0.20040814
CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://www.grass-japan.org/FOSS4G/ipafonts/
-DISTNAME= grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin
-DIST_SUBDIR= ipa-fonts
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= hrs@FreeBSD.org
-COMMENT= Freely available Japanese TrueType fonts by Infomation-technology Promotion Agency (IPA)
+COMMENT= Japanese TrueType fonts distributed by IPA
-USE_X_PREFIX= yes
-NO_BUILD= yes
-NO_PACKAGE= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-NO_CDROM= "License prohibits to distribute without i18n'ed GRASS http://www.grass-japan.org/FOSS4G/"
-
-FONTSDIR= lib/X11/fonts/TrueType
-LOCALFONTSDIR= share/fonts/TrueType
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR} \
- LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
+RUN_DEPENDS= ${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
-WRKSRC= ${WRKDIR}
-
-DOC_FILES= license-ipafonts.eucjp
+NO_BUILD= yes
+NO_WRKSUBDIR= yes
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-install
+
+LOCAL_FONTSDIR= share/fonts/TrueType
+X_FONTSDIR= lib/X11/fonts/TrueType
+GRASS_FONTSDIR= grass5/fonts
+
+PKGINSTALL_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
+PLIST_SUB= X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
+ FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
+ LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+ GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+
+pre-install:
+ @${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/pkg-install.in \
+ > ${WRKDIR}/pkg-install
+ ${CHMOD} +x ${WRKDIR}/pkg-install
do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
- @${ECHO} "*********************************************************"
- @${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
- @${ECHO} "and load 'xtt' module in /etc/XF86Config."
- @${ECHO} "*********************************************************"
- ${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
- ${INSTALL_DATA} ${WRKSRC}/fonts/ipag.ttf \
- ${WRKSRC}/fonts/ipagp.ttf \
- ${WRKSRC}/fonts/ipagui.ttf \
- ${WRKSRC}/fonts/ipam.ttf \
- ${WRKSRC}/fonts/ipamp.ttf \
- ${FILESDIR}/fonts.dir.ipa \
- ${FILESDIR}/fonts.alias.ipa \
- ${PREFIX}/${FONTSDIR}
- ${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipag.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipag.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagp.ttf
- ${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipagui.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipagui.ttf
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+ ${MKDIR} ${X11BASE}/${X_FONTSDIR}
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipam.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipam.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${PREFIX}/${LOCAL_FONTSDIR}/
${LN} -s -f \
- ${PREFIX}/${FONTSDIR}/ipamp.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/ipamp.ttf
+ ${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+ ${X11BASE}/${X_FONTSDIR}/
-.for F in ${DOC_FILES}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
-.endfor
+post-install:
${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 048852d217e8..000000000000
--- a/japanese/ipa-ttfonts/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 38358c8d9e083f5e68dd403113b849ef
-SIZE (grass5.0.3_i686-pc-linux-i18n-ipafull-gnu_bin.tar.gz) = 47275548
diff --git a/japanese/ipa-ttfonts/files/fonts.alias.ipa b/japanese/ipa-ttfonts/files/fonts.alias.ipa
deleted file mode 100644
index bad932d28ccb..000000000000
--- a/japanese/ipa-ttfonts/files/fonts.alias.ipa
+++ /dev/null
@@ -1,60 +0,0 @@
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPMincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -ipa-IPAPGothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-ipa/files/fonts.dir.ipa b/japanese/ipa-ttfonts/files/pkg-install.in
index 3bd5caa99da1..5c33ba4d34c0 100644
--- a/japanese/font-ipa/files/fonts.dir.ipa
+++ b/japanese/ipa-ttfonts/files/pkg-install.in
@@ -1,4 +1,22 @@
-150
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+catfontsdir ()
+{
+ while read _IN
+ do
+ case "${_IN}" in
+ *-ipa-*|[0-9]*|"") ;;
+ *) echo ${_IN} ;;
+ esac
+ done
+}
+
+addentries ()
+{
+ (while read _IN; do echo ${_IN}; done) <<EOT
ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
@@ -149,3 +167,28 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+EOT
+}
+
+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-deinstall b/japanese/ipa-ttfonts/pkg-deinstall
deleted file mode 100644
index b294b8f64f4f..000000000000
--- a/japanese/ipa-ttfonts/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
- exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/ipa-ttfonts/pkg-descr b/japanese/ipa-ttfonts/pkg-descr
index 731094c05994..d1f17977e37c 100644
--- a/japanese/ipa-ttfonts/pkg-descr
+++ b/japanese/ipa-ttfonts/pkg-descr
@@ -1,5 +1,2 @@
-Freely available Japanese TrueType fonts by
-Infomation-technology Promotion Agency (IPA) with
-http://www.grass-japan.org/FOSS4G/
-
-WWW: http://www.grass-japan.org/FOSS4G/readme-grass-i18n-ipafonts.eucjp.htm
+Japanese TrueType fonts distributed by Infomation-technology Promotion
+Agency (IPA).
diff --git a/japanese/ipa-ttfonts/pkg-install b/japanese/ipa-ttfonts/pkg-install
deleted file mode 100644
index 5b261cfa9f60..000000000000
--- a/japanese/ipa-ttfonts/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
- echo "Please add ${FONTDIR} to your /etc/XF86Config file"
- exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-ipa-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.ipa | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.ipa >> fonts.dir
-touch fonts.alias
-sed -e '/^-ipa-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.ipa >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist
index 5baadebe9034..c59b506e5b15 100644
--- a/japanese/ipa-ttfonts/pkg-plist
+++ b/japanese/ipa-ttfonts/pkg-plist
@@ -1,22 +1,25 @@
@comment $FreeBSD$
-%%FONTSDIR%%/fonts.alias.ipa
-%%FONTSDIR%%/fonts.dir.ipa
-%%FONTSDIR%%/ipag.ttf
-%%FONTSDIR%%/ipagp.ttf
-%%FONTSDIR%%/ipagui.ttf
-%%FONTSDIR%%/ipam.ttf
-%%FONTSDIR%%/ipamp.ttf
-%%PORTDOCS%%/license-ipafonts.eucjp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %%LOCALFONTSDIR%%
-@exec ln -s -f %D/%%FONTSDIR%%/ipag.ttf %%LOCALFONTSDIR%%/ipag.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagp.ttf %%LOCALFONTSDIR%%/ipagp.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipagui.ttf %%LOCALFONTSDIR%%/ipagui.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipam.ttf %%LOCALFONTSDIR%%/ipam.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/ipamp.ttf %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/ipamp.ttf
-@unexec rmdir %%LOCALFONTSDIR%% 2> /dev/null || true
+@exec mkdir -p %%LOCAL_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%LOCAL_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%LOCAL_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%LOCAL_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%X_FONTSDIR%%
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf %%X_FONTSDIR%%/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf %%X_FONTSDIR%%/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf %%X_FONTSDIR%%/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf %%X_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
+@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
+@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true