[pkgsrc/trunk]: pkgsrc/graphics/libotf Use pkg-config instead of freetype-con...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2adef5b1b5dd
branches:  trunk
changeset: 379888:2adef5b1b5dd
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon May 07 07:55:33 2018 +0000

description:
Use pkg-config instead of freetype-config; should fix PR 53264.

diffstat:

 graphics/libotf/Makefile                |   3 ++-
 graphics/libotf/distinfo                |   3 ++-
 graphics/libotf/patches/patch-configure |  25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r 544bf5d065bb -r 2adef5b1b5dd graphics/libotf/Makefile
--- a/graphics/libotf/Makefile  Mon May 07 07:14:10 2018 +0000
+++ b/graphics/libotf/Makefile  Mon May 07 07:55:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/02/11 16:16:54 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/05/07 07:55:33 dholland Exp $
 
 DISTNAME=      libotf-0.9.16
 CATEGORIES=    graphics
@@ -14,6 +14,7 @@
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=   libotf.pc.in
+CONFIGURE_ENV+=                HAVE_FREETYPE_CONFIG=yes # actually uses pkg-config now
 
 .include "options.mk"
 
diff -r 544bf5d065bb -r 2adef5b1b5dd graphics/libotf/distinfo
--- a/graphics/libotf/distinfo  Mon May 07 07:14:10 2018 +0000
+++ b/graphics/libotf/distinfo  Mon May 07 07:55:33 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/02/11 16:16:54 wiz Exp $
+$NetBSD: distinfo,v 1.10 2018/05/07 07:55:33 dholland Exp $
 
 SHA1 (libotf-0.9.16.tar.gz) = ee3037f468a5381de89846ee1c78320964cfbf78
 RMD160 (libotf-0.9.16.tar.gz) = ddea1124409fa97a58386251aa70b961c11b9374
 SHA512 (libotf-0.9.16.tar.gz) = 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
 Size (libotf-0.9.16.tar.gz) = 423979 bytes
+SHA1 (patch-configure) = 5d43a445f6950ac14e5a91f37b25601d951868c2
diff -r 544bf5d065bb -r 2adef5b1b5dd graphics/libotf/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libotf/patches/patch-configure   Mon May 07 07:55:33 2018 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2018/05/07 07:55:33 dholland Exp $
+
+Use pkg-config instead of the freetype-config script, as the latte
+has gone away.
+
+--- configure~ 2018-01-24 15:08:23.000000000 +0000
++++ configure
+@@ -13172,7 +13172,7 @@ fi
+ 
+ 
+ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++  FREETYPE_INC=`pkg-config --cflags freetype2`
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+   ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default"
+ if test "x$ac_cv_header_ft2build_h" = xyes; then :
+@@ -13183,7 +13183,7 @@ fi
+ 
+ 
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+-    FREETYPE_LD_FLAGS=`freetype-config --libs`;
++    FREETYPE_LD_FLAGS=`pkg-config --libs freetype2`;
+     LIBS="$LIBS $FREETYPE_LD_FLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
+ $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }