Backport of freetype2 from trunk

graphics/freetype2/Makefile

@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.108 2016/10/30 17:07:12 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2017/09/18 16:54:06 adam Exp $
 
-DISTNAME=	freetype-2.7
+DISTNAME=	freetype-2.8.1
 PKGNAME=	${DISTNAME:S/-/2-/}
-PKGREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
-		http://download.savannah.gnu.org/releases/freetype/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}
+MASTER_SITES+=	http://download.savannah.gnu.org/releases/freetype/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.freetype.org/
+HOMEPAGE=	https://www.freetype.org/
 COMMENT=	Font rendering engine and library API
 LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
-USE_MULTIARCH=		bin lib
 USE_TOOLS+=		grep gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		builds/unix

graphics/freetype2/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2016/01/10 21:16:33 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.24 2017/05/14 11:02:15 spz Exp $
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
@@ -34,6 +34,7 @@ include/freetype2/freetype/ftmodapi.h
 include/freetype2/freetype/ftmoderr.h
 include/freetype2/freetype/ftotval.h
 include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpcfdrv.h
 include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
 include/freetype2/freetype/ftsizes.h

graphics/freetype2/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.60 2016/09/12 18:06:44 wiz Exp $
+$NetBSD: distinfo,v 1.63 2017/09/18 16:54:06 adam Exp $
 
-SHA1 (freetype-2.7.tar.bz2) = f251029d5ab542a96dd4531605fe577185077560
-RMD160 (freetype-2.7.tar.bz2) = 5a175dceeb4454f87d79fcbd5719f3fed837abeb
-SHA512 (freetype-2.7.tar.bz2) = cd5bcde276d6d59379d9c60a90095be59b0692ec8fd2817aa44ff80ebb84840e8a72be2cfbbbcf7e13258026fa691f28c2673f03c3a3961a859900e61a62d761
-Size (freetype-2.7.tar.bz2) = 1789896 bytes
-SHA1 (patch-ab) = 5c6998020bda378828035bafe5dfcca6f9cd8fca
+SHA1 (freetype-2.8.1.tar.bz2) = 417bb3747c4ac95b6f2652024a53fad45581fa1c
+RMD160 (freetype-2.8.1.tar.bz2) = 4b31c73b38d1f03c431b12408f800569e0724cc4
+SHA512 (freetype-2.8.1.tar.bz2) = ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823
+Size (freetype-2.8.1.tar.bz2) = 1886443 bytes
+SHA1 (patch-builds_unix_freetype-config.in) = 60217b884a0f50c90f89529eaf909ded2693e3be
+SHA1 (patch-builds_unix_unix-cc.in) = bd911998ec6bf6a59c1bfad9cc5702310ad5efc5

graphics/freetype2/patches/patch-builds_unix_freetype-config.in

@@ -0,0 +1,41 @@
+$NetBSD: patch-builds_unix_freetype-config.in,v 1.1 2017/09/18 16:54:06 adam Exp $
+
+Do not substitute %PKG_CONFIG% as it ends with temporary DESTDIR.
+
+--- builds/unix/freetype-config.in.orig	2017-09-18 15:52:06.000000000 +0000
++++ builds/unix/freetype-config.in
+@@ -14,7 +14,7 @@ export LC_ALL
+
+
+ # if `pkg-config' is available, use values from `freetype2.pc'
+-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
++pkg-config --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
+ if test $? -eq 0 ; then
+   # note that option `--variable' is not affected by the
+   # PKG_CONFIG_SYSROOT_DIR environment variable
+@@ -23,17 +23,17 @@ if test $? -eq 0 ; then
+     export PKG_CONFIG_SYSROOT_DIR
+   fi
+
+-  prefix=`%PKG_CONFIG% --variable prefix freetype2`
+-  exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
++  prefix=`pkg-config --variable prefix freetype2`
++  exec_prefix=`pkg-config --variable exec_prefix freetype2`
+
+-  includedir=`%PKG_CONFIG% --variable includedir freetype2`
+-  libdir=`%PKG_CONFIG% --variable libdir freetype2`
++  includedir=`pkg-config --variable includedir freetype2`
++  libdir=`pkg-config --variable libdir freetype2`
+
+-  version=`%PKG_CONFIG% --modversion freetype2`
++  version=`pkg-config --modversion freetype2`
+
+-  cflags=`%PKG_CONFIG% --cflags freetype2`
+-  dynamic_libs=`%PKG_CONFIG% --libs freetype2`
+-  static_libs=`%PKG_CONFIG% --static --libs freetype2`
++  cflags=`pkg-config --cflags freetype2`
++  dynamic_libs=`pkg-config --libs freetype2`
++  static_libs=`pkg-config --static --libs freetype2`
+ else
+   prefix="%prefix%"
+   exec_prefix="%exec_prefix%"

graphics/freetype2/patches/patch-ab → graphics/freetype2/patches/patch-builds_unix_unix-cc.in

@@ -1,6 +1,9 @@
-$NetBSD: patch-ab,v 1.18 2016/07/09 12:23:16 adam Exp $
+$NetBSD: patch-builds_unix_unix-cc.in,v 1.1 2017/09/18 16:54:06 adam Exp $
 
---- builds/unix/unix-cc.in.orig	2016-05-23 04:49:31.000000000 +0000
+Provide tag to libtool.
+Use CFLAGS when compiling executables.
+
+--- builds/unix/unix-cc.in.orig	2017-03-30 10:20:23.000000000 +0000
 +++ builds/unix/unix-cc.in
 @@ -89,7 +89,7 @@ ANSIFLAGS := @XX_ANSIFLAGS@
  #
@@ -13,7 +16,7 @@ $NetBSD: patch-ab,v 1.18 2016/07/09 12:23:16 adam Exp $
  #
 @@ -101,14 +101,14 @@ LDFLAGS := @LDFLAGS@
  CCraw_build  := @CC_BUILD@	# native CC of building system
- E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
+ E_BUILD      := @EXEEXT_BUILD@	# extension for executable on building system
  EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
 -CCexe        := $(CCraw_build)	# used to compile `apinames' only
 +CCexe        := $(CCraw_build) @CFLAGS@	# used to compile `apinames' only