2 files changed, 149 insertions, 145 deletions

diff --git a/japanese/makejvf/Makefile b/japanese/makejvf/Makefile
index 4809d27e86bf..90e1816c167e 100644
--- a/japanese/makejvf/Makefile
+++ b/japanese/makejvf/Makefile
@@ -23,39 +23,44 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=    makejvf
 INSTALL_TARGET=	install-all
 BINARIES=	makejvf makejvfh makejvfk
-MAKEJVFDIR=	${PREFIX}/share/fonts/makejvf
-PTEXTFM=	standard nmin-ngoth jis morisawa
+TEXMF=		${PREFIX}/share/texmf
+MAKEJVF_DIR=	${PREFIX}/share/fonts/makejvf
+MAP_DIR=	${TEXMF}/dvips/makejvf
+PTEX_TFM_DIR=	${TEXMF}/fonts/tfm/makejvf
+DVIPS_TFM_DIR=	${TEXMF}/fonts/tfm/makejvf
+DVIPS_VF_DIR=	${TEXMF}/fonts/vf/makejvf
+PTEX_TFM=	standard nmin-ngoth jis morisawa
 
-DOCS=	README.1st README.txt test1.tex test2.tex kuten2jis jy1mch.fd
+DOCS=		README.1st README.txt test1.tex test2.tex kuten2jis jy1mch.fd
 
 post-extract:
-	@for i in ${PTEXTFM} ; do \
+	@for i in ${PTEX_TFM} ; do \
 		${TAR} -C ${WRKDIR}/ -zxf ${DISTDIR}/${DIST_SUBDIR}/$$i${EXTRACT_SUFX} ; \
 	done
 
 post-install:
-	@${MKDIR} ${MAKEJVFDIR}
-	@for i in ${PTEXTFM} ; do \
+	@${MKDIR} ${MAP_DIR}
+	@for i in ${PTEX_TFM} ; do \
 		${INSTALL_DATA} ${WRKDIR}/$$i/$$i.map \
-			${MAKEJVFDIR}/ ; \
+			${MAP_DIR}/ ; \
 	done
 
-	@${MKDIR} ${MAKEJVFDIR}/tfm/ptex
-	@for i in ${PTEXTFM} ; do \
+	@${MKDIR} ${PTEX_TFM_DIR}/ptex
+	@for i in ${PTEX_TFM} ; do \
 		${INSTALL_DATA} ${WRKDIR}/$$i/tfm/ptex/* \
-			${MAKEJVFDIR}/tfm/ptex/ ; \
+			${PTEX_TFM_DIR}/ptex/ ; \
 	done
 
-	@${MKDIR} ${MAKEJVFDIR}/tfm/dvips
-	@for i in ${PTEXTFM} ; do \
+	@${MKDIR} ${DVIPS_TFM_DIR}/dvips
+	@for i in ${PTEX_TFM} ; do \
 		${INSTALL_DATA} ${WRKDIR}/$$i/tfm/dvips/* \
-			${MAKEJVFDIR}/tfm/dvips/ ; \
+			${DVIPS_TFM_DIR}/dvips/ ; \
 	done
 
-	@${MKDIR} ${MAKEJVFDIR}/vf
-	@for i in ${PTEXTFM} ; do \
+	@${MKDIR} ${DVIPS_VF_DIR}
+	@for i in ${PTEX_TFM} ; do \
 		${INSTALL_DATA} ${WRKDIR}/$$i/vf/* \
-			${MAKEJVFDIR}/vf/ ; \
+			${DVIPS_VF_DIR}/ ; \
 	done
 
 .if !defined(NOPORTDOCS)
diff --git a/japanese/makejvf/pkg-plist b/japanese/makejvf/pkg-plist
index 6184e92b8140..5c742c3b8648 100644
--- a/japanese/makejvf/pkg-plist
+++ b/japanese/makejvf/pkg-plist
@@ -7,133 +7,132 @@ share/doc/makejvf-fkr/test1.tex
 share/doc/makejvf-fkr/test2.tex
 share/doc/makejvf-fkr/kuten2jis
 share/doc/makejvf-fkr/jy1mch.fd
-share/fonts/makejvf/standard.map
-share/fonts/makejvf/nmin-ngoth.map
-share/fonts/makejvf/jis.map
-share/fonts/makejvf/morisawa.map
-share/fonts/makejvf/tfm/ptex/goth10.tfm
-share/fonts/makejvf/tfm/ptex/goth5.tfm
-share/fonts/makejvf/tfm/ptex/goth6.tfm
-share/fonts/makejvf/tfm/ptex/goth7.tfm
-share/fonts/makejvf/tfm/ptex/goth8.tfm
-share/fonts/makejvf/tfm/ptex/goth9.tfm
-share/fonts/makejvf/tfm/ptex/min10.tfm
-share/fonts/makejvf/tfm/ptex/min5.tfm
-share/fonts/makejvf/tfm/ptex/min6.tfm
-share/fonts/makejvf/tfm/ptex/min7.tfm
-share/fonts/makejvf/tfm/ptex/min8.tfm
-share/fonts/makejvf/tfm/ptex/min9.tfm
-share/fonts/makejvf/tfm/ptex/tgoth10.tfm
-share/fonts/makejvf/tfm/ptex/tgoth5.tfm
-share/fonts/makejvf/tfm/ptex/tgoth6.tfm
-share/fonts/makejvf/tfm/ptex/tgoth7.tfm
-share/fonts/makejvf/tfm/ptex/tgoth8.tfm
-share/fonts/makejvf/tfm/ptex/tgoth9.tfm
-share/fonts/makejvf/tfm/ptex/tmin10.tfm
-share/fonts/makejvf/tfm/ptex/tmin5.tfm
-share/fonts/makejvf/tfm/ptex/tmin6.tfm
-share/fonts/makejvf/tfm/ptex/tmin7.tfm
-share/fonts/makejvf/tfm/ptex/tmin8.tfm
-share/fonts/makejvf/tfm/ptex/tmin9.tfm
-share/fonts/makejvf/tfm/ptex/ngoth10.tfm
-share/fonts/makejvf/tfm/ptex/ngoth5.tfm
-share/fonts/makejvf/tfm/ptex/ngoth6.tfm
-share/fonts/makejvf/tfm/ptex/ngoth7.tfm
-share/fonts/makejvf/tfm/ptex/ngoth8.tfm
-share/fonts/makejvf/tfm/ptex/ngoth9.tfm
-share/fonts/makejvf/tfm/ptex/nmin10.tfm
-share/fonts/makejvf/tfm/ptex/nmin5.tfm
-share/fonts/makejvf/tfm/ptex/nmin6.tfm
-share/fonts/makejvf/tfm/ptex/nmin7.tfm
-share/fonts/makejvf/tfm/ptex/nmin8.tfm
-share/fonts/makejvf/tfm/ptex/nmin9.tfm
-share/fonts/makejvf/tfm/ptex/jis.tfm
-share/fonts/makejvf/tfm/ptex/jisg.tfm
-share/fonts/makejvf/tfm/ptex/FutoGoB101-Bold-H.tfm
-share/fonts/makejvf/tfm/ptex/FutoGoB101-Bold-J.tfm
-share/fonts/makejvf/tfm/ptex/FutoGoB101-Bold-V.tfm
-share/fonts/makejvf/tfm/ptex/FutoMinA101-Bold-H.tfm
-share/fonts/makejvf/tfm/ptex/FutoMinA101-Bold-J.tfm
-share/fonts/makejvf/tfm/ptex/FutoMinA101-Bold-V.tfm
-share/fonts/makejvf/tfm/ptex/GothicBBB-Medium-H.tfm
-share/fonts/makejvf/tfm/ptex/GothicBBB-Medium-J.tfm
-share/fonts/makejvf/tfm/ptex/GothicBBB-Medium-V.tfm
-share/fonts/makejvf/tfm/ptex/Jun101-Light-H.tfm
-share/fonts/makejvf/tfm/ptex/Jun101-Light-J.tfm
-share/fonts/makejvf/tfm/ptex/Jun101-Light-V.tfm
-share/fonts/makejvf/tfm/ptex/Ryumin-Light-H.tfm
-share/fonts/makejvf/tfm/ptex/Ryumin-Light-J.tfm
-share/fonts/makejvf/tfm/ptex/Ryumin-Light-V.tfm
-share/fonts/makejvf/tfm/dvips/gbm.tfm
-share/fonts/makejvf/tfm/dvips/gbmv.tfm
-share/fonts/makejvf/tfm/dvips/rml.tfm
-share/fonts/makejvf/tfm/dvips/rmlv.tfm
-share/fonts/makejvf/tfm/dvips/futogo-b-v.tfm
-share/fonts/makejvf/tfm/dvips/futogo-b.tfm
-share/fonts/makejvf/tfm/dvips/futomin-b-v.tfm
-share/fonts/makejvf/tfm/dvips/futomin-b.tfm
-share/fonts/makejvf/tfm/dvips/gtbbb-m-v.tfm
-share/fonts/makejvf/tfm/dvips/gtbbb-m.tfm
-share/fonts/makejvf/tfm/dvips/jun101-l-v.tfm
-share/fonts/makejvf/tfm/dvips/jun101-l.tfm
-share/fonts/makejvf/tfm/dvips/ryumin-l-v.tfm
-share/fonts/makejvf/tfm/dvips/ryumin-l.tfm
-share/fonts/makejvf/vf/goth10.vf
-share/fonts/makejvf/vf/goth5.vf
-share/fonts/makejvf/vf/goth6.vf
-share/fonts/makejvf/vf/goth7.vf
-share/fonts/makejvf/vf/goth8.vf
-share/fonts/makejvf/vf/goth9.vf
-share/fonts/makejvf/vf/min10.vf
-share/fonts/makejvf/vf/min5.vf
-share/fonts/makejvf/vf/min6.vf
-share/fonts/makejvf/vf/min7.vf
-share/fonts/makejvf/vf/min8.vf
-share/fonts/makejvf/vf/min9.vf
-share/fonts/makejvf/vf/tgoth10.vf
-share/fonts/makejvf/vf/tgoth5.vf
-share/fonts/makejvf/vf/tgoth6.vf
-share/fonts/makejvf/vf/tgoth7.vf
-share/fonts/makejvf/vf/tgoth8.vf
-share/fonts/makejvf/vf/tgoth9.vf
-share/fonts/makejvf/vf/tmin10.vf
-share/fonts/makejvf/vf/tmin5.vf
-share/fonts/makejvf/vf/tmin6.vf
-share/fonts/makejvf/vf/tmin7.vf
-share/fonts/makejvf/vf/tmin8.vf
-share/fonts/makejvf/vf/tmin9.vf
-share/fonts/makejvf/vf/ngoth10.vf
-share/fonts/makejvf/vf/ngoth5.vf
-share/fonts/makejvf/vf/ngoth6.vf
-share/fonts/makejvf/vf/ngoth7.vf
-share/fonts/makejvf/vf/ngoth8.vf
-share/fonts/makejvf/vf/ngoth9.vf
-share/fonts/makejvf/vf/nmin10.vf
-share/fonts/makejvf/vf/nmin5.vf
-share/fonts/makejvf/vf/nmin6.vf
-share/fonts/makejvf/vf/nmin7.vf
-share/fonts/makejvf/vf/nmin8.vf
-share/fonts/makejvf/vf/nmin9.vf
-share/fonts/makejvf/vf/jis.vf
-share/fonts/makejvf/vf/jisg.vf
-share/fonts/makejvf/vf/FutoGoB101-Bold-H.vf
-share/fonts/makejvf/vf/FutoGoB101-Bold-J.vf
-share/fonts/makejvf/vf/FutoGoB101-Bold-V.vf
-share/fonts/makejvf/vf/FutoMinA101-Bold-H.vf
-share/fonts/makejvf/vf/FutoMinA101-Bold-J.vf
-share/fonts/makejvf/vf/FutoMinA101-Bold-V.vf
-share/fonts/makejvf/vf/GothicBBB-Medium-H.vf
-share/fonts/makejvf/vf/GothicBBB-Medium-J.vf
-share/fonts/makejvf/vf/GothicBBB-Medium-V.vf
-share/fonts/makejvf/vf/Jun101-Light-H.vf
-share/fonts/makejvf/vf/Jun101-Light-J.vf
-share/fonts/makejvf/vf/Jun101-Light-V.vf
-share/fonts/makejvf/vf/Ryumin-Light-H.vf
-share/fonts/makejvf/vf/Ryumin-Light-J.vf
-share/fonts/makejvf/vf/Ryumin-Light-V.vf
-@dirrm share/fonts/makejvf/tfm/ptex
-@dirrm share/fonts/makejvf/tfm/dvips
-@dirrm share/fonts/makejvf/tfm
-@dirrm share/fonts/makejvf/vf
-@dirrm share/fonts/makejvf
+share/texmf/dvips/makejvf/standard.map
+share/texmf/dvips/makejvf/nmin-ngoth.map
+share/texmf/dvips/makejvf/jis.map
+share/texmf/dvips/makejvf/morisawa.map
+share/texmf/fonts/tfm/makejvf/ptex/goth10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/goth5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/goth6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/goth7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/goth8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/goth9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/min9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tgoth9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/tmin9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/ngoth9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin10.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin5.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin6.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin7.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin8.tfm
+share/texmf/fonts/tfm/makejvf/ptex/nmin9.tfm
+share/texmf/fonts/tfm/makejvf/ptex/jis.tfm
+share/texmf/fonts/tfm/makejvf/ptex/jisg.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-H.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-J.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-V.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-H.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-J.tfm
+share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-V.tfm
+share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-H.tfm
+share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-J.tfm
+share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-V.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-H.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-J.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-V.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-H.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-J.tfm
+share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-V.tfm
+share/texmf/fonts/tfm/makejvf/dvips/gbm.tfm
+share/texmf/fonts/tfm/makejvf/dvips/gbmv.tfm
+share/texmf/fonts/tfm/makejvf/dvips/rml.tfm
+share/texmf/fonts/tfm/makejvf/dvips/rmlv.tfm
+share/texmf/fonts/tfm/makejvf/dvips/futogo-b-v.tfm
+share/texmf/fonts/tfm/makejvf/dvips/futogo-b.tfm
+share/texmf/fonts/tfm/makejvf/dvips/futomin-b-v.tfm
+share/texmf/fonts/tfm/makejvf/dvips/futomin-b.tfm
+share/texmf/fonts/tfm/makejvf/dvips/gtbbb-m-v.tfm
+share/texmf/fonts/tfm/makejvf/dvips/gtbbb-m.tfm
+share/texmf/fonts/tfm/makejvf/dvips/jun101-l-v.tfm
+share/texmf/fonts/tfm/makejvf/dvips/jun101-l.tfm
+share/texmf/fonts/tfm/makejvf/dvips/ryumin-l-v.tfm
+share/texmf/fonts/tfm/makejvf/dvips/ryumin-l.tfm
+share/texmf/fonts/vf/makejvf/goth10.vf
+share/texmf/fonts/vf/makejvf/goth5.vf
+share/texmf/fonts/vf/makejvf/goth6.vf
+share/texmf/fonts/vf/makejvf/goth7.vf
+share/texmf/fonts/vf/makejvf/goth8.vf
+share/texmf/fonts/vf/makejvf/goth9.vf
+share/texmf/fonts/vf/makejvf/min10.vf
+share/texmf/fonts/vf/makejvf/min5.vf
+share/texmf/fonts/vf/makejvf/min6.vf
+share/texmf/fonts/vf/makejvf/min7.vf
+share/texmf/fonts/vf/makejvf/min8.vf
+share/texmf/fonts/vf/makejvf/min9.vf
+share/texmf/fonts/vf/makejvf/tgoth10.vf
+share/texmf/fonts/vf/makejvf/tgoth5.vf
+share/texmf/fonts/vf/makejvf/tgoth6.vf
+share/texmf/fonts/vf/makejvf/tgoth7.vf
+share/texmf/fonts/vf/makejvf/tgoth8.vf
+share/texmf/fonts/vf/makejvf/tgoth9.vf
+share/texmf/fonts/vf/makejvf/tmin10.vf
+share/texmf/fonts/vf/makejvf/tmin5.vf
+share/texmf/fonts/vf/makejvf/tmin6.vf
+share/texmf/fonts/vf/makejvf/tmin7.vf
+share/texmf/fonts/vf/makejvf/tmin8.vf
+share/texmf/fonts/vf/makejvf/tmin9.vf
+share/texmf/fonts/vf/makejvf/ngoth10.vf
+share/texmf/fonts/vf/makejvf/ngoth5.vf
+share/texmf/fonts/vf/makejvf/ngoth6.vf
+share/texmf/fonts/vf/makejvf/ngoth7.vf
+share/texmf/fonts/vf/makejvf/ngoth8.vf
+share/texmf/fonts/vf/makejvf/ngoth9.vf
+share/texmf/fonts/vf/makejvf/nmin10.vf
+share/texmf/fonts/vf/makejvf/nmin5.vf
+share/texmf/fonts/vf/makejvf/nmin6.vf
+share/texmf/fonts/vf/makejvf/nmin7.vf
+share/texmf/fonts/vf/makejvf/nmin8.vf
+share/texmf/fonts/vf/makejvf/nmin9.vf
+share/texmf/fonts/vf/makejvf/jis.vf
+share/texmf/fonts/vf/makejvf/jisg.vf
+share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-H.vf
+share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-J.vf
+share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-V.vf
+share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-H.vf
+share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-J.vf
+share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-V.vf
+share/texmf/fonts/vf/makejvf/GothicBBB-Medium-H.vf
+share/texmf/fonts/vf/makejvf/GothicBBB-Medium-J.vf
+share/texmf/fonts/vf/makejvf/GothicBBB-Medium-V.vf
+share/texmf/fonts/vf/makejvf/Jun101-Light-H.vf
+share/texmf/fonts/vf/makejvf/Jun101-Light-J.vf
+share/texmf/fonts/vf/makejvf/Jun101-Light-V.vf
+share/texmf/fonts/vf/makejvf/Ryumin-Light-H.vf
+share/texmf/fonts/vf/makejvf/Ryumin-Light-J.vf
+share/texmf/fonts/vf/makejvf/Ryumin-Light-V.vf
+@dirrm share/texmf/fonts/tfm/makejvf/ptex
+@dirrm share/texmf/fonts/tfm/makejvf/dvips
+@dirrm share/texmf/fonts/tfm/makejvf
+@dirrm share/texmf/fonts/vf/makejvf
 @dirrm share/doc/makejvf-fkr