git: 107f7d815e14 - main - games/rlvm: prepare for freetype2 update

[Tobias C. Berner]

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=107f7d815e1496a3e6f6b81989cd7b893f1c711d

commit 107f7d815e1496a3e6f6b81989cd7b893f1c711d
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-10 14:28:35 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-08-10 14:42:34 +0000

    games/rlvm: 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/rlvm/files/patch-SConstruct | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/games/rlvm/files/patch-SConstruct b/games/rlvm/files/patch-SConstruct
index 9e7ac7cdff91..8960cb596572 100644
--- a/games/rlvm/files/patch-SConstruct
+++ b/games/rlvm/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct~
+--- SConstruct.orig	2021-08-10 14:26:06 UTC
 +++ SConstruct
-@@ -19,7 +19,12 @@ AddOption('--fullstatic', action='store_
+@@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true',
  
  # Set libraries used by all configurations and all binaries in rlvm.
  env = Environment(
@@ -8,20 +8,23 @@
    tools = ["default", "rlvm"],
 +  **dict((k, v.split()) for k, v in ARGUMENTS.items())
 +)
-+
-+env.Append(
  
++env.Append(
++
    LIBS = ["z"],
  
-@@ -278,6 +275,7 @@ if not config.CheckGuichan():
+   LOCAL_LIBS = [],
+@@ -284,7 +289,8 @@ if not config.CheckGuichan():
+ 
  # Get the configuration from sdl and freetype
  env.ParseConfig("sdl-config --cflags")
- env.ParseConfig("freetype-config --cflags --libs")
+-env.ParseConfig("freetype-config --cflags --libs")
++env.ParseConfig("pkg-config freetype2 --cflags --libs")
 +config.CheckLibWithHeader('intl', 'libintl.h', "cpp")
  
  env = config.Finish()
  
-@@ -314,7 +311,6 @@ if GetOption('release'):
+@@ -313,7 +319,6 @@ if GetOption('release'):
    # Now add release optimizations to the environment
    env.Append(
      CPPFLAGS = [
@@ -29,7 +32,7 @@
        "-DNDEBUG",
        "-DBOOST_DISABLE_ASSERTS"
      ]
-@@ -360,13 +356,7 @@ elif GetOption('pprof'):
+@@ -359,13 +364,7 @@ elif GetOption('pprof'):
               "profiler"]
    )
  else: