From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 10: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 F26F4668ABE; Sat, 7 Aug 2021 10:19:02 +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 4Ghdc66H0xz3Dcv; Sat, 7 Aug 2021 10:19:02 +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 BFD1D1EFE8; Sat, 7 Aug 2021 10:19:02 +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 177AJ2hH030400; Sat, 7 Aug 2021 10:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177AJ2t9030399; Sat, 7 Aug 2021 10:19:02 GMT (envelope-from git) Date: Sat, 7 Aug 2021 10:19:02 GMT Message-Id: <202108071019.177AJ2t9030399@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: 56dd31264460 - main - x11-fonts/otf2bdf: 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: 56dd3126446012f781e2bd39f0e5092ee89ac4c7 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 10:19:03 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=56dd3126446012f781e2bd39f0e5092ee89ac4c7 commit 56dd3126446012f781e2bd39f0e5092ee89ac4c7 Author: Tobias C. Berner AuthorDate: 2021-08-07 10:17:53 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 10:18:09 +0000 x11-fonts/otf2bdf: 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 --- x11-fonts/otf2bdf/Makefile | 2 +- x11-fonts/otf2bdf/files/patch-configure.in | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/x11-fonts/otf2bdf/Makefile b/x11-fonts/otf2bdf/Makefile index 2f0d2029f5c9..70f7ef2f4c1c 100644 --- a/x11-fonts/otf2bdf/Makefile +++ b/x11-fonts/otf2bdf/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= autoreconf tar:tgz +USES= autoreconf pkgconfig tar:tgz GNU_CONFIGURE= yes diff --git a/x11-fonts/otf2bdf/files/patch-configure.in b/x11-fonts/otf2bdf/files/patch-configure.in new file mode 100644 index 000000000000..b44d091bb626 --- /dev/null +++ b/x11-fonts/otf2bdf/files/patch-configure.in @@ -0,0 +1,13 @@ +--- configure.in.orig 2021-08-07 10:16:18 UTC ++++ configure.in +@@ -5,8 +5,8 @@ AC_INIT(otf2bdf.c) + AC_PROG_CC + + OLDLIBS=$LIBS +-LIBS="$LIBS `freetype-config --libs`" +-CPPFLAGS="$CPPFLAGS `freetype-config --cflags`" ++LIBS="$LIBS `pkg-config freetype2 --libs`" ++CPPFLAGS="$CPPFLAGS `pkg-config freetype2 --cflags`" + AC_CHECK_LIB(freetype, FT_Init_FreeType, LIBS="$LIBS -lfreetype",[ + AC_MSG_ERROR([Can't find Freetype library! Compile FreeType first.])]) + AC_SUBST(LIBS)