1 files changed, 26 insertions, 27 deletions
diff --git a/sysutils/smartmontools/files/patch-update-smart-drivedb.in b/sysutils/smartmontools/files/patch-update-smart-drivedb.in
index b3cfba9f2427..c10bf0f88d69 100644
--- a/sysutils/smartmontools/files/patch-update-smart-drivedb.in
+++ b/sysutils/smartmontools/files/patch-update-smart-drivedb.in
@@ -1,30 +1,29 @@
---- update-smart-drivedb.in.orig	2014-12-06 20:12:50 UTC
-+++ update-smart-drivedb.in
-@@ -69,26 +69,8 @@ EOF
-   *)  DEST="$1" ;;
+--- update-smart-drivedb.in.orig	2016-02-26 23:29:24.000000000 +0300
++++ update-smart-drivedb.in	2016-05-12 23:07:17.558810000 +0300
+@@ -51,7 +51,8 @@
+   -s SMARTCTL     Use SMARTCTL for syntax check ('-s -' to disable)
+                   [default: $SMARTCTL]
+   -t TOOL         Use TOOL for download: $os_dltools
+-                  [default: first one found in PATH]
++                  [default: fetch, which is always available
++                  on FreeBSD.]
+   -u LOCATION     Use URL of LOCATION for download:
+                     sf (Sourceforge code browser via HTTPS)
+                     svn (SVN repository via HTTPS) [default]
+@@ -262,14 +263,8 @@
  esac
  
--# Abort if 'which' is not available
--which which >/dev/null || exit 1
--
- # Find download tool
--DOWNLOAD=
--for t in $os_dltools; do
--  if which $t >/dev/null 2>/dev/null; then
--    case $t in
--      curl)  DOWNLOAD="curl ${q:+-s }"'-f -o "$DEST.new" "$SRC"' ;;
--      lynx)  DOWNLOAD='lynx -source "$SRC" >"$DEST.new"' ;;
--      wget)  DOWNLOAD="wget $q"'-O "$DEST.new" "$SRC"' ;;
--      fetch) DOWNLOAD='fetch -o "$DEST.new" "$SRC"' ;; # FreeBSD
--      ftp)   DOWNLOAD='ftp -o "$DEST.new" "$SRC"' ;; # OpenBSD
--    esac
--    break
--  fi
--done
--if [ -z "$DOWNLOAD" ]; then
--  echo "$0: found none of: $os_dltools" >&2; exit 1
--fi
-+DOWNLOAD='fetch -o "$DEST.new" "$SRC"'
+ if [ -z "$tool" ]; then
+-  # Find download tool in PATH
+-  for t in $os_dltools; do
+-    if inpath "$t"; then
+-      tool=$t
+-      break
+-    fi
+-  done
+-  test -n "$tool" || error "found none of: $os_dltools"
++  # Set to fetch by default
++  tool="fetch"
+ fi
  
- # Try possible branch first, then trunk
- for location in "branches/$BRANCH" "trunk"; do
+ test -n "$url" || selecturl "svn"