From owner-svn-ports-all@freebsd.org Tue Jan 2 18:20:29 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C172CEB1FBF; Tue, 2 Jan 2018 18:20:29 +0000 (UTC) (envelope-from dim@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 mx1.freebsd.org (Postfix) with ESMTPS id 701DA6BC6E; Tue, 2 Jan 2018 18:20:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w02IKS75089411; Tue, 2 Jan 2018 18:20:28 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w02IKS3R089409; Tue, 2 Jan 2018 18:20:28 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201801021820.w02IKS3R089409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 2 Jan 2018 18:20:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r457915 - in branches/2018Q1/sysutils/smartmontools: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in branches/2018Q1/sysutils/smartmontools: . files X-SVN-Commit-Revision: 457915 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jan 2018 18:20:29 -0000 Author: dim (src committer) Date: Tue Jan 2 18:20:28 2018 New Revision: 457915 URL: https://svnweb.freebsd.org/changeset/ports/457915 Log: MFH: r457814 Make smartmontools 6.6 compile with clang 6.0.0 and higher Because clang 6.0.0 and higher default to -std=gnu++14, like gcc 6 and higher, compiling smartmontools results in the following error: os_freebsd.cpp:487:45: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] else if (sscanf(dev, NVME_CTRLR_PREFIX"%d"NVME_NS_PREFIX"%d%c", ^ Fix this by adding spaces around the NVME_NS_PREFIX macro. This makes the source C++14 compatible. Approved by: portmgr (zi) Approved by: samm@os2.kiev.ua (maintainer) PR: 224826 Added: branches/2018Q1/sysutils/smartmontools/files/patch-os__freebsd.cpp - copied unchanged from r457814, head/sysutils/smartmontools/files/patch-os__freebsd.cpp Modified: branches/2018Q1/sysutils/smartmontools/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/smartmontools/Makefile ============================================================================== --- branches/2018Q1/sysutils/smartmontools/Makefile Tue Jan 2 16:49:24 2018 (r457914) +++ branches/2018Q1/sysutils/smartmontools/Makefile Tue Jan 2 18:20:28 2018 (r457915) @@ -3,6 +3,7 @@ PORTNAME= smartmontools PORTVERSION= 6.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF Copied: branches/2018Q1/sysutils/smartmontools/files/patch-os__freebsd.cpp (from r457814, head/sysutils/smartmontools/files/patch-os__freebsd.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/sysutils/smartmontools/files/patch-os__freebsd.cpp Tue Jan 2 18:20:28 2018 (r457915, copy of r457814, head/sysutils/smartmontools/files/patch-os__freebsd.cpp) @@ -0,0 +1,11 @@ +--- os_freebsd.cpp.orig 2017-04-24 16:34:16 UTC ++++ os_freebsd.cpp +@@ -484,7 +484,7 @@ bool freebsd_nvme_device::open() + } + nsid = 0xFFFFFFFF; // broadcast id + } +- else if (sscanf(dev, NVME_CTRLR_PREFIX"%d"NVME_NS_PREFIX"%d%c", ++ else if (sscanf(dev, NVME_CTRLR_PREFIX"%d" NVME_NS_PREFIX "%d%c", + &ctrlid, &nsid, &tmp) == 2) + { + if(ctrlid < 0 || nsid < 0) {