git: 733e1ac16919 - main - devel/m17n-lib: prepare for freetype2 update

[Tobias C. Berner]

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=733e1ac16919ae3261c96df1842a74786c76241c

commit 733e1ac16919ae3261c96df1842a74786c76241c
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-06 10:23:45 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
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)