Index: sysutils/smartmontools/Makefile
===================================================================
--- sysutils/smartmontools/Makefile
+++ sysutils/smartmontools/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	smartmontools
-PORTVERSION=	7.0
-PORTREVISION=	2
+PORTVERSION=	7.1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -13,7 +12,7 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		alias compiler:c++11-lib gmake shebangfix
+USES=		alias compiler:c++11-lib shebangfix
 
 CONFLICTS=	smartmontools-devel-[0-9]*
 
@@ -23,6 +22,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--enable-sample \
+		--with-update-smart-drivedb=no \
+		--with-gnupg=no \
 		--with-nvme-devicescan=yes \
 		--with-initscriptdir=${PREFIX}/etc/rc.d
 
Index: sysutils/smartmontools/distinfo
===================================================================
--- sysutils/smartmontools/distinfo
+++ sysutils/smartmontools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546416586
-SHA256 (smartmontools-7.0.tar.gz) = e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c
-SIZE (smartmontools-7.0.tar.gz) = 944925
+TIMESTAMP = 1578557367
+SHA256 (smartmontools-7.1.tar.gz) = 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846
+SIZE (smartmontools-7.1.tar.gz) = 971468
Index: sysutils/smartmontools/files/patch-configure
===================================================================
--- sysutils/smartmontools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2018-12-30 14:49:08 UTC
-+++ configure
-@@ -6891,7 +6891,7 @@ case "${host}" in
-   *-*-freebsd*|*-*-dragonfly*|*-*-kfreebsd*-gnu*)
-     os_deps='os_freebsd.o cciss.o dev_areca.o'
-     os_libs='-lcam -lsbuf'
--    os_dltools='curl wget lynx fetch svn'
-+    os_dltools='fetch curl wget lynx svn'
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_device_desc in -lusb" >&5
- $as_echo_n "checking for libusb20_dev_get_device_desc in -lusb... " >&6; }
- if ${ac_cv_lib_usb_libusb20_dev_get_device_desc+:} false; then :
Index: sysutils/smartmontools/files/patch-os__freebsd.cpp
===================================================================
--- sysutils/smartmontools/files/patch-os__freebsd.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: os_freebsd.cpp
-===================================================================
---- os_freebsd.cpp.orig	2018-12-05 18:30:46 UTC
-+++ os_freebsd.cpp
-@@ -9,6 +9,7 @@
-  */
- 
- #include <sys/param.h>
-+#include <sys/endian.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <dirent.h>
-@@ -522,29 +523,29 @@ bool freebsd_nvme_device::nvme_pass_through(const nvme
-   pt.cmd.opc = in.opcode;
- #endif
-   pt.cmd.opc = in.opcode;
--  pt.cmd.nsid = in.nsid;
-+  pt.cmd.nsid = htole32(in.nsid);
-   pt.buf = in.buffer;
-   pt.len = in.size;
--  pt.cmd.cdw10 = in.cdw10;
--  pt.cmd.cdw11 = in.cdw11;
--  pt.cmd.cdw12 = in.cdw12;
--  pt.cmd.cdw13 = in.cdw13;
--  pt.cmd.cdw14 = in.cdw14;
--  pt.cmd.cdw15 = in.cdw15;
-+  pt.cmd.cdw10 = htole32(in.cdw10);
-+  pt.cmd.cdw11 = htole32(in.cdw11);
-+  pt.cmd.cdw12 = htole32(in.cdw12);
-+  pt.cmd.cdw13 = htole32(in.cdw13);
-+  pt.cmd.cdw14 = htole32(in.cdw14);
-+  pt.cmd.cdw15 = htole32(in.cdw15);
-   pt.is_read = 1; // should we use in.direction()?
-   
-   int status = ioctl(get_fd(), NVME_PASSTHROUGH_CMD, &pt);
- 
-   if (status < 0)
-     return set_err(errno, "NVME_PASSTHROUGH_CMD: %s", strerror(errno));
--
-+#if __FreeBSD_version >= 1200058
-+  nvme_completion_swapbytes(&pt.cpl);
-+#endif
-   cp_p = &pt.cpl;
-   out.result=cp_p->cdw0; // Command specific result (DW0)
- 
-   if (nvme_completion_is_error(cp_p)) {  /* ignore DNR and More bits */
--    uint16_t nvme_status = ((cp_p->status.sct << 8) | cp_p->status.sc) & 0x3ff;
--
--    return set_nvme_err(out, nvme_status);
-+    return set_nvme_err(out, nvme_completion_is_error(&pt.cpl));
-   }
- 
-   return true;
Index: sysutils/smartmontools/pkg-plist
===================================================================
--- sysutils/smartmontools/pkg-plist
+++ sysutils/smartmontools/pkg-plist
@@ -4,9 +4,7 @@
 man/man5/smartd.conf.5.gz
 man/man8/smartd.8.gz
 man/man8/smartctl.8.gz
-man/man8/update-smart-drivedb.8.gz
 sbin/smartctl
 sbin/smartd
-sbin/update-smart-drivedb
 %%DATADIR%%/drivedb.h
 @dir etc/smartd_warning.d