5 files changed, 6 insertions, 96 deletions

diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index e813da791c34..bd46727f79db 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smartmontools
-PORTVERSION=	5.38
-PORTREVISION=	8
+PORTVERSION=	5.39
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -17,6 +16,8 @@ COMMENT=	S.M.A.R.T. disk monitoring tools
 CONFLICTS=	smartmontools-devel-[0-9]*
 
 USE_GMAKE=	yes
+# hack to prevent gmake failure on 6.xx
+GMAKE=		make
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --enable-sample
 
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index a604c0dabdad..e6b68ba2f358 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,3 +1,3 @@
-MD5 (smartmontools-5.38.tar.gz) = a282846532ecbd6b4a28072373b3a70b
-SHA256 (smartmontools-5.38.tar.gz) = b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
-SIZE (smartmontools-5.38.tar.gz) = 617326
+MD5 (smartmontools-5.39.tar.gz) = 63c1b5373a9ef91e9c9becb16e147571
+SHA256 (smartmontools-5.39.tar.gz) = e118de37541ef78061a823439425c63106df249e925610d96aabc9bd8239e0d0
+SIZE (smartmontools-5.39.tar.gz) = 658355
diff --git a/sysutils/smartmontools/files/patch-knowndrives.cpp b/sysutils/smartmontools/files/patch-knowndrives.cpp
deleted file mode 100644
index 70071494c1a0..000000000000
--- a/sysutils/smartmontools/files/patch-knowndrives.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- knowndrives.cpp.orig	2008-02-02 19:10:48.000000000 +0100
-+++ knowndrives.cpp	2008-03-14 13:35:59.000000000 +0100
-@@ -1155,7 +1155,7 @@
-     NULL, NULL, NULL, NULL
-   },
-   { "Western Digital Caviar SE Serial ATA family",
--    "^WDC WD((4|8|12|16|20|25|32|40)00(JD|KD))-.*$",
-+    "^WDC WD((4|8|12|16|20|25|32|40)00(JD|KD|PD))-.*$",
-     ".*",
-     NULL, NULL, NULL, NULL
-   },
diff --git a/sysutils/smartmontools/files/patch-os__freebsd.cpp b/sysutils/smartmontools/files/patch-os__freebsd.cpp
deleted file mode 100644
index c752a93a8547..000000000000
--- a/sysutils/smartmontools/files/patch-os__freebsd.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- os_freebsd.cpp.orig
-+++ os_freebsd.cpp
-@@ -272,7 +272,6 @@
- }
- 
- int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) {
--{
-   return -1;
- }
- 
-@@ -341,6 +340,15 @@
-     request.count=512;
-     copydata=1;
-     break;
-+  case WRITE_LOG:
-+    memcpy(buff, data, 512);
-+    request.u.ata.feature=ATA_SMART_WRITE_LOG_SECTOR;
-+    request.u.ata.lba=select|(0xc24f<<8);
-+    request.u.ata.count=1;
-+    request.flags=ATA_CMD_WRITE;
-+    request.data=(char *)buff;
-+    request.count=512;
-+    break;
-   case IDENTIFY:
-     request.u.ata.command=ATA_IDENTIFY_DEVICE;
-     request.flags=ATA_CMD_READ;
-@@ -525,7 +533,7 @@
-     return -1;
-   }
- 
--  if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-+  if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
-  #if __FreeBSD_version > 500000
-     cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
-  #endif
-@@ -924,6 +932,7 @@
- static const char * fbsd_dev_prefix = "/dev/";
- static const char * fbsd_dev_ata_disk_prefix = "ad";
- static const char * fbsd_dev_scsi_disk_plus = "da";
-+static const char * fbsd_dev_scsi_pass = "pass";
- static const char * fbsd_dev_scsi_tape1 = "sa";
- static const char * fbsd_dev_scsi_tape2 = "nsa";
- static const char * fbsd_dev_scsi_tape3 = "esa";
-@@ -960,6 +969,11 @@
-     return CONTROLLER_ATA;
-   }
-   
-+  // form /dev/pass* or pass*
-+  if (!strncmp(fbsd_dev_scsi_pass, dev_name,
-+               strlen(fbsd_dev_scsi_pass)))
-+    goto handlescsi;
-+
-   // form /dev/da* or da*
-   if (!strncmp(fbsd_dev_scsi_disk_plus, dev_name,
-                strlen(fbsd_dev_scsi_disk_plus)))
diff --git a/sysutils/smartmontools/files/patch-scsiata.cpp b/sysutils/smartmontools/files/patch-scsiata.cpp
deleted file mode 100644
index 173fd2b26e84..000000000000
--- a/sysutils/smartmontools/files/patch-scsiata.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- scsiata.cpp.orig	2007-12-02 19:14:20.000000000 -0700
-+++ scsiata.cpp	2009-09-04 14:27:48.000000000 -0600
-@@ -380,14 +380,14 @@
-    return 1, else 0 */
- int has_sat_pass_through(int device, int packet_interface)
- {
--    char data[512];
-+    int ret;
-+    char *data = (char *)malloc(512);	// (alignment)
-     smart_command_set command;
- 
-     command = packet_interface ? PIDENTIFY : IDENTIFY;
--    if (0 == sat_command_interface(device, command, 0, data))
--        return 1;
--    else
--        return 0;
-+    ret = ( 0 == sat_command_interface(device, command, 0, data) ? 1 : 0 );
-+    free(data);
-+    return ret;
- }
- 
- /* Next two functions are borrowed from sg_lib.c in the sg3_utils