diff options
| author | cy <cy@FreeBSD.org> | 2016-06-16 11:50:06 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2016-06-16 11:50:06 +0800 |
| commit | 0cdedfb8273f0745803a608d91e2b19bbda1515e (patch) | |
| tree | 404d51ecf046127be573dc42eeadb521516f8eb9 | |
| parent | 1596dd43d9295f0c324c9a13a9c25d30a8700c93 (diff) | |
| download | freebsd-ports-gnome-0cdedfb8273f0745803a608d91e2b19bbda1515e.tar.gz freebsd-ports-gnome-0cdedfb8273f0745803a608d91e2b19bbda1515e.tar.zst freebsd-ports-gnome-0cdedfb8273f0745803a608d91e2b19bbda1515e.zip | |
Fix build under HEAD with __FreeBSD_version >= 1100110.
| -rw-r--r-- | sysutils/smartmontools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/patch-atacmds.h | 12 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h | 18 |
3 files changed, 32 insertions, 0 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 67ba44587076..c46d6439b01e 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -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 diff --git a/sysutils/smartmontools/files/patch-atacmds.h b/sysutils/smartmontools/files/patch-atacmds.h new file mode 100644 index 000000000000..72d3379b8a4d --- /dev/null +++ b/sysutils/smartmontools/files/patch-atacmds.h @@ -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 diff --git a/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h b/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h new file mode 100644 index 000000000000..4cd8a5909c35 --- /dev/null +++ b/sysutils/smartmontools/files/patch-freebsd_nvme_ioctl.h @@ -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) |