Date: Thu, 16 Jun 2016 03:50:06 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416949 - in head/sysutils/smartmontools: . files Message-ID: <201606160350.u5G3o6VF062477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Jun 16 03:50:06 2016 New Revision: 416949 URL: https://svnweb.freebsd.org/changeset/ports/416949 Log: Fix build under HEAD with __FreeBSD_version >= 1100110. Added: head/sysutils/smartmontools/files/patch-atacmds.h (contents, props changed) head/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h (contents, props changed) Modified: head/sysutils/smartmontools/Makefile Modified: head/sysutils/smartmontools/Makefile ============================================================================== --- head/sysutils/smartmontools/Makefile Thu Jun 16 01:41:32 2016 (r416948) +++ head/sysutils/smartmontools/Makefile Thu Jun 16 03:50:06 2016 (r416949) @@ -3,6 +3,7 @@ PORTNAME= smartmontools PORTVERSION= 6.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF @@ -21,6 +22,7 @@ SHEBANG_FILES= examplescripts/Example5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-sample \ + --with-nvme-devicescan=yes \ --with-initscriptdir=${PREFIX}/etc/rc.d SUB_FILES= pkg-message smart Added: head/sysutils/smartmontools/files/patch-atacmds.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/smartmontools/files/patch-atacmds.h Thu Jun 16 03:50:06 2016 (r416949) @@ -0,0 +1,12 @@ +--- atacmds.h.orig 2015-10-31 09:36:16.000000000 -0700 ++++ atacmds.h 2016-06-15 19:39:43.425233000 -0700 +@@ -74,7 +74,9 @@ + #define ATA_IDLE 0xe3 + #define ATA_SMART_CMD 0xb0 + #define ATA_SECURITY_FREEZE_LOCK 0xf5 ++#ifndef ATA_SET_FEATURES + #define ATA_SET_FEATURES 0xef ++#endif + #define ATA_STANDBY_IMMEDIATE 0xe0 + + // SET_FEATURES subcommands Added: head/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h Thu Jun 16 03:50:06 2016 (r416949) @@ -0,0 +1,18 @@ +--- freebsd_nvme_ioctl.h.orig 2016-03-28 09:25:56.000000000 -0700 ++++ freebsd_nvme_ioctl.h 2016-06-15 20:43:22.389493000 -0700 +@@ -31,6 +31,7 @@ + + #define NVME_PASSTHROUGH_CMD _IOWR('n', 0, struct nvme_pt_command) + ++#if __FreeBSD_version < 1100110 + struct nvme_command + { + /* dword 0 */ +@@ -143,6 +144,7 @@ + */ + struct mtx * driver_lock; + }; ++#endif + + #define nvme_completion_is_error(cpl) \ + ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606160350.u5G3o6VF062477>