8 files changed, 40 insertions, 30 deletions

diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile
index cc607e071e6e..c65e3fdea3f6 100644
--- a/japanese/dvipsk-vflib/Makefile
+++ b/japanese/dvipsk-vflib/Makefile
@@ -19,8 +19,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz \
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common \
-		${LOCALBASE}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
+RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of dvipsk-*
@@ -31,7 +30,6 @@ CONFIGURE_ENV=	ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
 MAKE_FLAGS=	XCFLAGS="-I${PREFIX}/include" XLOADLIBES="-L${PREFIX}/lib"
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 MAN1=		dvips.1 afm2tfm.1
-IS_INTERACTIVE=	yes
 
 TEXMF=		${PREFIX}/share/texmf
 DVIPSDIR=	${TEXMF}/dvips
@@ -88,12 +86,6 @@ post-install:
 	done
 	@${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib
 .endif
-.if defined(BATCH)
-	@${SETENV} PKG_PREFIX=${PREFIX} BATCH=yes \
-	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-.else
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-.endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/japanese/dvipsk-vflib/pkg-descr b/japanese/dvipsk-vflib/pkg-descr
index 1bc7678ed809..076f82fc8ceb 100644
--- a/japanese/dvipsk-vflib/pkg-descr
+++ b/japanese/dvipsk-vflib/pkg-descr
@@ -7,12 +7,13 @@ and `METAPOST'.
 The dvipsk program is modified version of Tom Rokicki's dvips and
 use the kpathsea library for configuration and path searching.
 You may have to set some variables in the path configuration file for
-kpathsea /usr/local/share/texmf/web2c/texmf.cnf so that the program
+kpathsea `/usr/local/share/texmf/web2c/texmf.cnf' so that the program
 can find PK fonts, Virtual fonts and TFM files. For example,
 
-PKFONTS = .:/usr/local/lib/fonts//:{$TEXMF/fonts:$VARTEXFONTS}//pk//
-VFFONTS = .:/usr/local/share/fonts/vf-a2bk:$TEXMF/fonts//vf//
-TFMFONTS = .:/usr/local/share/fonts/vf-a2bk:{$TEXMF/fonts:$VARTEXFONTS}//tfm//
+PKFONTS = .:/usr/local/lib/fonts/{pk118:pk240:pk300:pk360:pk400:pk600}:{$TEXMF
+/fonts:$VARTEXFONTS}//pk/{$MAKETEX_MODE:modeless}//
+VFFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts}//vf//
+TFMFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts:$VARTEXFONTS}//tfm//
 
 - Makoto WATANABE
 watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/dvipsk-vflib/pkg-message b/japanese/dvipsk-vflib/pkg-message
new file mode 100644
index 000000000000..bf54a7e63192
--- /dev/null
+++ b/japanese/dvipsk-vflib/pkg-message
@@ -0,0 +1,13 @@
+******************************************************************************
+This program requires some japanese virtual fonts. For that purpose,
+you can install `ja-makejvf-fkr-1.0' or `ja-vftool-1.2' package.
+
+Also you may have to set some variables in the path configuration file
+for kpathsea `/usr/local/share/texmf/web2c/texmf.cnf' so that the
+program can find PK fonts, Virtual fonts and TFM files. For example,
+
+PKFONTS = .:/usr/local/lib/fonts/{pk118:pk240:pk300:pk360:pk400:pk600}:{$TEXMF
+/fonts:$VARTEXFONTS}//pk/{$MAKETEX_MODE:modeless}//
+VFFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts}//vf//
+TFMFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts:$VARTEXFONTS}//tfm//
+******************************************************************************
diff --git a/japanese/dvipsk-vflib/pkg-plist b/japanese/dvipsk-vflib/pkg-plist
index 631133fd811e..17056485aa38 100644
--- a/japanese/dvipsk-vflib/pkg-plist
+++ b/japanese/dvipsk-vflib/pkg-plist
@@ -120,4 +120,3 @@ share/doc/dvips/dvips.help
 @dirrm share/texmf/tex/latex209/dvips
 @dirrm share/texmf/tex/latex209
 @dirrm share/doc/dvips
-@unexec if [ -f %D/share/texmf/web2c/texmf.cnf.bak ] ; then rm -f %D/share/texmf/web2c/texmf.cnf ; mv %D/share/texmf/web2c/texmf.cnf.bak %D/share/texmf/web2c/texmf.cnf ; fi
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 0cad464a9f04..3ff663e4acd8 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -17,8 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common \
-		${LOCALBASE}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
+RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of dvipsk-*
 
@@ -27,7 +26,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 MAN1=		dvips.1 afm2tfm.1
-IS_INTERACTIVE=	yes
 
 TEXMF=		${PREFIX}/share/texmf
 DVIPSDIR=	${TEXMF}/dvips
@@ -83,12 +81,6 @@ post-install:
 	done
 	@${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib
 .endif
-.if defined(BATCH)
-	@${SETENV} PKG_PREFIX=${PREFIX} BATCH=yes \
-	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-.else
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-.endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/japanese/dvipsk/pkg-descr b/japanese/dvipsk/pkg-descr
index 1bc7678ed809..076f82fc8ceb 100644
--- a/japanese/dvipsk/pkg-descr
+++ b/japanese/dvipsk/pkg-descr
@@ -7,12 +7,13 @@ and `METAPOST'.
 The dvipsk program is modified version of Tom Rokicki's dvips and
 use the kpathsea library for configuration and path searching.
 You may have to set some variables in the path configuration file for
-kpathsea /usr/local/share/texmf/web2c/texmf.cnf so that the program
+kpathsea `/usr/local/share/texmf/web2c/texmf.cnf' so that the program
 can find PK fonts, Virtual fonts and TFM files. For example,
 
-PKFONTS = .:/usr/local/lib/fonts//:{$TEXMF/fonts:$VARTEXFONTS}//pk//
-VFFONTS = .:/usr/local/share/fonts/vf-a2bk:$TEXMF/fonts//vf//
-TFMFONTS = .:/usr/local/share/fonts/vf-a2bk:{$TEXMF/fonts:$VARTEXFONTS}//tfm//
+PKFONTS = .:/usr/local/lib/fonts/{pk118:pk240:pk300:pk360:pk400:pk600}:{$TEXMF
+/fonts:$VARTEXFONTS}//pk/{$MAKETEX_MODE:modeless}//
+VFFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts}//vf//
+TFMFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts:$VARTEXFONTS}//tfm//
 
 - Makoto WATANABE
 watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/dvipsk/pkg-message b/japanese/dvipsk/pkg-message
new file mode 100644
index 000000000000..bf54a7e63192
--- /dev/null
+++ b/japanese/dvipsk/pkg-message
@@ -0,0 +1,13 @@
+******************************************************************************
+This program requires some japanese virtual fonts. For that purpose,
+you can install `ja-makejvf-fkr-1.0' or `ja-vftool-1.2' package.
+
+Also you may have to set some variables in the path configuration file
+for kpathsea `/usr/local/share/texmf/web2c/texmf.cnf' so that the
+program can find PK fonts, Virtual fonts and TFM files. For example,
+
+PKFONTS = .:/usr/local/lib/fonts/{pk118:pk240:pk300:pk360:pk400:pk600}:{$TEXMF
+/fonts:$VARTEXFONTS}//pk/{$MAKETEX_MODE:modeless}//
+VFFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts}//vf//
+TFMFONTS = .:{/usr/local/share/fonts/makejvf:$TEXMF/fonts:$VARTEXFONTS}//tfm//
+******************************************************************************
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index fd3b60b53823..dcf6d85cd367 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -118,4 +118,3 @@ share/doc/dvips/dvips.help
 @dirrm share/texmf/tex/latex209/dvips
 @dirrm share/texmf/tex/latex209
 @dirrm share/doc/dvips
-@unexec if [ -f %D/share/texmf/web2c/texmf.cnf.bak ] ; then rm -f %D/share/texmf/web2c/texmf.cnf ; mv %D/share/texmf/web2c/texmf.cnf.bak %D/share/texmf/web2c/texmf.cnf ; fi