Received: by mail.netbsd.org (Postfix, from userid 605) id 61FC384D81; Fri, 15 Feb 2019 20:38:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DB01C84DFE for ; Fri, 15 Feb 2019 20:38:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id JTfcTjMaX6xT for ; Fri, 15 Feb 2019 20:38:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 528FF84D81 for ; Fri, 15 Feb 2019 20:38:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4F1D8FB16; Fri, 15 Feb 2019 20:38:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155026310976460" MIME-Version: 1.0 Date: Fri, 15 Feb 2019 20:38:29 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/sysutils/smartmontools To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20190215203829.4F1D8FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155026310976460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Fri Feb 15 20:38:29 UTC 2019 Modified Files: pkgsrc/sysutils/smartmontools: Makefile distinfo Added Files: pkgsrc/sysutils/smartmontools/patches: patch-os__freebsd.cpp Log Message: smartmontools: fix build for FreeBSD * Change c++03 to c++: clang++ now identify strtoull() * Patch NVMe * Bump revision To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/smartmontools/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/smartmontools/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/smartmontools/patches/patch-os__freebsd.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155026310976460 Content-Disposition: inline Content-Length: 2957 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/smartmontools/Makefile diff -u pkgsrc/sysutils/smartmontools/Makefile:1.35 pkgsrc/sysutils/smartmontools/Makefile:1.36 --- pkgsrc/sysutils/smartmontools/Makefile:1.35 Fri Jan 18 02:05:50 2019 +++ pkgsrc/sysutils/smartmontools/Makefile Fri Feb 15 20:38:29 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2019/01/18 02:05:50 tnn Exp $ +# $NetBSD: Makefile,v 1.36 2019/02/15 20:38:29 triaxx Exp $ DISTNAME= smartmontools-7.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 ONLY_FOR_PLATFORM= Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* -USE_LANGUAGES= c c++03 +USE_LANGUAGES= c c++ USE_TOOLS+= gmake GNU_CONFIGURE= yes Index: pkgsrc/sysutils/smartmontools/distinfo diff -u pkgsrc/sysutils/smartmontools/distinfo:1.33 pkgsrc/sysutils/smartmontools/distinfo:1.34 --- pkgsrc/sysutils/smartmontools/distinfo:1.33 Fri Jan 18 02:04:43 2019 +++ pkgsrc/sysutils/smartmontools/distinfo Fri Feb 15 20:38:29 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2019/01/18 02:04:43 tnn Exp $ +$NetBSD: distinfo,v 1.34 2019/02/15 20:38:29 triaxx Exp $ SHA1 (smartmontools-7.0.tar.gz) = 00e6a7bb26b283695ab0deaf521be6723ba44f0a RMD160 (smartmontools-7.0.tar.gz) = db20533115aa05a52836dbef0006c664083fbe90 @@ -7,3 +7,4 @@ Size (smartmontools-7.0.tar.gz) = 944925 SHA1 (patch-aa) = bd08aff267f0e9e9307ebc57858e61e35144bf16 SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b SHA1 (patch-nvmecmds.cpp) = 0fec043f00b4a7fde2974e1a4670ce42343f2d52 +SHA1 (patch-os__freebsd.cpp) = 96db45ca207e3a2f0d454f7b5c8b1b0d4e8a3e9c Added files: Index: pkgsrc/sysutils/smartmontools/patches/patch-os__freebsd.cpp diff -u /dev/null pkgsrc/sysutils/smartmontools/patches/patch-os__freebsd.cpp:1.1 --- /dev/null Fri Feb 15 20:38:29 2019 +++ pkgsrc/sysutils/smartmontools/patches/patch-os__freebsd.cpp Fri Feb 15 20:38:29 2019 @@ -0,0 +1,21 @@ +$NetBSD: patch-os__freebsd.cpp,v 1.1 2019/02/15 20:38:29 triaxx Exp $ + +* Big-endian support has been added to NVMe in FreeBSD 1200059: status field of + struct nvme_completion changed from struct nvme_status to uint16_t. + https://svnweb.freebsd.org/base/stable/12/sys/dev/nvme/nvme.h?revision=329824 + +--- os_freebsd.cpp.orig 2018-12-05 18:30:46.000000000 +0000 ++++ os_freebsd.cpp +@@ -542,7 +542,12 @@ bool freebsd_nvme_device::nvme_pass_through(const nvme + out.result=cp_p->cdw0; // Command specific result (DW0) + + if (nvme_completion_is_error(cp_p)) { /* ignore DNR and More bits */ ++#if __FreeBSD_version < 1200059 + uint16_t nvme_status = ((cp_p->status.sct << 8) | cp_p->status.sc) & 0x3ff; ++#else ++ uint16_t nvme_status = NVME_STATUS_GET_SCT(cp_p->status) | ++ NVME_STATUS_GET_SC(cp_p->status); ++#endif + + return set_nvme_err(out, nvme_status); + } --_----------=_155026310976460--