Page MenuHomeFreeBSD
Files F151434670

D27525.diff
No OneTemporary
Actions

D27525.diff
View Options

Index: head/astro/geographiclib/Makefile
===================================================================
--- head/astro/geographiclib/Makefile
+++ head/astro/geographiclib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= geographiclib
-DISTVERSION= 1.50.1
-PORTREVISION= 1
+DISTVERSION= 1.51
CATEGORIES= astro
MASTER_SITES= SF/geographiclib/distrib\
SF/geographiclib/distrib/archive\
@@ -18,20 +17,29 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= cmake compiler:c++14-lang python:env
+USES= cmake compiler:c++14-lang localbase python:env
PORTDOCS= *
USE_LDCONFIG= yes
CMAKE_ARGS= -DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\
-DGEOGRAPHICLIB_LIB_TYPE:STRING=BOTH\
-DINSTALL_PYTHON_DIR:STRING=${PYTHON_SITELIBDIR:Q}\
-DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q}
+USE_PYTHON= optsuffix
OPTIONS_DEFINE= DOCS DOXYGEN PERL
-OPTIONS_DEFAULT= DOXYGEN PERL
+OPTIONS_DEFAULT= DOXYGEN PERL PREC2
+DATASETS_DESC= geoid datasets, gravity models and magnetic field models
PERL_DESC= Build documentation with pod2man and pod2html
+PREC1_DESC= 1 = float
+PREC2_DESC= 2 = double
+PREC3_DESC= 3 = extended
+PREC4_DESC= 4 = quadruple
+PREC5_DESC= 5 = variable
+PRECISION_DESC= default "real" precision
+OPTIONS_SINGLE= PRECISION
OPTIONS_GROUP= DATASETS
+OPTIONS_SINGLE_PRECISION= PREC1 PREC2 PREC3 PREC4 PREC5
OPTIONS_SUB= yes
-DATASETS_DESC= geoid datasets, gravity models and magnetic field models
DOXYGEN_CMAKE_BOOL= GEOGRAPHICLIB_DOCUMENTATION
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen\
sphinx-build:textproc/py-sphinx
@@ -39,6 +47,21 @@
PERL_USE= PERL5=build
PERL_USES= perl5
PERL_BUILD_DEPENDS= nroff:textproc/groff
+PREC1_CMAKE_ON= -DGEOGRAPHICLIB_PRECISION:STRING=1
+PREC2_CMAKE_ON= -DGEOGRAPHICLIB_PRECISION:STRING=2
+PREC3_CMAKE_ON= -DGEOGRAPHICLIB_PRECISION:STRING=3
+PREC4_CMAKE_ON= -DGEOGRAPHICLIB_PRECISION:STRING=4
+PREC4_USE= GCC=yes
+PREC4_BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
+PREC4_RUN_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
+PREC5_CMAKE_ON= -DGEOGRAPHICLIB_PRECISION:STRING=5
+PREC5_USE= GCC=yes
+PREC5_BROKEN= error: call of overloaded 'max' is ambiguous\
+ error: '*' was not declared in this scope
+PREC5_BUILD_DEPENDS= ${LOCALBASE}/include/mpreal.h:math/mpfrc++
+PREC5_LIB_DEPENDS= libgmp.so:math/gmp\
+ libmpfr.so:math/mpfr
+PREC5_RUN_DEPENDS= ${LOCALBASE}/include/mpreal.h:math/mpfrc++
GEOID_NAMES= egm84-30 egm84-15 egm96-15 egm96-5\
egm2008-5 egm2008-2_5 egm2008-1
@@ -48,7 +71,7 @@
emm2010 emm2015 emm2017
DEFAULT_GEOID_NAMES= egm96-5
DEFAULT_GRAVITY_NAMES= egm96 wgs84
-DEFAULT_MAGNETIC_NAMES= wmm2020 igrf12
+DEFAULT_MAGNETIC_NAMES= wmm2020 igrf13
DEPRECATED_NAMES= wmm2015
.for n in ${GEOID_NAMES}
Index: head/astro/geographiclib/distinfo
===================================================================
--- head/astro/geographiclib/distinfo
+++ head/astro/geographiclib/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1603076400
-SHA256 (GeographicLib/GeographicLib-1.50.1.tar.gz) = d1765009e068b8cc5e76957e5d6be45ce6cff08c4aad8e5995e84a28354385f1
-SIZE (GeographicLib/GeographicLib-1.50.1.tar.gz) = 2463854
+TIMESTAMP = 1607396400
+SHA256 (GeographicLib/GeographicLib-1.51.tar.gz) = 34370949617df5105bd6961e0b91581aef758dc455fe8629eb5858516022d310
+SIZE (GeographicLib/GeographicLib-1.51.tar.gz) = 2470362
SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5
SIZE (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = 162388303
SHA256 (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = d602e13446a4a4a23f39aecfe6a2a0760a1bc6c1b497482c2ebc9f7d513be699
Index: head/astro/geographiclib/files/patch-CMakeLists.txt
===================================================================
--- head/astro/geographiclib/files/patch-CMakeLists.txt
+++ head/astro/geographiclib/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2019-12-12 10:51:35 UTC
+--- CMakeLists.txt.orig 2020-11-22 14:00:22 UTC
+++ CMakeLists.txt
@@ -183,6 +183,11 @@ option (APPLE_MULTIPLE_ARCHITECTURES
# directory is present you get this behavior regardless.
@@ -12,7 +12,7 @@
set (LIBNAME Geographic)
if (MSVC OR CMAKE_CONFIGURATION_TYPES)
# For multi-config systems and for Visual Studio, the debug version of
-@@ -464,7 +469,7 @@ endif ()
+@@ -434,7 +439,7 @@ endif ()
# documentation files into the source tree. Skip Apple here because
# man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a
# file and there's no simple equivalent for MacOSX
Index: head/astro/geographiclib/files/patch-cmake_CMakeLists.txt
===================================================================
--- head/astro/geographiclib/files/patch-cmake_CMakeLists.txt
+++ head/astro/geographiclib/files/patch-cmake_CMakeLists.txt
@@ -1,6 +1,6 @@
---- cmake/CMakeLists.txt.orig 2019-09-24 12:55:55 UTC
+--- cmake/CMakeLists.txt.orig 2020-11-22 14:00:22 UTC
+++ cmake/CMakeLists.txt
-@@ -96,4 +96,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}")
+@@ -100,4 +100,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}")
configure_file (project.pc.in geographiclib.pc @ONLY)
install (FILES
"${CMAKE_CURRENT_BINARY_DIR}/geographiclib.pc"
Index: head/astro/geographiclib/pkg-help
===================================================================
--- head/astro/geographiclib/pkg-help
+++ head/astro/geographiclib/pkg-help
@@ -36,6 +36,7 @@
wmm2020 12 2020-2025 2 3
igrf11 13 1900-2015 7 25
igrf12 13 1900-2020 7 26
+ igrf13 13 1900-2025 7 28
emm2010 739 2010-2015 3700 4400
emm2015 729 2000-2020 660 4300
emm2017 790 2000-2022 1740 5050
Index: head/astro/geographiclib/pkg-plist
===================================================================
--- head/astro/geographiclib/pkg-plist
+++ head/astro/geographiclib/pkg-plist
@@ -61,7 +61,7 @@
lib/libGeographic.a
lib/libGeographic.so
lib/libGeographic.so.19
-lib/libGeographic.so.19.0.1
+lib/libGeographic.so.19.1.0
lib/node_modules/geographiclib/LICENSE.txt
lib/node_modules/geographiclib/README.md
lib/node_modules/geographiclib/geographiclib.js

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 9:34 AM (5 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31149490
Default Alt Text
D27525.diff (6 KB)

Event Timeline