[pkgsrc/trunk]: pkgsrc/fonts/ttf2pk fonts/ttf2pk: Make this build with freety...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26bd1dd1790b
branches:  trunk
changeset: 379733:26bd1dd1790b
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat May 05 12:31:25 2018 +0000

description:
fonts/ttf2pk: Make this build with freetype2-2.9.1

freetype2 no longer installs freetype-config. Use pkg-config instead.

diffstat:

 fonts/ttf2pk/Makefile                |   4 +++-
 fonts/ttf2pk/distinfo                |   3 ++-
 fonts/ttf2pk/patches/patch-configure |  19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r f7432d5c8c7c -r 26bd1dd1790b fonts/ttf2pk/Makefile
--- a/fonts/ttf2pk/Makefile     Sat May 05 12:22:46 2018 +0000
+++ b/fonts/ttf2pk/Makefile     Sat May 05 12:31:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/08/01 14:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/05/05 12:31:25 minskim Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       ttf2pk-2.0
@@ -27,6 +27,8 @@
                --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
                --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=       --with-system-freetype2
+CONFIGURE_ENV+=                FT2_CONFIG=pkg-config \
+                       PKG_CONFIG=${TOOLS_CMD.pkg-config}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff -r f7432d5c8c7c -r 26bd1dd1790b fonts/ttf2pk/distinfo
--- a/fonts/ttf2pk/distinfo     Sat May 05 12:22:46 2018 +0000
+++ b/fonts/ttf2pk/distinfo     Sat May 05 12:31:25 2018 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/06/23 22:22:18 markd Exp $
+$NetBSD: distinfo,v 1.11 2018/05/05 12:31:25 minskim Exp $
 
 SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
 RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
 SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 Size (texlive-20170524-source.tar.xz) = 63483372 bytes
 SHA1 (patch-Makefile.in) = 99eca5218f4ac6ac33302d0f06c168f9a2208ca7
+SHA1 (patch-configure) = 5b345f05cb3c76acb6668e04338ea8f8054b5eae
diff -r f7432d5c8c7c -r 26bd1dd1790b fonts/ttf2pk/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/ttf2pk/patches/patch-configure      Sat May 05 12:31:25 2018 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2018/05/05 12:31:25 minskim Exp $
+
+freetype-config is deprecated.
+
+--- configure.orig     2017-01-10 23:13:02.000000000 +0000
++++ configure
+@@ -15165,9 +15165,9 @@ esac
+ else
+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
++if $PKG_CONFIG --version >/dev/null 2>&1; then
++  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
++  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+ fi