git: 9abe0ca3217a - main - games/scorched3d: prepare for freetype2 update

[Tobias C. Berner]

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9abe0ca3217a1ad1d9080d01e369994e01554e49

commit 9abe0ca3217a1ad1d9080d01e369994e01554e49
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-06 14:56:30 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
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/'`