From owner-svn-ports-all@freebsd.org Mon Jan 1 21:19:34 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 C61DDE81B7C; Mon, 1 Jan 2018 21:19:34 +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 930877EEC4; Mon, 1 Jan 2018 21:19:34 +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 w01LJXK5054542; Mon, 1 Jan 2018 21:19:33 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w01LJXE9054540; Mon, 1 Jan 2018 21:19:33 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201801012119.w01LJXE9054540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Jan 2018 21:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457814 - in head/sysutils/smartmontools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head/sysutils/smartmontools: . files X-SVN-Commit-Revision: 457814 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: Mon, 01 Jan 2018 21:19:34 -0000 Author: dim (src committer) Date: Mon Jan 1 21:19:33 2018 New Revision: 457814 URL: https://svnweb.freebsd.org/changeset/ports/457814 Log: 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: samm@os2.kiev.ua (maintainer) PR: 224826 MFH: 2018Q1 Added: head/sysutils/smartmontools/files/patch-os__freebsd.cpp (contents, props changed) Modified: head/sysutils/smartmontools/Makefile Modified: head/sysutils/smartmontools/Makefile ============================================================================== --- head/sysutils/smartmontools/Makefile Mon Jan 1 20:59:45 2018 (r457813) +++ head/sysutils/smartmontools/Makefile Mon Jan 1 21:19:33 2018 (r457814) @@ -3,6 +3,7 @@ PORTNAME= smartmontools PORTVERSION= 6.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF Added: head/sysutils/smartmontools/files/patch-os__freebsd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/smartmontools/files/patch-os__freebsd.cpp Mon Jan 1 21:19:33 2018 (r457814) @@ -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) {