2 files changed, 81 insertions, 50 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 4c88b396a245..16b93e988166 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	xdvik-22.15
-PKGNAME=	ja-vfxdvik-22.15
+PKGNAME?=	ja-xdvik-vflib-22.15
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
 		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
 		ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
 		${MASTER_SITE_LOCAL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+#DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
 		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
@@ -31,40 +31,41 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	inagaki@tg.rim.or.jp
 
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
-RUN_DEPENDS=	makejvf:${PORTSDIR}/japanese/makejvf
+RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 DIST_SUBDIR=	xdvik
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS= \
-		--enable-a4 --enable-bdpi=300 --enable-shrink=8 \
-		--enable-xdviprint=${PREFIX}/libexec/xdviprint
-CONFIGURE_ENV= INSTALL="${INSTALL}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
+CONFIGURE_ARGS=	--enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \
+		--with-dvifilter=${DVIPS} \
+		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
+		--enable-smallpanel --enable-zoombutton \
+		--enable-vikey
+CONFIGURE_ENV=	INSTALL="${INSTALL}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" \
+		XDEFS='-DMFMODE=\"${MF_MODE}\"'
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
-VFFONTS=	.:${PREFIX}/share/fonts/makejvf/vf//
-TFMFONTS=	.:${PREFIX}/share/fonts/makejvf/tfm/ptex//
-PKFONTS=	.:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}//
-MAKE_ENV=	XDEFS="-DDEFAULT_VFFONTS='"\"\\\"${VFFONTS}\\\""\"' -DDEFAULT_TFMFONTS='"\"\\\"${TFMFONTS}\\\""\"' -DDEFAULT_PKFONTS='"\"\\\"${PKFONTS}\\\""\"'"
+#MAKE_ENV=	'XDEFS=${XDEFS}'
 PATCH_STRIP=	-p1
 MAN1=		xdvi.1
 
 TEXMF=		${PREFIX}/share/texmf
-VARTEXFONTS=	/var/tmp/texfonts
+#VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
-MAKEJVFDIR=	${PREFIX}/share/fonts/makejvf
-MAKETEX_MODE?=	ljfour
-DVIPS?=		dvipsk
-
-PTEXTFM=	standard nmin-ngoth jis morisawa
-DOCS=		FAQ \
-		xdvi.icon \
-		CHANGES.xdvik-jp \
-		README \
-		README.xdvik-jp \
+
+#VFFONTS=	.:${MAKEJVFDIR}/vf//
+#XDEFS+=		-DDEFAULT_VFFONTS=\"\\\"${VFFONTS}\\\"\"
+#TFMFONTS=	.:${MAKEJVFDIR}/tfm/ptex//
+#XDEFS+=		-DDEFAULT_TFMFONTS=\"\\\"${TFMFONTS}\\\"\"
+#PKFONTS=	.:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}//
+#XDEFS+=		-DDEFAULT_PKFONTS=\"\\\"${PKFONTS}\\\"\"
+
+DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
+		README README.xdvik-jp \
 		READMEs/ChangeLog.xdvik20a-j1.1 \
 		READMEs/ChangeLog.xdvik20c-j1.0 \
 		READMEs/HEADERS.DOC \
@@ -83,37 +84,65 @@ DOCS=		FAQ \
 		READMEs/README.xdvik20c-j1.0p1.patch
 
 # ******************
-# DVIPS:
-#  Please set up [dvipskˇĂdvipsk-vflibˇĂdvi2ps] to DVIPS when I want to
-#  change it.
-#  Also, please change script $ PREFIX/libexec/xdviprint after installation
-#  when the choice other than this wants.
+# USEPK_MODE:
+#  Mode name of Metafont to give to print/pkfonts* is set.
+#  It is care-and-attention to the other program how MetaFont wants to
+#  be executed that do not use modeless. Kpathsea always searches
+#  modeless because even if you specify any kind of mode.
 # MAKETEX_MODE:
-#  When MetaFont is used the kind of the printer that I use is set up.
-#  The default is ljfour.
-#  It does not need to change it particularly because it is able to set up it
-#  with the option of xdvi.
+#  It is mode name of default at executing MetaFont. The default is ljfour.
+#  This needs not to be changed. It can be changed with an option or resource.
+# DVIPS:
+#  Specification of `dvi -> ps' conversion program to use.
+#  You can set following one: dvips, dvipsk-vflib, dvi2ps.
+#  Other way... After installation if you change script
+#  ${PREFIX}/libexec/xdviprint, any kind of program can be used.
 # ******************
+FONTTYPE?=	metafont
+USEPK_MODE?=	preview
+MAKETEX_MODE?=	ljfour
+SHRINK?=	6
+BDPI?=		300
+DVIPS?=		dvips
 
-.if ${DVIPS} == dvi2ps
-CONFIGURE_ARGS+= --with-dvifilter=dvi2ps
-.elif ${DVIPS} == dvipsk-vflib
-CONFIGURE_ARGS+= --with-dvifilter=dvips
-.elif ${DVIPS} == dvipsk
-CONFIGURE_ARGS+= --with-dvifilter=dvips
+.if ${FONTTYPE} == metafont
+RUN_DEPENDS+=    ptex-common:${PORTSDIR}/japanese/ptex-common
+MF_MODE=	${MAKETEX_MODE}
 .else
-DVIPS=dvipsk
-CONFIGURE_ARGS+= --with-dvifilter=dvips
+MF_MODE=	${USEPK_MODE}
+CONFIGURE_ARGS+=--without-mktexpk-default
+.endif
+
+.BEGIN:
+.if ${FONTTYPE} != metafont && \
+	${FONTTYPE} != pkfont && ${FONTTYPE} != pkall
+	@${ECHO} "Error: invalid value for FONTTYPE: \"${FONTTYPE}\""
+	@${ECHO} "Possible values are: metafont, pkall and pkfont."
+	@${FALSE}
+.endif
+.if ${BDPI} != 118 && ${BDPI} != 240 && \
+	${BDPI} != 300 && ${BDPI} != 360 && \
+	${BDPI} != 400  && ${BDPI} != 600
+	@${ECHO} "Error: invalid value for BDPI: \"${BDPI}\""
+	@${ECHO} "Possible values are: all, 118, 240, 300, 360, 400 and 600."
+	@${FALSE}
+.endif
+.if ${DVIPS} != dvi2ps && ${DVIPS} != dvips
+	@${ECHO} "Error: invalid value for DVIPS: \"${DVIPS}\""
+	@${ECHO} "Possible values are: dvi2ps and dvips."
+	@${FALSE}
 .endif
 
-#.include <bsd.port.pre.mk>
+.include <bsd.port.pre.mk>
 
 pre-fetch:
 	@( \
-	${ECHO} "************************************************************"; \
-	${ECHO} "*           japanese/dvipsk is used in default.            *"; \
-	${ECHO} "*          Please refer to Makefile about a change.        *"; \
-	${ECHO} "************************************************************")
+	${ECHO} "**************************************************************"; \
+	${ECHO} "*            japanese/dvipsk is used in default.             *"; \
+	${ECHO} "*          Please refer to Makefile about a change.          *"; \
+	${ECHO} "*           or, after installation, please change            *"; \
+	${ECHO} "*                ${PREFIX}/libexec/xdviprint.                *"; \
+	${ECHO} "**************************************************************")
 
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
@@ -127,9 +156,9 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xdvi
 	@for i in ${DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${PREFIX}/share/doc/xdvi ; \
+	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i \
+		${PREFIX}/share/doc/xdvi ; \
 	done
 .endif
-	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index 8e17544ba6f0..66f4e247536b 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -8,6 +8,8 @@ Japanese dvi file previewer for X.
     5. built-in EPS preview (need to any ghostscript)
     6. print out from this program (use lpr).
     7. convert dvi -> ps (default use japanese/dvipsk).
-    8. support wheel mouse.
+    8. wheel mouse supports.
 
 - Kentaro Inagaki <inagaki@tg.rim.or.jp>
+
+WWW: http://www.ipc.chiba-u.ac.jp/~yamaga/index-j.html