Date: Tue, 10 Aug 2021 15:10:30 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 14270c75f521 - main - print/tex-xdvik: prepare for freetype2 update Message-ID: <202108101510.17AFAU8N021595@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=14270c75f521c0ca6f46966ea8eba096bf61ef60 commit 14270c75f521c0ca6f46966ea8eba096bf61ef60 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-10 14:50:51 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-10 14:50:51 +0000 print/tex-xdvik: prepare for freetype2 update - freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512 --- print/tex-xdvik/Makefile | 4 +++- print/tex-xdvik/files/patch-texk-xdvik-configure | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile index c6b13c95033f..e8c659cef1cd 100644 --- a/print/tex-xdvik/Makefile +++ b/print/tex-xdvik/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpaper.so:print/libpaper RUN_DEPENDS= tex-dvipsk>=5.995:print/tex-dvipsk -USES= iconv motif xorg +USES= iconv motif pkgconfig xorg USE_TEX= web2c kpathsea texmf texhash TEXHASHDIRS= ${TEXMFDISTDIR} USE_XORG= ice sm x11 xmu xpm xt xi @@ -51,6 +51,8 @@ PORTDOCS= BUGS CHANGES INSTALL README README.CVS README.coding \ OPTIONS_DEFINE= DOCS +BINARY_ALIAS= freetype-config=true + .include <bsd.port.options.mk> post-install: diff --git a/print/tex-xdvik/files/patch-texk-xdvik-configure b/print/tex-xdvik/files/patch-texk-xdvik-configure index 46bc053d55a9..dade70b597be 100644 --- a/print/tex-xdvik/files/patch-texk-xdvik-configure +++ b/print/tex-xdvik/files/patch-texk-xdvik-configure @@ -29,10 +29,22 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" -@@ -18409,6 +18424,82 @@ ${top_builddir}/../../libs/freetype2/fre +@@ -18393,8 +18408,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=`pkg-config freetype2 --cflags` ++ FREETYPE2_LIBS=`pkg-config freetype2 --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 +@@ -18408,6 +18423,82 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freety + ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi - ++ +## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags + +# Check whether --with-system-zlib was given. @@ -108,7 +120,6 @@ +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac -+ - # Check whether --with-default-gs-lib-path was given. +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108101510.17AFAU8N021595>