diff options
| -rw-r--r-- | sysutils/smartmontools/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/smartmontools/PLIST | 5 | ||||
| -rw-r--r-- | sysutils/smartmontools/distinfo | 11 | ||||
| -rw-r--r-- | sysutils/smartmontools/patches/patch-aa | 12 | ||||
| -rw-r--r-- | sysutils/smartmontools/patches/patch-ab | 21 |
5 files changed, 17 insertions, 37 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 6244939088e..2def7b56029 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2006/07/17 17:01:32 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/06/03 10:40:07 jmmv Exp $ -DISTNAME= smartmontools-5.36 +DISTNAME= smartmontools-5.37 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/} @@ -10,6 +10,7 @@ COMMENT= Control and monitor storage systems using SMART PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_LANGUAGES+= c++ USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/sysutils/smartmontools/PLIST b/sysutils/smartmontools/PLIST index ff13e09ce65..4338a70c564 100644 --- a/sysutils/smartmontools/PLIST +++ b/sysutils/smartmontools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:06 reed Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/06/03 10:40:07 jmmv Exp $ man/man5/smartd.conf.5 man/man8/smartctl.8 man/man8/smartd.8 @@ -15,9 +15,10 @@ share/doc/smartmontools/WARNINGS share/doc/smartmontools/examplescripts/Example1 share/doc/smartmontools/examplescripts/Example2 share/doc/smartmontools/examplescripts/Example3 +share/doc/smartmontools/examplescripts/Example4 share/doc/smartmontools/examplescripts/README share/examples/rc.d/smartd share/examples/smartmontools/smartd.conf +@dirrm share/examples/smartmontools @dirrm share/doc/smartmontools/examplescripts @dirrm share/doc/smartmontools -@dirrm share/examples/smartmontools diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 9e1d657a80a..7da23a40202 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.12 2006/09/24 17:14:55 martin Exp $ +$NetBSD: distinfo,v 1.13 2007/06/03 10:40:07 jmmv Exp $ -SHA1 (smartmontools-5.36.tar.gz) = aafc42287c694e4206d80b7886401acdb0eff230 -RMD160 (smartmontools-5.36.tar.gz) = 38efdc3b8dd78ded3f09890683c84973ccc036e7 -Size (smartmontools-5.36.tar.gz) = 540786 bytes -SHA1 (patch-aa) = 676ab97ffa01d023fb1792b0590538af9a6c2fa2 -SHA1 (patch-ab) = 5f70173f83d95f3d7c194b8f17a00eea0dbb6229 +SHA1 (smartmontools-5.37.tar.gz) = d6e88f576e26836b929c570290644b0580645602 +RMD160 (smartmontools-5.37.tar.gz) = e9d18c71340766dc43bf462a4c12cb0d152f2812 +Size (smartmontools-5.37.tar.gz) = 590605 bytes +SHA1 (patch-aa) = 005d69bebfdb385ca42c59aa2c90a62e22c14733 diff --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa index c5d9914951e..39712f67158 100644 --- a/sysutils/smartmontools/patches/patch-aa +++ b/sysutils/smartmontools/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2006/07/17 17:01:32 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $ ---- Makefile.in.orig 2006-04-12 17:39:15.000000000 +0000 +--- Makefile.in.orig 2006-12-20 21:38:50.000000000 +0100 +++ Makefile.in -@@ -93,7 +93,7 @@ CONFIG_HEADER = config.h +@@ -92,7 +92,7 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docsdir)" \ @@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 2006/07/17 17:01:32 wiz Exp $ + "$(DESTDIR)$(sysconfdir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) - am__smartctl_SOURCES_DIST = smartctl.c smartctl.h atacmdnames.c \ -@@ -330,8 +330,7 @@ docs_DATA = AUTHORS \ + am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \ +@@ -353,8 +353,7 @@ docs_DATA = AUTHORS \ NEWS \ README \ TODO \ @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.3 2006/07/17 17:01:32 wiz Exp $ sysconf_DATA = smartd.conf$(smartd_suffix) EXTRA_DIST = smartmontools.spec \ -@@ -1068,7 +1067,7 @@ info: info-recursive +@@ -1122,7 +1121,7 @@ info: info-recursive info-am: diff --git a/sysutils/smartmontools/patches/patch-ab b/sysutils/smartmontools/patches/patch-ab deleted file mode 100644 index 8dd08035d59..00000000000 --- a/sysutils/smartmontools/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2006/09/24 17:14:55 martin Exp $ - ---- ataprint.c.orig 2006-04-12 16:54:28.000000000 +0200 -+++ ataprint.c 2006-09-24 18:47:09.000000000 +0200 -@@ -95,11 +95,12 @@ - char tmp[65]; - - n = n > 64 ? 64 : n; --#ifndef __NetBSD__ -- swapbytes(tmp, in, n); --#else -- strncpy(tmp, in, n); /* NetBSD delivers host byte order strings */ -+#ifdef __NetBSD__ -+ if (isbigendian()) -+ strncpy(tmp, in, n); -+ else - #endif -+ swapbytes(tmp, in, n); - tmp[n] = '\0'; - trim(out, tmp); - } |