git: 8785f2bd03ae - main - graphics/py-ming: prepare for freetype2 update

Tobias C. Berner tcberner at FreeBSD.org
Tue Aug 10 15:15:22 UTC 2021


The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8785f2bd03ae6cbc94eb8b5a2a0c770431e1f0c2

commit 8785f2bd03ae6cbc94eb8b5a2a0c770431e1f0c2
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-10 15:12:10 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-08-10 15:12:10 +0000

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

diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index bf70f0c6883b..7ad254947cca 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libming.so:graphics/ming \
 		libpng.so:graphics/png
 
-USES=		autoreconf libtool localbase:ldflags python:3.6+
+USES=		autoreconf libtool localbase:ldflags pkgconfig python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 CONFIGURE_ARGS=	--enable-python
@@ -35,6 +35,8 @@ GH_PROJECT=	libming
 
 PORTSCOUT=	limit:^ming-
 
+BINARY_ALIAS=	freetype-config=true
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/py_ext/Makefile.am
 	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in
diff --git a/graphics/py-ming/files/patch-configure.in b/graphics/py-ming/files/patch-configure.in
new file mode 100644
index 000000000000..65d382927611
--- /dev/null
+++ b/graphics/py-ming/files/patch-configure.in
@@ -0,0 +1,13 @@
+--- configure.in.orig	2021-08-10 15:11:31 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)


More information about the dev-commits-ports-main mailing list