Update TeXLive to 2014.

- Note that full support of configuration tools such as tlmgr and texconfig
  is not ready yet.

- Most of dviware now supports libpaper to choose the default papersize.
  Use paperconfig(8) utility or print/papersize-default-* packages.

- Some quite old macros of the age of latex209 have been removed, and
  there are user-visible/invisible incompatibilities.  Please send a report
  to freebsd-tex@FreeBSD.org or file a PR if you have trouble.

26 files changed, 360 insertions, 369 deletions

diff --git a/print/texlive-base/files/patch-libc++ b/print/texlive-base/files/patch-libc++
deleted file mode 100644
index 649e15564d4c..000000000000
--- a/print/texlive-base/files/patch-libc++
+++ /dev/null
@@ -1,60 +0,0 @@
---- texk/lcdf-typetools/libefont/cff.cc.orig
-+++ texk/lcdf-typetools/libefont/cff.cc
-@@ -27,6 +27,7 @@
- #include <ctype.h>
- #include <efont/t1unparser.hh>
- 
-+#undef static_assert
- #ifndef static_assert
- #define static_assert(c) switch (c) case 0: case (c):
- #endif
---- texk/lcdf-typetools/libefont/t1interp.cc.orig
-+++ texk/lcdf-typetools/libefont/t1interp.cc
-@@ -30,6 +30,7 @@
- #define CHECK_PATH_START()	do { _state = S_PATH; } while (0)
- #define CHECK_PATH_END()	do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0)
- 
-+#undef static_assert
- #ifndef static_assert
- # define static_assert(c)	switch (c) case 0: case (c):
- #endif
---- texk/dvisvgm/dvisvgm-1.0.11/src/FileFinder.cpp.orig
-+++ texk/dvisvgm/dvisvgm-1.0.11/src/FileFinder.cpp
-@@ -18,6 +18,7 @@
- ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
- 
-+#include <sys/time.h>
- #include <cstdlib>
- #include <fstream>
- #include <map>
---- texk/dvisvgm/dvisvgm-1.0.11/src/Message.cpp.orig
-+++ texk/dvisvgm/dvisvgm-1.0.11/src/Message.cpp
-@@ -18,6 +18,7 @@
- ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
- 
-+#include <sys/time.h>
- #include <cstdarg>
- #include <cstdlib>
- #include <cstring>
---- texk/dvisvgm/dvisvgm-1.0.11/src/Font.cpp.orig
-+++ texk/dvisvgm/dvisvgm-1.0.11/src/Font.cpp
-@@ -18,6 +18,7 @@
- ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
- 
-+#include <sys/time.h>
- #include <cstdlib>
- #include <iostream>
- #include <fstream>
---- texk/dvisvgm/dvisvgm-1.0.11/src/FontEncoding.cpp.orig
-+++ texk/dvisvgm/dvisvgm-1.0.11/src/FontEncoding.cpp
-@@ -18,6 +18,7 @@
- ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
- 
-+#include <sys/time.h>
- #include <fstream>
- #include "Font.h"
- #include "FontEncoding.h"
diff --git a/print/texlive-base/files/patch-texk-bibtex8-Makefile.in b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
index 9b44480522af..ebac2a440c2e 100644
--- a/print/texlive-base/files/patch-texk-bibtex8-Makefile.in
+++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
@@ -1,16 +1,16 @@
---- texk/bibtex8/Makefile.in.orig	2013-05-22 14:50:24.000000000 +0900
-+++ texk/bibtex8/Makefile.in	2013-05-22 14:51:44.000000000 +0900
-@@ -86,8 +86,7 @@
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
+--- texk/bibtex-x/Makefile.in.orig	2013-12-26 00:37:50.000000000 +0900
++++ texk/bibtex-x/Makefile.in	2014-08-22 17:37:38.000000000 +0900
+@@ -124,8 +124,7 @@
  CONFIG_CLEAN_VPATH_FILES =
+ @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT)
+ @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT)
 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" \
 -	"$(DESTDIR)$(csfdir)"
 +am__installdirs = "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS)
- am_bibtex8_OBJECTS = bibtex-1.$(OBJEXT) bibtex-2.$(OBJEXT) \
- 	bibtex-3.$(OBJEXT) bibtex-4.$(OBJEXT) bibtex.$(OBJEXT) \
-@@ -854,7 +853,7 @@
+ am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \
+ 	bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \
+@@ -1427,7 +1426,7 @@
  check: check-am
  all-am: Makefile $(PROGRAMS) $(DATA) config.h
  installdirs:
@@ -19,12 +19,12 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -911,7 +910,7 @@
+@@ -1487,7 +1486,7 @@
  
  info-am:
  
 -install-data-am: install-dist_btdocDATA install-dist_csfDATA
-+install-data-am:
++install-data-am: install-dist_csfDATA
  
  install-dvi: install-dvi-am
  
diff --git a/print/texlive-base/files/patch-texk-bibtexu-Makefile.in b/print/texlive-base/files/patch-texk-bibtexu-Makefile.in
deleted file mode 100644
index 5441c1fed35b..000000000000
--- a/print/texlive-base/files/patch-texk-bibtexu-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- texk/bibtexu/Makefile.in.orig	2013-05-22 14:52:12.000000000 +0900
-+++ texk/bibtexu/Makefile.in	2013-05-22 14:53:13.000000000 +0900
-@@ -88,8 +88,7 @@
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" \
--	"$(DESTDIR)$(csfdir)"
-+am__installdirs = "$(DESTDIR)$(bindir)"
- PROGRAMS = $(bin_PROGRAMS)
- am_bibtexu_OBJECTS = bibtex-1.$(OBJEXT) bibtex-2.$(OBJEXT) \
- 	bibtex-3.$(OBJEXT) bibtex-4.$(OBJEXT) bibtex.$(OBJEXT) \
-@@ -897,7 +896,7 @@
- check: check-am
- all-am: Makefile $(PROGRAMS) $(DATA) config.h
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
-@@ -954,7 +953,7 @@
- 
- info-am:
- 
--install-data-am: install-dist_btdocDATA install-dist_csfDATA
-+install-data-am:
- 
- install-dvi: install-dvi-am
- 
diff --git a/print/texlive-base/files/patch-texk-chktex-Makefile.in b/print/texlive-base/files/patch-texk-chktex-Makefile.in
new file mode 100644
index 000000000000..70cce1df42e2
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-chktex-Makefile.in
@@ -0,0 +1,35 @@
+--- texk/chktex/Makefile.in.orig	2013-12-26 00:37:50.000000000 +0900
++++ texk/chktex/Makefile.in	2014-08-21 00:21:15.000000000 +0900
+@@ -123,10 +123,8 @@
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = deweb.pl
+ CONFIG_CLEAN_VPATH_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+-	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \
+-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \
+-	"$(DESTDIR)$(pdfdocdir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
++	"$(DESTDIR)$(man1dir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \
+ 	@CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \
+@@ -1379,7 +1377,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -1443,8 +1441,8 @@
+ 
+ info-am:
+ 
+-install-data-am: install-configDATA install-dist_pdfdocDATA \
+-	install-man install-nodist_texmfSCRIPTS install-texmfSCRIPTS
++install-data-am: \
++	install-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp
new file mode 100644
index 000000000000..3977e5b194cb
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp
@@ -0,0 +1,10 @@
+--- texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp.orig	2014-04-13 22:09:23.000000000 +0900
++++ texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp	2014-08-20 23:34:37.000000000 +0900
+@@ -34,6 +34,7 @@
+ 	#endif
+ #endif
+ 
++#include <sys/time.h>
+ #include <cstdlib>
+ #include <fstream>
+ #include <map>
diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp
new file mode 100644
index 000000000000..b80454f6fc63
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp
@@ -0,0 +1,10 @@
+--- texk/dvisvgm/dvisvgm-1.6/src/Font.cpp.orig	2014-04-13 22:09:23.000000000 +0900
++++ texk/dvisvgm/dvisvgm-1.6/src/Font.cpp	2014-08-20 23:41:16.000000000 +0900
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+ 
+ #include <config.h>
++#include <sys/time.h>
+ #include <cstdlib>
+ #include <iostream>
+ #include <fstream>
diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp
new file mode 100644
index 000000000000..bf1b75d75423
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp
@@ -0,0 +1,10 @@
+--- texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp.orig	2014-01-13 17:24:56.000000000 +0900
++++ texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp	2014-08-20 23:41:52.000000000 +0900
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+ 
+ #include <config.h>
++#include <sys/time.h>
+ #include "CMap.h"
+ #include "CMapManager.h"
+ #include "EncFile.h"
diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp
new file mode 100644
index 000000000000..2eb775a0e064
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp
@@ -0,0 +1,10 @@
+--- texk/dvisvgm/dvisvgm-1.6/src/Message.cpp.orig	2014-01-13 17:24:56.000000000 +0900
++++ texk/dvisvgm/dvisvgm-1.6/src/Message.cpp	2014-08-20 23:38:38.000000000 +0900
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+ 
+ #include <config.h>
++#include <sys/time.h>
+ #include <cstdarg>
+ #include <cstdlib>
+ #include <cstring>
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-Makefile.in b/print/texlive-base/files/patch-texk-lcdf-typetools-Makefile.in
deleted file mode 100644
index 977139db7ef5..000000000000
--- a/print/texlive-base/files/patch-texk-lcdf-typetools-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- texk/lcdf-typetools/Makefile.in.orig	2013-05-22 14:15:55.000000000 +0900
-+++ texk/lcdf-typetools/Makefile.in	2013-05-22 14:19:14.000000000 +0900
-@@ -126,7 +126,7 @@
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"
-+am__installdirs = 
- DATA = $(enc_DATA) $(glyphlist_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -810,9 +810,6 @@
- all-am: Makefile $(DATA) autoconf.h all-local
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
--	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -866,7 +863,7 @@
- 
- info-am:
- 
--install-data-am: install-encDATA install-glyphlistDATA
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in
new file mode 100644
index 000000000000..b1b5eb64ed5c
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in
@@ -0,0 +1,22 @@
+--- ./texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in.orig	2014-01-09 21:51:50.000000000 +0900
++++ ./texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in	2014-08-22 15:36:45.000000000 +0900
+@@ -154,8 +154,8 @@
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"
+-DATA = $(enc_DATA) $(glyphlist_DATA)
++am__installdirs =
++DATA =
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -703,7 +703,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-encDATA install-glyphlistDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc
new file mode 100644
index 000000000000..89f498ffcc73
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc
@@ -0,0 +1,10 @@
+--- texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc.orig	2014-01-09 21:51:50.000000000 +0900
++++ texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc	2014-08-20 23:34:37.000000000 +0900
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <efont/t1unparser.hh>
+ 
++#undef static_assert
+ #ifndef static_assert
+ #define static_assert(c, msg) switch (c) case 0: case (c):
+ #endif
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc
new file mode 100644
index 000000000000..0af2b3d4e74b
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc
@@ -0,0 +1,10 @@
+--- texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc.orig	2014-01-09 21:51:50.000000000 +0900
++++ texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc	2014-08-20 23:34:37.000000000 +0900
+@@ -30,6 +30,7 @@
+ #define CHECK_PATH_START()	do { _state = S_PATH; } while (0)
+ #define CHECK_PATH_END()	do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0)
+ 
++#undef static_assert
+ #ifndef static_assert
+ # define static_assert(c, msg)	switch (c) case 0: case (c):
+ #endif
diff --git a/print/texlive-base/files/patch-texk-tetex-Makefile.in b/print/texlive-base/files/patch-texk-tetex-Makefile.in
deleted file mode 100644
index 40a1e86bb167..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- texk/tetex/Makefile.in.orig	2013-05-22 14:09:48.000000000 +0900
-+++ texk/tetex/Makefile.in	2013-05-22 14:12:23.000000000 +0900
-@@ -106,10 +106,10 @@
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" \
-+am__installdirs = "$(DESTDIR)$(bindir)" \
- 	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" \
- 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
--	"$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"
-+	"$(DESTDIR)$(web2cdir)"
- SCRIPTS = $(dist_bin_SCRIPTS) $(dist_texconfig_SCRIPTS) \
- 	$(dist_texmf_SCRIPTS) $(nodist_bin_SCRIPTS)
- SOURCES =
-@@ -891,7 +891,7 @@
- check: check-am
- all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
-@@ -946,8 +946,8 @@
- 
- info-am:
- 
--install-data-am: install-dist_texconfigDATA \
--	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
-+install-data-am: \
-+	install-dist_texmfSCRIPTS \
- 	install-dist_web2cDATA install-man
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/print/texlive-base/files/patch-texk-tetex-fmtutil b/print/texlive-base/files/patch-texk-tetex-fmtutil
deleted file mode 100644
index 557059fe6330..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-fmtutil
+++ /dev/null
@@ -1,12 +0,0 @@
---- texk/tetex/fmtutil.orig	2013-02-27 06:21:21.000000000 +0900
-+++ texk/tetex/fmtutil	2013-02-27 06:29:24.000000000 +0900
-@@ -680,6 +680,9 @@
- 
-   # remove any * for the sake of the kpsewhich lookup.
-   eval lastarg=\$$#
-+  case $lastarg in
-+  \#*)	eval lastarg=\$$(($# - 1)) ;;
-+  esac
-   inifile=`echo $lastarg | sed 's%^\*%%'`
- 
-   # See if we can find $inifile for return code:
diff --git a/print/texlive-base/files/patch-texk-tetex-fmtutil-sys b/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
deleted file mode 100644
index 45a82652d0f4..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
+++ /dev/null
@@ -1,8 +0,0 @@
---- texk/tetex/fmtutil-sys.orig	2013-05-07 13:20:06.000000000 +0900
-+++ texk/tetex/fmtutil-sys	2013-05-07 13:20:52.000000000 +0900
-@@ -26,4 +26,4 @@
- TEXMFCONFIG="$c"
- export TEXMFVAR TEXMFCONFIG
- 
--exec fmtutil ${1+"$@"}
-+exec %%PREFIX%%/bin/fmtutil ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-tetex-fmtutil.cnf b/print/texlive-base/files/patch-texk-tetex-fmtutil.cnf
deleted file mode 100644
index 36a558e79586..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-fmtutil.cnf
+++ /dev/null
@@ -1,134 +0,0 @@
---- texk/tetex/fmtutil.cnf.orig	2012-05-14 20:58:08.000000000 +0900
-+++ texk/tetex/fmtutil.cnf	2013-02-27 06:10:30.000000000 +0900
-@@ -36,15 +36,15 @@
- 
- #
- # from aleph:
--aleph aleph - *aleph.ini
--lamed aleph language.dat *lambda.ini
-+# aleph aleph - *aleph.ini
-+# lamed aleph language.dat *lambda.ini
- #
- # from amstex:
--amstex pdftex - -translate-file=cp227.tcx *amstex.ini
-+# amstex pdftex - -translate-file=cp227.tcx *amstex.ini
- #
- # from context:
--cont-en pdftex cont-usr.tex -8bit *cont-en.ini
--cont-en xetex cont-usr.tex -8bit *cont-en.ini
-+# cont-en pdftex cont-usr.tex -8bit *cont-en.ini
-+# cont-en xetex cont-usr.tex -8bit *cont-en.ini
- #! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
- #! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini
- #! cont-it pdftex cont-usr.tex -8bit *cont-it.ini
-@@ -52,54 +52,54 @@
- #! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini
- #
- # from cslatex:
--cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
--pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
-+# cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
-+# pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
- #
- # from csplain:
--csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
--pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
-+# csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
-+# pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
- #
- # from eplain:
--eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
-+# eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
- #
- # from jadetex:
--jadetex pdftex language.dat *jadetex.ini
--pdfjadetex pdftex language.dat *pdfjadetex.ini
-+# jadetex pdftex language.dat *jadetex.ini
-+# pdfjadetex pdftex language.dat *pdfjadetex.ini
- #
- # from latex-bin:
--latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
--pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
--dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
--lualatex luatex language.dat,language.dat.lua lualatex.ini
-+# latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-+# pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
-+# dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
-+# lualatex luatex language.dat,language.dat.lua lualatex.ini
- #
- # from luatex:
--luatex luatex language.def,language.dat.lua luatex.ini
--dviluatex luatex language.def,language.dat.lua dviluatex.ini
-+# luatex luatex language.def,language.dat.lua luatex.ini
-+# dviluatex luatex language.def,language.dat.lua dviluatex.ini
- #
- # from metafont:
--mf mf-nowin - -translate-file=cp227.tcx mf.ini
-+# mf mf-nowin - -translate-file=cp227.tcx mf.ini
- #
- # from mex:
--mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
--pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
--utf8mex pdftex mexconf.tex -enc *utf8mex.ini
-+# mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
-+# pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
-+# utf8mex pdftex mexconf.tex -enc *utf8mex.ini
- #
- # from mltex:
--mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
--mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
-+# mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
-+# mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
- #
- # from mptopdf:
--mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
-+# mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
- #
- # from pdftex:
--pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
--etex pdftex language.def -translate-file=cp227.tcx *etex.ini
--pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
-+# pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
-+# etex pdftex language.def -translate-file=cp227.tcx *etex.ini
-+# pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
- #
- # from ptex:
--ptex ptex - ptex.ini
--eptex eptex language.def *eptex.ini
--platex eptex language.dat *platex.ini
-+# ptex ptex - ptex.ini
-+# eptex eptex language.def *eptex.ini
-+# platex eptex language.dat *platex.ini
- #
- # from t2:
- #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
-@@ -107,20 +107,20 @@
- #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
- #
- # from tex:
--tex tex - tex.ini
-+# tex tex - tex.ini
- #
- # from texsis:
--texsis pdftex - -translate-file=cp227.tcx texsis.ini
-+# texsis pdftex - -translate-file=cp227.tcx texsis.ini
- #
- # from uptex:
--uptex uptex - uptex.ini
--euptex euptex language.def *euptex.ini
--uplatex euptex language.dat *uplatex.ini
-+# uptex uptex - uptex.ini
-+# euptex euptex language.def *euptex.ini
-+# uplatex euptex language.dat *uplatex.ini
- #
- # from xetex:
--xetex xetex language.def -etex xetex.ini
--xelatex xetex language.dat -etex xelatex.ini
-+# xetex xetex language.def -etex xetex.ini
-+# xelatex xetex language.dat -etex xelatex.ini
- #
- # from xmltex:
--xmltex pdftex language.dat *xmltex.ini
--pdfxmltex pdftex language.dat *pdfxmltex.ini
-+# xmltex pdftex language.dat *xmltex.ini
-+# pdfxmltex pdftex language.dat *pdfxmltex.ini
diff --git a/print/texlive-base/files/patch-texk-tetex-texconfig-sys b/print/texlive-base/files/patch-texk-tetex-texconfig-sys
deleted file mode 100644
index a8fe8f5fee88..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-texconfig-sys
+++ /dev/null
@@ -1,8 +0,0 @@
---- texk/tetex/texconfig-sys.orig	2013-05-07 13:24:39.000000000 +0900
-+++ texk/tetex/texconfig-sys	2013-05-07 13:24:50.000000000 +0900
-@@ -28,4 +28,4 @@
- TEXMFCONFIG="$c"
- export TEXMFVAR TEXMFCONFIG
- 
--exec texconfig ${1+"$@"}
-+exec %%PREFIX%%/bin/texconfig ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh b/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
deleted file mode 100644
index 14fc3372a92d..000000000000
--- a/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- texk/tetex/updmap-sys.sh.orig	2013-05-07 13:25:38.000000000 +0900
-+++ texk/tetex/updmap-sys.sh	2013-05-07 13:25:50.000000000 +0900
-@@ -27,4 +27,4 @@
- TEXMFCONFIG="$c"
- export TEXMFVAR TEXMFCONFIG
- 
--exec updmap ${1+"$@"}
-+exec %%PREFIX%%/bin/updmap ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
new file mode 100644
index 000000000000..106356771edd
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
@@ -0,0 +1,35 @@
+--- ./texk/texlive/tl_scripts/Makefile.in.orig	2013-12-26 00:37:50.000000000 +0900
++++ ./texk/texlive/tl_scripts/Makefile.in	2014-08-20 23:57:06.000000000 +0900
+@@ -121,10 +121,9 @@
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" \
++am__installdirs = "$(DESTDIR)$(texmfdir)" \
+ 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+-	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \
+-	"$(DESTDIR)$(web2cdir)"
++	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"
+ SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \
+ 	$(nodist_bin_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -627,7 +626,7 @@
+ check: check-am
+ all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
+ installdirs:
+-	for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
++	for dir in "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -681,8 +680,8 @@
+ 
+ info-am:
+ 
+-install-data-am: install-dist_texconfigDATA \
+-	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
++install-data-am: \
++	install-dist_texmfSCRIPTS \
+ 	install-dist_web2cDATA install-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh
new file mode 100644
index 000000000000..58c1f2850617
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh
@@ -0,0 +1,8 @@
+--- texk/texlive/tl_scripts/fmtutil-sys.sh.orig	2013-05-07 13:20:06.000000000 +0900
++++ texk/texlive/tl_scripts/fmtutil-sys.sh	2013-05-07 13:20:52.000000000 +0900
+@@ -26,4 +26,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec fmtutil ${1+"$@"}
++exec %%PREFIX%%/bin/fmtutil ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
new file mode 100644
index 000000000000..7b99618e5e8b
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
@@ -0,0 +1,150 @@
+--- texk/texlive/tl_scripts/fmtutil.cnf.orig	2014-04-28 22:32:21.000000000 +0900
++++ texk/texlive/tl_scripts/fmtutil.cnf	2014-08-21 00:15:56.000000000 +0900
+@@ -36,80 +36,80 @@
+ 
+ #
+ # from aleph:
+-aleph aleph - *aleph.ini
+-lamed aleph language.dat *lambda.ini
++#aleph aleph - *aleph.ini
++#lamed aleph language.dat *lambda.ini
+ #
+ # from amstex:
+-amstex pdftex - -translate-file=cp227.tcx *amstex.ini
++#amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+ #
+ # from context:
+-cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
+-cont-en xetex cont-usr.tex -8bit *cont-en.mkii
++#cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
++#cont-en xetex cont-usr.tex -8bit *cont-en.mkii
+ #! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
+ #! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
+ #! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
+ #! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
+ #
+ # from cslatex:
+-cslatex pdftex - -etex cslatex.ini
+-pdfcslatex pdftex - -etex cslatex.ini
++#cslatex pdftex - -etex cslatex.ini
++#pdfcslatex pdftex - -etex cslatex.ini
+ #
+ # from csplain:
+-csplain pdftex - -etex -enc csplain-utf8.ini
+-pdfcsplain pdftex - -etex -enc csplain-utf8.ini
+-pdfcsplain xetex - -etex csplain.ini
+-pdfcsplain luatex - -etex csplain.ini
++#csplain pdftex - -etex -enc csplain-utf8.ini
++#pdfcsplain pdftex - -etex -enc csplain-utf8.ini
++#pdfcsplain xetex - -etex csplain.ini
++#pdfcsplain luatex - -etex csplain.ini
+ #
+ # from eplain:
+-eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
++#eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
+ #
+ # from jadetex:
+-jadetex pdftex language.dat *jadetex.ini
+-pdfjadetex pdftex language.dat *pdfjadetex.ini
++#jadetex pdftex language.dat *jadetex.ini
++#pdfjadetex pdftex language.dat *pdfjadetex.ini
+ #
+ # from latex-bin:
+-latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+-pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
+-dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
+-lualatex luatex language.dat,language.dat.lua lualatex.ini
++#latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
++#pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
++#dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
++#lualatex luatex language.dat,language.dat.lua lualatex.ini
+ #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
+ #
+ # from lollipop:
+-lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
+-lualollipop luatex - lualollipop.ini
+-xelollipop xetex - -etex xelollipop.ini
++#lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
++#lualollipop luatex - lualollipop.ini
++#xelollipop xetex - -etex xelollipop.ini
+ #! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
+ #! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini
+ #
+ # from luatex:
+-luatex luatex language.def,language.dat.lua luatex.ini
+-dviluatex luatex language.def,language.dat.lua dviluatex.ini
+-luajittex luajittex language.def,language.dat.lua luatex.ini
++#luatex luatex language.def,language.dat.lua luatex.ini
++#dviluatex luatex language.def,language.dat.lua dviluatex.ini
++#luajittex luajittex language.def,language.dat.lua luatex.ini
+ #
+ # from metafont:
+-mf mf-nowin - -translate-file=cp227.tcx mf.ini
++#mf mf-nowin - -translate-file=cp227.tcx mf.ini
+ #
+ # from mex:
+-mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
+-pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
+-utf8mex pdftex mexconf.tex -enc *utf8mex.ini
++#mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
++#pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
++#utf8mex pdftex mexconf.tex -enc *utf8mex.ini
+ #
+ # from mltex:
+-mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini
+-mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
++#mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini
++#mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
+ #
+ # from mptopdf:
+-mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
++#mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
+ #
+ # from pdftex:
+-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+-etex pdftex language.def -translate-file=cp227.tcx *etex.ini
+-pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
++#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
++#etex pdftex language.def -translate-file=cp227.tcx *etex.ini
++#pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+ #
+ # from ptex:
+-ptex ptex - ptex.ini
+-eptex eptex language.def *eptex.ini
+-platex eptex language.dat *platex.ini
++#ptex ptex - ptex.ini
++#eptex eptex language.def *eptex.ini
++#platex eptex language.dat *platex.ini
+ #
+ # from t2:
+ #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
+@@ -117,20 +117,20 @@
+ #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
+ #
+ # from tex:
+-tex tex - tex.ini
++# tex tex - tex.ini
+ #
+ # from texsis:
+-texsis pdftex - -translate-file=cp227.tcx texsis.ini
++# texsis pdftex - -translate-file=cp227.tcx texsis.ini
+ #
+ # from uptex:
+-uptex uptex - uptex.ini
+-euptex euptex language.def *euptex.ini
+-uplatex euptex language.dat *uplatex.ini
++# uptex uptex - uptex.ini
++# euptex euptex language.def *euptex.ini
++# uplatex euptex language.dat *uplatex.ini
+ #
+ # from xetex:
+-xetex xetex language.def -etex xetex.ini
+-xelatex xetex language.dat -etex xelatex.ini
++# xetex xetex language.def -etex xetex.ini
++# xelatex xetex language.dat -etex xelatex.ini
+ #
+ # from xmltex:
+-xmltex pdftex language.dat *xmltex.ini
+-pdfxmltex pdftex language.dat *pdfxmltex.ini
++# xmltex pdftex language.dat *xmltex.ini
++# pdfxmltex pdftex language.dat *pdfxmltex.ini
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh
new file mode 100644
index 000000000000..0fcf9c2c6cb9
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh
@@ -0,0 +1,22 @@
+--- ./texk/texlive/tl_scripts/fmtutil.sh.orig	2014-04-21 09:17:48.000000000 +0900
++++ ./texk/texlive/tl_scripts/fmtutil.sh	2014-08-21 05:35:01.000000000 +0900
+@@ -404,8 +404,7 @@
+ ###############################################################################
+ mktexupd()
+ {
+-  initTexmfMain
+-  "$MT_TEXMFMAIN/web2c/mktexupd" "$@"
++  "$MT_MKTEXUPD" "$@"
+ }
+ 
+ ###############################################################################
+@@ -687,6 +686,9 @@
+ 
+   # remove any * for the sake of the kpsewhich lookup.
+   eval lastarg=\$$#
++  case $lastarg in
++  \#*)	eval lastarg=\$$(($# - 1)); texargs="${texargs%\#*}" ;;
++  esac
+   inifile=`echo $lastarg | sed 's%^\*%%'`
+ 
+   # See if we can find $inifile for return code:
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh
new file mode 100644
index 000000000000..9e92e5584289
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh
@@ -0,0 +1,8 @@
+--- texk/texlive/tl_scripts/texconfig-sys.sh.orig	2013-05-07 13:24:39.000000000 +0900
++++ texk/texlive/tl_scripts/texconfig-sys.sh	2013-05-07 13:24:50.000000000 +0900
+@@ -28,4 +28,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec texconfig ${1+"$@"}
++exec %%PREFIX%%/bin/texconfig ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh
new file mode 100644
index 000000000000..c82b950e292e
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh
@@ -0,0 +1,8 @@
+--- texk/texlive/tl_scripts/updmap-sys.sh.orig	2013-05-07 13:25:38.000000000 +0900
++++ texk/texlive/tl_scripts/updmap-sys.sh	2013-05-07 13:25:50.000000000 +0900
+@@ -27,4 +27,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec updmap ${1+"$@"}
++exec %%PREFIX%%/bin/updmap ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-ttf2pk-Makefile.in b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
index b8986656d621..f5d2730b4639 100644
--- a/print/texlive-base/files/patch-texk-ttf2pk-Makefile.in
+++ b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
@@ -1,5 +1,5 @@
---- texk/ttf2pk/Makefile.in.orig	2012-04-26 20:02:04.000000000 +0900
-+++ texk/ttf2pk/Makefile.in	2013-05-22 14:39:41.000000000 +0900
+--- texk/ttf2pk2/Makefile.in.orig	2012-04-26 20:02:04.000000000 +0900
++++ texk/ttf2pk2/Makefile.in	2013-05-22 14:39:41.000000000 +0900
 @@ -88,9 +88,7 @@
  CONFIG_HEADER = c-auto.h
  CONFIG_CLEAN_FILES =
diff --git a/print/texlive-base/files/patch-utils-chktex-Makefile.in b/print/texlive-base/files/patch-utils-chktex-Makefile.in
deleted file mode 100644
index aeb48f2fc4ee..000000000000
--- a/print/texlive-base/files/patch-utils-chktex-Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- utils/chktex/Makefile.in.orig	2013-05-22 13:40:02.000000000 +0900
-+++ utils/chktex/Makefile.in	2013-05-22 14:02:57.000000000 +0900
-@@ -81,8 +81,7 @@
- CONFIG_CLEAN_VPATH_FILES =
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
- 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
--	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \
--	"$(DESTDIR)$(pdfdocdir)"
-+	"$(DESTDIR)$(man1dir)"
- PROGRAMS = $(bin_PROGRAMS)
- am_chktex_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
- 	ChkTeX.$(OBJEXT) FindErrs.$(OBJEXT) OpSys.$(OBJEXT) \
-@@ -1045,7 +1044,7 @@
- check: check-am
- all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
-@@ -1102,8 +1101,8 @@
- 
- info-am:
- 
--install-data-am: install-configDATA install-dist_pdfdocDATA \
--	install-man install-nodist_texmfSCRIPTS
-+install-data-am: \
-+	install-man
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am