diff options
| author | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
| commit | 91bc291f41ded5a7610d7def5080ce479b65499e (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /converters | |
| parent | abcbd9a281594691f5813bc65435050263601f44 (diff) | |
| download | pkgsrc-91bc291f41ded5a7610d7def5080ce479b65499e.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 'converters')
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 10 | ||||
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index d5019d58c59..3db17f8708e 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.12 2004/01/15 23:04:00 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 06:58:02 jlam Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -33,6 +33,14 @@ _NEED_ICONV= YES . endfor .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Miconv) +_NEED_ICONV= YES +. endif +.endif + .if ${_NEED_ICONV} == "YES" # let other packages know that we're using the pkgsrc # GNU libiconv diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index 472501168a7..da417dcb558 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.iconv= YES . endif .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Miconv) +BUILDLINK_USE_BUILTIN.iconv= NO +. endif +.endif + .if defined(USE_GNU_ICONV) BUILDLINK_USE_BUILTIN.iconv= NO .endif |