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.

24 files changed, 141 insertions, 127 deletions

diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure
new file mode 100644
index 000000000000..429162c7401d
--- /dev/null
+++ b/print/texlive-base/files/patch-configure
@@ -0,0 +1,36 @@
+--- configure.orig	2015-04-12 11:22:39 UTC
++++ configure
+@@ -5685,6 +5685,15 @@ $as_echo "$as_me:   ->  installed \`zlib
+     as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
+   fi
+ fi
++# Check whether --with-teckit-includes was given.
++if test "${with_teckit_includes+set}" = set; then :
++  withval=$with_teckit_includes;
++fi
++
++# Check whether --with-teckit-libdir was given.
++if test "${with_teckit_libdir+set}" = set; then :
++  withval=$with_teckit_libdir;
++fi
+ 
+ test "x$need_teckit" = xyes && {
+   need_zlib=yes
+@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system
+   as_fn_error $? "did not find graphite2" "$LINENO" 5
+ fi
+ 
+-if $PKG_CONFIG teckit; then
+-  TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+-  TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+-  as_fn_error $? "did not find teckit" "$LINENO" 5
++if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
++  TECKIT_INCLUDES="-I$with_teckit_includes"
++fi
++TECKIT_LIBS="-lTECkit"
++if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
++  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+ fi
+ 
+ if test -n "$ac_tool_prefix"; then
diff --git a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
index ebac2a440c2e..d2e3be4391e0 100644
--- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
+++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- texk/bibtex-x/Makefile.in.orig	2015-03-12 14:42:02 UTC
++++ texk/bibtex-x/Makefile.in
+@@ -121,8 +121,7 @@ CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
  @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT)
  @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT)
@@ -10,7 +10,7 @@
  PROGRAMS = $(bin_PROGRAMS)
  am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \
  	bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \
-@@ -1427,7 +1426,7 @@
+@@ -1438,7 +1437,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(PROGRAMS) $(DATA) config.h
  installdirs:
@@ -19,7 +19,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -1487,7 +1486,7 @@
+@@ -1498,7 +1497,7 @@ info: info-am
  
  info-am:
  
diff --git a/print/texlive-base/files/patch-texk-chktex-Makefile.in b/print/texlive-base/files/patch-texk-chktex-Makefile.in
index 70cce1df42e2..b46867fd1e44 100644
--- a/print/texlive-base/files/patch-texk-chktex-Makefile.in
+++ b/print/texlive-base/files/patch-texk-chktex-Makefile.in
@@ -1,8 +1,8 @@
---- 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 @@
+--- texk/chktex/Makefile.in.orig	2015-04-13 09:45:32 UTC
++++ texk/chktex/Makefile.in
+@@ -119,10 +119,8 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = deweb.pl
+ CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl
  CONFIG_CLEAN_VPATH_FILES =
 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 -	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \
@@ -13,7 +13,7 @@
  PROGRAMS = $(bin_PROGRAMS)
  am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \
  	@CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \
-@@ -1379,7 +1377,7 @@
+@@ -1405,7 +1403,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
  installdirs:
@@ -22,14 +22,14 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -1443,8 +1441,8 @@
+@@ -1469,9 +1467,7 @@ info: info-am
  
  info-am:
  
--install-data-am: install-configDATA install-dist_pdfdocDATA \
--	install-man install-nodist_texmfSCRIPTS install-texmfSCRIPTS
-+install-data-am: \
-+	install-man
+-install-data-am: install-configDATA install-man \
+-	install-nodist_texmfSCRIPTS install-pdfdocDATA \
+-	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-cjkutils-Makefile.in b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in
index 0571f4b4342c..e9f1ff3e8841 100644
--- a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in
+++ b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in
@@ -1,6 +1,6 @@
---- texk/cjkutils/Makefile.in.orig	2013-05-22 13:57:46.000000000 +0900
-+++ texk/cjkutils/Makefile.in	2013-05-22 13:58:53.000000000 +0900
-@@ -94,7 +94,7 @@
+--- texk/cjkutils/Makefile.in.orig	2015-03-12 14:42:02 UTC
++++ texk/cjkutils/Makefile.in
+@@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
  @WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
@@ -9,7 +9,7 @@
  PROGRAMS = $(bin_PROGRAMS)
  bg5conv_SOURCES = bg5conv.c
  bg5conv_OBJECTS = bg5conv.$(OBJEXT)
-@@ -1084,7 +1084,7 @@
+@@ -1412,7 +1412,7 @@ check: check-am
  all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \
  		all-local
  installdirs:
@@ -18,7 +18,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -1142,7 +1142,7 @@
+@@ -1477,7 +1477,7 @@ info: info-am
  
  info-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
deleted file mode 100644
index 3977e5b194cb..000000000000
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.9.2-src-FileFinder.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp
new file mode 100644
index 000000000000..c9f0d5bbedf1
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp
@@ -0,0 +1,10 @@
+--- texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp.orig	2015-03-02 08:48:21 UTC
++++ texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp
+@@ -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.9.2-src-Font.cpp
index b80454f6fc63..8444cc2e747d 100644
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp
@@ -1,5 +1,5 @@
---- 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
+--- texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp.orig	2015-03-02 08:48:21 UTC
++++ texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp
 @@ -19,6 +19,7 @@
  *************************************************************************/
  
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.9.2-src-FontEncoding.cpp
index bf1b75d75423..9f03ce0ff1fb 100644
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp
@@ -1,5 +1,5 @@
---- 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
+--- texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp.orig	2015-03-02 08:48:21 UTC
++++ texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp
 @@ -19,6 +19,7 @@
  *************************************************************************/
  
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.9.2-src-Message.cpp
index 2eb775a0e064..14f28dffe931 100644
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp
@@ -1,5 +1,5 @@
---- 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
+--- texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp.orig	2015-03-02 08:48:21 UTC
++++ texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp
 @@ -19,6 +19,7 @@
  *************************************************************************/
  
diff --git a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in
index 0ca699a773a0..61623e5101e6 100644
--- a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in
+++ b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in
@@ -1,6 +1,6 @@
---- texk/gsftopk/Makefile.in.orig	2013-05-22 14:05:21.000000000 +0900
-+++ texk/gsftopk/Makefile.in	2013-05-22 14:06:17.000000000 +0900
-@@ -85,8 +85,7 @@
+--- texk/gsftopk/Makefile.in.orig	2015-03-12 14:42:02 UTC
++++ texk/gsftopk/Makefile.in
+@@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = c-auto.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -10,7 +10,7 @@
  PROGRAMS = $(bin_PROGRAMS)
  am_gsftopk_OBJECTS = gsftopk.$(OBJEXT)
  gsftopk_OBJECTS = $(am_gsftopk_OBJECTS)
-@@ -751,7 +750,7 @@
+@@ -818,7 +817,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
  installdirs:
@@ -19,7 +19,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -808,7 +807,7 @@
+@@ -875,7 +874,7 @@ info: info-am
  
  info-am:
  
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
deleted file mode 100644
index 89f498ffcc73..000000000000
--- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 0af2b3d4e74b..000000000000
--- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-lcdf-typetools-lcdf-typetools-2.100-Makefile.in b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in
index b1b5eb64ed5c..2226742e37a1 100644
--- 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.104-Makefile.in
@@ -1,6 +1,6 @@
---- ./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 @@
+--- texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in.orig	2015-03-12 14:42:02 UTC
++++ texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in
+@@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
@@ -11,7 +11,7 @@
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
  am__recursive_targets = \
-@@ -703,7 +703,7 @@
+@@ -714,7 +714,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc
new file mode 100644
index 000000000000..2ef57a961e05
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc
@@ -0,0 +1,10 @@
+--- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc.orig	2014-07-08 06:44:39 UTC
++++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <efont/t1unparser.hh>
+ 
++#undef static_assert
+ #ifndef static_assert
+ #define static_assert(c, msg) switch ((int) (c)) case 0: case (c):
+ #endif
diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc
new file mode 100644
index 000000000000..4c140c56abd3
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc
@@ -0,0 +1,10 @@
+--- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc.orig	2014-07-08 06:44:39 UTC
++++ texk/lcdf-typetools/lcdf-typetools-2.104/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, msg)	switch ((int) (c)) case 0: case (c):
+ #endif
diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh
new file mode 100644
index 000000000000..40f8c5a48927
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh
@@ -0,0 +1,8 @@
+--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig	2015-04-20 07:45:42 UTC
++++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+ 
+-exec fmtutil --sys ${1+"$@"}
++exec %%PREFIX%%/bin/fmtutil --sys ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh
new file mode 100644
index 000000000000..40cdf468a3c7
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh
@@ -0,0 +1,8 @@
+--- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig	2015-04-20 07:45:42 UTC
++++ texk/texlive/linked_scripts/texlive/updmap-sys.sh
+@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+ 
+-exec updmap --sys ${1+"$@"}
++exec %%PREFIX%%/bin/updmap --sys ${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
index 6824fff91322..b72bce2d767c 100644
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
@@ -1,6 +1,6 @@
---- texk/texlive/tl_scripts/Makefile.in.orig	2013-12-26 00:37:50.000000000 +0900
-+++ texk/texlive/tl_scripts/Makefile.in	2014-12-15 00:41:48.000000000 +0900
-@@ -121,10 +121,9 @@
+--- texk/texlive/tl_scripts/Makefile.in.orig	2015-04-26 23:57:20 UTC
++++ texk/texlive/tl_scripts/Makefile.in
+@@ -128,10 +128,9 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
@@ -13,16 +13,16 @@
  SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \
  	$(nodist_bin_SCRIPTS)
  AM_V_P = $(am__v_P_@AM_V@)
-@@ -253,8 +252,6 @@
+@@ -263,8 +262,6 @@ sh_scripts = \
+ 	dvi2fax \
  	dvired \
- 	fmtutil \
  	fontinst \
 -	kpsetool \
 -	kpsewhere \
  	ps2frag \
  	pslatex \
  	rubibtex \
-@@ -283,8 +280,6 @@
+@@ -293,8 +290,6 @@ dist_man_MANS = \
  	fmtutil.1 \
  	fmtutil.cnf.5 \
  	fontinst.1 \
@@ -31,7 +31,7 @@
  	ps2frag.1 \
  	pslatex.1 \
  	rubibtex.1 \
-@@ -296,14 +291,10 @@
+@@ -306,14 +301,10 @@ dist_man_MANS = \
  
  bin_links = \
  	allcm:allec \
@@ -47,7 +47,7 @@
  	fmtutil:mktexfmt \
  	texconfig:texconfig-sys \
  	updmap:updmap-sys
-@@ -627,7 +618,7 @@
+@@ -638,7 +629,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
  installdirs:
@@ -56,7 +56,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -681,8 +672,8 @@
+@@ -692,8 +683,8 @@ info: info-am
  
  info-am:
  
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
deleted file mode 100644
index 58c1f2850617..000000000000
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
index 7b99618e5e8b..e964521bb095 100644
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
@@ -1,6 +1,6 @@
---- 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 @@
+--- texk/texlive/tl_scripts/fmtutil.cnf.orig	2015-05-05 22:32:32 UTC
++++ texk/texlive/tl_scripts/fmtutil.cnf
+@@ -37,80 +37,80 @@
  
  #
  # from aleph:
@@ -118,7 +118,7 @@
  #
  # from t2:
  #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
-@@ -117,20 +117,20 @@
+@@ -118,20 +118,20 @@ platex eptex language.dat *platex.ini
  #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
  #
  # from tex:
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
deleted file mode 100644
index 0fcf9c2c6cb9..000000000000
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./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
index 9e92e5584289..db5746b70c15 100644
--- 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
@@ -1,6 +1,6 @@
---- 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 @@
+--- texk/texlive/tl_scripts/texconfig-sys.sh.orig	2014-07-13 00:06:11 UTC
++++ texk/texlive/tl_scripts/texconfig-sys.sh
+@@ -30,4 +30,4 @@ TEXMFVAR="$v"
  TEXMFCONFIG="$c"
  export TEXMFVAR TEXMFCONFIG
  
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
deleted file mode 100644
index c82b950e292e..000000000000
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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-ttf2pk2-Makefile.in b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
index f5d2730b4639..e3f2f1b063c8 100644
--- a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
+++ b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
@@ -1,7 +1,7 @@
---- 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
+--- texk/ttf2pk2/Makefile.in.orig	2015-03-12 14:42:02 UTC
++++ texk/ttf2pk2/Makefile.in
+@@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@@ -9,18 +9,18 @@
 -	"$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)"
 +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
- am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) \
+ am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) ftlib.$(OBJEXT) \
  	ligkern.$(OBJEXT) newobj.$(OBJEXT) parse.$(OBJEXT) \
-@@ -1006,7 +1004,7 @@
+@@ -1321,7 +1319,7 @@ check-am: all-am
  check: check-am
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
  installdirs:
 -	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cfgdatadir)" "$(DESTDIR)$(encdatadir)" "$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)"; do \
 +	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -1063,8 +1061,7 @@
+@@ -1381,8 +1379,7 @@ info: info-am
  
  info-am: