o fix fonts.alias handling, mostly taken from mplusfonts.

o utilize DOCSDIR.

4 files changed, 22 insertions, 132 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 58941ff83037..287ba67d4b24 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -34,6 +34,7 @@ FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
 MAKE_ARGS=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
+DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 
 post-extract:
 	(cd ${WRKSRC} ; ${TAR} xpzf ${DISTDIR}/${AYUDISTNAME}${AYU_SUFFIX})
@@ -44,11 +45,15 @@ post-extract:
 pre-build:
 	(cd ${WRKSRC} ; ${SH} makebdf.sh)
 
-post-install:
-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+pre-install:
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DOCSDIR}
+	@${CAT} ${WRKSRC}/fonts.alias >> ${PREFIX}/${FONTSDIR}/fonts.alias
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/ja/${PORTNAME}/README.euc-jp
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README.euc-jp
 .endif
 
+post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+
 .include <bsd.port.post.mk>
diff --git a/japanese/kappa20/files/Makefile.in b/japanese/kappa20/files/Makefile.in
index 9ec2be7330ad..df4b0df211be 100644
--- a/japanese/kappa20/files/Makefile.in
+++ b/japanese/kappa20/files/Makefile.in
@@ -53,11 +53,10 @@ fonts.alias: Makefile.dist
 	${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' $> > $@
 	${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' $> | ${SED} 's/-r-/-i-/g;s/\(^[^-][^ 	]*\) /\1i /' >> $@
 	${CAT} fonts.alias.ayu >> $@
-	egrep -iv '^(-(kappa|ayu)-[^ 	]*--20-|(v?k|a|r)20g?[mb]i?[ 	]*|(ipa-)?10x20g?(rk|L[1-9]0?)?[mb]i?[ 	]*)' ${PREFIX}/${FONTSDIR}/fonts.alias >> fonts.alias || true
 
 install:
 	mkdir -p ${PREFIX}/${FONTSDIR}
-	${BSD_INSTALL_DATA} ${PCF_ALL} fonts.alias ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index 2fc75f0e402f..9e9ac7f08650 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -62,9 +62,11 @@
 %%FONTSDIR%%/vk20bi.pcf.gz
 %%FONTSDIR%%/vk20m.pcf.gz
 %%FONTSDIR%%/vk20mi.pcf.gz
-%%PORTDOCS%%share/doc/ja/k20fonts/README.euc-jp
-%%PORTDOCS%%@dirrm share/doc/ja/k20fonts
+%%PORTDOCS%%%%DOCSDIR%%/README.euc-jp
+%%PORTDOCS%%%%DOCSDIR%%/fonts.alias
+@dirrm %%DOCSDIR%%
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
 @unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
 @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
index 6593231a8fbf..d856ce2bed1a 100644
--- a/japanese/kappa20/pkg-req
+++ b/japanese/kappa20/pkg-req
@@ -19,132 +19,16 @@ if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
 	mkdir ${FONTDIR}
 fi
 
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
--kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
-a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
--kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
-vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
-vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
-ipa-10x20m  -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
-ipa-10x20b  -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
-10x20L2m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-2
-10x20L2b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-2
-10x20L3m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-3
-10x20L3b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-3
-10x20L4m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-4
-10x20L4b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-4
-10x20L5m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-9
-10x20L5b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-9
-10x20L6m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-10
-10x20L6b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-10
-10x20L7m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-13
-10x20L7b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-13
-10x20L8m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-14
-10x20L8b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-14
-10x20L9m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-15
-10x20L9b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-15
-10x20L10m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-16
-10x20L10b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-16
--kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-10x20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
-a20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
-10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
-a20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
-10x20rkbi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20rkmi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
--kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
-vk20bi -kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
-vk20mi -kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
-ipa-10x20mi  -kappa-fixed-medium-i-normal--20-190-75-75-c-100-muleipa-1
-ipa-10x20bi  -kappa-fixed-bold-i-normal--20-190-75-75-c-100-muleipa-1
-10x20L2mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-2
-10x20L2bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-2
-10x20L3mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-3
-10x20L3bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-3
-10x20L4mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-4
-10x20L4bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-4
-10x20L5mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-9
-10x20L5bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-9
-10x20L6mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-10
-10x20L6bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-10
-10x20L7mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-13
-10x20L7bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-13
-10x20L8mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-14
-10x20L8bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-14
-10x20L9mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-15
-10x20L9bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-15
-10x20L10mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-16
-10x20L10bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-16
-10x20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-100-iso8859-1
-10x20gmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-iso8859-1
-10x20grkm	-ayu-gothic-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20grkmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-k20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20gmi		-ayu-gothic-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
-	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
-	 cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
+if [ "$2" = "DEINSTALL" ] ; then
+	TMPFILE=/tmp/install-fonts-alias-$$
+	cat ${PKG_PREFIX}/share/doc/ja/k20fonts/fonts.alias > ${TMPFILE}
+	echo "Updating ${FONTDIR}/fonts.alias"
+	cd ${FONTDIR}
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
 	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig ${TMPFILE}
 fi
-rm -f fonts.alias.orig ${TMPFILE}
 
 echo "**********************************************************"
 echo "You should restart X server or do 'xset fp rehash' command"