diff options
| author | tron <tron> | 2014-03-24 15:29:54 +0000 |
|---|---|---|
| committer | tron <tron> | 2014-03-24 15:29:54 +0000 |
| commit | 30f60612a91eeb43170e119852ca1d5fa214a34a (patch) | |
| tree | 39646ee9ca7c748de98cee14ebfdb8cee1522cfb | |
| parent | 608adc278cec229b9f9d56caebe456aa8d13aa5f (diff) | |
| download | pkgsrc-30f60612a91eeb43170e119852ca1d5fa214a34a.tar.gz | |
Correctly detect modern versions of "freetype2" e.g. under recent
versions of NetBSD-current.
| -rw-r--r-- | graphics/freetype2/builtin.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk index 782f315adde..9fc295140b7 100644 --- a/graphics/freetype2/builtin.mk +++ b/graphics/freetype2/builtin.mk @@ -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 @@ BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h .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 |