From owner-dev-commits-ports-main@freebsd.org Tue Aug 10 15:15:21 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6C6C66A2D2; Tue, 10 Aug 2021 15:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gkc2d5zsXz4krp; Tue, 10 Aug 2021 15:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5BAE1D7FE; Tue, 10 Aug 2021 15:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17AFFLj5026031; Tue, 10 Aug 2021 15:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17AFFLjB026030; Tue, 10 Aug 2021 15:15:21 GMT (envelope-from git) Date: Tue, 10 Aug 2021 15:15:21 GMT Message-Id: <202108101515.17AFFLjB026030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 8785f2bd03ae - main - graphics/py-ming: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8785f2bd03ae6cbc94eb8b5a2a0c770431e1f0c2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2021 15:15:22 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8785f2bd03ae6cbc94eb8b5a2a0c770431e1f0c2 commit 8785f2bd03ae6cbc94eb8b5a2a0c770431e1f0c2 Author: Tobias C. Berner AuthorDate: 2021-08-10 15:12:10 +0000 Commit: Tobias C. Berner 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)