- Separate libsynctex from tex-web2c to devel/tex-synctex.

- Separate basic TeX engines from tex-web2c to print/tex-basic-engines.
- Add CTAN mirrors to MASTER_SITES.
- Drop gmake where not required.
- Remove extra dependencies in print/tex-aleph, print/tex-dvipdfmx,
  print/tex-luatex, print/tex-xetex, and japanese/tex-ptex.

17 files changed, 994 insertions, 66 deletions

diff --git a/print/Makefile b/print/Makefile
index 20e0af6df9a5..e0cf5b6e08db 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -229,6 +229,7 @@
     SUBDIR += t1utils
     SUBDIR += tex
     SUBDIR += tex-aleph
+    SUBDIR += tex-basic-engines
     SUBDIR += tex-dvipdfmx
     SUBDIR += tex-dvipsk
     SUBDIR += tex-formats
diff --git a/print/tex-aleph/Makefile b/print/tex-aleph/Makefile
index 0eac497f8e88..c8abbdd206af 100644
--- a/print/tex-aleph/Makefile
+++ b/print/tex-aleph/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	aleph
 PORTVERSION=	1.15.2.1.r.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -15,7 +15,10 @@ EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Engine including Omega and e-TeX features
 
-USES=		gmake tar:xz pkgconfig
+LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
+		libpng.so:${PORTSDIR}/graphics/png
+
+USES=		tar:xz pkgconfig
 USE_TEX=	kpathsea web2c texmf formats fmtutil
 USE_XORG=	pixman
 USE_GNOME=	cairo
@@ -37,20 +40,11 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/lambda
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=etex luatex luajittex pdftex mf mf-nowin ptex eptex uptex \
-		euptex xetex tex synctex
+EXCLUDE_ENGINES=etex pdftex luatex luajittex mf mf-nowin \
+		ptex eptex uptex euptex \
+		otangle mp pmp upmp web2c web-progs xetex tex synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-aleph \
-		--enable-otangle \
-		--disable-mp \
-		--enable-web2c \
-		--disable-web-progs \
-		--with-system-freetype2 \
-		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
-		--with-freetype2-libdir=${LOCALBASE}/lib \
-		--with-system-poppler \
-		--with-system-t1lib \
-		--with-system-zziplib \
 		--with-system-zlib
 .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
 CONFIGURE_ARGS+=--with-system-$L \
diff --git a/print/tex-aleph/files/patch-configure b/print/tex-aleph/files/patch-configure
new file mode 100644
index 000000000000..ffcef7d0c69d
--- /dev/null
+++ b/print/tex-aleph/files/patch-configure
@@ -0,0 +1,429 @@
+--- configure.orig	2015-04-12 11:22:39 UTC
++++ configure
+@@ -23712,26 +23712,6 @@ $as_echo "#define z_const /**/" >>confde
+  ;;
+ esac
+ 
+-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+-  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
+-  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
+-  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
+-  LUA52_RULE='# Rebuild libtexlua52
+-$(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h
+-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/lua52/include/lua.h:
+-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+-  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
+-  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
+-  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
+-  LUAJIT_RULE='# Rebuild libtexluajit
+-$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
+-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/luajit/include/luajit.h:
+-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+ ## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+ 
+ # Check whether --with-system-libpng was given.
+@@ -23756,121 +23736,6 @@ ${top_builddir}/../../libs/libpng/includ
+ 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+ 
+-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-
+-# Check whether --with-system-freetype2 was given.
+-if test "${with_system_freetype2+set}" = set; then :
+-  withval=$with_system_freetype2;
+-fi
+-if test "x$with_system_freetype2" = xyes; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$FT2_CONFIG"; then
+-  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+-if test -n "$FT2_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+-$as_echo "$FT2_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_FT2_CONFIG"; then
+-  ac_ct_FT2_CONFIG=$FT2_CONFIG
+-  # Extract the first word of "freetype-config", so it can be a program name with args.
+-set dummy freetype-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_FT2_CONFIG"; then
+-  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+-if test -n "$ac_ct_FT2_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+-$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_FT2_CONFIG" = x; then
+-    FT2_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    FT2_CONFIG=$ac_ct_FT2_CONFIG
+-  fi
+-else
+-  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+-fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+-  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+-fi
+-else
+-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
+-  FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+-  FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
+-  FREETYPE2_RULE='# Rebuild libfreetype
+-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h
+-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
+-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+ 
+ # Check whether --with-system-pixman was given.
+@@ -23989,34 +23854,6 @@ ${top_builddir}/../../libs/mpfr/include/
+ 	cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+ 
+-## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
+-
+-# Check whether --with-system-poppler was given.
+-if test "${with_system_poppler+set}" = set; then :
+-  withval=$with_system_poppler;
+-fi
+-if test "x$with_system_poppler" = xyes; then
+-  if $PKG_CONFIG poppler --atleast-version=0.18; then
+-  POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
+-  POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
+-elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
+-  as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
+-fi
+-
+-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+-POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
+-else
+-  POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include"
+-  POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a"
+-  POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a'
+-  POPPLER_RULE='# Rebuild libpoppler
+-$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/include/Stream.h
+-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/poppler/include/Stream.h:
+-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
+-
+ ## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
+ 
+ # Check whether --with-system-xpdf was given.
+@@ -24045,242 +23882,6 @@ ${top_builddir}/../../libs/xpdf/xpdf/Str
+ fi
+ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
+ 
+-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
+-
+-# Check whether --with-system-zziplib was given.
+-if test "${with_system_zziplib+set}" = set; then :
+-  withval=$with_system_zziplib;
+-fi
+-if test "x$with_system_zziplib" = xyes; then
+-  if $PKG_CONFIG zziplib --atleast-version=0.12; then
+-  ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
+-  ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
+-elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+-  as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5
+-fi
+-else
+-  ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include"
+-  ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a"
+-  ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a'
+-  ZZIPLIB_RULE='# Rebuild libzzip
+-$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h
+-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
+-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-
+-# Check whether --with-system-teckit was given.
+-if test "${with_system_teckit+set}" = set; then :
+-  withval=$with_system_teckit;
+-fi
+-if test "x$with_system_teckit" = xyes; then
+-  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
+-fi
+-else
+-  TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
+-  TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
+-  TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a'
+-  TECKIT_RULE='# Rebuild libTECkit
+-$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h
+-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h:
+-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# Check whether --with-system-icu was given.
+-if test "${with_system_icu+set}" = set; then :
+-  withval=$with_system_icu;
+-fi
+-if test "x$with_system_icu" = xyes; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}icu-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ICU_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ICU_CONFIG"; then
+-  ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
+-if test -n "$ICU_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+-$as_echo "$ICU_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_ICU_CONFIG"; then
+-  ac_ct_ICU_CONFIG=$ICU_CONFIG
+-  # Extract the first word of "icu-config", so it can be a program name with args.
+-set dummy icu-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_ICU_CONFIG"; then
+-  ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_ICU_CONFIG="icu-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
+-if test -n "$ac_ct_ICU_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
+-$as_echo "$ac_ct_ICU_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_ICU_CONFIG" = x; then
+-    ICU_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    ICU_CONFIG=$ac_ct_ICU_CONFIG
+-  fi
+-else
+-  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
+-fi
+-if $ICU_CONFIG --version >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
+-  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif test "x$need_icu:$with_system_icu" = xyes:yes; then
+-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-fi
+-else
+-  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
+-  ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
+-  ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
+-  ICU_RULE='# Rebuild libicuxxx
+-$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
+-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/icu/include/unicode/uversion.h:
+-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz-icu; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-
+ # Check size of off_t (using <kpathsea/config.h>)
+ eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
+ eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
diff --git a/print/tex-basic-engines/Makefile b/print/tex-basic-engines/Makefile
new file mode 100644
index 000000000000..23a62a923582
--- /dev/null
+++ b/print/tex-basic-engines/Makefile
@@ -0,0 +1,50 @@
+# $FreeBSD$
+
+PORTNAME=	basic-engines
+PORTVERSION=	20150521
+CATEGORIES=	print
+MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+PKGNAMEPREFIX=	tex-
+DISTNAME=	texlive-20150521-source
+DIST_SUBDIR=	TeX
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Basic TeX Engines
+
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+
+USES=		pkgconfig libtool tar:xz
+USE_TEX=	kpathsea web2c>=20150521_1
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux \
+		libs/xpdf \
+		texk/web2c
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+GNU_CONFIGURE=	yes
+EXCLUDE_ENGINES=aleph luatex luajittex mf \
+		mf-nowin ptex eptex uptex euptex xetex \
+		otangle mp pmp upmp web2c web-progs synctex
+CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
+		--disable-missing \
+		--with-x=no \
+		--without-mf-x-toolkit \
+		--with-system-zlib \
+		--with-system-kpathsea
+.for L in libpng
+CONFIGURE_ARGS+=--with-system-$L \
+		--with-$L-include=${LOCALBASE}/include \
+		--with-$L-libdir=${LOCALBASE}/lib
+.endfor
+CFLAGS+=	-I${LOCALBASE}/include
+INSTALL_TARGET=	install-strip
+
+post-configure:
+	cd ${WRKDIR}/${DISTNAME}/libs/xpdf && \
+	    ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+		LIBS="${LIBS}" \
+		${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
+		    ${CONFIGURE_ARGS}
+
+.include <bsd.port.mk>
diff --git a/print/tex-basic-engines/distinfo b/print/tex-basic-engines/distinfo
new file mode 100644
index 000000000000..5e60be0fc6e1
--- /dev/null
+++ b/print/tex-basic-engines/distinfo
@@ -0,0 +1,2 @@
+SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
+SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
diff --git a/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in
new file mode 100644
index 000000000000..c57b6c2e1089
--- /dev/null
+++ b/print/tex-basic-engines/files/patch-Makefile.in
@@ -0,0 +1,31 @@
+--- Makefile.in.orig	2015-04-17 04:53:45.000000000 +0900
++++ Makefile.in	2015-07-26 07:48:39.326669000 +0900
+@@ -99,8 +99,8 @@
+ 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
+ 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+-	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
++bin_PROGRAMS = $(am__EXEEXT_5) \
++	$(am__EXEEXT_6) \
+ 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+ 	$(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
+ 	$(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
+@@ -2081,7 +2081,7 @@
+ AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
+ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
+ version = $(WEB2CVERSION)
+-SUBDIRS = doc lib man web2c . window omegafonts otps
++SUBDIRS = lib man web2c .
+ proglib = lib/lib.a
+ EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
+ 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
+@@ -2090,7 +2090,7 @@
+ EXTRA_LTLIBRARIES = libsynctex.la
+ lib_LIBRARIES = $(am__append_98)
+ lib_LTLIBRARIES = $(am__append_97)
+-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
++dist_man_MANS =
+ nodist_man_MANS = 
+ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
+ 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
diff --git a/print/tex-basic-engines/files/patch-man-Makefile.in b/print/tex-basic-engines/files/patch-man-Makefile.in
new file mode 100644
index 000000000000..a06313ab8816
--- /dev/null
+++ b/print/tex-basic-engines/files/patch-man-Makefile.in
@@ -0,0 +1,24 @@
+--- man/Makefile.in.orig	2015-07-26 05:53:09.990626000 +0900
++++ man/Makefile.in	2015-07-26 05:54:10.576804000 +0900
+@@ -437,17 +437,15 @@
+ 	$(otangle_man_sources) aleph.man $(misc_man_sources) \
+ 	amslatex.min initex.min lamstex.min slitex.min spell.add \
+ 	virtex.min
+-bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
++bootstrap_man_sources = 
+ 
+ # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
+-man1_links = cweb:ctangle cweb:cweave $(am__append_4) $(am__append_8) \
++man1_links = $(am__append_4) $(am__append_8) \
+ 	$(am__append_10) $(am__append_13) $(am__append_15)
+-web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
+-	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
+-	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
++web_man_sources = 
+ 
+ pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
+-otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
++otangle_man_sources = 
+ misc_man_sources = \
+ 	amstex.man \
+ 	latex.man \
diff --git a/print/tex-basic-engines/pkg-descr b/print/tex-basic-engines/pkg-descr
new file mode 100644
index 000000000000..3ae45b885623
--- /dev/null
+++ b/print/tex-basic-engines/pkg-descr
@@ -0,0 +1,3 @@
+Basic TeX engines including tex and pdftex.
+
+WWW: http://tug.org/texlive/
diff --git a/print/tex-basic-engines/pkg-plist b/print/tex-basic-engines/pkg-plist
new file mode 100644
index 000000000000..8e4c0167f789
--- /dev/null
+++ b/print/tex-basic-engines/pkg-plist
@@ -0,0 +1,13 @@
+bin/initex
+bin/pdftex
+bin/pdftosrc
+bin/tex
+bin/ttf2afm
+man/man1/amstex.1.gz
+man/man1/latex.1.gz
+man/man1/pdfetex.1.gz
+man/man1/pdflatex.1.gz
+man/man1/pdftex.1.gz
+man/man1/pdftosrc.1.gz
+man/man1/tex.1.gz
+man/man1/ttf2afm.1.gz
diff --git a/print/tex-dvipdfmx/Makefile b/print/tex-dvipdfmx/Makefile
index 023442fedf35..c50c90626e6e 100644
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dvipdfmx
 PORTVERSION=	20150315
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -18,11 +19,10 @@ COMMENT=	DVI Previewer(kpathsearch) for X
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libpaper.so:${PORTSDIR}/print/libpaper \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+		libpaper.so:${PORTSDIR}/print/libpaper
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/Identity-H:${PORTSDIR}/print/adobe-cmaps
 
-USES=		gmake pkgconfig tar:xz
+USES=		pkgconfig tar:xz
 USE_TEX=	kpathsea web2c texmf dvipsk luatex texhash
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
@@ -51,10 +51,7 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/fonts/map/dvipdfm/
 WRKSRC=	${WRKDIR}/${DISTNAME}/texk/dvipdfm-x
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-system-freetype2 \
-		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
-		--with-freetype2-libdir=${LOCALBASE}/lib \
-		--with-system-kpathsea \
+CONFIGURE_ARGS= --with-system-kpathsea \
 		--with-kpathsea-includes=${LOCALBASE}/include \
 		--with-kpathsea-libdir=${LOCALBASE}/lib \
 		--with-system-libpaper \
diff --git a/print/tex-formats/Makefile b/print/tex-formats/Makefile
index f97bb52aa8d1..9f6dd2f458d5 100644
--- a/print/tex-formats/Makefile
+++ b/print/tex-formats/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	formats
 PORTVERSION=	20150521
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	#empty
 PKGNAMEPREFIX=	tex-
@@ -10,12 +10,12 @@ DISTFILES=	#empty
 EXTRACT_ONLY=	#empty
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Formats for Basic TeX Engines
+COMMENT=	Formats for basic TeX engines
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
 
-USE_TEX=	web2c kpathsea texmf texhash fmtutil
+USE_TEX=	web2c basic texmf fmtutil texhash
 TEXHASHDIRS=	${TEXMFVARDIR}
 TEX_FORMATS=	amstex context cslatex csplain eplain latex-bin \
 		metafont mex mptopdf pdftex tex
diff --git a/print/tex-formats/pkg-descr b/print/tex-formats/pkg-descr
index 8c16472ff0aa..655b7500d05f 100644
--- a/print/tex-formats/pkg-descr
+++ b/print/tex-formats/pkg-descr
@@ -1,3 +1,3 @@
-TeX Live binaries and manuals.
+Format files for basic TeX engines.
 
 WWW: http://tug.org/texlive/
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 0ac93168d18b..da510ce02658 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	luatex
 PORTVERSION=	0.80.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -14,19 +15,16 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgraphite.so:${PORTSDIR}/graphics/silgraphite \
-		libicuio.so:${PORTSDIR}/devel/icu \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libTECkit.so:${PORTSDIR}/textproc/teckit \
+		libmpfr.so:${PORTSDIR}/math/mpfr \
 		libzzip.so:${PORTSDIR}/devel/zziplib
 
 USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
 USE_XORG=	pixman
 USE_GONME=	cairo
 USE_LDCONFIG=	yes
-USES=		pkgconfig tar:xz gmake libtool
+USES=		pkgconfig tar:xz libtool
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
@@ -62,25 +60,16 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/lualatex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin mp ptex eptex uptex euptex \
-		xetex tex synctex
+EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin \
+		ptex eptex uptex euptex \
+		otangle mp pmp upmp web2c web-progs xetex tex synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-luatex \
 		--enable-luajittex \
-		--enable-web2c \
-		--disable-web-progs \
-		--with-system-freetype2 \
-		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
-		--with-freetype2-libdir=${LOCALBASE}/lib \
-		--with-system-gd \
 		--with-system-poppler \
-		--with-system-t1lib \
-		--with-system-teckit \
-		--with-teckit-includes=${LOCALBASE}/include/teckit \
-		--with-teckit-libdir=${LOCALBASE}/lib \
-		--with-system-zziplib \
-		--with-system-zlib
-.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu
+		--with-system-zlib \
+		--with-system-zziplib
+.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
 CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
@@ -97,7 +86,8 @@ post-extract:
 pre-configure:
 	for D in libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
-		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
+		    ${CONFIGURE_ARGS}; \
 	done
 
 pre-install:
diff --git a/print/tex-luatex/files/patch-configure b/print/tex-luatex/files/patch-configure
new file mode 100644
index 000000000000..5c072f88f161
--- /dev/null
+++ b/print/tex-luatex/files/patch-configure
@@ -0,0 +1,343 @@
+--- configure.orig	2015-04-12 11:22:39 UTC
++++ configure
+@@ -23756,121 +23756,6 @@ ${top_builddir}/../../libs/libpng/includ
+ 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+ 
+-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-
+-# Check whether --with-system-freetype2 was given.
+-if test "${with_system_freetype2+set}" = set; then :
+-  withval=$with_system_freetype2;
+-fi
+-if test "x$with_system_freetype2" = xyes; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$FT2_CONFIG"; then
+-  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+-if test -n "$FT2_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+-$as_echo "$FT2_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_FT2_CONFIG"; then
+-  ac_ct_FT2_CONFIG=$FT2_CONFIG
+-  # Extract the first word of "freetype-config", so it can be a program name with args.
+-set dummy freetype-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_FT2_CONFIG"; then
+-  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+-if test -n "$ac_ct_FT2_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+-$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_FT2_CONFIG" = x; then
+-    FT2_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    FT2_CONFIG=$ac_ct_FT2_CONFIG
+-  fi
+-else
+-  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+-fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+-  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+-fi
+-else
+-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
+-  FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+-  FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
+-  FREETYPE2_RULE='# Rebuild libfreetype
+-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h
+-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
+-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+ 
+ # Check whether --with-system-pixman was given.
+@@ -24069,218 +23954,6 @@ ${top_builddir}/../../libs/zziplib/inclu
+ 	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+ 
+-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-
+-# Check whether --with-system-teckit was given.
+-if test "${with_system_teckit+set}" = set; then :
+-  withval=$with_system_teckit;
+-fi
+-if test "x$with_system_teckit" = xyes; then
+-  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
+-fi
+-else
+-  TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
+-  TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
+-  TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a'
+-  TECKIT_RULE='# Rebuild libTECkit
+-$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h
+-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h:
+-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# Check whether --with-system-icu was given.
+-if test "${with_system_icu+set}" = set; then :
+-  withval=$with_system_icu;
+-fi
+-if test "x$with_system_icu" = xyes; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}icu-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ICU_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ICU_CONFIG"; then
+-  ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
+-if test -n "$ICU_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+-$as_echo "$ICU_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_ICU_CONFIG"; then
+-  ac_ct_ICU_CONFIG=$ICU_CONFIG
+-  # Extract the first word of "icu-config", so it can be a program name with args.
+-set dummy icu-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_ICU_CONFIG"; then
+-  ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_ICU_CONFIG="icu-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
+-if test -n "$ac_ct_ICU_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
+-$as_echo "$ac_ct_ICU_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_ICU_CONFIG" = x; then
+-    ICU_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    ICU_CONFIG=$ac_ct_ICU_CONFIG
+-  fi
+-else
+-  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
+-fi
+-if $ICU_CONFIG --version >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
+-  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif test "x$need_icu:$with_system_icu" = xyes:yes; then
+-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-fi
+-else
+-  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
+-  ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
+-  ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
+-  ICU_RULE='# Rebuild libicuxxx
+-$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
+-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/icu/include/unicode/uversion.h:
+-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz-icu; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-
+ # Check size of off_t (using <kpathsea/config.h>)
+ eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
+ eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index b0d8638d881b..bf0559ddc2e6 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpaper.so:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	tex-dvipsk>=5.995:${PORTSDIR}/print/tex-dvipsk
 
-USES=		iconv gmake motif
+USES=		iconv motif
 USE_TEX=	web2c kpathsea texmf texhash
 TEXHASHDIRS=	${TEXMFDISTDIR}
 USE_XORG=	ice sm x11 xmu xpm xt xi
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 3564821d080b..86c00de43886 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.99992
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -18,13 +19,11 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
 		libicuio.so:${PORTSDIR}/devel/icu \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libTECkit.so:${PORTSDIR}/textproc/teckit \
-		libzzip.so:${PORTSDIR}/devel/zziplib
+		libTECkit.so:${PORTSDIR}/textproc/teckit
 
-USES=		pkgconfig gmake tar:xz
+USES=		pkgconfig tar:xz
 USE_TEX=	kpathsea web2c texmf formats fmtutil
 USE_XORG=	pixman
 USE_GNOME=	cairo
@@ -53,12 +52,11 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/generic/xetexconfig/unicode-letters.tex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin mp ptex eptex \
-		uptex euptex tex synctex
+EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
+		ptex eptex uptex euptex \
+		otangle mp pmp upmp web2c web-progs tex synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-xetex \
-		--enable-web2c \
-		--disable-web-progs \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
@@ -82,9 +80,10 @@ MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	xetex
 
 pre-configure:
-	for D in libs/harfbuzz libs/xpdf; do \
+	for D in libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
-		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+		    ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
+			${CONFIGURE_ARGS}; \
 	done
 
 pre-install:
diff --git a/print/tex-xetex/files/patch-configure b/print/tex-xetex/files/patch-configure
index 31fbca576bd3..73e6926bf55c 100644
--- a/print/tex-xetex/files/patch-configure
+++ b/print/tex-xetex/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2015-04-12 11:22:39 UTC
-+++ configure
+--- configure.orig	2015-04-12 11:22:39.000000000 +0000
++++ configure	2015-07-25 21:47:24.532843000 +0000
 @@ -1033,6 +1033,8 @@ with_system_poppler
  with_system_xpdf
  with_system_zziplib
@@ -9,16 +9,68 @@
  with_system_icu
  with_system_graphite2
  with_system_harfbuzz
-@@ -24071,17 +24073,33 @@ fi
+@@ -23712,26 +23714,6 @@ $as_echo "#define z_const /**/" >>confde
+  ;;
+ esac
  
- ## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+-  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
+-  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
+-  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
+-  LUA52_RULE='# Rebuild libtexlua52
+-$(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h
+-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/lua52/include/lua.h:
+-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+-  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
+-  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
+-  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
+-  LUAJIT_RULE='# Rebuild libtexluajit
+-$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
+-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/luajit/include/luajit.h:
+-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+ ## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
  
--# Check whether --with-system-teckit was given.
+ # Check whether --with-system-libpng was given.
+@@ -24045,43 +24027,35 @@ ${top_builddir}/../../libs/xpdf/xpdf/Str
+ fi
+ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
+ 
+-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
++## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+ 
+-# Check whether --with-system-zziplib was given.
+-if test "${with_system_zziplib+set}" = set; then :
+-  withval=$with_system_zziplib;
+-fi
+-if test "x$with_system_zziplib" = xyes; then
+-  if $PKG_CONFIG zziplib --atleast-version=0.12; then
+-  ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
+-  ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
+-elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+-  as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5
+-fi
+-else
+-  ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include"
+-  ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a"
+-  ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a'
+-  ZZIPLIB_RULE='# Rebuild libzzip
+-$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h
+-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
+-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 +# Check whether --with-teckit-includes was given.
 +if test "${with_teckit_includes+set}" = set; then :
 +  withval=$with_teckit_includes;
-+fi
-+
+ fi
+ 
+-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-
+-# Check whether --with-system-teckit was given.
 +# Check whether --with-teckit-libdir was given.
 +if test "${with_teckit_libdir+set}" = set; then :
 +  withval=$with_teckit_libdir;