Bug 201635 - message correctness Mk/Scripts/do-depends.sh
Summary: message correctness Mk/Scripts/do-depends.sh
Status: Closed Overcome By Events
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2015-07-16 22:30 UTC by Tomohiro Hosaka
Modified: 2016-04-13 11:33 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Tomohiro Hosaka 2015-07-16 22:30:07 UTC
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 613ea0c..a8141a7 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -39,41 +39,41 @@ install_depends()
                        ${dp_WRKDIR}/pkg-static add ${pkgfile}
                        rm -f ${dp_WRKDIR}/pkg-static
                else
                        ${dp_PKG_ADD} -A ${pkgfile}
                fi
        elif [ -n "${dp_USE_PACKAGE_DEPENDS_ONLY}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
                echo "===>   ${dp_PKGNAME} depends on package: ${pkgfile} - not found" >&2
                echo "===>   dp_USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency from source" >&2
                exit 1
        else
                ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args}
        fi
 }

 find_package()
 {
        if ${dp_PKG_INFO} "$1" >/dev/null 2>&1; then
                echo "===>   ${dp_PKGNAME} depends on package: $1 - found"
                return 0
        fi
-       echo "===>   ${dp_PKGNAME} depends on file: $1 - not found"
+       echo "===>   ${dp_PKGNAME} depends on package: $1 - not found"
        return 1
 }

 find_file()
 {
        if [ -e "$1" ]; then
                echo "===>   ${dp_PKGNAME} depends on file: $1 - found"
                return 0
        fi
        echo "===>   ${dp_PKGNAME} depends on file: $1 - not found"
        return 1
 }

 find_file_path()
 {
        if which -s $1 ; then
                echo "===>   ${dp_PKGNAME} depends on executable: $1 - found"
                return 0
        fi
        echo "===>   ${dp_PKGNAME} depends on executable: $1 - not found"
Comment 1 Mathieu Arnold freebsd_committer freebsd_triage 2016-04-13 11:33:26 UTC
fixed in ports r395910.