From owner-svn-ports-all@freebsd.org Sun Jul 26 06:57:33 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C55AE9A91CE; Sun, 26 Jul 2015 06:57:33 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B30CFC7B; Sun, 26 Jul 2015 06:57:33 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6Q6vXbG083396; Sun, 26 Jul 2015 06:57:33 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6Q6vRna083376; Sun, 26 Jul 2015 06:57:27 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201507260657.t6Q6vRna083376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 26 Jul 2015 06:57:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392909 - in head: Mk devel devel/tex-kpathsea devel/tex-libtexlua devel/tex-libtexluajit devel/tex-synctex devel/tex-synctex/files devel/tex-web2c devel/tex-web2c/files japanese/tex-pt... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2015 06:57:34 -0000 Author: hrs Date: Sun Jul 26 06:57:26 2015 New Revision: 392909 URL: https://svnweb.freebsd.org/changeset/ports/392909 Log: - 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. Added: head/devel/tex-synctex/ head/devel/tex-synctex/Makefile (contents, props changed) head/devel/tex-synctex/distinfo (contents, props changed) head/devel/tex-synctex/files/ head/devel/tex-synctex/files/patch-Makefile.in (contents, props changed) head/devel/tex-synctex/files/patch-configure (contents, props changed) head/devel/tex-synctex/files/patch-man-Makefile.in (contents, props changed) head/devel/tex-synctex/pkg-descr (contents, props changed) head/devel/tex-synctex/pkg-plist (contents, props changed) head/devel/tex-web2c/files/patch-man-Makefile.in (contents, props changed) head/japanese/tex-ptex/files/patch-configure (contents, props changed) head/print/tex-aleph/files/patch-configure (contents, props changed) head/print/tex-basic-engines/ head/print/tex-basic-engines/Makefile (contents, props changed) head/print/tex-basic-engines/distinfo (contents, props changed) head/print/tex-basic-engines/files/ head/print/tex-basic-engines/files/patch-Makefile.in (contents, props changed) head/print/tex-basic-engines/files/patch-man-Makefile.in (contents, props changed) head/print/tex-basic-engines/pkg-descr (contents, props changed) head/print/tex-basic-engines/pkg-plist (contents, props changed) head/print/tex-luatex/files/patch-configure (contents, props changed) Modified: head/Mk/bsd.tex.mk head/devel/Makefile head/devel/tex-kpathsea/Makefile head/devel/tex-libtexlua/Makefile head/devel/tex-libtexluajit/Makefile head/devel/tex-web2c/Makefile head/devel/tex-web2c/files/patch-Makefile.in head/devel/tex-web2c/pkg-plist head/japanese/tex-ptex/Makefile head/print/Makefile head/print/tex-aleph/Makefile head/print/tex-dvipdfmx/Makefile head/print/tex-formats/Makefile head/print/tex-formats/pkg-descr head/print/tex-luatex/Makefile head/print/tex-xdvik/Makefile head/print/tex-xetex/Makefile head/print/tex-xetex/files/patch-configure Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Sat Jul 25 21:36:56 2015 (r392908) +++ head/Mk/bsd.tex.mk Sun Jul 26 06:57:26 2015 (r392909) @@ -22,9 +22,11 @@ TEX_MAINTAINER= hrs@FreeBSD.org # web2c: WEB2C toolchain and TeX engines # kpathsea: kpathsea library # ptexenc: character code conversion library for pTeX +# basic: basic TeX engines including tex and pdftex # tlmgr: tlmgr dependency (Perl modules) # texlua: texlua52 library # texluajit: texluajit library +# synctex: synctex library # # dvipsk: dvipsk # dvipdfmx: DVIPDFMx @@ -102,6 +104,9 @@ _USE_TEX_XDVIK_PKGNAME= tex-xdvik _USE_TEX_DVIPDFMX_DEP= dvipdfmx _USE_TEX_DVIPDFMX_PORT= print/${_USE_TEX_DVIPDFMX_PKGNAME} _USE_TEX_DVIPDFMX_PKGNAME=tex-dvipdfmx +_USE_TEX_BASIC_DEP= tex +_USE_TEX_BASIC_PORT= print/${_USE_TEX_BASIC_PKGNAME} +_USE_TEX_BASIC_PKGNAME= tex-basic-engines .for _L in TEX LATEX PDFTEX _USE_TEX_${_L}_DEP= ${_USE_TEX_FORMATS_DEP} _USE_TEX_${_L}_PORT= ${_USE_TEX_FORMATS_PORT} @@ -134,6 +139,9 @@ _USE_TEX_TEXLUAJIT_PKGNAME=tex-libtexlua _USE_TEX_FORMATS_DEP= ${LOCALBASE}/${TEXMFVARDIR}/web2c/tex/tex.fmt _USE_TEX_FORMATS_PORT= print/${_USE_TEX_FORMATS_PKGNAME} _USE_TEX_FORMATS_PKGNAME=tex-formats +_USE_TEX_SYNCTEX_DEP= libsynctex.so +_USE_TEX_SYNCTEX_PORT= devel/${_USE_TEX_SYNCTEX_PKGNAME} +_USE_TEX_SYNCTEX_PKGNAME=tex-synctex _USE_TEX_ALEPH_DEP= aleph _USE_TEX_ALEPH_PORT= print/${_USE_TEX_ALEPH_PKGNAME} _USE_TEX_ALEPH_PKGNAME= tex-aleph @@ -146,9 +154,9 @@ _USE_TEX_XETEX_PKGNAME= tex-xetex _USE_TEX_FULLLIST= texmf>=20150523 base>=20150521 \ web2c tlmgr:run \ - formats aleph xetex jadetex luatex xmltex ptex \ + basic formats aleph xetex jadetex luatex xmltex ptex \ dvipsk dvipdfmx xdvik \ - kpathsea:lib ptexenc:lib texlua:lib texluajit:lib + kpathsea:lib ptexenc:lib texlua:lib texluajit:lib synctex:lib .if !empty(USE_TEX:tu:MFULL) USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu} @@ -166,7 +174,8 @@ _U:= ${_U}>=20150521 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUA) || \ - !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUAJIT) + !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUAJIT) || \ + !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MSYNCTEX) _U:= ${_U}:lib . endif . if !empty(_U:M*[<>=]*) Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -5042,6 +5042,7 @@ SUBDIR += tex-kpathsea SUBDIR += tex-libtexlua SUBDIR += tex-libtexluajit + SUBDIR += tex-synctex SUBDIR += tex-web2c SUBDIR += thrift SUBDIR += thrift-c_glib Modified: head/devel/tex-kpathsea/Makefile ============================================================================== --- head/devel/tex-kpathsea/Makefile Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-kpathsea/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -11,13 +11,13 @@ DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org COMMENT= Path searching library for TeX -USES= gmake tar:xz libtool +USES= libtool tar:xz USE_LDCONFIG= yes USE_TEX= yes -EXTRACT_AFTER_ARGS= ${EXTRACT_FILES} -EXTRACT_FILES= ${DISTNAME}/build-aux \ - ${DISTNAME}/texk/kpathsea \ - ${DISTNAME}/texk/texlive/tl_scripts +EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} +EXTRACT_FILES= build-aux \ + texk/kpathsea \ + texk/texlive/tl_scripts WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Modified: head/devel/tex-libtexlua/Makefile ============================================================================== --- head/devel/tex-libtexlua/Makefile Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-libtexlua/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -3,7 +3,7 @@ PORTNAME= libtexlua PORTVERSION= 5.2.4 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ +MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMEPREFIX= tex- DISTNAME= texlive-20150521-source DIST_SUBDIR= TeX Modified: head/devel/tex-libtexluajit/Makefile ============================================================================== --- head/devel/tex-libtexluajit/Makefile Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-libtexluajit/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -3,7 +3,7 @@ PORTNAME= libtexluajit PORTVERSION= 2.0.3 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ +MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMEPREFIX= tex- DISTNAME= texlive-20150521-source DIST_SUBDIR= TeX Added: head/devel/tex-synctex/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PORTNAME= synctex +PORTVERSION= 1.17.0 +CATEGORIES= devel +MASTER_SITES= TEX_CTAN/systems/texlive/Source/ +PKGNAMEPREFIX= tex- +DISTNAME= texlive-20150521-source +DIST_SUBDIR= TeX + +MAINTAINER= hrs@FreeBSD.org +COMMENT= Synchronization TeXnology parser library + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/synctexdir/README.txt + +CONFLICTS= tex-web2c-20150521 +USES= libtool pkgconfig tar:xz +USE_TEX= yes +USE_LDCONFIG= yes +EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} +EXTRACT_FILES= build-aux texk/web2c +WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c +GNU_CONFIGURE= yes +EXCLUDE_ENGINES=etex aleph luatex luajittex pdftex mf mf-nowin ptex \ + eptex uptex euptex xetex tex otangle mp pmp upmp web2c \ + web-progs +CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ + --with-x=no \ + --without-mf-x-toolkit \ + --with-system-zlib \ + --with-system-kpathsea +CFLAGS+= -I${LOCALBASE}/include +INSTALL_TARGET= install-strip + +.include Added: head/devel/tex-synctex/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/distinfo Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,2 @@ +SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 +SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 Added: head/devel/tex-synctex/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/files/patch-Makefile.in Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,40 @@ +--- Makefile.in.orig 2015-04-17 04:53:45.000000000 +0900 ++++ Makefile.in 2015-07-25 22:52:31.390521000 +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) \ +@@ -108,7 +108,7 @@ + $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \ + $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \ + $(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) +-noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ ++noinst_PROGRAMS = \ + $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \ + $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) + check_PROGRAMS = $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \ +@@ -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 . + proglib = lib/lib.a + EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \ + libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \ +@@ -3557,7 +3557,7 @@ + + nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES) + syncincludedir = ${includedir}/synctex +-pkgconfigdir = ${libdir}/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + @SYNCTEX_TRUE@syncinclude_HEADERS = \ + @SYNCTEX_TRUE@ synctexdir/synctex_parser.h \ + @SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h Added: head/devel/tex-synctex/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/files/patch-configure Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,607 @@ +--- configure.orig 2015-04-12 20:22:39.000000000 +0900 ++++ configure 2015-07-25 06:32:59.629591000 +0900 +@@ -23614,28 +23614,6 @@ + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" + fi + +-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags +- +-# Check whether --with-system-ptexenc was given. +-if test "${with_system_ptexenc+set}" = set; then : +- withval=$with_system_ptexenc; +-fi +-if test "x$with_system_ptexenc" = xyes; then +- if $PKG_CONFIG ptexenc; then +- PTEXENC_INCLUDES=`$PKG_CONFIG ptexenc --cflags` +- PTEXENC_LIBS=`$PKG_CONFIG ptexenc --libs` +-elif test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then +- as_fn_error $? "did not find ptexenc" "$LINENO" 5 +-fi +-else +- PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" +- PTEXENC_LIBS="$kpse_BLD/texk/ptexenc/libptexenc.la" +- PTEXENC_DEPEND='${top_builddir}/../ptexenc/libptexenc.la' +- PTEXENC_RULE='# Rebuild libptexenc +-$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h +- cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-fi +- + ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags + + # Check whether --with-system-zlib was given. +@@ -23712,575 +23690,6 @@ + ;; + 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. +-if test "${with_system_libpng+set}" = set; then : +- withval=$with_system_libpng; +-fi +-if test "x$with_system_libpng" = xyes; then +- if $PKG_CONFIG libpng; then +- LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags` +- LIBPNG_LIBS=`$PKG_CONFIG libpng --libs` +-elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then +- as_fn_error $? "did not find libpng" "$LINENO" 5 +-fi +-else +- LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" +- LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" +- LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' +- LIBPNG_RULE='# Rebuild libpng +-$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h +- cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/libpng/include/png.h: +- 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. +-if test "${with_system_pixman+set}" = set; then : +- withval=$with_system_pixman; +-fi +-if test "x$with_system_pixman" = xyes; then +- if $PKG_CONFIG pixman-1 --atleast-version=0.18; then +- PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags` +- PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs` +-elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then +- as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5 +-fi +-else +- PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include" +- PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.a" +- PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.a' +- PIXMAN_RULE='# Rebuild libpixman +-$(PIXMAN_DEPEND): ${top_builddir}/../../libs/pixman/include/pixman.h +- cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/pixman/include/pixman.h: +- cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-fi +- +-## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags +- +-# Check whether --with-system-cairo was given. +-if test "${with_system_cairo+set}" = set; then : +- withval=$with_system_cairo; +-fi +-if test "x$with_system_cairo" = xyes; then +- if $PKG_CONFIG cairo --atleast-version=1.12; then +- CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` +- CAIRO_LIBS=`$PKG_CONFIG cairo --libs` +-elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then +- as_fn_error $? "did not find cairo 1.12 or better" "$LINENO" 5 +-fi +-else +- CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo" +- CAIRO_LIBS="$kpse_BLD/libs/cairo/libcairo.a" +- CAIRO_DEPEND='${top_builddir}/../../libs/cairo/libcairo.a' +- CAIRO_RULE='# Rebuild libcairo +-$(CAIRO_DEPEND): ${top_builddir}/../../libs/cairo/cairo/cairo.h +- cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/cairo/cairo/cairo.h: +- cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-fi +- +-## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags +- +-# Check whether --with-system-gmp was given. +-if test "${with_system_gmp+set}" = set; then : +- withval=$with_system_gmp; +-fi +- +-# Check whether --with-gmp-includes was given. +-if test "${with_gmp_includes+set}" = set; then : +- withval=$with_gmp_includes; +-fi +- +-# Check whether --with-gmp-libdir was given. +-if test "${with_gmp_libdir+set}" = set; then : +- withval=$with_gmp_libdir; +-fi +-if test "x$with_system_gmp" = xyes; then +- if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then +- GMP_INCLUDES="-I$with_gmp_includes" +-fi +-GMP_LIBS="-lgmp" +-if test "x$with_gmp_libdir" != x && test "x$with_gmp_libdir" != xyes; then +- GMP_LIBS="-L$with_gmp_libdir $GMP_LIBS" +-fi +-else +- GMP_INCLUDES="-I$kpse_BLD/libs/gmp/include" +- GMP_LIBS="$kpse_BLD/libs/gmp/libgmp.a" +- GMP_DEPEND='${top_builddir}/../../libs/gmp/libgmp.a' +- GMP_RULE='# Rebuild libgmp +-$(GMP_DEPEND): ${top_builddir}/../../libs/gmp/include/gmp.h +- cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/gmp/include/gmp.h: +- cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-fi +- +-## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags +- +-# Check whether --with-system-mpfr was given. +-if test "${with_system_mpfr+set}" = set; then : +- withval=$with_system_mpfr; +-fi +- +-# Check whether --with-mpfr-includes was given. +-if test "${with_mpfr_includes+set}" = set; then : +- withval=$with_mpfr_includes; +-fi +- +-# Check whether --with-mpfr-libdir was given. +-if test "${with_mpfr_libdir+set}" = set; then : +- withval=$with_mpfr_libdir; +-fi +-if test "x$with_system_mpfr" = xyes; then +- if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then +- MPFR_INCLUDES="-I$with_mpfr_includes" +-fi +-MPFR_LIBS="-lmpfr" +-if test "x$with_mpfr_libdir" != x && test "x$with_mpfr_libdir" != xyes; then +- MPFR_LIBS="-L$with_mpfr_libdir $MPFR_LIBS" +-fi +-else +- MPFR_INCLUDES="-I$kpse_BLD/libs/mpfr/include" +- MPFR_LIBS="$kpse_BLD/libs/mpfr/libmpfr.a" +- MPFR_DEPEND='${top_builddir}/../../libs/mpfr/libmpfr.a' +- MPFR_RULE='# Rebuild libmpfr +-$(MPFR_DEPEND): ${top_builddir}/../../libs/mpfr/include/mpfr.h +- cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/mpfr/include/mpfr.h: +- 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. +-if test "${with_system_xpdf+set}" = set; then : +- withval=$with_system_xpdf; +-fi +-if test "x$with_system_xpdf" = xyes; then +- if $PKG_CONFIG poppler --atleast-version=0.12; then +- XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags` +- XPDF_LIBS=`$PKG_CONFIG poppler --libs` +-elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then +- as_fn_error $? "did not find poppler 0.12 or better" "$LINENO" 5 +-fi +- +-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' +-XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES" +-else +- XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf" +- XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a" +- XPDF_DEPEND='${top_builddir}/../../libs/xpdf/libxpdf.a' +- XPDF_RULE='# Rebuild libxpdf +-$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h +- cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/xpdf/xpdf/Stream.h: +- cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-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 ) + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" + eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" Added: head/devel/tex-synctex/files/patch-man-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/files/patch-man-Makefile.in Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,27 @@ +--- man/Makefile.in.orig 2015-07-25 06:17:56.308987000 +0900 ++++ man/Makefile.in 2015-07-25 06:20:43.483764000 +0900 +@@ -437,10 +437,10 @@ + $(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 \ +@@ -448,10 +448,7 @@ + + pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man + otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man +-misc_man_sources = \ +- amstex.man \ +- latex.man \ +- pdfetex.man ++misc_man_sources = + + SUFFIXES = .1 .man .ps .dvi + man_files = $(man_sources:.man=.1) Added: head/devel/tex-synctex/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/pkg-descr Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,6 @@ +The Synchronization TeXnology named SyncTeX is a new feature of recent +TeX engines designed by Jerome Laurens. It allows to synchronize +between input and output, which means to navigate from the source +document to the typeset material and vice versa. + +WWW: http://itexmac.sourceforge.net/SyncTeX.html Added: head/devel/tex-synctex/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-synctex/pkg-plist Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,10 @@ +bin/synctex +include/synctex/synctex_parser.h +include/synctex/synctex_parser_utils.h +lib/libsynctex.a +lib/libsynctex.so +lib/libsynctex.so.1 +lib/libsynctex.so.1.17.0 +libdata/pkgconfig/synctex.pc +man/man1/synctex.1.gz +man/man5/synctex.5.gz Modified: head/devel/tex-web2c/Makefile ============================================================================== --- head/devel/tex-web2c/Makefile Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-web2c/Makefile Sun Jul 26 06:57:26 2015 (r392909) @@ -2,8 +2,9 @@ PORTNAME= web2c PORTVERSION= 20150521 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ +MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${PORTVERSION}-source DIST_SUBDIR= TeX @@ -16,7 +17,7 @@ LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/ libzzip.so:${PORTSDIR}/devel/zziplib \ libmpfr.so:${PORTSDIR}/math/mpfr -USES= pkgconfig gmake libtool tar:xz +USES= pkgconfig libtool tar:xz USE_TEX= kpathsea ptexenc USE_XORG= pixman USE_GNOME= cairo @@ -27,15 +28,18 @@ EXTRACT_FILES= build-aux \ texk/web2c WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c GNU_CONFIGURE= yes -CONFIGURE_ENV= OBSDCOMPAT_INCLUDES=-I${WRKSRC}/../../libs/obsdcompat CONFIGURE_ARGS= --disable-luatex \ --disable-luajittex \ --disable-xetex \ --disable-aleph \ --disable-ptex \ + --disable-tex \ + --disable-latex \ + --disable-pdftex \ --disable-eptex \ --disable-uptex \ --disable-euptex \ + --disable-synctex \ --with-x=no \ --without-mf-x-toolkit \ --with-system-zlib \ Modified: head/devel/tex-web2c/files/patch-Makefile.in ============================================================================== --- head/devel/tex-web2c/files/patch-Makefile.in Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-web2c/files/patch-Makefile.in Sun Jul 26 06:57:26 2015 (r392909) @@ -1,6 +1,21 @@ ---- Makefile.in.orig 2015-04-16 19:53:45 UTC -+++ Makefile.in -@@ -3557,7 +3557,7 @@ libsynctex_la_SOURCES = \ +--- Makefile.in.orig 2015-04-17 04:53:45.000000000 +0900 ++++ Makefile.in 2015-07-26 07:55:27.835477000 +0900 +@@ -2086,11 +2086,11 @@ + EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \ + libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \ + libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \ +- libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a +-EXTRA_LTLIBRARIES = libsynctex.la ++ libluatex.a libluajittex.a libxetex.a libmd5.a ++EXTRA_LTLIBRARIES = + 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 \ +@@ -3557,7 +3557,7 @@ nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES) syncincludedir = ${includedir}/synctex Added: head/devel/tex-web2c/files/patch-man-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tex-web2c/files/patch-man-Makefile.in Sun Jul 26 06:57:26 2015 (r392909) @@ -0,0 +1,14 @@ +--- man/Makefile.in.orig 2015-07-26 05:24:02.711529000 +0900 ++++ man/Makefile.in 2015-07-26 05:24:25.464588000 +0900 +@@ -448,10 +448,7 @@ + + pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man + otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man +-misc_man_sources = \ +- amstex.man \ +- latex.man \ +- pdfetex.man ++misc_man_sources = + + SUFFIXES = .1 .man .ps .dvi + man_files = $(man_sources:.man=.1) Modified: head/devel/tex-web2c/pkg-plist ============================================================================== --- head/devel/tex-web2c/pkg-plist Sat Jul 25 21:36:56 2015 (r392908) +++ head/devel/tex-web2c/pkg-plist Sun Jul 26 06:57:26 2015 (r392909) @@ -23,26 +23,12 @@ bin/weave bin/ctie bin/cweave bin/tie -bin/tex bin/mf bin/mf-nowin bin/mpost -bin/pdftex -bin/ttf2afm -bin/pdftosrc -bin/synctex bin/dvitomp bin/inimf -bin/initex bin/mfplain -include/synctex/synctex_parser.h -include/synctex/synctex_parser_utils.h -lib/libsynctex.a -lib/libsynctex.so -lib/libsynctex.so.1 -lib/libsynctex.so.1.17.0 -libdata/pkgconfig/synctex.pc -man/man1/amstex.1.gz man/man1/bibtex.1.gz man/man1/ctangle.1.gz man/man1/ctie.1.gz @@ -54,27 +40,18 @@ man/man1/dvitype.1.gz man/man1/gftodvi.1.gz man/man1/gftopk.1.gz man/man1/gftype.1.gz -man/man1/latex.1.gz man/man1/mf-nowin.1.gz man/man1/mf.1.gz man/man1/mft.1.gz man/man1/mpost.1.gz man/man1/patgen.1.gz -man/man1/pdfetex.1.gz -man/man1/pdflatex.1.gz -man/man1/pdftex.1.gz -man/man1/pdftosrc.1.gz man/man1/pktogf.1.gz man/man1/pktype.1.gz man/man1/pltotf.1.gz man/man1/pooltype.1.gz -man/man1/synctex.1.gz man/man1/tangle.1.gz -man/man1/tex.1.gz man/man1/tftopl.1.gz man/man1/tie.1.gz -man/man1/ttf2afm.1.gz man/man1/vftovp.1.gz man/man1/vptovf.1.gz man/man1/weave.1.gz *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***