diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 84c45b3787a0..c7cab6172c86 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -67,6 +67,7 @@ SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ # during build phase gnu configure is run a lot GNU_CONFIGURE= yes +CONFIGURE_ENV= FT2_CONFIG="true" CONFIGURE_ARGS= --disable-native-texlive-build \ --disable-web-progs \ --disable-psutils \ @@ -128,7 +129,11 @@ post-patch: tl_scripts/texconfig-sys.sh \ linked_scripts/texlive/updmap-sys.sh ${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \ - ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \ + ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro + ${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_INCLUDES%%|-I${LOCALBASE}/include/freetype2|g' \ + ${PATCH_WRKSRC}/configure + ${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_LIBS%%|-L${LOCALBASE}/lib -lfreetype|g' \ + ${PATCH_WRKSRC}/configure post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure index 429162c7401d..1131902a55bf 100644 --- a/print/texlive-base/files/patch-configure +++ b/print/texlive-base/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2015-04-12 11:22:39 UTC +++ configure -@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib +@@ -5685,7 +5685,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 fi fi @@ -8,15 +8,27 @@ +if test "${with_teckit_includes+set}" = set; then : + withval=$with_teckit_includes; +fi -+ + +# Check whether --with-teckit-libdir was given. +if test "${with_teckit_libdir+set}" = set; then : + withval=$with_teckit_libdir; +fi - ++ test "x$need_teckit" = xyes && { need_zlib=yes -@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system + } +@@ -21198,8 +21207,8 @@ 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` ++ FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%" ++ FREETYPE2_LIBS="%%FREETYPE2_PORT_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 +@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = as_fn_error $? "did not find graphite2" "$LINENO" 5 fi