- Update to 5.38.2874

PR:		138108
Submitted by:	Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
No objection from: marck (sysutils/smartmontools maintainer)

6 files changed, 32 insertions, 98 deletions

diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile
index 9b077d4b4aea..e805e1ae954b 100644
--- a/sysutils/smartmontools-devel/Makefile
+++ b/sysutils/smartmontools-devel/Makefile
@@ -6,17 +6,23 @@
 #
 
 PORTNAME=	smartmontools
-PORTVERSION=	5.38
-PORTREVISION=	8
+PORTVERSION=	5.38.r${SVNREVISION}
 CATEGORIES=	sysutils
-MASTER_SITES=	SF
+MASTER_SITES=	http://wisnia21.freeshell.org/f/ports/distfiles/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	marck@FreeBSD.org
-COMMENT=	S.M.A.R.T. disk monitoring tools
+MAINTAINER=	mwisnicki+freebsd@gmail.com
+COMMENT=	S.M.A.R.T. disk monitoring tools (SVN snapshot)
 
-USE_GMAKE=	yes
+SVNREVISION=	2874
+
+CONFLICTS=	smartmontools-[0-9]*
+
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --enable-sample
+AUTOMAKE_ARGS=	--add-missing --copy --foreign
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --enable-sample --with-initscriptdir=no
 
 SUB_FILES=	pkg-message smart
 USE_RC_SUBR=	smartd
@@ -24,14 +30,18 @@ USE_RC_SUBR=	smartd
 MAN5=		smartd.conf.5
 MAN8=		smartd.8 smartctl.8
 
-CFLAGS:=	${CFLAGS:S/-O2/-O/} -Wno-write-strings
-
-post-patch:
-	@${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in
+CFLAGS:=	${CFLAGS:S/-O2/-O/}
 
 post-install:
 	${MKDIR} ${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/smart ${PREFIX}/etc/periodic/daily/smart
 	@${CAT} ${PKGMESSAGE}
 
+x-maintainer-make-snapshot:
+	svn export -r${SVNREVISION} \
+		https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools \
+		${DISTNAME}
+	${TAR} -cjvf ${DISTNAME}.tar.bz2 ${DISTNAME}
+	${RM} -rf ${DISTNAME}
+
 .include <bsd.port.mk>
diff --git a/sysutils/smartmontools-devel/distinfo b/sysutils/smartmontools-devel/distinfo
index a604c0dabdad..bf9f468da914 100644
--- a/sysutils/smartmontools-devel/distinfo
+++ b/sysutils/smartmontools-devel/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.38.r2874.tar.bz2) = d2cadaaa1a8390c38372f5c4f5972219
+SHA256 (smartmontools-5.38.r2874.tar.bz2) = 96c1f34daddedf6575caa6bfe4621023f8a861b248b1b3f87a5b79e9e00d0875
+SIZE (smartmontools-5.38.r2874.tar.bz2) = 477163
diff --git a/sysutils/smartmontools-devel/files/patch-knowndrives.cpp b/sysutils/smartmontools-devel/files/patch-knowndrives.cpp
deleted file mode 100644
index 70071494c1a0..000000000000
--- a/sysutils/smartmontools-devel/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-devel/files/patch-os__freebsd.cpp b/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp
index c752a93a8547..f4b184a6205c 100644
--- a/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp
+++ b/sysutils/smartmontools-devel/files/patch-os__freebsd.cpp
@@ -1,58 +1,11 @@
-
-$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 @@
+--- os_freebsd.cpp.orig	2008-03-04 23:09:47.000000000 +0100
++++ os_freebsd.cpp	2008-03-14 13:52:37.000000000 +0100
+@@ -525,7 +524,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-devel/files/patch-scsiata.cpp b/sysutils/smartmontools-devel/files/patch-scsiata.cpp
deleted file mode 100644
index 173fd2b26e84..000000000000
--- a/sysutils/smartmontools-devel/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
diff --git a/sysutils/smartmontools-devel/pkg-descr b/sysutils/smartmontools-devel/pkg-descr
index c95debe3b9fa..de4fd32883be 100644
--- a/sysutils/smartmontools-devel/pkg-descr
+++ b/sysutils/smartmontools-devel/pkg-descr
@@ -4,4 +4,8 @@ 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
 support for ATA/ATAPI-5 disks.
 
+Compared to version 5.38 this SVN snapshot brings more USB hardware support:
+ http://sourceforge.net/apps/trac/smartmontools/wiki/Supported_USB-Devices
+as well as other improvements.
+
 WWW: http://smartmontools.sourceforge.net