diff options
| author | jlam <jlam> | 2004-02-16 03:08:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-16 03:08:52 +0000 |
| commit | a6909613a5fc11a6cfd42387450efbbf3753817a (patch) | |
| tree | adc927cc38af06f26efde42480b50998eed2f700 /mk | |
| parent | add7b0efb84614a6759ca8829b202501905402c1 (diff) | |
| download | pkgsrc-a6909613a5fc11a6cfd42387450efbbf3753817a.tar.gz | |
Move section that checks for PREFER_PKGSRC a little higher so that it
actually has some effect.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index a5c82997b2c..9419da62bc8 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.85 2004/02/15 14:50:11 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.86 2004/02/16 03:08:52 jlam Exp $ # # An example package buildlink3.mk file: # @@ -196,6 +196,13 @@ ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} .for _pkg_ in ${_BLNK_PACKAGES} ${_BLNK_X11_LINKS_PACKAGE} BUILDLINK_IS_BUILTIN.${_pkg_}?= no # +# If we prefer the pkgsrc version, then don't use the built-in package. +# +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:M${_pkg_}) +BUILDLINK_USE_BUILTIN.${_pkg_}?= no +. endif +# # If the "built-in" package (the software supplied by the base operating # system) is available, then use it by default. # @@ -205,13 +212,6 @@ BUILDLINK_USE_BUILTIN.${_pkg_}?= yes BUILDLINK_USE_BUILTIN.${_pkg_}?= no . endif # -# If we prefer the pkgsrc version, then don't user the built-in package. -# -. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:M${_pkg_}) -BUILDLINK_USE_BUILTIN.${_pkg_}?= no -. endif -# # If we're using the built-in package, then provide sensible defaults. # . if !empty(BUILDLINK_USE_BUILTIN.${_pkg_}:M[yY][eE][sS]) |