Date: Fri, 6 Aug 2021 14:10:00 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: 63c8147ee1aa - main - games/openmortal: prepare for freetype2 update Message-ID: <202108061410.176EA0vZ017263@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=63c8147ee1aafa7d42d24407f3905aed7408f182 commit 63c8147ee1aafa7d42d24407f3905aed7408f182 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-06 13:34:24 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-06 14:09:31 +0000 games/openmortal: 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/openmortal/Makefile | 4 +++- games/openmortal/files/patch-configure | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 8081762f52b6..a5db4d35feb6 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -11,7 +11,7 @@ COMMENT= Parody of the once popular coin-up fighting game, Mortal Kombat LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= dos2unix perl5 sdl tar:bzip2 +USES= dos2unix perl5 pkgconfig sdl tar:bzip2 GNU_CONFIGURE= yes USE_SDL= mixer image sdl net DOS2UNIX_FILES= src/gfx.cpp @@ -19,4 +19,6 @@ DOS2UNIX_FILES= src/gfx.cpp PLIST_FILES= bin/${PORTNAME} PORTDATA= * +BINARY_ALIAS= freetype-config=true + .include <bsd.port.mk> diff --git a/games/openmortal/files/patch-configure b/games/openmortal/files/patch-configure new file mode 100644 index 000000000000..a7680ba7d5b0 --- /dev/null +++ b/games/openmortal/files/patch-configure @@ -0,0 +1,21 @@ +--- configure.orig 2021-08-06 13:30:20 UTC ++++ configure +@@ -1685,13 +1685,13 @@ no_ft="" + 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/'`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108061410.176EA0vZ017263>