[pkgsrc/trunk]: pkgsrc/graphics/freetype2 Correctly detect modern versions of...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f7710fe80de
branches:  trunk
changeset: 632324:9f7710fe80de
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Mar 24 15:29:54 2014 +0000

description:
Correctly detect modern versions of "freetype2" e.g. under recent
versions of NetBSD-current.

diffstat:

 graphics/freetype2/builtin.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 58fc674b3403 -r 9f7710fe80de graphics/freetype2/builtin.mk
--- a/graphics/freetype2/builtin.mk     Sun Mar 23 15:16:35 2014 +0000
+++ b/graphics/freetype2/builtin.mk     Mon Mar 24 15:29:54 2014 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: builtin.mk,v 1.13 2012/03/19 12:34:14 joerg Exp $
+# $NetBSD: builtin.mk,v 1.14 2014/03/24 15:29:54 tron Exp $
 
 BUILTIN_PKG:=  freetype2
 
-BUILTIN_FIND_FILES_VAR:=       H_FREETYPE2
-BUILTIN_FIND_FILES.H_FREETYPE2=        ${X11BASE}/include/freetype2/freetype/freetype.h
+BUILTIN_FIND_FILES_VAR:=               H_FREETYPE2 H_FREETYPE2_NEW
+BUILTIN_FIND_FILES.H_FREETYPE2=                ${X11BASE}/include/freetype2/freetype/freetype.h
+BUILTIN_FIND_FILES.H_FREETYPE2_NEW=    ${X11BASE}/include/freetype2/freetype.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -14,6 +15,9 @@
 .if !defined(IS_BUILTIN.freetype2)
 .  if empty(H_FREETYPE2:M__nonexistent__)
 IS_BUILTIN.freetype2=  yes
+.  elif empty(H_FREETYPE2_NEW:M__nonexistent__)
+IS_BUILTIN.freetype2=  yes
+H_FREETYPE2:=          ${H_FREETYPE2_NEW}
 .  else
 IS_BUILTIN.freetype2=  no
 .  endif