From owner-svn-ports-head@freebsd.org Fri Sep 7 15:45:15 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50C2EFFE0A5; Fri, 7 Sep 2018 15:45:15 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0769E8E2C2; Fri, 7 Sep 2018 15:45:15 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 027CE1DE37; Fri, 7 Sep 2018 15:45:15 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w87FjEoa098700; Fri, 7 Sep 2018 15:45:14 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w87FjEBE098699; Fri, 7 Sep 2018 15:45:14 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201809071545.w87FjEBE098699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Fri, 7 Sep 2018 15:45:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479196 - head/sysutils/smartmontools/files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/sysutils/smartmontools/files X-SVN-Commit-Revision: 479196 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2018 15:45:15 -0000 Author: fernape Date: Fri Sep 7 15:45:14 2018 New Revision: 479196 URL: https://svnweb.freebsd.org/changeset/ports/479196 Log: sysutils/smartmontools: unbreak in 12-CURRENT Between __FreeBSD_version 1200058 and 1200081 fields opc and fuse of struct nvme_command (sys/dev/nvme/nvme.h) where merged under opc_fuse, but in r338182 this change was undone and this port broke. Update patch to fix it so it works regardless of the revision we check out. PR: 230867 Submitted by: ohartmann@walstatt.org Approved by: tcberner (mentor), maintainer (timeout, 2 weeks) Differential Revision: https://reviews.freebsd.org/D16908 Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp ============================================================================== --- head/sysutils/smartmontools/files/patch-os__freebsd.cpp Fri Sep 7 14:47:48 2018 (r479195) +++ head/sysutils/smartmontools/files/patch-os__freebsd.cpp Fri Sep 7 15:45:14 2018 (r479196) @@ -22,7 +22,7 @@ struct nvme_pt_command pt; memset(&pt, 0, sizeof(pt)); -+#if __FreeBSD_version >= 1200058 ++#if __FreeBSD_version >= 1200058 && __FreeBSD_version < 1200081 + pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode); +#else pt.cmd.opc = in.opcode;