From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 10:33:53 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 D1699653978; Fri, 6 Aug 2021 10:33:53 +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 4Gh1zj5CcCz3vxy; Fri, 6 Aug 2021 10:33:53 +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 9B09C4583; Fri, 6 Aug 2021 10:33:53 +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 176AXrVl030039; Fri, 6 Aug 2021 10:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176AXr0Z030038; Fri, 6 Aug 2021 10:33:53 GMT (envelope-from git) Date: Fri, 6 Aug 2021 10:33:53 GMT Message-Id: <202108061033.176AXr0Z030038@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: 733e1ac16919 - main - devel/m17n-lib: 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: 733e1ac16919ae3261c96df1842a74786c76241c 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: Fri, 06 Aug 2021 10:33:53 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=733e1ac16919ae3261c96df1842a74786c76241c commit 733e1ac16919ae3261c96df1842a74786c76241c Author: Tobias C. Berner AuthorDate: 2021-08-06 10:23:45 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 10:31:48 +0000 devel/m17n-lib: 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 --- devel/m17n-lib/Makefile | 1 + devel/m17n-lib/files/patch-configure.ac | 44 ++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 63583a4c227b..266a253c984d 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -31,6 +31,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-nls +BINARY_ALIAS= freetype-config=true OPTIONS_DEFINE= ANTHY ISPELL THAI diff --git a/devel/m17n-lib/files/patch-configure.ac b/devel/m17n-lib/files/patch-configure.ac index 0b32d968e5e0..968f65fa8498 100644 --- a/devel/m17n-lib/files/patch-configure.ac +++ b/devel/m17n-lib/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2014-12-10 14:22:52 UTC +--- configure.ac.orig 2017-12-08 12:13:45 UTC +++ configure.ac -@@ -106,7 +106,7 @@ if test x$with_gui != xno; then +@@ -107,7 +107,7 @@ if test x$with_gui != xno; then dnl Checks if dlopen exists, and if it's in libc or libdl. @@ -9,7 +9,33 @@ AC_DEFINE(HAVE_DLOPEN, 1, [Define to 1 if you have the function dlopen.])) -@@ -342,6 +342,10 @@ LIBS="$save_LIBS" +@@ -204,21 +204,21 @@ fi + AC_SUBST(OTF_LD_FLAGS) + + dnl Check for Freetype2 usability. +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) ++AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, pkg-config freetype2, yes) + if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` ++ FREETYPE_INC=`pkg-config freetype2 --cflags` + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_INC" + AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") + if test "x$HAVE_FREETYPE" = "xyes" ; then + save_LIBS="$LIBS" +- LIBS="$LIBS `freetype-config --libs`" ++ LIBS="$LIBS `pkg-config freetype2 --libs`" + AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + LIBS="$save_LIBS" + if test "x$HAVE_FREETYPE" = "xyes"; then +- FREETYPE_LD_FLAGS=`freetype-config --libs` ++ FREETYPE_LD_FLAGS=`pkg-config freetype2 --libs` + AC_DEFINE(HAVE_FREETYPE, 1, + [Define to 1 if you have FreeType library and header file.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" +@@ -344,6 +344,10 @@ LIBS="$save_LIBS" AC_SUBST(XML2_LD_FLAGS) dnl Check for Anthy usability. @@ -20,7 +46,7 @@ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no) if test "x$HAVE_ANTHY" = "xyes"; then -@@ -351,6 +355,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then +@@ -353,6 +357,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then ANTHY_LD_FLAGS="$ANTHY_LIBS" CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY" fi @@ -29,7 +55,7 @@ AC_SUBST(ANTHY_LD_FLAGS) dnl Check for Ispell usability. -@@ -365,11 +371,15 @@ dnl Check for Thai word-segmentation lib +@@ -367,11 +373,15 @@ dnl Check for Thai word-segmentation library. dnl If we have one, define HAVE_THAI_WORDSEG and one of these: dnl HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value. @@ -46,12 +72,12 @@ AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai]) THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS" -@@ -425,6 +435,8 @@ if test "x$HAVE_THAI_WORDSEG" = "xyes"; +@@ -426,6 +436,8 @@ fi + if test "x$HAVE_THAI_WORDSEG" = "xyes"; then AC_DEFINE(HAVE_THAI_WORDSEG, 1, [Define if you have some Thai word-segmentation library]) - fi -+ +fi ++ + fi AC_SUBST(THAI_WORDSEG_LD_FLAGS) - AC_SUBST(CONFIG_FLAGS)