Date: Sat, 24 Oct 2015 09:57:31 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400113 - in branches/2015Q4/astro/gpstk: . files Message-ID: <201510240957.t9O9vVgj067376@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sat Oct 24 09:57:31 2015 New Revision: 400113 URL: https://svnweb.freebsd.org/changeset/ports/400113 Log: MFH: r399952 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 Approved by: portmgr (feld) Added: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp - copied unchanged from r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp - copied unchanged from r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp Deleted: branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp Modified: branches/2015Q4/astro/gpstk/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/astro/gpstk/Makefile ============================================================================== --- branches/2015Q4/astro/gpstk/Makefile Sat Oct 24 09:50:11 2015 (r400112) +++ branches/2015Q4/astro/gpstk/Makefile Sat Oct 24 09:57:31 2015 (r400113) @@ -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 <bsd.port.mk> Copied: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp (from r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp Sat Oct 24 09:57:31 2015 (r400113, copy of r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp) @@ -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 <unistd.h> + #include <dirent.h> ++#include <sys/syslimits.h> + #else + #include <io.h> + #include <direct.h> Copied: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp (from r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp Sat Oct 24 09:57:31 2015 (r400113, copy of r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp) @@ -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 <machine/endian.h> + #ifndef BYTE_ORDER + #ifdef _MSC_VER + #define LITTLE_ENDIAN 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510240957.t9O9vVgj067376>