From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 06:19:03 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 5C6716658CC; Sat, 7 Aug 2021 06:19:03 +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 4GhXHC1blHz4jyV; Sat, 7 Aug 2021 06:19:03 +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 1EEAE1C15C; Sat, 7 Aug 2021 06:19:03 +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 1776J3wW010567; Sat, 7 Aug 2021 06:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1776J354010566; Sat, 7 Aug 2021 06:19:03 GMT (envelope-from git) Date: Sat, 7 Aug 2021 06:19:03 GMT Message-Id: <202108070619.1776J354010566@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: 600b48f2d263 - main - graphics/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: 600b48f2d263963f1d0b30849ae7eed6dd0ab8dc 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: Sat, 07 Aug 2021 06:19:03 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=600b48f2d263963f1d0b30849ae7eed6dd0ab8dc commit 600b48f2d263963f1d0b30849ae7eed6dd0ab8dc Author: Tobias C. Berner AuthorDate: 2021-08-07 06:15:07 +0000 Commit: Tobias C. Berner 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)