- Update to 5.42

- Remove useless patch

PR:		ports/161859
Submitted by:	Alex Samorukov <samm _AT_ os2.kiev.ua> (maintainer)

3 files changed, 3 insertions, 78 deletions

diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 83557246be65..6622eb116de5 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smartmontools
-PORTVERSION=	5.41
-PORTREVISION=	3
+PORTVERSION=	5.42
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index 1ae36d2f8c3f..ce145b311503 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smartmontools-5.41.tar.gz) = 173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32
-SIZE (smartmontools-5.41.tar.gz) = 740661
+SHA256 (smartmontools-5.42.tar.gz) = ee9760064fdd0727a111dc5fef2b748b951ac21df4a09ea513acdb353e9e37b3
+SIZE (smartmontools-5.42.tar.gz) = 740025
diff --git a/sysutils/smartmontools/files/patch-os_freebsd b/sysutils/smartmontools/files/patch-os_freebsd
deleted file mode 100644
index 097cec21b4bf..000000000000
--- a/sysutils/smartmontools/files/patch-os_freebsd
+++ /dev/null
@@ -1,74 +0,0 @@
-$FreeBSD$
-
-This patch from upstream address 2 issues:
-
-1) SMART health status is always "GOOD" with atacam driver.
-2) Command "-l scterc" is broken on ata and atacam drivers.
-
-See https://sourceforge.net/apps/trac/smartmontools/ticket/198 for more
-details.
-
-NOTE: Path stripped from filename to make make patch work, but otherwise
-identical to the patch in the ticket.
-
-Index: trunk/smartmontools/os_freebsd.cpp
-===================================================================
---- os_freebsd.cpp (revision 3407)
-+++ os_freebsd.cpp (revision 3421)
-@@ -288,10 +288,10 @@
-       break;
-     case ata_cmd_in::data_in:  
--      request.flags=ATA_CMD_READ;
-+      request.flags=ATA_CMD_READ | ATA_CMD_CONTROL;
-       request.data=(char *)in.buffer;
-       request.count=in.size;
-       break;
-     case ata_cmd_in::data_out: 
--      request.flags=ATA_CMD_WRITE;
-+      request.flags=ATA_CMD_WRITE | ATA_CMD_CONTROL;
-       request.data=(char *)in.buffer;
-       request.count=in.size;
-@@ -300,6 +300,6 @@
-       return set_err(ENOSYS);
-   }
--                          
--  clear_err(); 
-+
-+  clear_err();
-   errno = 0;
-   if (do_cmd(&request, in.in_regs.is_48bit_cmd()))
-@@ -390,5 +390,5 @@
-   if (request->count == 0)
-     camflags = CAM_DIR_NONE;
--  else if (request->flags == ATA_CMD_READ)
-+  else if (request->flags & ATA_CMD_READ)
-     camflags = CAM_DIR_IN;
-   else
-@@ -406,9 +406,6 @@
-                  request->timeout * 1000); // timeout in seconds
- 
-+  ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
-   // ata_28bit_cmd
--  if (request->flags == ATA_CMD_CONTROL)
--    ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
--  else
--    ccb.ataio.cmd.flags = 0;
-   ccb.ataio.cmd.command = request->u.ata.command;
-   ccb.ataio.cmd.features = request->u.ata.feature;
-@@ -436,5 +433,15 @@
-   }
- 
--  request->u.ata.count = ccb.ataio.res.sector_count;
-+  request->u.ata.lba =
-+    ((u_int64_t)(ccb.ataio.res.lba_low)) |
-+    ((u_int64_t)(ccb.ataio.res.lba_mid) << 8) |
-+    ((u_int64_t)(ccb.ataio.res.lba_high) << 16) |
-+    ((u_int64_t)(ccb.ataio.res.lba_low_exp) << 24) |
-+    ((u_int64_t)(ccb.ataio.res.lba_mid_exp) << 32) |
-+    ((u_int64_t)(ccb.ataio.res.lba_high_exp) << 40);
-+
-+  request->u.ata.count = ccb.ataio.res.sector_count | (ccb.ataio.res.sector_count_exp << 8);
-+  request->error = ccb.ataio.res.error;
-+
-   return 0;
- }