Update TeXLive to TL2015.

- print/texlive-infra was renamed with print/texlive-tlmgr.
  Note that currently tlmgr(1) does not work because of
  lack of TLPDB.  This will be fixed.

- Lua libraries used in LuaTeX are separated into
  devel/tex-libtexlua and devel/texlibtexluajit.
  USE_TEX supports them via keywords "texlua" and "texluajit".

- libsynctex is currently installed by devel/tex-web2c.
  This will be separated into a single port.

- Add graphics/libpotrace and use installed libpotrace
  and libharfbuzz.

70 files changed, 296 insertions, 297 deletions

diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index 9f88c76d7025..b0d8638d881b 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	22.87
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	SF/xdvi/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	tex-
@@ -14,14 +14,14 @@ COMMENT=	DVI Previewer(kpathsearch) for X
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpaper.so:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	tex-dvipsk>=5.994_1:${PORTSDIR}/print/tex-dvipsk
+RUN_DEPENDS=	tex-dvipsk>=5.995:${PORTSDIR}/print/tex-dvipsk
 
 USES=		iconv gmake motif
 USE_TEX=	web2c kpathsea texmf texhash
 TEXHASHDIRS=	${TEXMFDISTDIR}
 USE_XORG=	ice sm x11 xmu xpm xt xi
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}	
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
 		--datarootdir=${LOCALBASE}/share \
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-AJ16.c b/print/tex-xdvik/files/patch-texk-xdvik-AJ16.c
index 49f30ca0fda0..a036f528e38b 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-AJ16.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-AJ16.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/AJ16.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/AJ16.c.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/AJ16.c
 @@ -0,0 +1,2338 @@
 +/*
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-CHANGES.xdvik-jp b/print/tex-xdvik/files/patch-texk-xdvik-CHANGES.xdvik-jp
index ea912b534fb7..1e0cd2dbe74e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-CHANGES.xdvik-jp
+++ b/print/tex-xdvik/files/patch-texk-xdvik-CHANGES.xdvik-jp
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/CHANGES.xdvik-jp	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/CHANGES.xdvik-jp.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/CHANGES.xdvik-jp
 @@ -0,0 +1,758 @@
 +2013-05-04  TANAKA Takuji  <KXD02663@nifty.ne.jp>
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-Makefile.am b/print/tex-xdvik/files/patch-texk-xdvik-Makefile.am
index 297638fa0618..55d92687b782 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-Makefile.am
+++ b/print/tex-xdvik/files/patch-texk-xdvik-Makefile.am
@@ -1,6 +1,6 @@
---- texk/xdvik/Makefile.am.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/Makefile.am	2015-01-31 21:02:18.000000000 +0900
-@@ -87,6 +87,19 @@
+--- texk/xdvik/Makefile.am.orig	2013-04-16 07:22:53 UTC
++++ texk/xdvik/Makefile.am
+@@ -87,6 +87,19 @@ libxdvi_a_SOURCES = \
  	xdvi-debug.h \
  	xserver-info.c \
  	xdvi.h \
@@ -20,7 +20,7 @@
  	xserver-info.h
  
  ## We cannot easily use two different libraries due to the mutual
-@@ -173,9 +186,14 @@
+@@ -173,9 +186,14 @@ bin_PROGRAMS = xdvi-bin
  
  xdvi_bin_SOURCES = main.c
  
@@ -37,7 +37,7 @@
  
  # When cross-compiling, EXEEXT for the build and host systems may differ.
  # Thus we depend on the auxiliary file squeeze/stamp-squeeze.
-@@ -206,14 +224,14 @@
+@@ -206,14 +224,14 @@ dist_xdvi_DATA = texmf/XDvi
  pixmapdir = $(datarootdir)/texmf-dist/xdvi/pixmap
  dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-Makefile.in b/print/tex-xdvik/files/patch-texk-xdvik-Makefile.in
index cdd8c60307ef..5800f3a7fe6e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-Makefile.in
+++ b/print/tex-xdvik/files/patch-texk-xdvik-Makefile.in
@@ -1,6 +1,6 @@
---- texk/xdvik/Makefile.in.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/Makefile.in	2015-01-31 21:03:09.000000000 +0900
-@@ -154,6 +154,8 @@
+--- texk/xdvik/Makefile.in.orig	2014-04-13 01:27:58 UTC
++++ texk/xdvik/Makefile.in
+@@ -154,6 +154,8 @@ am_libxdvi_a_OBJECTS = browser.$(OBJEXT)
  	search-internal.$(OBJEXT) special.$(OBJEXT) \
  	string-utils.$(OBJEXT) string_list.$(OBJEXT) util.$(OBJEXT) \
  	vf.$(OBJEXT) x_util.$(OBJEXT) xdvi.$(OBJEXT) \
@@ -9,7 +9,7 @@
  	xserver-info.$(OBJEXT) gui/Panner.$(OBJEXT) gui/Tip.$(OBJEXT) \
  	gui/help-window.$(OBJEXT) gui/mag.$(OBJEXT) gui/menu.$(OBJEXT) \
  	gui/message-window.$(OBJEXT) gui/pagesel.$(OBJEXT) \
-@@ -502,7 +504,7 @@
+@@ -502,7 +504,7 @@ x_ldflags = $(X_LIBS) $(x_linker_options
  x_extra_libs = $(X_EXTRA_LIBS) $(iconv_libs)
  xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \
  	$(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
@@ -18,7 +18,7 @@
  common_dependencies = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND)
  libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c
  AM_CPPFLAGS = -I$(srcdir)/gui $(common_includes)
-@@ -521,6 +523,8 @@
+@@ -521,6 +523,8 @@ libxdvi_a_SOURCES = alloc-debug.h browse
  	string-utils.c string-utils.h string_list.c string_list.h \
  	translations.h util.c util.h version.h vf.c x_util.c x_util.h \
  	xdvi.c xdvi-config.h xdvi-debug.h xserver-info.c xdvi.h \
@@ -27,7 +27,7 @@
  	xserver-info.h gui/Panner.c gui/Panner.h gui/PannerP.h \
  	gui/Tip.c gui/Tip.h gui/TipP.h gui/help-window.c \
  	gui/help-window.h gui/mag.c gui/mag.h gui/menu.c gui/menu.h \
-@@ -562,10 +566,10 @@
+@@ -562,10 +566,10 @@ EXTRA_DIST = psheader.txt mksedscript xd
  	xdvi.icon xdvizilla xdvizilla.1
  CLEANFILES = psheader.c sedscript xdvi.1
  nodist_man1_MANS = xdvi.1
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-README.xdvik-jp b/print/tex-xdvik/files/patch-texk-xdvik-README.xdvik-jp
index 7b6252a1b52c..86300d51bad4 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-README.xdvik-jp
+++ b/print/tex-xdvik/files/patch-texk-xdvik-README.xdvik-jp
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/README.xdvik-jp	2015-01-31 21:02:19.000000000 +0900
+--- texk/xdvik/README.xdvik-jp.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/README.xdvik-jp
 @@ -0,0 +1,84 @@
 +
 +		<< xdvik-22.84.16-jp patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20a-j1.1 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20a-j1.1
index 482a8f814356..80c7ce7392c7 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20a-j1.1
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20a-j1.1
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/ChangeLog.xdvik20a-j1.1	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/ChangeLog.xdvik20a-j1.1.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/ChangeLog.xdvik20a-j1.1
 @@ -0,0 +1,132 @@
 +xdvik20a-j1.1 変更履歴
 +				千葉大学総合情報処理センター 山賀正人
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20c-j1.0 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20c-j1.0
index 12399a6feb3f..a6da612fe461 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20c-j1.0
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik20c-j1.0
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/ChangeLog.xdvik20c-j1.0	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/ChangeLog.xdvik20c-j1.0.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/ChangeLog.xdvik20c-j1.0
 @@ -0,0 +1,34 @@
 +xdvik20c-j1.0p0.patch 変更履歴
 +                                     筑波大学 社会工学研究科 中右 浩二
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40b-j1.05 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40b-j1.05
index bb4ce878daee..e37a23d33111 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40b-j1.05
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40b-j1.05
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/ChangeLog.xdvik22.40b-j1.05	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/ChangeLog.xdvik22.40b-j1.05.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/ChangeLog.xdvik22.40b-j1.05
 @@ -0,0 +1,69 @@
 +/* ******************* *
 + *  xdvik-jp 変更履歴  *
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40y1-j1.21.html b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40y1-j1.21.html
index 59dbe1ea0b31..e2f6ee04349b 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40y1-j1.21.html
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-ChangeLog.xdvik22.40y1-j1.21.html
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/ChangeLog.xdvik22.40y1-j1.21.html	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/ChangeLog.xdvik22.40y1-j1.21.html.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/ChangeLog.xdvik22.40y1-j1.21.html
 @@ -0,0 +1,322 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 +<HTML>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-HEADERS.DOC b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-HEADERS.DOC
index acabe540f28e..01a43f5df4bf 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-HEADERS.DOC
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-HEADERS.DOC
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/HEADERS.DOC	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/HEADERS.DOC.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/HEADERS.DOC
 @@ -0,0 +1,170 @@
 +Path: tkyex1.phys.s.u-tokyo.ac.jp!news.u-tokyo.ac.jp!eccnews!ecc-s401!s31514
 +From: s31514@secc.ecc.u-tokyo.ac.jp (s31514)
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-InternalVars b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-InternalVars
index fcc7b1fe258a..29061fc0c6cf 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-InternalVars
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-InternalVars
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/InternalVars	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/InternalVars.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/InternalVars
 @@ -0,0 +1,56 @@
 +------------------------------------------------------------------------
 +            <<<< Internal Variable for printdvi patch >>>>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp+toc+hal2 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp+toc+hal2
index cdfe5a089298..b1e53e6f806f 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp+toc+hal2
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp+toc+hal2
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.jp+toc+hal2	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.jp+toc+hal2.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.jp+toc+hal2
 @@ -0,0 +1,57 @@
 +やーどうもどうも。このパッチは xdvi-17 にあてるパッチでっす(ver1.2)。
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp-patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp-patch
index 83346ed1b3a0..10f7aafcd747 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp-patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.jp-patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.jp-patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.jp-patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.jp-patch
 @@ -0,0 +1,778 @@
 +
 +            << xdvi PL17 jp-patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi
index cbf2daf8f102..a8b448c9409e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.markpage+toc+printdvi	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.markpage+toc+printdvi.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.markpage+toc+printdvi
 @@ -0,0 +1,200 @@
 +
 +        << xdvi-17+markpage+toc+printdvi patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi+paper b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi+paper
index 44620e0d8c29..13b61cd7c07e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi+paper
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.markpage+toc+printdvi+paper
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.markpage+toc+printdvi+paper	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.markpage+toc+printdvi+paper.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.markpage+toc+printdvi+paper
 @@ -0,0 +1,583 @@
 +
 +      << xdvi-17+markpage+toc+printdvi+paper patchについて >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.miyu-beta6 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.miyu-beta6
index 390db4d6a96a..673b732cdfb1 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.miyu-beta6
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.miyu-beta6
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.miyu-beta6	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.miyu-beta6.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.miyu-beta6
 @@ -0,0 +1,239 @@
 +
 +                << miyu-patch for xdvi PL17 について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.ptex b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.ptex
index 97d23b5e28c9..cc1beefa1e25 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.ptex
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.ptex
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.ptex	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.ptex.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.ptex
 @@ -0,0 +1,80 @@
 +
 +		  << xdvi-17+ptex patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.tasai-ussy b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.tasai-ussy
index cbf24521b958..642c53856e8a 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.tasai-ussy
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.tasai-ussy
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.tasai-ussy	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.tasai-ussy.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.tasai-ussy
 @@ -0,0 +1,312 @@
 +
 +               ** pagenumber-patch for Xdvi PL17 + etc. **
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.vf2ft b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.vf2ft
index 58416ed95139..8700807c8efc 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.vf2ft
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.vf2ft
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.vf2ft	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.vf2ft.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.vf2ft
 @@ -0,0 +1,100 @@
 +＊ xdvik-22.40l-j1.09-vf2ft.patch について
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.15-j1.04.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.15-j1.04.patch
index b35ddf717ad5..3bceab501509 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.15-j1.04.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.15-j1.04.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik-22.15-j1.04.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik-22.15-j1.04.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik-22.15-j1.04.patch
 @@ -0,0 +1,217 @@
 +
 +		<< xdvik-22.15-j1.04 patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40b-j1.05.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40b-j1.05.patch
index a01c4d983eb6..5e46c4fa1c4f 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40b-j1.05.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40b-j1.05.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik-22.40b-j1.05.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik-22.40b-j1.05.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik-22.40b-j1.05.patch
 @@ -0,0 +1,220 @@
 +
 +		<< xdvik-22.40b-j1.05 patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40y1-j1.21 b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40y1-j1.21
index 87b37eb8123d..aecfe1b62724 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40y1-j1.21
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik-22.40y1-j1.21
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik-22.40y1-j1.21	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik-22.40y1-j1.21.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik-22.40y1-j1.21
 @@ -0,0 +1,239 @@
 +
 +		<< xdvik-22.40y1-j1.21 patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.0.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.0.patch
index 0e06fd7ff542..64335411a022 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.0.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.0.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik18f-j1.0.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik18f-j1.0.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik18f-j1.0.patch
 @@ -0,0 +1,103 @@
 +*このパッチについて
 +  このパッチ (xdvik18f-j1.0.patch) は xdvik18f を日本語対応にするため
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.1p5.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.1p5.patch
index c164aa0ef06d..443cd41d7434 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.1p5.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik18f-j1.1p5.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik18f-j1.1p5.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik18f-j1.1p5.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik18f-j1.1p5.patch
 @@ -0,0 +1,322 @@
 +*xdvik18f-j1.1p5.patch について
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20a-j1.1.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20a-j1.1.patch
index 5ff8ec50e2fa..3a80859f4333 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20a-j1.1.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20a-j1.1.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik20a-j1.1.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik20a-j1.1.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik20a-j1.1.patch
 @@ -0,0 +1,273 @@
 +*xdvik20a-j1.1.patch について
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0+hal2+dvisel b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0+hal2+dvisel
index eba3a1cb1a84..f22a67f69b2c 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0+hal2+dvisel
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0+hal2+dvisel
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik20c-j1.0+hal2+dvisel	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik20c-j1.0+hal2+dvisel.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik20c-j1.0+hal2+dvisel
 @@ -0,0 +1,179 @@
 +
 +		<< xdvik20c+hal2+dvisel patch について >>
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0p1.patch b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0p1.patch
index 06814292e74a..bbf46bce0d09 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0p1.patch
+++ b/print/tex-xdvik/files/patch-texk-xdvik-READMEs-README.xdvik20c-j1.0p1.patch
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch.orig	2015-07-19 18:49:41 UTC
++++ texk/xdvik/READMEs/README.xdvik20c-j1.0p1.patch
 @@ -0,0 +1,43 @@
 +xdvik20c-j1.0p1.patch について
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ac-withenable.ac b/print/tex-xdvik/files/patch-texk-xdvik-ac-withenable.ac
index ba03974b0a12..9ff2b80613f9 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ac-withenable.ac
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ac-withenable.ac
@@ -1,6 +1,6 @@
---- texk/xdvik/ac/withenable.ac.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/ac/withenable.ac	2015-01-31 21:02:19.000000000 +0900
-@@ -6,5 +6,5 @@
+--- texk/xdvik/ac/withenable.ac.orig	2013-04-05 00:03:01 UTC
++++ texk/xdvik/ac/withenable.ac
+@@ -6,5 +6,5 @@ dnl
  dnl extra_dirs = texk/xdvik/squeeze
  dnl
  ## configure options and TL libraries required for xdvik
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-c-auto.in b/print/tex-xdvik/files/patch-texk-xdvik-c-auto.in
index 5b09dcd395cf..c8895ba74180 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-c-auto.in
+++ b/print/tex-xdvik/files/patch-texk-xdvik-c-auto.in
@@ -1,5 +1,5 @@
---- texk/xdvik/c-auto.in.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/c-auto.in	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/c-auto.in.orig	2014-04-13 01:27:58 UTC
++++ texk/xdvik/c-auto.in
 @@ -72,6 +72,9 @@
  /* Define to 1 if you have the <float.h> header file. */
  #undef HAVE_FLOAT_H
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-configure b/print/tex-xdvik/files/patch-texk-xdvik-configure
index 1de416c00e73..46bc053d55a9 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-configure
+++ b/print/tex-xdvik/files/patch-texk-xdvik-configure
@@ -1,6 +1,6 @@
---- texk/xdvik/configure.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/configure	2015-01-31 21:02:18.000000000 +0900
-@@ -667,6 +667,7 @@
+--- texk/xdvik/configure.orig	2014-04-13 03:58:38 UTC
++++ texk/xdvik/configure
+@@ -667,6 +667,7 @@ X_CFLAGS
  XMKMF
  LIBOBJS
  ALLOCA
@@ -8,7 +8,7 @@
  PS_DEF
  CPP
  OTOOL64
-@@ -13309,6 +13310,20 @@
+@@ -13309,6 +13310,20 @@ $as_echo "#define A4 1" >>confdefs.h
  
  fi
  
@@ -29,7 +29,7 @@
  ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
  
  
-@@ -18409,6 +18424,82 @@
+@@ -18409,6 +18424,82 @@ ${top_builddir}/../../libs/freetype2/fre
  	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
  fi
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-configure.ac b/print/tex-xdvik/files/patch-texk-xdvik-configure.ac
index 3851bf57b339..cbe18c88bc08 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-configure.ac
+++ b/print/tex-xdvik/files/patch-texk-xdvik-configure.ac
@@ -1,6 +1,6 @@
---- texk/xdvik/configure.ac.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/configure.ac	2015-01-31 21:02:18.000000000 +0900
-@@ -67,6 +67,16 @@
+--- texk/xdvik/configure.ac.orig	2014-04-13 03:58:39 UTC
++++ texk/xdvik/configure.ac
+@@ -67,6 +67,16 @@ AS_IF([test "x$enable_a4" = xno],
        [AC_MSG_NOTICE([Disabled a4/cm, using letter/in instead])],
        [AC_DEFINE([A4], 1, [Define to use A4 as the default paper size.])])
  
@@ -17,7 +17,7 @@
  AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
  
  AC_FUNC_FORK
-@@ -263,6 +273,7 @@
+@@ -263,6 +273,7 @@ fi
  
  KPSE_KPATHSEA_FLAGS
  KPSE_FREETYPE2_FLAGS
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.c b/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.c
index 0f50bd15ce54..716ae5720429 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.c
@@ -1,6 +1,6 @@
---- texk/xdvik/dvi-draw.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvi-draw.c	2015-01-31 21:02:18.000000000 +0900
-@@ -56,6 +56,9 @@
+--- texk/xdvik/dvi-draw.c.orig	2013-09-01 05:55:44 UTC
++++ texk/xdvik/dvi-draw.c
+@@ -56,6 +56,9 @@ in xdvi.c.
  #include "statusline.h"
  #include "hypertex.h"
  #include "special.h"
@@ -10,7 +10,7 @@
  #include "my-snprintf.h"
  #include "kpathsea/tex-file.h"
  #include "mag.h"
-@@ -531,8 +534,8 @@
+@@ -531,8 +534,8 @@ print_char(ubyte ch, struct glyph *g)
  }
  
  static const char *dvi_table1[] = {
@@ -21,7 +21,7 @@
      "RIGHT2", "RIGHT3", "RIGHT4", "W0", "W1", "W2", "W3", "W4",
      "X0", "X1", "X2", "X3", "X4", "DOWN1", "DOWN2", "DOWN3",
      "DOWN4", "Y0", "Y1", "Y2", "Y3", "Y4", "Z0", "Z1",
-@@ -542,7 +545,12 @@
+@@ -542,7 +545,12 @@ static const char *dvi_table1[] = {
  static const char *dvi_table2[] = {
      "FNT1", "FNT2", "FNT3", "FNT4", "XXX1", "XXX2", "XXX3", "XXX4",
      "FNTDEF1", "FNTDEF2", "FNTDEF3", "FNTDEF4", "PRE", "POST", "POSTPOST",
@@ -35,7 +35,7 @@
  };
  
  static void
-@@ -667,6 +675,146 @@
+@@ -667,6 +675,146 @@ sample(bmUnitT *bits, int bytes_wide, in
      return n;
  }
  
@@ -182,7 +182,7 @@
  static void
  shrink_glyph(struct glyph *g)
  {
-@@ -757,6 +905,89 @@
+@@ -757,6 +905,89 @@ shrink_glyph(struct glyph *g)
  	print_bitmap(&g->bitmap2);
  }
  
@@ -272,7 +272,7 @@
  #ifdef	GREY
  
  #ifdef RGB_ANTI_ALIASING
-@@ -970,6 +1201,7 @@
+@@ -970,6 +1201,7 @@ shrink_glyph_grey(struct glyph *g)
  				 BMBITS, 0);
  	size = g->image2->bytes_per_line * g->bitmap2.h;
  	g->pixmap2 = g->image2->data = xmalloc(size != 0 ? size : 1);
@@ -280,7 +280,7 @@
      }
      /* ... and the pixmap used for globals.gc.fore2: */
      if (globals.gc.fore2 != NULL && g->pixmap2_gc2 == NULL) {
-@@ -1283,8 +1515,13 @@
+@@ -1283,8 +1515,13 @@ static ubyte scantable[256] = {
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
      1, 2,	/* SET1,SET2 (128,129) */
@@ -295,7 +295,7 @@
      M1, 0, 0, 1, 2, 3, 4, 0, 1, 2,	/* EOP,PUSH,POP,RIGHT1-4,W0M2 (140-149) */
      3, 4, 0, 1, 2, 3, 4, 1, 2, 3,	/* W3-4,X0-4,DOWN1-3 (150-159) */
      4, 0, 1, 2, 3, 4, 0, 1, 2, 3,	/* DOWN4,Y0-4,Z0-3 (160-169) */
-@@ -1337,9 +1574,11 @@
+@@ -1337,9 +1574,11 @@ spcl_scan(Boolean (*spcl_proc)(char *str
  		ch = xone(fp);
  		xskip(fp, (long)ch + (long)xone(fp));
  		break;
@@ -307,7 +307,7 @@
  	    case M5:	/* doesn't belong */
  		dvi_fmt_error("spcl_scan: shouldn't happen: %s encountered",
  			      dvi_table2[ch - (FNTNUM0 + 64)]);
-@@ -1453,6 +1692,46 @@
+@@ -1453,6 +1692,46 @@ prescan(FILE *fp)
   *	Routines to print characters.
   */
  
@@ -354,7 +354,7 @@
  setcharRetvalT
  set_char(
  #ifdef TEXXET
-@@ -1461,9 +1740,6 @@
+@@ -1461,9 +1740,6 @@ set_char(
  	 wide_ubyte ch)
  {
      struct glyph *g;
@@ -364,7 +364,7 @@
  
      if (ch > maxchar)
  	realloc_font(currinf.fontp, (wide_ubyte)ch);
-@@ -1497,14 +1773,41 @@
+@@ -1497,14 +1773,41 @@ set_char(
  	    print_char((ubyte) ch, g);
  	currinf.fontp->timestamp = ++current_timestamp;
      }
@@ -409,7 +409,7 @@
  	
  #ifdef RGB_ANTI_ALIASING
  	if (currwin.shrinkfactor == -1) {
-@@ -1546,9 +1849,9 @@
+@@ -1546,9 +1849,9 @@ set_char(
  #ifdef TEXXET
      }
      if (cmd == PUT1 || (resource.omega && cmd == PUT2))
@@ -422,7 +422,7 @@
      return;
  #else
      return g->dvi_adv;
-@@ -1603,6 +1906,33 @@
+@@ -1603,6 +1906,33 @@ set_empty_char(
  #endif
  }
  
@@ -456,7 +456,7 @@
  setcharRetvalT
  load_n_set_char(
  #ifdef TEXXET
-@@ -1650,7 +1980,7 @@
+@@ -1650,7 +1980,7 @@ set_vf_char(
      wide_ubyte oldmaxchar;
      static ubyte c;
  #ifdef TEXXET
@@ -465,7 +465,7 @@
  #endif
  
      if (ch > maxchar)
-@@ -1666,9 +1996,9 @@
+@@ -1666,9 +1996,9 @@ set_vf_char(
  #endif
      }
  #ifdef TEXXET
@@ -478,7 +478,7 @@
      if (scan_frame == NULL) {
  #endif
  	oldinfo = currinf;
-@@ -1693,9 +2023,9 @@
+@@ -1693,9 +2023,9 @@ set_vf_char(
  #ifdef TEXXET
      }
      if (cmd == PUT1 || (resource.omega && cmd == PUT2))
@@ -491,7 +491,7 @@
      return;
  #else
      return m->dvi_adv;
-@@ -1813,9 +2143,64 @@
+@@ -1813,9 +2143,64 @@ set_no_char(
   *	Set rule.  Arguments are coordinates of lower left corner.
   */
  
@@ -556,7 +556,7 @@
  #ifdef TEXXET
      put_rule(PXL_H - (currinf.dir < 0 ? w - 1 : 0), PXL_V - h + 1,
  	     (unsigned int)w, (unsigned int)h);
-@@ -1860,7 +2245,7 @@
+@@ -1860,7 +2245,7 @@ draw_part(FILE *fp, struct frame *minfra
  #ifdef TEXXET
  	    (*currinf.set_char_p) (ch, ch);
  #else
@@ -565,7 +565,7 @@
  #endif
  	}
  	else if (FNTNUM0 <= ch && ch <= (ubyte) (FNTNUM0 + 63)) {
-@@ -1877,7 +2262,7 @@
+@@ -1877,7 +2262,7 @@ draw_part(FILE *fp, struct frame *minfra
  #else
  		a = (*currinf.set_char_p) (xone(fp));
  		if (ch != PUT1)
@@ -574,7 +574,7 @@
  #endif
  		break;
  
-@@ -1892,7 +2277,39 @@
+@@ -1892,7 +2277,39 @@ draw_part(FILE *fp, struct frame *minfra
  #else
  		    a = (*currinf.set_char_p) (xnum(fp, 2));
  		    if (ch != PUT2)
@@ -615,7 +615,7 @@
  #endif
  		}
  		break;
-@@ -1910,7 +2327,7 @@
+@@ -1910,7 +2327,7 @@ draw_part(FILE *fp, struct frame *minfra
  		    ) {
  		    set_rule(pixel_round(xspell_conv(a)), pixel_round(b));
  		}
@@ -624,7 +624,7 @@
  		break;
  
  	    case PUTRULE:
-@@ -1934,6 +2351,9 @@
+@@ -1934,6 +2351,9 @@ draw_part(FILE *fp, struct frame *minfra
  		DVI_V = OFFSET_Y;
  		PXL_V = pixel_conv(DVI_V);
  		WW = XX = YY = ZZ = 0;
@@ -634,7 +634,7 @@
  		break;
  
  	    case EOP:
-@@ -2028,7 +2448,7 @@
+@@ -2028,7 +2448,7 @@ draw_part(FILE *fp, struct frame *minfra
  	    case RIGHT2:
  	    case RIGHT3:
  	    case RIGHT4:
@@ -643,7 +643,7 @@
  		break;
  
  	    case W1:
-@@ -2037,7 +2457,7 @@
+@@ -2037,7 +2457,7 @@ draw_part(FILE *fp, struct frame *minfra
  	    case W4:
  		WW = xspell_conv(xsnum(fp, ch - W0));
  	    case W0:
@@ -652,7 +652,7 @@
  		break;
  
  	    case X1:
-@@ -2046,15 +2466,14 @@
+@@ -2046,15 +2466,14 @@ draw_part(FILE *fp, struct frame *minfra
  	    case X4:
  		XX = xspell_conv(xsnum(fp, ch - X0));
  	    case X0:
@@ -670,7 +670,7 @@
  		break;
  
  	    case Y1:
-@@ -2063,8 +2482,7 @@
+@@ -2063,8 +2482,7 @@ draw_part(FILE *fp, struct frame *minfra
  	    case Y4:
  		YY = xspell_conv(xsnum(fp, ch - Y0));
  	    case Y0:
@@ -680,7 +680,7 @@
  		break;
  
  	    case Z1:
-@@ -2073,8 +2491,7 @@
+@@ -2073,8 +2491,7 @@ draw_part(FILE *fp, struct frame *minfra
  	    case Z4:
  		ZZ = xspell_conv(xsnum(fp, ch - Z0));
  	    case Z0:
@@ -690,7 +690,7 @@
  		break;
  
  	    case FNT1:
-@@ -2121,6 +2538,11 @@
+@@ -2121,6 +2538,11 @@ draw_part(FILE *fp, struct frame *minfra
  		dvi_fmt_error("%s:%d: draw_part: shouldn't happen: %s encountered",
  			      __FILE__, __LINE__, dvi_table2[ch - (FNTNUM0 + 64)]);
  		break;
@@ -702,7 +702,7 @@
  
  	    default:
  		dvi_fmt_error("%s:%d: draw_part: unknown op-code %d", __FILE__, __LINE__, ch);
-@@ -2311,7 +2733,7 @@
+@@ -2311,7 +2733,7 @@ draw_page(void)
      psp.endpage();
  #endif
      if (currwin.win == mane.win && resource.postscript != 1) {
@@ -711,7 +711,7 @@
      }
      if (search_have_match(current_page)) {
  	/* highlight search match */
-@@ -2921,7 +3343,15 @@
+@@ -2921,7 +3343,15 @@ do_char(wide_ubyte ch,
      last_dvi_h1 = DVI_H;
      last_u_glyph = u_glyph;
      last_pxl_v = pxl_v1;
@@ -727,7 +727,7 @@
      last_x = x2;
  }
  
-@@ -2935,6 +3365,10 @@
+@@ -2935,6 +3365,10 @@ text_do_char(FILE *fp, struct scan_info 
  	    return 0;	/* error; we'll catch it later */
  	maxchar = currinf.fontp->maxchar;
  	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -738,7 +738,7 @@
      }
  
      if (currinf.set_char_p == set_empty_char)
-@@ -2962,10 +3396,6 @@
+@@ -2962,10 +3396,6 @@ text_do_char(FILE *fp, struct scan_info 
  	}
  	maxchar = currinf.fontp->maxchar;
  	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -749,7 +749,7 @@
      }
  
      if (currinf.set_char_p == set_char) {
-@@ -2993,25 +3423,56 @@
+@@ -2993,25 +3423,56 @@ text_do_char(FILE *fp, struct scan_info 
  	}
  #ifdef TEXXET
  	if (geom_scan_frame == NULL) {
@@ -760,11 +760,12 @@
 +	    PUSH_POSITION;
 +	    if (! TATE && currinf.dir < 0)
 +		moveH(1, -g->dvi_adv);
-+#endif
-+	    x = G_PXL_H - g->x;
-+	    y = PXL_V - g->y;
-+	    do_char(ch, currinf, info, PXL_V, y, x, x + g->bitmap.w - 1, g);
-+#ifdef TEXXET
+ #endif
+ 	    x = G_PXL_H - g->x;
+ 	    y = PXL_V - g->y;
+ 	    do_char(ch, currinf, info, PXL_V, y, x, x + g->bitmap.w - 1, g);
+ #ifdef TEXXET
+-	    DVI_H = dvi_h_sav;
 +	    POP_POSITION;
 +	}
 +#endif
@@ -789,12 +790,11 @@
 +	    PUSH_POSITION;
 +	    if (! TATE && currinf.dir < 0)
 +		moveH(1, -g->dvi_adv);
- #endif
- 	    x = G_PXL_H - g->x;
- 	    y = PXL_V - g->y;
- 	    do_char(ch, currinf, info, PXL_V, y, x, x + g->bitmap.w - 1, g);
- #ifdef TEXXET
--	    DVI_H = dvi_h_sav;
++#endif
++	    x = G_PXL_H - g->x;
++	    y = PXL_V - g->y;
++	    do_char(ch, currinf, info, PXL_V, y, x, x + g->bitmap.w - 1, g);
++#ifdef TEXXET
 +	    POP_POSITION;
  	}
  #endif
@@ -811,7 +811,7 @@
  #endif
  
  	if (ch > maxchar)
-@@ -3019,9 +3480,9 @@
+@@ -3019,9 +3480,9 @@ text_do_char(FILE *fp, struct scan_info 
  	if ((m = &currinf.fontp->macro[ch])->pos == NULL)
  	    return 0;	/* catch the error later */
  #ifdef TEXXET
@@ -824,7 +824,7 @@
  	if (geom_scan_frame == NULL) {
  #endif
  	    oldinfo = currinf;
-@@ -3037,7 +3498,7 @@
+@@ -3037,7 +3498,7 @@ text_do_char(FILE *fp, struct scan_info 
  	    currinf = oldinfo;
  	    maxchar = oldmaxchar;
  #ifdef TEXXET
@@ -833,7 +833,7 @@
  	}
  #endif
  	return DIR * m->dvi_adv;
-@@ -3049,6 +3510,11 @@
+@@ -3049,6 +3510,11 @@ text_do_char(FILE *fp, struct scan_info 
      return 0;
  }
  
@@ -845,7 +845,7 @@
  /*
   *	Handle a character in geometric scanning routine.
   */
-@@ -3064,6 +3530,10 @@
+@@ -3064,6 +3530,10 @@ geom_do_char(FILE *fp, struct scan_info 
  	    return 0;	/* error; we'll catch it later */
  	maxchar = currinf.fontp->maxchar;
  	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -856,7 +856,7 @@
      }
  
      if (currinf.set_char_p == set_empty_char)
-@@ -3091,10 +3561,6 @@
+@@ -3091,10 +3561,6 @@ geom_do_char(FILE *fp, struct scan_info 
  	}
  	maxchar = currinf.fontp->maxchar;
  	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -867,7 +867,7 @@
      }
  
      if (currinf.set_char_p == set_char) {
-@@ -3122,27 +3588,58 @@
+@@ -3122,27 +3588,58 @@ geom_do_char(FILE *fp, struct scan_info 
  	}
  #ifdef TEXXET
  	if (geom_scan_frame == NULL) {
@@ -893,7 +893,7 @@
 +    else if (currinf.set_char_p == set_char2) {
 +	struct glyph *g;
 +	long x, y;
- 
++
 +	g = currinf.fontp->kglyph[ch];
 +	if (g == NULL || g->bitmap.bits == NULL) {
 +	    (*currinf.fontp->read_char)(currinf.fontp, ch);
@@ -901,8 +901,9 @@
 +	    free_bitmap2(g);
 +	    g->tdir = currinf.fontp->dir;
 +	}
-+
-+#ifdef TEXXET
+ 
+ #ifdef TEXXET
+-	    DVI_H = dvi_h_sav;
 +	if (geom_scan_frame == NULL) {
 +	    DEFINE_POSITION_VAL;
 +	    PUSH_POSITION;
@@ -913,8 +914,7 @@
 +	    y = PXL_V - g->y;
 +	    g_info->geom_box(info, x, y,
 +			     x + g->bitmap.w - 1, y + g->bitmap.h - 1);
- #ifdef TEXXET
--	    DVI_H = dvi_h_sav;
++#ifdef TEXXET
 +	    POP_POSITION;
  	}
  #endif
@@ -931,7 +931,7 @@
  #endif
  
  	if (ch > maxchar)
-@@ -3150,9 +3647,9 @@
+@@ -3150,9 +3647,9 @@ geom_do_char(FILE *fp, struct scan_info 
  	if ((m = &currinf.fontp->macro[ch])->pos == NULL)
  	    return 0;	/* catch the error later */
  #ifdef TEXXET
@@ -944,7 +944,7 @@
  	if (geom_scan_frame == NULL) {
  #endif
  	    oldinfo = currinf;
-@@ -3168,7 +3665,7 @@
+@@ -3168,7 +3665,7 @@ geom_do_char(FILE *fp, struct scan_info 
  	    currinf = oldinfo;
  	    maxchar = oldmaxchar;
  #ifdef TEXXET
@@ -953,7 +953,7 @@
  	}
  #endif
  	return DIR * m->dvi_adv;
-@@ -3188,21 +3685,35 @@
+@@ -3188,21 +3685,35 @@ static void
  geom_do_rule(struct scan_info *info, long h, long w)
  {
      long x, y;
@@ -995,7 +995,7 @@
  #endif
  }
  
-@@ -3232,7 +3743,7 @@
+@@ -3232,7 +3743,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
      for (;;) {
  	ch = xone(fp);
  	if (ch <= (ubyte)(SETCHAR0 + 127))
@@ -1004,7 +1004,7 @@
  	else if (FNTNUM0 <= ch && ch <= (ubyte) (FNTNUM0 + 63)) {
  	    change_font((unsigned long)(ch - FNTNUM0));
  	}
-@@ -3244,7 +3755,7 @@
+@@ -3244,7 +3755,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case PUT1:
  		a = char_proc(fp, info, xone(fp));
  		if (ch != PUT1)
@@ -1013,7 +1013,7 @@
  		break;
  
  	    case SET2:
-@@ -3258,7 +3769,39 @@
+@@ -3258,7 +3769,39 @@ geom_scan_part(long(*char_proc)(FILE *, 
  #else
  		    a = char_proc(fp, info, xnum(fp, 2));
  		    if (ch != PUT2)
@@ -1054,7 +1054,7 @@
  #endif
  		}
  		break;
-@@ -3278,7 +3821,7 @@
+@@ -3278,7 +3821,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  		    if (info->geom_special != NULL)
  			geom_do_rule(info, xspell_conv(a), b);
  		}
@@ -1063,7 +1063,7 @@
  		break;
  
  	    case PUTRULE:
-@@ -3399,7 +3942,7 @@
+@@ -3399,7 +3942,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case RIGHT2:
  	    case RIGHT3:
  	    case RIGHT4:
@@ -1072,7 +1072,7 @@
  		break;
  
  	    case W1:
-@@ -3408,7 +3951,7 @@
+@@ -3408,7 +3951,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case W4:
  		WW = xspell_conv(xsnum(fp, ch - W0));
  	    case W0:
@@ -1081,7 +1081,7 @@
  		break;
  
  	    case X1:
-@@ -3417,15 +3960,14 @@
+@@ -3417,15 +3960,14 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case X4:
  		XX = xspell_conv(xsnum(fp, ch - X0));
  	    case X0:
@@ -1099,7 +1099,7 @@
  		break;
  
  	    case Y1:
-@@ -3434,8 +3976,7 @@
+@@ -3434,8 +3976,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case Y4:
  		YY = xspell_conv(xsnum(fp, ch - Y0));
  	    case Y0:
@@ -1109,7 +1109,7 @@
  		break;
  
  	    case Z1:
-@@ -3444,8 +3985,7 @@
+@@ -3444,8 +3985,7 @@ geom_scan_part(long(*char_proc)(FILE *, 
  	    case Z4:
  		ZZ = xspell_conv(xsnum(fp, ch - Z0));
  	    case Z0:
@@ -1119,7 +1119,7 @@
  		break;
  
  	    case FNT1:
-@@ -3482,6 +4022,12 @@
+@@ -3482,6 +4022,12 @@ geom_scan_part(long(*char_proc)(FILE *, 
  		xskip(fp, a + (long)xone(fp));
  		break;
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.h b/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.h
index 55d526fcdd8a..765679fcbbd1 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi-draw.h
@@ -1,6 +1,6 @@
---- texk/xdvik/dvi-draw.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvi-draw.h	2015-01-31 21:02:18.000000000 +0900
-@@ -82,6 +82,11 @@
+--- texk/xdvik/dvi-draw.h.orig	2013-04-05 00:14:54 UTC
++++ texk/xdvik/dvi-draw.h
+@@ -82,6 +82,11 @@ extern void src_parse(const char *str, i
  #define XX      currinf.data.x
  #define YY      currinf.data.y
  #define ZZ      currinf.data.z
@@ -12,7 +12,7 @@
  
  extern void draw_page(void);
  extern void source_reverse_search(int, int, wide_bool);
-@@ -120,6 +125,13 @@
+@@ -120,6 +125,13 @@ extern setcharRetvalT set_char(
  			       wide_ubyte cmd,
  #endif
  			       wide_ubyte ch);
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
index 5110e868c40d..6d21277c957e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
@@ -1,6 +1,6 @@
---- texk/xdvik/dvi-init.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvi-init.c	2015-01-31 21:03:09.000000000 +0900
-@@ -31,6 +31,10 @@
+--- texk/xdvik/dvi-init.c.orig	2013-04-05 00:14:54 UTC
++++ texk/xdvik/dvi-init.c
+@@ -31,6 +31,10 @@ in xdvi.c.
  
  #include "dvi-init.h"
  #include "dvi-draw.h"
@@ -11,7 +11,7 @@
  #include "util.h"
  #include "x_util.h"
  #include "exit-handlers.h"
-@@ -53,6 +57,9 @@
+@@ -53,6 +57,9 @@ in xdvi.c.
  #include "statusline.h"
  #include "events.h"
  #include "font-open.h"
@@ -21,7 +21,7 @@
  
  #if FREETYPE
  # include FT_SIZES_H
-@@ -67,6 +74,10 @@
+@@ -67,6 +74,10 @@ in xdvi.c.
  #define	VF_PRE		247
  #define	VF_ID_BYTE	202
  #define	VF_MAGIC	((VF_PRE << 8) | VF_ID_BYTE)
@@ -32,7 +32,7 @@
  
  /* font stuff */
  struct font *tn_table[TNTABLELEN];
-@@ -170,8 +181,22 @@
+@@ -170,8 +181,22 @@ static void
  delete_glyphs(struct font *fontp)
  {
      struct glyph *g;
@@ -55,7 +55,7 @@
  	if (g->bitmap2.bits) {
  	    free(g->bitmap2.bits);
  	    g->bitmap2.bits = NULL;
-@@ -283,7 +308,23 @@
+@@ -283,7 +308,23 @@ free_unused_fonts(void)
  		}
  		else {
  		    delete_glyphs(fontp);
@@ -79,7 +79,7 @@
  		}
  		free((char *)fontp);
  	    }
-@@ -324,7 +365,11 @@
+@@ -324,7 +365,11 @@ reset_colors(void)
  	struct glyph *g;
  
  	for (f = font_head; f != NULL; f = f->next)
@@ -92,7 +92,7 @@
  		for (g = f->glyph; g <= f->glyph + f->maxchar; ++g)
  		    g->fg = NULL;
      }
-@@ -447,6 +492,10 @@
+@@ -447,6 +492,10 @@ load_font(struct font *fontp
       * appear before the main window comes up ...
       */
  
@@ -103,7 +103,7 @@
      fontp->file = font_open(
  #if DELAYED_MKTEXPK
  			    load_font_now,
-@@ -511,6 +560,12 @@
+@@ -511,6 +560,12 @@ load_font(struct font *fontp
      fontp->fsize = size_found;
      fontp->timestamp = ++current_timestamp;
      fontp->maxchar = maxchar = 255;
@@ -116,7 +116,7 @@
      fontp->set_char_p = set_char;
      magic = get_bytes(fontp->file, 2);
  
-@@ -529,6 +584,13 @@
+@@ -529,6 +584,13 @@ load_font(struct font *fontp
  	else
  	    (void)read_VF_index(fontp, (wide_bool)hushcs);
  	break;
@@ -130,7 +130,7 @@
      default:
  	XDVI_FATAL((stderr, "Cannot recognize format for font file %s",
  	  fontp->filename));
-@@ -783,7 +845,13 @@
+@@ -783,7 +845,13 @@ process_preamble(FILE *fp, dviErrFlagT *
  	TRACE_FILES((stderr, "process_preamble: fp = %p, errflag = %d, returning False", (void *)fp, *errflag));
  	return False;
      }
@@ -145,7 +145,7 @@
  	*errflag = WRONG_DVI_VERSION;
  	TRACE_FILES((stderr, "process_preamble: fp = %p, errflag = %d, returning False", (void *)fp, *errflag));
  	return False;
-@@ -845,7 +913,12 @@
+@@ -845,7 +913,12 @@ find_postamble(FILE *fp, dviErrFlagT *er
  	fseek(fp, --pos, SEEK_SET);
  	byte = get_byte(fp);
      }
@@ -159,7 +159,7 @@
  	*errflag = WRONG_DVI_VERSION;
  	TRACE_FILES((stderr, "find_postamble: returning FALSE"));
  	return False;
-@@ -865,9 +938,14 @@
+@@ -865,9 +938,14 @@ set_paper_type(const char *arg)
      char temp[21];
      const char **p;
      char *q;
@@ -175,7 +175,7 @@
      if (*arg == '+') {
  	++arg;
  	ignore_papersize_specials = True;
-@@ -884,6 +962,57 @@
+@@ -884,6 +962,57 @@ set_paper_type(const char *arg)
  	    break;
      }
      arg = temp;
@@ -233,7 +233,7 @@
      /* perform substitutions */
      for (p = paper_types; p < paper_types + paper_types_size; p += 2) {
  	if (strcmp(temp, *p) == 0) {
-@@ -898,6 +1027,7 @@
+@@ -898,6 +1027,7 @@ set_paper_type(const char *arg)
      m_paper_unshrunk_h = atopix(arg1 + 1, False);
  
      globals.grid_paper_unit = atopixunit(arg);
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.h b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.h
index 283cff6824d8..66eb4be06bd9 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.h
@@ -1,6 +1,6 @@
---- texk/xdvik/dvi-init.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvi-init.h	2015-01-31 21:02:18.000000000 +0900
-@@ -100,6 +100,12 @@
+--- texk/xdvik/dvi-init.h.orig	2013-03-31 05:28:20 UTC
++++ texk/xdvik/dvi-init.h
+@@ -100,6 +100,12 @@ struct glyph {
      char *pixmap2_gc2;	    /* separate image data for drawing image to globals.gc.fore2 */
  #endif /* GREY */
      struct bitmap bitmap2;  /* shrunken bitmap for character */
@@ -13,7 +13,7 @@
  };
  
  /*
-@@ -131,6 +137,9 @@
+@@ -131,6 +137,9 @@ struct macro {
  #define	FONT_IN_USE	1	/* used for housekeeping */
  #define	FONT_LOADED	2	/* if font file has been read */
  #define	FONT_VIRTUAL	4	/* if font is virtual */
@@ -23,7 +23,7 @@
  
  /* forward declarations */
  struct font;
-@@ -156,6 +165,11 @@
+@@ -156,6 +165,11 @@ struct font {
      struct glyph *glyph;
      /* these fields are used by (loaded) virtual fonts */
      struct font **vf_table;	/* list of fonts used by this vf */
@@ -35,7 +35,7 @@
      struct tn *vf_chain;	/* ditto, if TeXnumber >= VFTABLELEN */
      struct font *first_font;	/* first font defined */
      struct macro *macro;
-@@ -175,6 +189,7 @@
+@@ -175,6 +189,7 @@ struct tn {
  };
  
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi.h b/print/tex-xdvik/files/patch-texk-xdvik-dvi.h
index 6a9e06f927b2..a369fd07e07e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi.h
@@ -1,5 +1,5 @@
---- texk/xdvik/dvi.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvi.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/dvi.h.orig	2001-04-18 14:24:42 UTC
++++ texk/xdvik/dvi.h
 @@ -5,9 +5,13 @@
  #define	SETCHAR0	0
  #define	SET1		128
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvisel.c b/print/tex-xdvik/files/patch-texk-xdvik-dvisel.c
index 56ffbfb9da1d..b106ed7573db 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvisel.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvisel.c
@@ -1,5 +1,5 @@
---- texk/xdvik/dvisel.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/dvisel.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/dvisel.c.orig	2008-02-11 22:47:58 UTC
++++ texk/xdvik/dvisel.c
 @@ -28,6 +28,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -8,7 +8,7 @@
  #include "dvi.h"
  #include "pagesel.h"
  #include "dvisel.h"
-@@ -510,6 +511,12 @@
+@@ -510,6 +511,12 @@ WriteDVI(FILE *fin, FILE *fout, long *fo
  	    n += 4;
  	    /* fall through */
  	    
@@ -21,7 +21,7 @@
  	case RIGHT4:
  	case W4:
  	case X4:
-@@ -519,6 +526,12 @@
+@@ -519,6 +526,12 @@ WriteDVI(FILE *fin, FILE *fout, long *fo
  	    n++;
  	    /* fall through */
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-encodings.c b/print/tex-xdvik/files/patch-texk-xdvik-encodings.c
index fe5d0026080d..48b8761f5cd9 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-encodings.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-encodings.c
@@ -1,6 +1,6 @@
---- texk/xdvik/encodings.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/encodings.c	2015-01-31 21:02:18.000000000 +0900
-@@ -69,10 +69,18 @@
+--- texk/xdvik/encodings.c.orig	2013-03-31 05:28:20 UTC
++++ texk/xdvik/encodings.c
+@@ -69,10 +69,18 @@ OTHER DEALINGS IN THE SOFTWARE.
  #if HAVE_ICONV_H
  # include <iconv.h>
  static iconv_t m_iconv_gb_ucs4 = (iconv_t)(-1);
@@ -19,7 +19,7 @@
  #include "util.h"
  #include "encodings.h"
  #include "my-snprintf.h"
-@@ -3021,9 +3029,75 @@
+@@ -3021,8 +3029,74 @@ close_iconv(void *dummy)
  	iconv_close(m_iconv_gb_ucs4);
  	m_iconv_gb_ucs4 = (iconv_t)(-1);
      }
@@ -27,9 +27,9 @@
 +	iconv_close(m_iconv_jis_ucs4);
 +	m_iconv_jis_ucs4 = (iconv_t)(-1);
 +    }
- #endif /* HAVE_ICONV_H */
- }
- 
++#endif /* HAVE_ICONV_H */
++}
++
 +#ifdef PTEX
 +/* convert a JIS char to unicode (UCS-4) using iconv() */
 +uint32_t
@@ -88,14 +88,13 @@
 +        warned = True;
 +    }
 +    return 0;
-+#endif /* HAVE_ICONV_H */
-+}
+ #endif /* HAVE_ICONV_H */
+ }
 +#endif /* PTEX */
-+
+ 
  /* convert a CJK char to unicode (UCS-4) using iconv() */
  static uint32_t
- cjk2unicode(unsigned char *cjk)
-@@ -3577,6 +3651,24 @@
+@@ -3577,6 +3651,24 @@ guess_encoding(wide_ubyte ch, const char
      
      TRACE_FIND_VERBOSE((stderr, "guess_encoding: |%s|, char 0x%.4X", fontname, ch));
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-encodings.h b/print/tex-xdvik/files/patch-texk-xdvik-encodings.h
index be4b89291ebb..ad19efdbb56c 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-encodings.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-encodings.h
@@ -1,6 +1,6 @@
---- texk/xdvik/encodings.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/encodings.h	2015-01-31 21:02:18.000000000 +0900
-@@ -53,5 +53,7 @@
+--- texk/xdvik/encodings.h.orig	2004-11-01 23:15:22 UTC
++++ texk/xdvik/encodings.h
+@@ -53,5 +53,7 @@ extern int str_iso_8859_1_to_utf8(const 
  extern Boolean is_hyphenchar(uint32_t unicode);
  extern Boolean is_ideograph(uint32_t unicode);
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-font-open.c b/print/tex-xdvik/files/patch-texk-xdvik-font-open.c
index fc0186d0d548..58c908585a4e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-font-open.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-font-open.c
@@ -1,5 +1,5 @@
---- texk/xdvik/font-open.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/font-open.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/font-open.c.orig	2013-05-14 05:26:19 UTC
++++ texk/xdvik/font-open.c
 @@ -27,6 +27,9 @@
  #include "xdvi-config.h"
  #include "xdvi.h"
@@ -10,7 +10,7 @@
  #include "util.h"
  #include "events.h"
  #include "dvi-init.h"
-@@ -213,6 +216,38 @@
+@@ -213,6 +216,38 @@ getdefaults(FILE *f)
  		p_node->value = xmemdup(p, len + 1);
  		*p_tail = p_node;
  		p_tail = &p_node->next;
@@ -49,7 +49,7 @@
  	    }
  	}
  
-@@ -446,13 +481,38 @@
+@@ -446,13 +481,38 @@ init_t1_lookup(void)
  		TRACE_FT((stderr, "Encoding[%d]: '%s' = '%s' -> '%s'",
  		  i, enc, name, ptr));
  #  endif
@@ -88,7 +88,7 @@
  			  "Skipping unknown keyword \"%s\" in config file %s.",
  			  keyword, filename);
  	    }
-@@ -1103,7 +1163,7 @@
+@@ -1103,7 +1163,7 @@ process_gs_fontmap(FILE *f)
  	    if (ttype == GS_EOF || ttype == GS_ERR)
  		break;
  	    if (ttype == LPAREN) {
@@ -97,7 +97,7 @@
  		FILE	*f1;
  
  		ttype = get_gs_token(&gsf, pos1, &pos2, "Fontmap");
-@@ -1692,7 +1752,7 @@
+@@ -1692,7 +1752,7 @@ font_open(
  	  const char **font_ret,
  	  int *dpi_ret)
  {
@@ -106,7 +106,7 @@
      kpse_glyph_file_type file_ret;
  #if DELAYED_MKTEXPK
      Boolean message_done = False;
-@@ -1706,6 +1766,12 @@
+@@ -1706,6 +1766,12 @@ font_open(
      fontp->filename = NULL;
      *dpi_ret = fontp->fsize;
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.c b/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.c
index 24afa1fc6131..67d675bd0bd0 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/fontconfig.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/fontconfig.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/fontconfig.c
 @@ -0,0 +1,92 @@
 +#include "xdvi-config.h"
 +#include "xdvi.h"
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.h b/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.h
index 0ad6b2195c89..79edab6617a5 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-fontconfig.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/fontconfig.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/fontconfig.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/fontconfig.h
 @@ -0,0 +1,11 @@
 +
 +#ifndef FONTCONFIG_H_
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ft2.c b/print/tex-xdvik/files/patch-texk-xdvik-ft2.c
index 62782b3d4aa7..2de41188f036 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ft2.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ft2.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ft2.c	2015-01-31 21:02:19.000000000 +0900
+--- texk/xdvik/ft2.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ft2.c
 @@ -0,0 +1,285 @@
 +/*========================================================================*\
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ft2.h b/print/tex-xdvik/files/patch-texk-xdvik-ft2.h
index 499f1119495e..d4be75435726 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ft2.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ft2.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ft2.h	2015-01-31 21:02:19.000000000 +0900
+--- texk/xdvik/ft2.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ft2.h
 @@ -0,0 +1,33 @@
 +/*========================================================================*\
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.c b/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.c
index 1bba59f456c1..f3d39b3ded3f 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ft2vert.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ft2vert.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ft2vert.c
 @@ -0,0 +1,399 @@
 +/*
 + * "ft2vert.c"
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.h b/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.h
index d3aececb9358..eb2727065d58 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ft2vert.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ft2vert.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ft2vert.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ft2vert.h
 @@ -0,0 +1,30 @@
 +/*
 + * "ft2vert.h"
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-gui-help-window.c b/print/tex-xdvik/files/patch-texk-xdvik-gui-help-window.c
index f32146765382..1f5d44e8fad6 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-gui-help-window.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-gui-help-window.c
@@ -1,6 +1,6 @@
---- texk/xdvik/gui/help-window.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/gui/help-window.c	2015-01-31 21:02:18.000000000 +0900
-@@ -314,6 +314,9 @@
+--- texk/xdvik/gui/help-window.c.orig	2013-03-31 05:28:21 UTC
++++ texk/xdvik/gui/help-window.c
+@@ -314,6 +314,9 @@ initialize_items(struct topic_info *info
  #if FREETYPE
  	"- freetype2 (direct rendering of PS fonts) enabled\n",
  #endif
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-hypertex.h b/print/tex-xdvik/files/patch-texk-xdvik-hypertex.h
index 18a8a9955e24..52534115346a 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-hypertex.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-hypertex.h
@@ -1,5 +1,5 @@
---- texk/xdvik/hypertex.h.orig	2013-05-04 22:32:56.000000000 +0900
-+++ texk/xdvik/hypertex.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/hypertex.h.orig	2004-05-07 22:10:22 UTC
++++ texk/xdvik/hypertex.h
 @@ -21,7 +21,7 @@
   */
  
@@ -9,7 +9,7 @@
  
  /* fallbacks if parsing user-specified colors fails */
  #define LINK_COLOR_FALLBACK "BLUE2"
-@@ -68,4 +68,4 @@
+@@ -68,4 +68,4 @@ extern void htex_forward(void);
  
  extern Boolean htex_scan_anchor(const char *special, size_t len);
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-jfm.c b/print/tex-xdvik/files/patch-texk-xdvik-jfm.c
index a81cfa59ae83..2e85f1074c8d 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-jfm.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-jfm.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/jfm.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/jfm.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/jfm.c
 @@ -0,0 +1,143 @@
 +/*========================================================================*\
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-jfm.h b/print/tex-xdvik/files/patch-texk-xdvik-jfm.h
index f85d8c5d8e6f..4c2c25a3069e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-jfm.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-jfm.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/jfm.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/jfm.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/jfm.h
 @@ -0,0 +1,54 @@
 +/**********************************************
 + *  Copyright (C) Atsuo Kawaguchi, 1987.
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-main.c b/print/tex-xdvik/files/patch-texk-xdvik-main.c
index c098098c97c8..02c6e68092fd 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-main.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-main.c
@@ -1,5 +1,5 @@
---- texk/xdvik/main.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/main.c	2015-01-31 21:35:42.000000000 +0900
+--- texk/xdvik/main.c.orig	2014-04-03 01:17:12 UTC
++++ texk/xdvik/main.c
 @@ -39,6 +39,9 @@
  #include "filehist.h"
  #include "mag.h"
@@ -10,7 +10,7 @@
  
  #if FREETYPE
  # include <ft2build.h>
-@@ -54,6 +57,14 @@
+@@ -54,6 +57,14 @@ static const char *xdvi_kpse_prog_name =
  #undef STRINGIFY
  #undef TOSTRING
  
@@ -25,7 +25,7 @@
  static char XtRBool3[] = "Bool3";	/* resource for Bool3 */
  
  /* get these before setting `application_resources' */
-@@ -651,8 +662,16 @@
+@@ -651,8 +662,16 @@ init_check_resources(void)
  
      /* paper type */
      if (!set_paper_type(resource.paper)) {
@@ -43,7 +43,7 @@
  	const char **paper_types = get_paper_types();
  	for (p = paper_types; p < paper_types + get_paper_types_size(); p += 2) {
  	    if (**p == '\0') { /* next line of list */
-@@ -663,6 +682,7 @@
+@@ -663,6 +682,7 @@ init_check_resources(void)
  		helpmsg = xstrcat(helpmsg, " ");
  	    }
  	}
@@ -51,7 +51,7 @@
  	helpmsg = xstrcat(helpmsg,
  			  "\n(the names ending with `r' are `rotated' or `landscape' variants).\n"
  			  "Alternatively, you can specify the dimensions as `WIDTHxHEIGHT', followed "
-@@ -778,6 +798,9 @@
+@@ -778,6 +798,9 @@ static void
  display_version_info(void)
  {
      printf("%s version %s ", XDVIK_PROGNAME, XDVI_VERSION);
@@ -61,7 +61,7 @@
  #ifdef MOTIF
      printf("(%s, runtime version %d.%d)\n",
  	   /* 	   XmVERSION, XmREVISION, XmUPDATE_LEVEL, */
-@@ -786,12 +809,19 @@
+@@ -786,12 +809,19 @@ display_version_info(void)
  #else
      printf("%s\n", XDVI_GUI);
  #endif
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-pk.c b/print/tex-xdvik/files/patch-texk-xdvik-pk.c
index 243f5d02afd4..24503b55156e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-pk.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-pk.c
@@ -1,6 +1,6 @@
---- texk/xdvik/pk.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/pk.c	2015-01-31 21:02:18.000000000 +0900
-@@ -201,6 +201,9 @@
+--- texk/xdvik/pk.c.orig	2009-03-02 21:43:37 UTC
++++ texk/xdvik/pk.c
+@@ -201,6 +201,9 @@ read_PK_char(struct font *fontp,
  
      g->dvi_adv = fontp->dimconv * fpwidth;
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.c b/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.c
index fbf1ccde6c18..b0771c1251ab 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ptexmap.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ptexmap.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ptexmap.c
 @@ -0,0 +1,254 @@
 +#include "xdvi-config.h"
 +#include "xdvi.h"
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.h b/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.h
index 8b5b44046ff9..c388725fb38f 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ptexmap.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ptexmap.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ptexmap.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ptexmap.h
 @@ -0,0 +1,27 @@
 +#ifndef PTEXMAP_H_
 +#define PTEXMAP_H_
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.c b/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.c
index a58396ba0f64..597d4bf7758f 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.c
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ptexvf.c	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ptexvf.c.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ptexvf.c
 @@ -0,0 +1,147 @@
 +/*========================================================================*\
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.h b/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.h
index 5b620f5ed18a..7ab23f568e7d 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-ptexvf.h
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/ptexvf.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/ptexvf.h.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/ptexvf.h
 @@ -0,0 +1,36 @@
 +/*========================================================================*\
 +
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-special.c b/print/tex-xdvik/files/patch-texk-xdvik-special.c
index 46e70cf7ceec..cec0396066a5 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-special.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-special.c
@@ -1,6 +1,6 @@
---- texk/xdvik/special.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/special.c	2015-01-31 21:02:18.000000000 +0900
-@@ -691,6 +691,12 @@
+--- texk/xdvik/special.c.orig	2008-02-16 21:43:15 UTC
++++ texk/xdvik/special.c
+@@ -691,6 +691,12 @@ static size_t g_bbox_info_max_size = 0;
    contains these coordinates.
  */
  
@@ -13,7 +13,7 @@
  static void
  append_bbox_info(int x, int y, int w, int h, int angle)
  {
-@@ -735,25 +741,25 @@
+@@ -735,25 +741,25 @@ draw_bbox0(int xcorner, int ycorner)
  	    do_color_change();
  #endif
  
@@ -49,7 +49,7 @@
  
  	    XDrawLine(DISP, currwin.win, globals.gc.high,
  		      xcorner, ycorner,
-@@ -782,27 +788,27 @@
+@@ -782,27 +788,27 @@ display_bboxes(void)
      size_t i;
      
      for (i = 0; i < g_bbox_info_size; i++) {
@@ -96,7 +96,7 @@
  #endif
      }
      bbox_angle = 0;
-@@ -829,6 +835,9 @@
+@@ -829,6 +835,9 @@ save_bbox(void)
  	
  	ycorner -= bbox_voffset;
  	append_bbox_info(xcorner, ycorner, bbox_width, bbox_height, bbox_angle);
@@ -106,7 +106,7 @@
  
  	/* register boundaries of this box as anchor boundaries */
  	if (htex_inside_href) {
-@@ -907,6 +916,11 @@
+@@ -907,6 +916,11 @@ ps_startup2(void)
  }
  
  
@@ -118,7 +118,7 @@
  /*
   * dumb parsing of PostScript - search for rotation H. Zeller 1/97
   * Returns true if we find a potentially non-supported command that
-@@ -916,6 +930,52 @@
+@@ -916,6 +930,52 @@ static Boolean
  ps_parseraw(const char *PostScript_cmd)
  {
      const char *p;
@@ -171,7 +171,7 @@
  
      bbox_angle = 0;
      p = strstr(PostScript_cmd, "rotate");
-@@ -924,9 +984,137 @@
+@@ -924,9 +984,137 @@ ps_parseraw(const char *PostScript_cmd)
  	    --p;
  	while (*p != '\0' && isdigit((int)*p))
  	    --p;
@@ -310,7 +310,7 @@
  	return True;
      }
      if (strstr(PostScript_cmd, " scale ") != NULL)
-@@ -1477,10 +1665,10 @@
+@@ -1477,10 +1665,10 @@ psfig_special(char *cp)
  #endif	    
  	/* also raw PostScript, but no extra colon to skip */
  #if PS
@@ -323,7 +323,7 @@
  	    if (psfig_begun)
  		psp.drawraw(cp);
  	    else {
-@@ -2325,6 +2513,100 @@
+@@ -2325,6 +2513,100 @@ scan_papersize(const char *cp0)
  }
  
  /*
@@ -424,7 +424,7 @@
   *	The following copyright message applies to the rest of this file.  --PV
   */
  
-@@ -2555,6 +2837,8 @@
+@@ -2555,6 +2837,8 @@ applicationDoSpecial(char *cp, size_t le
  	case CMD('b', 'k'):
  	    blacken_last();
  	    return;
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-tests-Makefile.am b/print/tex-xdvik/files/patch-texk-xdvik-tests-Makefile.am
index 6029873f40bd..0b33515606ef 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-tests-Makefile.am
+++ b/print/tex-xdvik/files/patch-texk-xdvik-tests-Makefile.am
@@ -1,6 +1,6 @@
---- texk/xdvik/tests/Makefile.am.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/tests/Makefile.am	2015-01-31 21:02:18.000000000 +0900
-@@ -22,11 +22,17 @@
+--- texk/xdvik/tests/Makefile.am.orig	2013-03-13 20:24:29 UTC
++++ texk/xdvik/tests/Makefile.am
+@@ -22,11 +22,17 @@ run_tests_SOURCES = \
  
  $(run_tests_OBJECTS): ../libxdvi.a $(common_dependencies)
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-texmf-XDvi b/print/tex-xdvik/files/patch-texk-xdvik-texmf-XDvi
index b888a5d34337..40b8f4fadb6c 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-texmf-XDvi
+++ b/print/tex-xdvik/files/patch-texk-xdvik-texmf-XDvi
@@ -1,5 +1,5 @@
---- texk/xdvik/texmf/XDvi.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/texmf/XDvi	2015-01-31 21:03:10.000000000 +0900
+--- texk/xdvik/texmf/XDvi.orig	2012-03-28 14:46:30 UTC
++++ texk/xdvik/texmf/XDvi
 @@ -21,7 +21,7 @@
  !!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
  !!! issue when using T1lib.
@@ -9,7 +9,7 @@
  
  !!! This should be the best choice for modern displays with large color depth.
  *thorough: true
-@@ -118,14 +118,14 @@
+@@ -118,14 +118,14 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
  
  
  !!! help topics label for Xaw
@@ -26,7 +26,7 @@
  
  !!! time the mouse needs to stay on a button until tooltips pop up,
  !!! in milliseconds; set to a negative value to disable:
-@@ -133,11 +133,22 @@
+@@ -133,11 +133,22 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
  
  
  !!!------------------------------------------------------------------------------
@@ -51,7 +51,7 @@
  
  !!! Motif fonts. Meaning of the tags is:
  !!! NORMAL: Ordinary text, labels etc.
-@@ -147,11 +158,11 @@
+@@ -147,11 +158,11 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
  !!! TOPIC_HEADING: Heading for help text in help window
  !!!
  *fontList: \
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-texmf-config.xdvi b/print/tex-xdvik/files/patch-texk-xdvik-texmf-config.xdvi
index 605d83832865..6ef7598d0cca 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-texmf-config.xdvi
+++ b/print/tex-xdvik/files/patch-texk-xdvik-texmf-config.xdvi
@@ -1,5 +1,5 @@
---- texk/xdvik/texmf/config.xdvi.orig	2013-05-04 22:32:56.000000000 +0900
-+++ texk/xdvik/texmf/config.xdvi	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/texmf/config.xdvi.orig	2013-04-03 06:32:57 UTC
++++ texk/xdvik/texmf/config.xdvi
 @@ -37,4 +37,43 @@
  % because psfonts.map is (normally) a generated file (by the updmap
  % script).  Instead, map files should be added to the updmap.cfg file.
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-texmf-pxdvi.cfg b/print/tex-xdvik/files/patch-texk-xdvik-texmf-pxdvi.cfg
index 54f6d237da9a..ac5493d249ba 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-texmf-pxdvi.cfg
+++ b/print/tex-xdvik/files/patch-texk-xdvik-texmf-pxdvi.cfg
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/texmf/pxdvi.cfg	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/texmf/pxdvi.cfg.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/texmf/pxdvi.cfg
 @@ -0,0 +1,109 @@
 +% original xdvi.cfg -- Configuration file for the Type1 rendering module of xdvi.
 +% (If you change or delete `original' in the first line of this file,
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-tounimap2h.lua b/print/tex-xdvik/files/patch-texk-xdvik-tounimap2h.lua
index 4b4f6aabfcf9..017f31d03e35 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-tounimap2h.lua
+++ b/print/tex-xdvik/files/patch-texk-xdvik-tounimap2h.lua
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/tounimap2h.lua	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/tounimap2h.lua.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/tounimap2h.lua
 @@ -0,0 +1,80 @@
 +-- Copyright (c) 2011-2013 Hironori KITAGAWA
 +--
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-util.c b/print/tex-xdvik/files/patch-texk-xdvik-util.c
index 37bd750eb1fb..2c1c820c96f8 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-util.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-util.c
@@ -1,6 +1,6 @@
---- texk/xdvik/util.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/util.c	2015-01-31 21:02:18.000000000 +0900
-@@ -215,6 +215,7 @@
+--- texk/xdvik/util.c.orig	2014-04-08 18:43:12 UTC
++++ texk/xdvik/util.c
+@@ -215,6 +215,7 @@ struct debug_string_options debug_option
      {  DBG_GUI,		"gui",		", " },
      {  DBG_FIND,	"find",		", " },
      {  DBG_FILES,	"files",	", " },
@@ -8,7 +8,7 @@
      {  DBG_ALL,		"all",		"\n" },
      /* end marker */
      {  0,		NULL,		NULL }
-@@ -708,6 +709,38 @@
+@@ -708,6 +709,38 @@ alloc_bitmap(struct bitmap *bitmap)
      bitmap->bits = xmalloc(size != 0 ? size : 1);
  }
  
@@ -47,7 +47,7 @@
  
  #ifndef HAVE_MEMICMP
  /*
-@@ -1581,6 +1614,8 @@
+@@ -1581,6 +1614,8 @@ put_str_int_hash(hashTableT *hashtable, 
  }
  
  
@@ -56,7 +56,7 @@
  /*
   *	General AVL tree mechanism.  Search for a node, and return it if found.
   *	Otherwise insert a node.
-@@ -1712,6 +1747,8 @@
+@@ -1712,6 +1747,8 @@ avladd(const char *key, size_t key_len, 
  	return ap;
  }
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-util.h b/print/tex-xdvik/files/patch-texk-xdvik-util.h
index 13f54b401857..2cb8175a5c9b 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-util.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-util.h
@@ -1,6 +1,6 @@
---- texk/xdvik/util.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/util.h	2015-01-31 21:02:18.000000000 +0900
-@@ -73,6 +73,9 @@
+--- texk/xdvik/util.h.orig	2014-04-08 18:43:12 UTC
++++ texk/xdvik/util.h
+@@ -73,6 +73,9 @@ extern void prep_fd(int fd, wide_bool no
  
  struct bitmap; /* forward declaration */
  extern void alloc_bitmap(struct bitmap *);
@@ -10,7 +10,7 @@
  
  extern char *my_realpath(const char *path, char *real);
  #ifdef HAVE_REALPATH
-@@ -150,6 +153,7 @@
+@@ -150,6 +153,7 @@ typedef hash_table_type hashTableT; /* f
  extern Boolean find_str_int_hash(hashTableT *hashtable, const char *key, size_t *val);
  extern void put_str_int_hash(hashTableT *hashtable, const char *key, size_t val);
  
@@ -18,7 +18,7 @@
  
  /*
   *	AVL tree structures.
-@@ -168,6 +172,8 @@
+@@ -168,6 +172,8 @@ struct avl {		/* generic data structure 
  
  extern struct avl *avladd(const char *, size_t, struct avl **, size_t);
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-version.h b/print/tex-xdvik/files/patch-texk-xdvik-version.h
index 4a23e096b005..470c82f56c68 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-version.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-version.h
@@ -1,5 +1,5 @@
---- texk/xdvik/version.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/version.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/version.h.orig	2014-04-13 03:58:39 UTC
++++ texk/xdvik/version.h
 @@ -3,6 +3,7 @@
  #define VERSION_H_
  
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-vf.c b/print/tex-xdvik/files/patch-texk-xdvik-vf.c
index aefb6ae15d17..96ae9c5db8f4 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-vf.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-vf.c
@@ -1,6 +1,6 @@
---- texk/xdvik/vf.c.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/vf.c	2015-01-31 21:02:18.000000000 +0900
-@@ -126,7 +126,7 @@
+--- texk/xdvik/vf.c.orig	2008-02-11 22:47:58 UTC
++++ texk/xdvik/vf.c
+@@ -126,7 +126,7 @@ read_VF_index(struct font *fontp, wide_b
  	    len = get_bytes(VF_file, 4);
  	    cc = get_bytes(VF_file, 4);
  	    width = get_bytes(VF_file, 4);
@@ -9,7 +9,7 @@
  		|| (!resource.omega && cc >= 256)) {
  		XDVI_WARNING((stderr, "Virtual character %lu in font %s ignored.",
  			      cc, fontp->fontname));
-@@ -141,6 +141,13 @@
+@@ -141,6 +141,13 @@ read_VF_index(struct font *fontp, wide_b
  	}
  	if (resource.omega) {
  	    maxcc = (cc > maxcc) ? cc : maxcc;
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-xdvi-debug.h b/print/tex-xdvik/files/patch-texk-xdvik-xdvi-debug.h
index 9e3d3e69deb7..9811ed9b9b44 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-xdvi-debug.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-xdvi-debug.h
@@ -1,5 +1,5 @@
---- texk/xdvik/xdvi-debug.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/xdvi-debug.h	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/xdvi-debug.h.orig	2013-03-31 05:28:21 UTC
++++ texk/xdvik/xdvi-debug.h
 @@ -101,6 +101,7 @@
  #define DBG_GUI			131072
  #define DBG_FIND		262144
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-xdvi-ptex.map b/print/tex-xdvik/files/patch-texk-xdvik-xdvi-ptex.map
index 733ff01ec232..4efc38b9cb2e 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-xdvi-ptex.map
+++ b/print/tex-xdvik/files/patch-texk-xdvik-xdvi-ptex.map
@@ -1,5 +1,5 @@
---- /dev/null	2015-01-31 21:35:05.000000000 +0900
-+++ texk/xdvik/xdvi-ptex.map	2015-01-31 21:02:18.000000000 +0900
+--- texk/xdvik/xdvi-ptex.map.orig	2015-07-19 18:49:42 UTC
++++ texk/xdvik/xdvi-ptex.map
 @@ -0,0 +1,91 @@
 +%
 +% Sample "xdvi-ptex.map"
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-xdvi.h b/print/tex-xdvik/files/patch-texk-xdvik-xdvi.h
index b1242a9cdfe1..50b2d048adcc 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-xdvi.h
+++ b/print/tex-xdvik/files/patch-texk-xdvik-xdvi.h
@@ -1,6 +1,6 @@
---- texk/xdvik/xdvi.h.orig	2014-09-02 18:41:34.000000000 +0900
-+++ texk/xdvik/xdvi.h	2015-01-31 21:02:18.000000000 +0900
-@@ -168,7 +168,7 @@
+--- texk/xdvik/xdvi.h.orig	2014-04-03 01:17:13 UTC
++++ texk/xdvik/xdvi.h
+@@ -168,7 +168,7 @@ in xdvi.c.
  #include <X11/Intrinsic.h>
  
  #if HAVE_XI21
@@ -9,7 +9,7 @@
  #endif
  
  #ifndef MAXPATHLEN
-@@ -285,6 +285,10 @@
+@@ -285,6 +285,10 @@ extern unsigned long time_start, time_en
  #  define OPEN_MODE_ARGS const char *, const char *
  #endif
  
@@ -20,7 +20,7 @@
  #ifndef __LINE__
  #  define __LINE__ 0
  #endif
-@@ -335,6 +339,9 @@
+@@ -335,6 +339,9 @@ struct frame {
      struct framedata {
  	long dvi_h, dvi_v, w, x, y, z;
  	int pxl_v;
@@ -30,7 +30,7 @@
      } data;
      struct frame *next, *prev;
  };
-@@ -493,7 +500,7 @@
+@@ -493,7 +500,7 @@ extern struct x_resources {
  #endif
      Boolean	freetype;
  #if HAVE_XI21
@@ -39,7 +39,7 @@
  #endif
      const char *src_pos;
      const char *find_string;
-@@ -625,6 +632,9 @@
+@@ -625,6 +632,9 @@ extern struct x_resources {
      /* bitmask of current search window settings */
      unsigned int    search_window_defaults;
      /*     char *    _scroll_pages; */
@@ -49,7 +49,7 @@
      char       *help_general;
      char       *help_hypertex;
      char       *help_othercommands;
-@@ -964,47 +974,46 @@
+@@ -964,47 +974,46 @@ extern unsigned int color_list_max;	/* a
  extern Boolean color_warned;
  #endif /* COLOR */