diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
| commit | d2b62c66fbc6fa5d43546377699557ae9780a930 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /graphics/freetype2 | |
| parent | 8d7a59f64baaca76cd5a0b7d879528cc17e128f4 (diff) | |
| download | pkgsrc-d2b62c66fbc6fa5d43546377699557ae9780a930.tar.gz | |
Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC. Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE. If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
Diffstat (limited to 'graphics/freetype2')
| -rw-r--r-- | graphics/freetype2/buildlink2.mk | 18 | ||||
| -rw-r--r-- | graphics/freetype2/buildlink3.mk | 16 |
2 files changed, 27 insertions, 7 deletions
diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk index 0f442ad7bfa..fed2614cd76 100644 --- a/graphics/freetype2/buildlink2.mk +++ b/graphics/freetype2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.16 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.17 2004/02/12 02:35:06 jlam Exp $ .if !defined(FREETYPE2_BUILDLINK2_MK) FREETYPE2_BUILDLINK2_MK= # defined @@ -45,7 +45,7 @@ _BUILTIN_FREETYPE2!= \ ${ECHO} "NO"; \ fi . endif -MAKEFLAGS+= _BUILTIN_FREETYPE=${_BUILTIN_FREETYPE} +MAKEFLAGS+= _BUILTIN_FREETYPE2=${_BUILTIN_FREETYPE2} .endif .if !empty(_BUILTIN_FREETYPE2:M[yY][eE][sS]) @@ -54,8 +54,18 @@ _NEED_FREETYPE2= NO _NEED_FREETYPE2= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mfreetype2) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_FREETYPE2} == "YES" +_NEED_FREETYPE2= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_FREETYPE2= YES +.endif +.if !empty(PREFER_NATIVE:Mfreetype2) && \ + ${_BUILTIN_FREETYPE2} == "YES" +_NEED_FREETYPE2= NO +.endif +.if !empty(PREFER_PKGSRC:Mfreetype2) _NEED_FREETYPE2= YES .endif diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 7ddaad003c6..8b8a87d7829 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ @@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.freetype2= YES BUILDLINK_USE_BUILTIN.freetype2= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mfreetype2) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= NO +.endif +.if !empty(PREFER_NATIVE:Mfreetype2) && \ + !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= YES +.endif +.if !empty(PREFER_PKGSRC:Mfreetype2) BUILDLINK_USE_BUILTIN.freetype2= NO .endif |