Date: Sat, 7 Aug 2021 12:11:58 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: 126700319b28 - main - devel/agar: prepare for freetype2 update Message-ID: <202108071211.177CBw3U088815@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=126700319b281ec688f79aee54d8f328fef1a404 commit 126700319b281ec688f79aee54d8f328fef1a404 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-07 12:09:52 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-07 12:09:52 +0000 devel/agar: 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 --- devel/agar/files/patch-configure | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/devel/agar/files/patch-configure b/devel/agar/files/patch-configure new file mode 100644 index 000000000000..ef82a2be8c5e --- /dev/null +++ b/devel/agar/files/patch-configure @@ -0,0 +1,44 @@ +--- configure.orig 2021-08-07 12:03:06 UTC ++++ configure +@@ -5408,10 +5408,10 @@ $ECHO_N "checking for FreeType..." >> config.log + MK_EXEC_FOUND="No" + + if [ "${prefix_freetype}" != "" ]; then +- if [ -e "${prefix_freetype}/bin/freetype-config" ]; then +- FREETYPE_VERSION=`${prefix_freetype}/bin/freetype-config --version` ++# if [ -e "${prefix_freetype}/bin/freetype-config" ]; then ++ FREETYPE_VERSION=`pkg-config freetype2 --modversion` + MK_EXEC_FOUND="Yes" +- fi ++# fi + else + FREETYPE_VERSION="" + for path in `echo $PATH | sed 's/:/ /g'`; do +@@ -5425,10 +5425,10 @@ fi + MK_EXEC_FOUND="No" + + if [ "${prefix_freetype}" != "" ]; then +- if [ -e "${prefix_freetype}/bin/freetype-config" ]; then +- FREETYPE_CFLAGS=`${prefix_freetype}/bin/freetype-config --cflags` ++# if [ -e "${prefix_freetype}/bin/freetype-config" ]; then ++ FREETYPE_CFLAGS=`pkg-config freetype2 --cflags` + MK_EXEC_FOUND="Yes" +- fi ++# fi + else + FREETYPE_CFLAGS="" + for path in `echo $PATH | sed 's/:/ /g'`; do +@@ -5442,10 +5442,10 @@ fi + MK_EXEC_FOUND="No" + + if [ "${prefix_freetype}" != "" ]; then +- if [ -e "${prefix_freetype}/bin/freetype-config" ]; then +- FREETYPE_LIBS=`${prefix_freetype}/bin/freetype-config --libs` ++# if [ -e "${prefix_freetype}/bin/freetype-config" ]; then ++ FREETYPE_LIBS=`pkg-config freetype2 --libs` + MK_EXEC_FOUND="Yes" +- fi ++# fi + else + FREETYPE_LIBS="" + for path in `echo $PATH | sed 's/:/ /g'`; do
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108071211.177CBw3U088815>