From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 06:11:20 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 A81C56655F5; Sat, 7 Aug 2021 06:11:20 +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 4GhX6J40PRz4jTX; Sat, 7 Aug 2021 06:11:20 +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 71A321BE58; Sat, 7 Aug 2021 06:11:20 +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 1776BKH3005350; Sat, 7 Aug 2021 06:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1776BK0k005349; Sat, 7 Aug 2021 06:11:20 GMT (envelope-from git) Date: Sat, 7 Aug 2021 06:11:20 GMT Message-Id: <202108070611.1776BK0k005349@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: 26620b919510 - main - graphics/libgltext: 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: 26620b919510c8af4b9bb47e44d764dd9f5989d9 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:11:20 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=26620b919510c8af4b9bb47e44d764dd9f5989d9 commit 26620b919510c8af4b9bb47e44d764dd9f5989d9 Author: Tobias C. Berner AuthorDate: 2021-08-07 06:09:47 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 06:09:47 +0000 graphics/libgltext: 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/libgltext/Makefile | 4 +++- graphics/libgltext/files/patch-configure | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile index 5c46ee1bf97f..cc5c3da5d36d 100644 --- a/graphics/libgltext/Makefile +++ b/graphics/libgltext/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= gl gmake localbase libtool xorg +USES= gl gmake localbase libtool pkgconfig xorg USE_GL= gl glu USE_XORG= x11 xmu GNU_CONFIGURE= yes @@ -26,6 +26,8 @@ OPTIONS_SUB= yes EXAMPLES_DESC= Compile examples, need libglut EXAMPLES_USE= GL=glut +BINARY_ALIAS= freetype-config=true + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/${PORTNAME}-${PORTVERSION}.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0 diff --git a/graphics/libgltext/files/patch-configure b/graphics/libgltext/files/patch-configure new file mode 100644 index 000000000000..b294659ab456 --- /dev/null +++ b/graphics/libgltext/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2021-08-07 06:08:17 UTC ++++ configure +@@ -8610,8 +8610,8 @@ if test "$FT_CONFIG" = "" ; then + echo "$as_me: error: freetype not found" >&2;} + { (exit 1); exit 1; }; } + fi +-FT_FLAGS=`freetype-config --cflags` +-FT_LIBS=`freetype-config --libs` ++FT_FLAGS=`pkg-config freetype2 --cflags` ++FT_LIBS=`pkg-config freetype2 --libs` + CXXFLAGS="$FT_FLAGS $CXXFLAGS" + LIBS="$FT_LIBS $LIBS" +