Import of pkgsrc-2016Q3

sysutils/smartmontools/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2015/06/12 13:58:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2016/05/08 11:23:15 nonaka Exp $
 
-DISTNAME=		smartmontools-6.3
-PKGREVISION=		1
+DISTNAME=		smartmontools-6.5
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}
 
@@ -27,7 +26,7 @@ CONF_FILES_PERMS=	${EGDIR}/smartd_warning.sh \
 RCD_SCRIPTS=		smartd
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/smartmontools
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/smartmontools
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 INSTALLATION_DIRS=	${EGDIR}

sysutils/smartmontools/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/04/08 01:43:32 rodent Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/09/24 22:30:29 tnn Exp $
 man/man5/smartd.conf.5
 man/man8/smartctl.8
 man/man8/smartd.8
@@ -14,7 +14,6 @@ share/doc/smartmontools/INSTALL
 share/doc/smartmontools/NEWS
 share/doc/smartmontools/README
 share/doc/smartmontools/TODO
-share/doc/smartmontools/WARNINGS
 share/doc/smartmontools/examplescripts/Example1
 share/doc/smartmontools/examplescripts/Example2
 share/doc/smartmontools/examplescripts/Example3

sysutils/smartmontools/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.24 2015/06/12 13:58:07 jperkin Exp $
+$NetBSD: distinfo,v 1.27 2016/05/08 11:23:15 nonaka Exp $
 
-SHA1 (smartmontools-6.3.tar.gz) = 716c5dc339d408d628c55dbe69028b1561df4c7e
-RMD160 (smartmontools-6.3.tar.gz) = b51fa0dfd15820d33fb00506853b34bbebadd096
-Size (smartmontools-6.3.tar.gz) = 809790 bytes
-SHA1 (patch-aa) = 93a7725aa9e240d950d76f0da2d6b96f8d24f112
-SHA1 (patch-ag) = bbf85278f08390d51ac9bb428ac7026763e5ffcf
-SHA1 (patch-os__netbsd.cpp) = 9c197ae492ef377d72df009be40d0abc1a827a31
+SHA1 (smartmontools-6.5.tar.gz) = 7e788b429534a4ae627858fbcc826b93402cee7e
+RMD160 (smartmontools-6.5.tar.gz) = e62d15d406a92b75fa239603180c6b587f9d2aa8
+SHA512 (smartmontools-6.5.tar.gz) = dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3
+Size (smartmontools-6.5.tar.gz) = 855642 bytes
+SHA1 (patch-aa) = bd08aff267f0e9e9307ebc57858e61e35144bf16
+SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b
+SHA1 (patch-os__netbsd.cpp) = 28f78c08d7c7287165cfa38f8ee3467b3b03cb44

sysutils/smartmontools/patches/patch-aa

@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2015/04/08 01:43:33 rodent Exp $
+$NetBSD: patch-aa,v 1.9 2015/09/24 22:30:29 tnn Exp $
 
 Don't install Linux init.d files nor CONF_FILES.
 
---- Makefile.in.orig	2014-07-26 09:50:18.000000000 +0000
+--- Makefile.in.orig	2015-06-04 16:30:22.000000000 +0000
 +++ Makefile.in
-@@ -182,11 +182,10 @@ mkinstalldirs = $(install_sh) -d
+@@ -189,11 +189,10 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -17,17 +17,17 @@ Don't install Linux init.d files nor CONF_FILES.
  	"$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(systemdsystemunitdir)"
  PROGRAMS = $(sbin_PROGRAMS)
  am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \
-@@ -585,8 +584,7 @@ docs_DATA = \
+@@ -595,8 +594,7 @@ docs_DATA = \
+         INSTALL \
          NEWS \
          README \
-         TODO \
--        WARNINGS \
+-        TODO \
 -        smartd.conf
-+        WARNINGS
++        TODO
  
  examplesdir = $(exampledir)
  examples_DATA = \
-@@ -1666,7 +1664,7 @@ info-am:
+@@ -1686,7 +1684,7 @@ info-am:
  
  install-data-am: install-data-local install-docsDATA \
  	install-drivedbDATA install-examplesDATA \

sysutils/smartmontools/patches/patch-ag

@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.5 2015/06/12 13:58:07 jperkin Exp $
+$NetBSD: patch-ag,v 1.6 2016/05/08 11:23:15 nonaka Exp $
 
 Match x86 SunOS platforms correctly.
 Remove os_solaris=yes to avoid special man page section handling (PR 38199).
 
---- configure.orig	2014-07-26 09:50:18.000000000 +0000
-+++ configure
-@@ -6569,13 +6569,11 @@ fi
-   sparc-*-solaris*)
-     os_deps='os_solaris.o os_solaris_ata.o'
+--- configure.orig	2016-05-07 11:18:29.000000000 +0000
++++ configure	2016-05-08 06:41:03.000000000 +0000
+@@ -6659,13 +6659,11 @@ fi
+     test "$with_solaris_sparc_ata" = "yes" \
+       && os_deps="$os_deps os_solaris_ata.o"
      os_mailer='mailx'
 -    os_solaris=yes
      os_man_filter=Solaris

sysutils/smartmontools/patches/patch-os__netbsd.cpp

@@ -1,10 +1,10 @@
-$NetBSD: patch-os__netbsd.cpp,v 1.2 2015/04/08 01:43:33 rodent Exp $
+$NetBSD: patch-os__netbsd.cpp,v 1.3 2016/05/08 11:23:15 nonaka Exp $
 
 Use a raw disk device file on NetBSD.
 
---- os_netbsd.cpp.orig	2013-03-29 20:17:03.000000000 +0000
-+++ os_netbsd.cpp
-@@ -57,7 +57,7 @@ printwarning(int msgNo, const char *extr
+--- os_netbsd.cpp.orig	2016-03-26 19:47:47.000000000 +0000
++++ os_netbsd.cpp	2016-05-08 06:45:25.000000000 +0000
+@@ -54,7 +54,7 @@ printwarning(int msgNo, const char *extr
    return;
  }
  
@@ -13,3 +13,12 @@ Use a raw disk device file on NetBSD.
  static const char *net_dev_ata_disk = "wd";
  static const char *net_dev_scsi_disk = "sd";
  static const char *net_dev_scsi_tape = "enrst";
+@@ -128,7 +128,7 @@ get_dev_names(char ***names, const char 
+     n++;
+   }
+ 
+-  void * tmp = (char **)realloc(mp, n * (sizeof(char *)));
++  char ** tmp = (char **)realloc(mp, n * (sizeof(char *)));
+   if (NULL == tmp) {
+     pout("Out of memory constructing scan device list\n");
+     free(mp);