From owner-svn-ports-head@freebsd.org Thu Oct 22 07:01:48 2015 Return-Path: Delivered-To: svn-ports-head@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 6E016A1CB6B; Thu, 22 Oct 2015 07:01:48 +0000 (UTC) (envelope-from koobs@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 42C5815BB; Thu, 22 Oct 2015 07:01:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9M71lio085085; Thu, 22 Oct 2015 07:01:47 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9M71lTo085082; Thu, 22 Oct 2015 07:01:47 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510220701.t9M71lTo085082@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Thu, 22 Oct 2015 07:01:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399952 - in head/astro/gpstk: . files X-SVN-Group: ports-head 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.20 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: Thu, 22 Oct 2015 07:01:48 -0000 Author: koobs Date: Thu Oct 22 07:01:46 2015 New Revision: 399952 URL: https://svnweb.freebsd.org/changeset/ports/399952 Log: astro/gpstk: Fix patches and CMake build After the last commit to this port [1], that updated DISTFILES, patch errors were reported on pkg-fallout: patch: **** can't cd to /wrkdirs/usr/ports/astro/gpstk/work/dev: No such file or directory => Patch patch-ext__lib__FileDirProc__FileHunter.cpp failed to apply cleanly. *** Error code 1 This change replaces a WRKSRC override with a CMAKE_SOURCE_PATH variable to declare the source directory and regenerates patchfiles against the default WRKSRC. While I'm here: switch to USES=cmake:outsource to match the build instructions upstream [2] It was also noted during testing that this port builds with the base Clang c++ compiler and does not require USE_GCC. Upstream documentation requires only 'a modern, ANSI compliant C++ compiler' [3] [1] https://svnweb.freebsd.org/changeset/ports/399654 [2] http://www.gpstk.org/bin/view/Documentation/BuildingGPSTkUnderUnix [3] http://www.gpstk.org/bin/view/Documentation/SystemRequirements PR: 201196 MFH: 2015Q4 Added: head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp (contents, props changed) head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp (contents, props changed) Deleted: head/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp head/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp Modified: head/astro/gpstk/Makefile Modified: head/astro/gpstk/Makefile ============================================================================== --- head/astro/gpstk/Makefile Thu Oct 22 06:23:46 2015 (r399951) +++ head/astro/gpstk/Makefile Thu Oct 22 07:01:46 2015 (r399952) @@ -12,12 +12,12 @@ COMMENT= Toolkit for developing GPS appl LICENSE= LGPL3 -USES= cmake python:run +USES= cmake:outsource python:run USE_GCC= yes USE_LDCONFIG= yes -EXTRACT_AFTER_ARGS= --exclude .git +CMAKE_SOURCE_PATH= ${WRKSRC}/dev -WRKSRC= ${WRKDIR}/dev +EXTRACT_AFTER_ARGS= --exclude .git .include Added: head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp Thu Oct 22 07:01:46 2015 (r399952) @@ -0,0 +1,10 @@ +--- dev/ext/lib/FileDirProc/FileHunter.cpp.orig 2014-10-10 19:46:15 UTC ++++ dev/ext/lib/FileDirProc/FileHunter.cpp +@@ -52,6 +52,7 @@ using namespace gpstk::StringUtils; + #ifndef _WIN32 + #include + #include ++#include + #else + #include + #include Added: head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp Thu Oct 22 07:01:46 2015 (r399952) @@ -0,0 +1,10 @@ +--- dev/ext/lib/Utilities/BinUtils.hpp.orig 2014-10-10 19:46:16 UTC ++++ dev/ext/lib/Utilities/BinUtils.hpp +@@ -54,6 +54,7 @@ + + #include "Exception.hpp" + ++#include + #ifndef BYTE_ORDER + #ifdef _MSC_VER + #define LITTLE_ENDIAN 1