diff options
| author | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
| commit | ad185523f430ecfb1f9cda5ecad38a4a4683beef (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /x11/Xrender | |
| parent | c4fe63520c69f883783438f145675ea1c389c5e8 (diff) | |
| download | pkgsrc-ad185523f430ecfb1f9cda5ecad38a4a4683beef.tar.gz | |
Support a new global variable:
BUILDLINK_PREFER_PKGSRC
This variable determines whether or not to prefer the pkgsrc
versions of software that is also present in the base system.
This variable is multi-state:
defined, or "yes" always prefer the pkgsrc versions
not defined, or "no" only use the pkgsrc versions if
needed by dependency requirements
This can also take a list of packages for which to prefer the
pkgsrc-installed software. The package names may be found by
consulting the value added to BUILDLINK_PACKAGES in the
buildlink[23].mk files for that package.
Diffstat (limited to 'x11/Xrender')
| -rw-r--r-- | x11/Xrender/buildlink2.mk | 10 | ||||
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk index 4ae9180ff56..0f5e88c6d8b 100644 --- a/x11/Xrender/buildlink2.mk +++ b/x11/Xrender/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/11/10 02:26:53 fredb Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $ .if !defined(XRENDER_BUILDLINK2_MK) XRENDER_BUILDLINK2_MK= # defined @@ -52,6 +52,14 @@ _NEED_XRENDER!= \ BUILDLINK_FILES.Xrender= include/X11/extensions/Xrender.h BUILDLINK_FILES.Xrender+= lib/libXrender.* +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:MXrender) +_NEED_XRENDER= YES +. endif +.endif + .if ${_NEED_XRENDER} == "YES" BUILDLINK_PACKAGES+= Xrender EVAL_PREFIX+= BUILDLINK_PREFIX.Xrender=Xrender diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index ca4632a0776..de5eb77a8bb 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 06:58:03 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -29,6 +29,14 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}" .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:MXrender) +BUILDLINK_USE_BUILTIN.Xrender= NO +. endif +.endif + .if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES .endif |