diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index b9a3b337a767..df87dc202ed3 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,41 +1,40 @@ PORTNAME= smartmontools -DISTVERSION= 7.3 -PORTREVISION= 1 +DISTVERSION= 7.4 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= samm@FreeBSD.org COMMENT= S.M.A.R.T. disk monitoring tools WWW= https://www.smartmontools.org LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib cpe shebangfix USE_RC_SUBR= smartd SHEBANG_FILES= examplescripts/Example5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-sample \ --with-gnupg=no \ --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-nvme-devicescan=yes SUB_FILES= pkg-message smart PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's| install-initdDATA| |' ${WRKSRC}/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/smart \ ${STAGEDIR}${PREFIX}/etc/periodic/daily ${MV} ${STAGEDIR}${DATADIR}/drivedb.h \ ${STAGEDIR}${DATADIR}/drivedb.h.sample .include diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 1d3d0ad0e0cf..1f03708cea1b 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646298623 -SHA256 (smartmontools-7.3.tar.gz) = a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b -SIZE (smartmontools-7.3.tar.gz) = 1043932 +TIMESTAMP = 1690890805 +SHA256 (smartmontools-7.4.tar.gz) = e9a61f641ff96ca95319edfb17948cd297d0cd3342736b2c49c99d4716fb993d +SIZE (smartmontools-7.4.tar.gz) = 1094955 diff --git a/sysutils/smartmontools/files/patch-update-smart-drivedb.in b/sysutils/smartmontools/files/patch-update-smart-drivedb.in deleted file mode 100644 index 786236c5c01a..000000000000 --- a/sysutils/smartmontools/files/patch-update-smart-drivedb.in +++ /dev/null @@ -1,56 +0,0 @@ ---- update-smart-drivedb.in.orig 2022-02-23 21:47:28 UTC -+++ update-smart-drivedb.in -@@ -8,7 +8,7 @@ - # - # SPDX-License-Identifier: GPL-2.0-or-later - # --# $Id: update-smart-drivedb.in 5332 2022-02-23 21:47:28Z chrfranke $ -+# $Id$ - # - - set -e -@@ -527,7 +527,7 @@ gpg_verify() - # Remove temp home dir, retry on failure - i=0 - while ! out=`rm -f -r "$gnupgtmp" 2>&1`; do -- let ++i -+ i=$((i+1)) - if [ $i -ge 10 ]; then - echo "$out" >&2; break - fi -@@ -542,12 +542,14 @@ gpg_verify() - get_db_version() - { - local r v x -- x=$(sed -n '/^[ {]*"VERSION: *[^"]*"/{s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p;q}' "$1") \ -- || return 1 -+ x=`sed -n '/^[ {]*"VERSION: *[^"]*"/{ -+ s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p -+ q -+ }' "$1"` || return 1 - v=${x%% *} - test -n "$v" || return 0 - if [ "${v%/*}" = "$v" ]; then # trunk: get rev from expanded SVN-Id -- r=$(echo "$x" | sed -n 's,^[^$]*\$''Id: drivedb\.h \([1-9][0-9]*\) .*$,\1,p') -+ r=`echo "$x" | sed -n 's,^[^$]*\$''Id: drivedb\.h \([1-9][0-9]*\) .*$,\1,p'` - test -n "$r" || r="?" - v="$v/$r" - fi -@@ -860,7 +862,7 @@ if [ -z "$no_verify" ]; then - fi - - # Get version --newver=$(get_db_version "$drivedb.new") -+newver=`get_db_version "$drivedb.new"` - if [ -z "$newver" ]; then - if [ -z "$force" ]; then - mv_all "$drivedb" ".new" ".error" -@@ -905,7 +907,7 @@ if [ -n "$equal" ]; then - fi - - # Check branch and file version --oldver=$(get_db_version "$drivedb") -+oldver=`get_db_version "$drivedb"` - test -n "$oldver" || oldver="?/?" - if [ "${newver##*/}" = "?" ] \ - || [ "${oldver##*/}" = "?" ] \ diff --git a/sysutils/smartmontools/pkg-descr b/sysutils/smartmontools/pkg-descr index 4c983f080615..5459df9111a7 100644 --- a/sysutils/smartmontools/pkg-descr +++ b/sysutils/smartmontools/pkg-descr @@ -1,5 +1,5 @@ The smartmontools package contains two utility programs (smartctl and smartd) to control and monitor storage systems using the Self-Monitoring, Analysis -and Reporting Technology System (S.M.A.R.T.) built into most modern ATA and -SCSI hard disks. It is derived from the smartsuite package, and includes +and Reporting Technology System (S.M.A.R.T.) built into most modern SATA, NVMe +and SCSI hard disks. It is derived from the smartsuite package, and includes support for ATA/ATAPI/SATA disks and SCSI disks and tape devices.