git: 600b48f2d263 - main - graphics/ming: prepare for freetype2 update

[Tobias C. Berner]

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=600b48f2d263963f1d0b30849ae7eed6dd0ab8dc

commit 600b48f2d263963f1d0b30849ae7eed6dd0ab8dc
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-07 06:15:07 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-08-07 06:15:07 +0000

    graphics/ming: 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
---
 graphics/ming/Makefile                 |  4 +++-
 graphics/ming/files/patch-configure.in | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 2b294d4ebb3c..270af1bf4025 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgif.so:graphics/giflib \
 		libpng.so:graphics/png
 
-USES=		autoreconf bison gmake libtool localbase pathfix shebangfix
+USES=		autoreconf bison gmake libtool localbase pathfix pkgconfig shebangfix
 
 CFLAGS+=	-fcommon # https://github.com/libming/libming/issues/55
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/ming
@@ -40,6 +40,8 @@ SHEBANG_FILES=	util/cws2fws
 
 OPTIONS_DEFINE=	DOCS
 
+BINARY_ALIAS=	freetype-config=true
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/ming/ ${STAGEDIR}${PREFIX}/include/ming/blocks/ ${STAGEDIR}${PREFIX}/include/ming/util/
 	cd ${WRKSRC}/util/ && ${INSTALL_SCRIPT} cws2fws ming-config ${STAGEDIR}${PREFIX}/bin/
diff --git a/graphics/ming/files/patch-configure.in b/graphics/ming/files/patch-configure.in
new file mode 100644
index 000000000000..fd885cbf0481
--- /dev/null
+++ b/graphics/ming/files/patch-configure.in
@@ -0,0 +1,13 @@
+--- configure.in.orig	2021-08-07 06:13:17 UTC
++++ configure.in
+@@ -272,8 +272,8 @@ if test "$freetype_support" = "yes"; then
+         	ft_config="$freetype_config"
+ 	fi
+ 
+-	FREETYPE_CFLAGS="`$ft_config --cflags`"
+-	FREETYPE_LIBS="`$ft_config --libs`"
++	FREETYPE_CFLAGS="`pkg-config freetype2 --cflags`"
++	FREETYPE_LIBS="`pkg-config freetype2 --libs`"
+ 
+ 	AC_SUBST(FREETYPE_LIBS)
+ 	AC_SUBST(FREETYPE_CFLAGS)