diff options
| author | joerg <joerg> | 2011-09-25 19:51:47 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2011-09-25 19:51:47 +0000 |
| commit | 1332eae842d0212de7cc8e26a321e4251ef949ff (patch) | |
| tree | 3df50b9be1bce5074a7c6bc4ea6a22327e6de171 | |
| parent | 71d7610a05e857db922b70a7e4b117c6d8afebb8 (diff) | |
| download | pkgsrc-1332eae842d0212de7cc8e26a321e4251ef949ff.tar.gz | |
Fix a bug in the multi-version logic exposed by packages supporting only
Ruby 1.8. The multi-version logic was skipped for an attribute, if there
was only entry in the parameter list. This is wrong, if this entry is
not the default version for this attribute. Adjust.
Tested by comparing the resulting packages for a scan with and without
this change.
| -rw-r--r-- | mk/pbulk/pbulk-index.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk index 5fc6ecda1bc..36d94a21197 100644 --- a/mk/pbulk/pbulk-index.mk +++ b/mk/pbulk/pbulk-index.mk @@ -1,4 +1,4 @@ -# $NetBSD: pbulk-index.mk,v 1.11 2010/09/28 20:24:25 joerg Exp $ +# $NetBSD: pbulk-index.mk,v 1.12 2011/09/25 19:51:47 joerg Exp $ # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to the parallel bulk build @@ -45,11 +45,14 @@ _PBULK_MULTI_DEFAULT.ruby= _RUBY_VERSION_DEFAULT # don't follow the module naming conventions. .for _t in ${_PBULK_MULTI} -. if ${${_PBULK_MULTI_LIST.${_t}}:Unone:[\#]} != 1 && !empty(${_PBULK_MULTI_LIST.${_t}}) +. if defined(${_PBULK_MULTI_LIST.${_t}}) && !empty(${_PBULK_MULTI_LIST.${_t}}) +. if ${${_PBULK_MULTI_LIST.${_t}}:[\#]} != 1 || \ + !empty(${_PBULK_MULTI_LIST.${_t}}:N${_PBULK_MULTI_DEFAULT.${_t}}) _PBULK_MULTI_NEEDED:= ${_t} ${_PBULK_MULTI_NEEDED} _PBULK_SORTED_LIST.${_t}:= \ ${${_PBULK_MULTI_LIST.${_t}}:M${${_PBULK_MULTI_DEFAULT.${_t}}}} \ ${${_PBULK_MULTI_LIST.${_t}}:N${${_PBULK_MULTI_DEFAULT.${_t}}}} +. endif . endif .endfor |