- Repocopy from japanese/xdvik-vflib to japanese/xdvik because

  it no longer depends on VFlib.

- Fix kpathsea searching order.  This (Japanese version
  of xdvik) now uses $TEXMF/web2c-ptex/texmf.cnf first.

- Some style changes.

4 files changed, 102 insertions, 4 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index f9dced046da..b189c5e3724 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
@@ -22,8 +22,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X. + freetype support
 
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
@@ -33,7 +31,6 @@ RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
 		${X11BASE}/${TTFMINCHO}:${PORTSDIR}/japanese/kochi-ttfonts \
 		${X11BASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/kochi-ttfonts
-
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -91,6 +88,8 @@ PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
 
 PLIST_SUB=	TEXMF=${TEXMF}
 
+.include <bsd.port.pre.mk>
+
 BDPI?=		600
 SHRINK?=	6
 DVIPS?=		dvips
diff --git a/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in b/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in
new file mode 100644
index 00000000000..396813cc44c
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in
@@ -0,0 +1,11 @@
+--- xdvik-22.40w/texk/kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
++++ xdvik-22.40w/texk/kpathsea/Makefile.in	Fri Jun 11 20:45:58 2004
+@@ -126,7 +126,7 @@
+ 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
+ 	| tr '%' '\012' \
+ 	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
+-	      -e 's%\$$TEXMF%$(texmf)%g' \
++	      -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \
+ 	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
+ 	      -e 's%\$$web2cdir%$(web2cdir)%g' \
+ 	      -e 's%\$$prefix%$(prefix)%g' \
diff --git a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
new file mode 100644
index 00000000000..317171b0e05
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
@@ -0,0 +1,77 @@
+--- xdvik-22.40w/texk/kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
++++ xdvik-22.40w/texk/kpathsea/texmf.in	Sat Jun 12 12:34:24 2004
+@@ -1,4 +1,4 @@
+-% original texmf.cnf -- runtime path configuration file for kpathsea.
++% ptex-tetex texmf.cnf -- runtime path configuration file for kpathsea.
+ % (If you change or delete `original' on the previous line, the
+ % distribution won't install its version over yours.)
+ % Public domain.
+@@ -62,7 +62,7 @@
+ 
+ % If defined, teTeX's texconfig stores modifications here (instead of the
+ % TEXMFMAIN tree).
+-%   VARTEXMF = @texmf@-var
++VARTEXMF = @texmf@-var
+ 
+ % User texmf trees can be catered for like this...
+ HOMETEXMF = $HOME/texmf
+@@ -74,7 +74,7 @@
+ %   - list $VARTEXMF in the TEXMF definition;
+ %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
+ % TEXMF = $TEXMFMAIN
+-TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
++TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+ 
+ % The system trees.  These are the trees that are shared by all the users.
+ SYSTEXMF = $TEXMF
+@@ -144,6 +144,13 @@
+ TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
+ 
++% TeXfamily
++TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
++TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
++TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
++TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
++TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
++
+ % Fontinst needs to read afm files.
+ TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
+ 
+@@ -201,12 +208,12 @@
+ % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
+ % paths and directories here (they all resolve to a single place by default),
+ % but historically ...
+-TEXFORMATS = .;$TEXMF/web2c
+-MFBASES = .;$TEXMF/web2c
+-MPMEMS = .;$TEXMF/web2c
+-TEXPOOL = .;$TEXMF/web2c
+-MFPOOL = .;$TEXMF/web2c
+-MPPOOL = .;$TEXMF/web2c
++TEXFORMATS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++MFBASES = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++MPMEMS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++TEXPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++MFPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++MPPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
+ 
+ % Device-independent font metric files.
+ VFFONTS = .;$TEXMF/fonts/vf//
+@@ -318,7 +325,7 @@
+ %
+ % For security reasons, it is better not to have . part of the path.
+ % 
+-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/{web2c-ptex,web2c}};$TETEXDIR;@web2c@;$TEXMF/web2c
+ 
+ 
+ 
+@@ -483,3 +490,8 @@
+ error_line = 79
+ half_error_line = 50
+ max_print_line = 79
++
++% default file code of JTeX and MuLTeX
++% These override the code specified by TeX command in dumping (making format).
++jtex_filetype = euc
++%ml_input_code = junet
diff --git a/japanese/xdvik/files/patch-texk::make::paths.mk b/japanese/xdvik/files/patch-texk::make::paths.mk
new file mode 100644
index 00000000000..7494e1d8cfe
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::make::paths.mk
@@ -0,0 +1,11 @@
+--- xdvik-22.40w/texk/make/paths.mk.orig	Sat Jun 12 12:13:14 2004
++++ xdvik-22.40w/texk/make/paths.mk	Sat Jun 12 12:13:04 2004
+@@ -61,7 +61,7 @@
+ dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
+ 
+ # mktex.cnf, texmf.cnf, etc.
+-web2cdir = $(texmf)/web2c
++web2cdir = $(texmf)/web2c-ptex
+ 
+ # The top-level font directory.
+ fontdir = $(texmf)/fonts