--- sysutils/smartmontools/Makefile.orig 2016-03-29 23:52:11.000000000 +0300 +++ sysutils/smartmontools/Makefile 2016-05-12 22:27:05.811179000 +0300 @@ -2,8 +2,7 @@ # $FreeBSD: head/sysutils/smartmontools/Makefile 412136 2016-03-29 20:52:11Z amdmi3 $ PORTNAME= smartmontools -PORTVERSION= 6.4 -PORTREVISION= 2 +PORTVERSION= 6.5 CATEGORIES= sysutils MASTER_SITES= SF --- sysutils/smartmontools/distinfo.orig 2015-06-16 12:30:03.000000000 +0300 +++ sysutils/smartmontools/distinfo 2016-05-12 22:31:33.273573000 +0300 @@ -1,2 +1,2 @@ -SHA256 (smartmontools-6.4.tar.gz) = eab75600c1eda9c34b13097db71138ab376f3dad8a6a4667fb4d1d081feb7a85 -SIZE (smartmontools-6.4.tar.gz) = 822539 +SHA256 (smartmontools-6.5.tar.gz) = 89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc +SIZE (smartmontools-6.5.tar.gz) = 855642 --- sysutils/smartmontools/files/patch-update-smart-drivedb.in.orig 2016-03-29 23:52:11.000000000 +0300 +++ sysutils/smartmontools/files/patch-update-smart-drivedb.in 2016-05-12 23:07:24.302116000 +0300 @@ -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"