Bugfix update to 6.1

move examples where they belong
macppc test by Jan Stary, thanks
This commit is contained in:
giovanni 2013-03-22 17:55:42 +00:00
parent e238208e9d
commit 5e9390ccc3
4 changed files with 47 additions and 26 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2013/03/11 11:41:32 espie Exp $
# $OpenBSD: Makefile,v 1.23 2013/03/22 17:55:42 giovanni Exp $
ONLY_FOR_ARCHS= amd64 i386 powerpc
COMMENT= control and monitor storage systems using SMART
DISTNAME= smartmontools-6.0
DISTNAME= smartmontools-6.1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
@ -16,7 +16,8 @@ USE_GMAKE= Yes
USE_GROFF = Yes
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-docdir=${PREFIX}/share/doc/smartmontools \
CONFIGURE_ARGS= --with-docdir=${PREFIX}/share/doc/smartmontools \
--with-exampledir=${PREFIX}/share/examples/smartmontools \
--with-libcap-ng=no \
--disable-drivedb

View File

@ -1,2 +1,2 @@
SHA256 (smartmontools-6.0.tar.gz) = n+T/K3vNAP3hnbgruhaPVGLtboV9PvQ5SV4wTjIx06Y=
SIZE (smartmontools-6.0.tar.gz) = 771540
SHA256 (smartmontools-6.1.tar.gz) = qQA7i8zIJoL2WM521w7bGEJBHlHcVtTNa1ZhjaHZzgc=
SIZE (smartmontools-6.1.tar.gz) = 787091

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.8 2012/11/29 14:07:22 giovanni Exp $
--- Makefile.in.orig Wed Oct 10 13:54:29 2012
+++ Makefile.in Wed Nov 28 17:23:39 2012
@@ -272,8 +272,8 @@ man8dir = $(mandir)/man8
$OpenBSD: patch-Makefile_in,v 1.9 2013/03/22 17:55:42 giovanni Exp $
--- Makefile.in.orig Sat Mar 16 15:36:24 2013
+++ Makefile.in Wed Mar 20 14:48:40 2013
@@ -273,8 +273,8 @@ man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
DATA = $(attributelog_DATA) $(docs_DATA) $(drivedb_DATA) \
@ -12,20 +12,39 @@ $OpenBSD: patch-Makefile_in,v 1.8 2012/11/29 14:07:22 giovanni Exp $
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
@@ -486,15 +486,7 @@ EXTRA_smartd_SOURCES = os_darwin.cpp os_darwin.h os_li
@@ -490,17 +490,7 @@ EXTRA_smartd_SOURCES = os_darwin.cpp os_darwin.h os_li
@OS_SOLARIS_FALSE@ smartd.8
docsdir = $(docdir)
-docs_DATA = AUTHORS \
- CHANGELOG \
- COPYING \
- INSTALL \
- NEWS \
- README \
- TODO \
- WARNINGS \
- smartd.conf
-docs_DATA = \
- AUTHORS \
- ChangeLog \
- ChangeLog-5.0-6.0 \
- COPYING \
- INSTALL \
- NEWS \
- README \
- TODO \
- WARNINGS \
- smartd.conf
+docs_DATA = smartd.conf
examplesdir = $(exampledir)
examples_DATA = \
@@ -510,13 +500,14 @@ examples_SCRIPTS = \
examplescripts/Example1 \
examplescripts/Example2 \
examplescripts/Example3 \
- examplescripts/Example4
+ examplescripts/Example4 \
+ smartd_warning.sh
sysconf_DATA = smartd.conf
# automake does not allow 'sysconf_SCRIPTS'
sysscriptdir = $(sysconfdir)
-sysscript_SCRIPTS = smartd_warning.sh
+sysscript_SCRIPTS =
EXTRA_DIST = \
autogen.sh \
smartd.initd.in \

View File

@ -1,16 +1,17 @@
@comment $OpenBSD: PLIST,v 1.5 2010/11/23 18:21:45 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.6 2013/03/22 17:55:42 giovanni Exp $
@man man/man5/smartd.conf.5
@man man/man8/smartctl.8
@man man/man8/smartd.8
@bin sbin/smartctl
@bin sbin/smartd
share/doc/smartmontools/
share/doc/smartmontools/examplescripts/
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/doc/smartmontools/smartd.conf
@sample ${SYSCONFDIR}/smartd.conf
share/examples/smartmontools/
share/examples/smartmontools/Example1
share/examples/smartmontools/Example2
share/examples/smartmontools/Example3
share/examples/smartmontools/Example4
share/examples/smartmontools/README
share/examples/smartmontools/smartd_warning.sh
@rcscript ${RCDIR}/smartd