diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart index 4d6f598..6901571 100644 --- a/lib/pkg_info.cygpart +++ b/lib/pkg_info.cygpart @@ -383,14 +383,14 @@ __list_deps() { if check_prog perl then - pldirs=($(perl -e 'print join(" ",@INC)')) + pldirs=($(perl -e 'print join(" ",reverse grep !/site_perl/,@INC)')) pldirs+=" ${DEPS_PATH//:/ }" for pldep in $(find "${@//^_^/ }" -path 'usr/share/doc/*' -prune \ ${deps_prune} \ -o -path 'usr/share/help/*' -prune \ -o \( -name '*.pl' -o -name '*.pm' \) -print \ -o -type f ! -name '*.*' -executable -exec sed -sne '1{/^#!.*perl.*/F}' '{}' + \ - | xargs -r sed -ne "s/^[^#]*use \(base\|parent\) ['\"]*\(qw( *\)*\([A-Z][^-)'\";]*\).*/\3/gp;s/^[^#]*\(use\|require\) ['\"]*\([A-Z][^ '\";]*\).*/\2/gp" \ + | xargs -r sed -ne "s/^use \(base\|parent\) ['\"]*\(qw( *\)*\([A-Z][^-)'\";]*\).*/\3/gp;s/^\(use\|require\) ['\"]*\([A-Z][^ '\";]*\).*/\2/gp" \ | sort -u) do for d in ${pldirs[*]/\//${D}/} ${pldirs[*]}