From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 14:58:26 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 6379665829D; Fri, 6 Aug 2021 14:58:26 +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 4Gh7ry2L9Tz4jwZ; Fri, 6 Aug 2021 14:58:26 +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 383DB79CB; Fri, 6 Aug 2021 14:58:26 +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 176EwQ13083612; Fri, 6 Aug 2021 14:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176EwQhu083611; Fri, 6 Aug 2021 14:58:26 GMT (envelope-from git) Date: Fri, 6 Aug 2021 14:58:26 GMT Message-Id: <202108061458.176EwQhu083611@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: 9abe0ca3217a - main - games/scorched3d: 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: 9abe0ca3217a1ad1d9080d01e369994e01554e49 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 14:58:26 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9abe0ca3217a1ad1d9080d01e369994e01554e49 commit 9abe0ca3217a1ad1d9080d01e369994e01554e49 Author: Tobias C. Berner AuthorDate: 2021-08-06 14:56:30 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 14:58:14 +0000 games/scorched3d: 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 --- games/scorched3d/Makefile | 2 ++ games/scorched3d/files/patch-acinclude.m4 | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index ff1e4b5a249d..ae3ae0abed2b 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -48,6 +48,8 @@ PLIST_FILES= bin/scorched3d \ bin/scorched3ds PORTDATA= * +BINARY_ALIAS= freetype-config=true + post-extract: @${RM} ${WRKSRC}/src/client/GLEXT/[a-z]* diff --git a/games/scorched3d/files/patch-acinclude.m4 b/games/scorched3d/files/patch-acinclude.m4 new file mode 100644 index 000000000000..7f5a4e3a20f1 --- /dev/null +++ b/games/scorched3d/files/patch-acinclude.m4 @@ -0,0 +1,21 @@ +--- acinclude.m4.orig 2021-08-06 14:48:14 UTC ++++ acinclude.m4 +@@ -437,13 +437,13 @@ AC_DEFUN([AC_CHECK_FT2], + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes + else +- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` +- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` +- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ ++ FT2_CFLAGS=`pkg-config freetype2 --cflags` ++ FT2_LIBS=`pkg-config freetype2 --libs` ++ ft_config_major_version=`pkg-config freetype2 --modversion | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \ ++ ft_config_minor_version=`pkg-config freetype2 --modversion | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \ ++ ft_config_micro_version=`pkg-config freetype2 --modversion | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + ft_min_major_version=`echo $min_ft_version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`