From owner-dev-commits-ports-all@freebsd.org Sat Aug 7 12:11:58 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4E9C066A863; Sat, 7 Aug 2021 12:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ghh6Q1pyZz3M5n; Sat, 7 Aug 2021 12:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2709121132; Sat, 7 Aug 2021 12:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 177CBwRH088816; Sat, 7 Aug 2021 12:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177CBw3U088815; Sat, 7 Aug 2021 12:11:58 GMT (envelope-from git) Date: Sat, 7 Aug 2021 12:11:58 GMT Message-Id: <202108071211.177CBw3U088815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 126700319b28 - main - devel/agar: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 126700319b281ec688f79aee54d8f328fef1a404 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 12:11:58 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=126700319b281ec688f79aee54d8f328fef1a404 commit 126700319b281ec688f79aee54d8f328fef1a404 Author: Tobias C. Berner AuthorDate: 2021-08-07 12:09:52 +0000 Commit: Tobias C. Berner 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