From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 07:39:17 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 9F6186663E9; Sat, 7 Aug 2021 07:39:17 +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 4GhZ3n2Zb3z4nMc; Sat, 7 Aug 2021 07:39:17 +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 3FE031D179; Sat, 7 Aug 2021 07:39:17 +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 1777dHX9016448; Sat, 7 Aug 2021 07:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1777dHAE016447; Sat, 7 Aug 2021 07:39:17 GMT (envelope-from git) Date: Sat, 7 Aug 2021 07:39:17 GMT Message-Id: <202108070739.1777dHAE016447@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: de6064a1368a - main - graphics/sdl_ttf: 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: de6064a1368a5d7986a0e050de996b468542c4ca 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 07:39:17 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=de6064a1368a5d7986a0e050de996b468542c4ca commit de6064a1368a5d7986a0e050de996b468542c4ca Author: Tobias C. Berner AuthorDate: 2021-08-07 07:36:08 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 07:36:08 +0000 graphics/sdl_ttf: 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/sdl_ttf/Makefile | 2 ++ graphics/sdl_ttf/files/patch-configure | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile index 6f90b561aa6f..1f9ee82e1c1f 100644 --- a/graphics/sdl_ttf/Makefile +++ b/graphics/sdl_ttf/Makefile @@ -22,6 +22,8 @@ USE_GL= gl GNU_CONFIGURE= yes USE_LDCONFIG= yes +BINARY_ALIAS= freetype-config=true + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont \ diff --git a/graphics/sdl_ttf/files/patch-configure b/graphics/sdl_ttf/files/patch-configure new file mode 100644 index 000000000000..49511310b535 --- /dev/null +++ b/graphics/sdl_ttf/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2021-08-07 07:33:50 UTC ++++ configure +@@ -12642,8 +12642,8 @@ echo "$as_me: error: + " >&2;} + { (exit 1); exit 1; }; } + else +- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" +- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" ++ CFLAGS="$CFLAGS `pkg-config freetype2 --cflags`" ++ LIBS="$LIBS `pkg-config freetype2 --libs`" + fi + + SDL_VERSION=1.2.4