summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/smartmontools/Makefile5
-rw-r--r--sysutils/smartmontools/PLIST4
-rw-r--r--sysutils/smartmontools/distinfo11
-rw-r--r--sysutils/smartmontools/patches/patch-aa32
-rw-r--r--sysutils/smartmontools/patches/patch-ah12
5 files changed, 26 insertions, 38 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 4a323164e08..52fae99c601 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2010/10/25 22:58:56 shattered Exp $
+# $NetBSD: Makefile,v 1.18 2010/11/13 10:10:45 tnn Exp $
-DISTNAME= smartmontools-5.38
-PKGREVISION= 1
+DISTNAME= smartmontools-5.40
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
diff --git a/sysutils/smartmontools/PLIST b/sysutils/smartmontools/PLIST
index 2e200e8406a..efa6c91065c 100644
--- a/sysutils/smartmontools/PLIST
+++ b/sysutils/smartmontools/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/11/13 10:10:45 tnn Exp $
man/man5/smartd.conf.5
man/man8/smartctl.8
man/man8/smartd.8
sbin/smartctl
sbin/smartd
+sbin/update-smart-drivedb
share/doc/smartmontools/AUTHORS
share/doc/smartmontools/CHANGELOG
share/doc/smartmontools/COPYING
@@ -19,3 +20,4 @@ share/doc/smartmontools/examplescripts/Example4
share/doc/smartmontools/examplescripts/README
share/examples/rc.d/smartd
share/examples/smartmontools/smartd.conf
+share/smartmontools/drivedb.h
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index c32b0b71a32..87bbb23b32f 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/10/25 22:58:56 shattered Exp $
+$NetBSD: distinfo,v 1.17 2010/11/13 10:10:46 tnn Exp $
-SHA1 (smartmontools-5.38.tar.gz) = 90e36f46af7a35336c63868176aa71deef4c9e66
-RMD160 (smartmontools-5.38.tar.gz) = 6fcca6e18b14a14b579e8484c769f36b3ce238ea
-Size (smartmontools-5.38.tar.gz) = 617326 bytes
-SHA1 (patch-aa) = 98d7fee0a636f430756a9a57776053903d26bb7e
+SHA1 (smartmontools-5.40.tar.gz) = 08a86a939a2e2cd85d2c88c09188d494f06ce050
+RMD160 (smartmontools-5.40.tar.gz) = ff2ebfd130182ba721248ebfebd9d4d5cc325ff4
+Size (smartmontools-5.40.tar.gz) = 705592 bytes
+SHA1 (patch-aa) = b6f8b3bf263a46e4c88bcafa51582bb4c802165a
SHA1 (patch-ag) = a4efc16ceb1f213979e63d7f8f50cce942c20ccf
-SHA1 (patch-ah) = 712cf0cc567221a92d38d8b3c4623902705b6dfa
diff --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa
index 64a58921051..12e9ced13cf 100644
--- a/sysutils/smartmontools/patches/patch-aa
+++ b/sysutils/smartmontools/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2008/05/17 13:07:54 obache Exp $
+$NetBSD: patch-aa,v 1.6 2010/11/13 10:10:46 tnn Exp $
---- Makefile.in.orig 2008-03-10 10:44:13.000000000 +0000
+--- Makefile.in.orig 2010-10-16 16:36:17.000000000 +0000
+++ Makefile.in
-@@ -87,7 +87,7 @@ CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docsdir)" \
-- "$(DESTDIR)$(initddir)" "$(DESTDIR)$(sysconfdir)"
-+ "$(DESTDIR)$(sysconfdir)"
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@@ -115,7 +115,7 @@ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" \
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \
+ "$(DESTDIR)$(attributelogdir)" "$(DESTDIR)$(docsdir)" \
+- "$(DESTDIR)$(drivedbdir)" "$(DESTDIR)$(initddir)" \
++ "$(DESTDIR)$(drivedbdir)" \
+ "$(DESTDIR)$(savestatesdir)" "$(DESTDIR)$(sysconfdir)"
PROGRAMS = $(sbin_PROGRAMS)
am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \
-@@ -347,8 +347,7 @@ docs_DATA = AUTHORS \
+@@ -449,8 +449,7 @@ docs_DATA = AUTHORS \
NEWS \
README \
TODO \
@@ -20,13 +20,13 @@ $NetBSD: patch-aa,v 1.5 2008/05/17 13:07:54 obache Exp $
+ WARNINGS
sysconf_DATA = smartd.conf$(smartd_suffix)
- EXTRA_DIST = smartmontools.spec \
-@@ -1115,7 +1114,7 @@ info: info-recursive
-
+ EXTRA_DIST = smartd.initd.in \
+@@ -1475,7 +1474,7 @@ info: info-recursive
info-am:
--install-data-am: install-docsDATA install-initdDATA install-man
-+install-data-am: install-docsDATA install-man
+ install-data-am: install-attributelogDATA install-docsDATA \
+- install-drivedbDATA install-initdDATA install-man \
++ install-drivedbDATA install-man \
+ install-savestatesDATA
install-dvi: install-dvi-recursive
-
diff --git a/sysutils/smartmontools/patches/patch-ah b/sysutils/smartmontools/patches/patch-ah
deleted file mode 100644
index bc62ff2502a..00000000000
--- a/sysutils/smartmontools/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/05/17 13:07:54 obache Exp $
-
---- os_freebsd.cpp.orig 2008-03-04 22:09:47.000000000 +0000
-+++ os_freebsd.cpp
-@@ -272,7 +272,6 @@ int marvell_command_interface(__unused i
- }
-
- int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) {
--{
- return -1;
- }
-