Date: Fri, 17 Jan 2014 09:31:42 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340020 - in head/sysutils/smartmontools: . files Message-ID: <201401170931.s0H9VgmZ095803@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Jan 17 09:31:42 2014 New Revision: 340020 URL: http://svnweb.freebsd.org/changeset/ports/340020 QAT: https://qat.redports.org/buildarchive/r340020/ Log: - Fix a crash with some SCSI disks. - Add DOCS option and use option helpers. - USES=gmake. - Staging. - Remove CFLAGS left from old versions. PR: ports/181836 Approved by: maintainer timeout (3 weeks) Added: head/sysutils/smartmontools/files/patch-os_freebsd.cpp (contents, props changed) Modified: head/sysutils/smartmontools/Makefile head/sysutils/smartmontools/pkg-plist Modified: head/sysutils/smartmontools/Makefile ============================================================================== --- head/sysutils/smartmontools/Makefile Fri Jan 17 09:18:48 2014 (r340019) +++ head/sysutils/smartmontools/Makefile Fri Jan 17 09:31:42 2014 (r340020) @@ -3,6 +3,7 @@ PORTNAME= smartmontools PORTVERSION= 6.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF @@ -13,7 +14,11 @@ LICENSE= GPLv2 CONFLICTS= smartmontools-devel-[0-9]* -USE_GMAKE= yes +OPTIONS_DEFINE= DOCS +DOCS_CONFIGURE_OFF= --without-docdir --without-exampledir +DOCS_CONFIGURE_ON= --with-docdir=${DOCSDIR} + +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-drivedb --enable-sample \ @@ -22,29 +27,14 @@ CONFIGURE_ARGS= --disable-dependency-tra SUB_FILES= pkg-message smart USE_RC_SUBR= smartd -MAN5= smartd.conf.5 -MAN8= smartd.8 smartctl.8 - PORTDOCS= * -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ! ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --without-docdir --without-exampledir -.else -CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} -.endif - -CFLAGS:= ${CFLAGS:S/-O2/-O/} -Wno-write-strings - post-patch: @${REINPLACE_CMD} -e 's| install-initdDATA| |' ${WRKSRC}/Makefile.in post-install: - ${MKDIR} ${PREFIX}/etc/periodic/daily - ${INSTALL_SCRIPT} ${WRKDIR}/smart ${PREFIX}/etc/periodic/daily/smart - - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${INSTALL_SCRIPT} ${WRKDIR}/smart \ + ${STAGEDIR}${PREFIX}/etc/periodic/daily .include <bsd.port.mk> Added: head/sysutils/smartmontools/files/patch-os_freebsd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/smartmontools/files/patch-os_freebsd.cpp Fri Jan 17 09:31:42 2014 (r340020) @@ -0,0 +1,31 @@ +--- os_freebsd.cpp.orig 2013-07-05 12:40:38.000000000 +0200 ++++ os_freebsd.cpp 2013-12-25 20:54:46.000000000 +0100 +@@ -445,7 +445,8 @@ + } + + if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { +- cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); ++ if(scsi_debugmode > 0) ++ cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); + set_err(EIO); + return -1; + } +@@ -997,13 +998,15 @@ + + if (cam_send_ccb(m_camdev,ccb) < 0) { + warn("error sending SCSI ccb"); +- cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); ++ if (report > 0) ++ cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); + cam_freeccb(ccb); + return -EIO; + } + +- if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) { +- cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); ++ if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { ++ if(report > 0) ++ cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); + cam_freeccb(ccb); + return -EIO; + } Modified: head/sysutils/smartmontools/pkg-plist ============================================================================== --- head/sysutils/smartmontools/pkg-plist Fri Jan 17 09:18:48 2014 (r340019) +++ head/sysutils/smartmontools/pkg-plist Fri Jan 17 09:31:42 2014 (r340020) @@ -1,7 +1,9 @@ -@stopdaemon smartd etc/periodic/daily/smart etc/smartd.conf.sample etc/smartd_warning.sh +man/man5/smartd.conf.5.gz +man/man8/smartd.8.gz +man/man8/smartctl.8.gz sbin/smartctl sbin/smartd sbin/update-smart-drivedb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401170931.s0H9VgmZ095803>