Attachment 181967 Details for Bug 218158 – patch for astro/geographiclib

[patch] patch for astro/geographiclib

patch-GeographicLib-1.48.diff (text/plain), 9.88 KB, created by Tatsuki Makino on 2017-04-21 07:27:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2017-04-21 07:27:19 UTC

Size: 9.88 KB

patch

obsolete

>Index: astro/geographiclib/Makefile
>===================================================================
>--- astro/geographiclib/Makefile	(revision 437439)
>+++ astro/geographiclib/Makefile	(working copy)
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	geographiclib
>-PORTVERSION=	1.46
>-PORTREVISION=	1
>+PORTVERSION=	1.48
> CATEGORIES=	astro
> MASTER_SITES=	SF/geographiclib/distrib\
> 		SF/geographiclib:geoids,gravity,magnetic
>-DISTNAME=	GeographicLib-${PORTVERSION}
>+DISTNAME=	GeographicLib-${PORTVERSION}${DISTVERSIONSUFFIX}
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> DIST_SUBDIR=	GeographicLib
> 
>@@ -17,24 +16,36 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
>-
>-USES=		autoreconf compiler:c++11-lang gmake libtool python
>+USES=		compiler:c++14-lang python
>+WRKSRC=		${WRKDIR}/GeographicLib-${PORTVERSION}
> PORTDOCS=	*
> FETCH_ENV+=	HTTP_REFERER=
>-GNU_CONFIGURE=	yes
>-MAKE_ARGS+=	geographiclib_data=${DATADIR:Q}
>-MAKE_ARGS+=	pythondir=${PYTHON_SITELIBDIR}/geographiclib
>-INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	DOXYGEN PERL
>+OPTIONS_DEFINE=	CMAKE DOXYGEN PERL
> OPTIONS_DEFAULT=	DOXYGEN PERL\
> 			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
> 			MAGNETIC_WMM2015 MAGNETIC_IGRF12
>+CMAKE_DESC=	CMake support
> PERL_DESC=	Build documentation with pod2man and pod2html
> OPTIONS_GROUP=	DATASETS
> OPTIONS_SUB=	yes
>+CMAKE_CONFIGURE_OFF=	--with-pkgconfigdir=${PREFIX:Q}/libdata/pkgconfig
>+CMAKE_CMAKE_ON=	-DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\
>+		-DINSTALL_PYTHON_DIR:STRING=${PYTHON_SITELIBDIR:Q}\
>+		-DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q}
>+CMAKE_IMPLIES=	PERL
>+CMAKE_VARS_OFF=	GNU_CONFIGURE=yes
>+CMAKE_BUILD_DEPENDS_OFF=	autoconf-archive>=0.2017.03.21:devel/autoconf-archive
>+CMAKE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-CMakeLists.txt
>+CMAKE_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-configure.ac
>+CMAKE_INSTALL_TARGET_OFF=	install-strip
>+CMAKE_MAKE_ARGS_OFF=	geographiclib_data=${DATADIR:Q}\
>+		pythondir=${PYTHON_SITELIBDIR:Q}/geographiclib\
>+		cmakedir=\$$$datadir$/cmake/Modules
>+CMAKE_USES=	cmake
>+CMAKE_USES_OFF=	autoreconf gmake libtool pkgconfig
>+DOXYGEN_CMAKE_BOOL=	GEOGRAPHICLIB_DOCUMENTATION
> DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
> DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
> PERL_USE=	PERL5=build
>@@ -70,7 +81,16 @@
> OPTIONS_DEFAULT=	${MAKESUM_OPTIONS_DEFAULT}
> .endif
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MCMAKE} && ${PORT_OPTIONS:MDOXYGEN}
>+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
>+.endif
>+
> post-patch:
>+	${REINPLACE_CMD} -e 's/$tail$ --lines/\1 -n/g'\
>+		-e "s,head --lines -4,${SED} -e '\$$d' | ${SED} -e '\$$d' | ${SED} -e '\$$d' | ${SED} -e '\$$d',"\
>+		${WRKSRC}/man/makeusage.sh
> 	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
> 		${WRKSRC}/tools/geographiclib-get-*.sh
> 
>@@ -111,6 +131,9 @@
> 		s/[^0-9A-Za-z]/_/g;\
> 		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
> 		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
>+		-e '/^lib\/.*.a$$/{s|^|%%NO_CMAKE%%|;}'\
>+		-e '/^share\/cmake\/[^\/]\{1,\}\/F/{s|^|%%NO_CMAKE%%|;}'\
>+		-e '/^lib\/cmake\/GeographicLib\/g/{s|^|%%CMAKE%%|;}'\
> 		${PLIST}
> 
> .include <bsd.port.mk>
>Index: astro/geographiclib/distinfo
>===================================================================
>--- astro/geographiclib/distinfo	(revision 437439)
>+++ astro/geographiclib/distinfo	(working copy)
>@@ -1,5 +1,6 @@
>-SHA256 (GeographicLib/GeographicLib-1.46.tar.gz) = 3a0606fd99fb099572ba1923f556b05b545965359edb92930a658fc99172d962
>-SIZE (GeographicLib/GeographicLib-1.46.tar.gz) = 2208372
>+TIMESTAMP = 1492473600
>+SHA256 (GeographicLib/GeographicLib-1.48.tar.gz) = 7203d56123b6f6fb31842295d57b2418f79fb0db9a06f2f65ee9e415c6f0cb70
>+SIZE (GeographicLib/GeographicLib-1.48.tar.gz) = 2440654
> SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
> SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
> SHA256 (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 579e3dad2f33b54f1fed16edb3ed9d4ae8cdad6ea064f7375af30d678eb2e51c
>Index: astro/geographiclib/files/extra-patch-CMakeLists.txt
>===================================================================
>--- astro/geographiclib/files/extra-patch-CMakeLists.txt	(nonexistent)
>+++ astro/geographiclib/files/extra-patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,49 @@
>+--- cmake/CMakeLists.txt.orig	2017-04-09 12:48:27 UTC
>++++ cmake/CMakeLists.txt
>+@@ -77,4 +77,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}
>+ configure_file (project.pc.in geographiclib.pc @ONLY)
>+ install (FILES
>+   "${CMAKE_CURRENT_BINARY_DIR}/geographiclib.pc"
>+-  DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
>++  DESTINATION "libdata/pkgconfig")
>+--- doc/CMakeLists.txt.orig	2017-04-09 12:48:27 UTC
>++++ doc/CMakeLists.txt
>+@@ -9,9 +9,9 @@ foreach (TOOL ${TOOLS})
>+ endforeach ()
>+ 
>+ if (COMMON_INSTALL_PATH)
>+-  set (INSTALL_DOC_DIR "share/doc/GeographicLib")
>++  set (INSTALL_DOC_DIR "share/doc/GeographicLib" CACHE STRING "")
>+ else ()
>+-  set (INSTALL_DOC_DIR "doc")
>++  set (INSTALL_DOC_DIR "doc" CACHE STRING "")
>+ endif ()
>+ 
>+ # Run doxygen, if available
>+--- man/CMakeLists.txt.orig	2017-04-09 12:48:27 UTC
>++++ man/CMakeLists.txt
>+@@ -100,7 +100,7 @@ else ()
>+ endif ()
>+ 
>+ # Install the man pages.
>+-install (FILES ${MANPAGES} DESTINATION share/man/man1)
>++install (FILES ${MANPAGES} DESTINATION man/man1)
>+ if (NOT WIN32)
>+-  install (FILES ${SYSMANPAGES} DESTINATION share/man/man8)
>++  install (FILES ${SYSMANPAGES} DESTINATION man/man8)
>+ endif ()
>+--- python/geographiclib/CMakeLists.txt.orig	2017-04-09 12:48:27 UTC
>++++ python/geographiclib/CMakeLists.txt
>+@@ -4,9 +4,10 @@
>+ file (GLOB PYTHON_FILES [A-Za-z_]*.py)
>+ file (GLOB TEST_FILES test/[A-Za-z_]*.py)
>+ if (COMMON_INSTALL_PATH)
>+-  set (INSTALL_PYTHON_DIR "lib${LIB_SUFFIX}/python/site-packages")
>++  set (INSTALL_PYTHON_DIR "lib${LIB_SUFFIX}/python/site-packages"
>++    CACHE STRING "")
>+ else ()
>+-  set (INSTALL_PYTHON_DIR "python")
>++  set (INSTALL_PYTHON_DIR "python" CACHE STRING "")
>+ endif ()
>+ 
>+ install (FILES ${PYTHON_FILES}
>Index: astro/geographiclib/files/extra-patch-configure.ac
>===================================================================
>--- astro/geographiclib/files/extra-patch-configure.ac	(nonexistent)
>+++ astro/geographiclib/files/extra-patch-configure.ac	(working copy)
>@@ -0,0 +1,47 @@
>+--- configure.ac.orig	2017-04-09 12:48:27 UTC
>++++ configure.ac
>+@@ -21,6 +21,9 @@ AC_SUBST(GEOGRAPHICLIB_VERSION_MAJOR)
>+ AC_SUBST(GEOGRAPHICLIB_VERSION_MINOR)
>+ AC_SUBST(GEOGRAPHICLIB_VERSION_PATCH)
>+ 
>++AC_DEFINE_UNQUOTED([GEOGRAPHICLIB_VERSION_STRING],
>++        ["$VERSION"],[version string])
>++
>+ dnl
>+ dnl This directive is deprecated by someone, but I prefer to avoid
>+ dnl running autotools if not required explicitly. The reason is
>+@@ -51,9 +54,19 @@ AC_LANG_CPLUSPLUS
>+ 
>+ # Checks for long double
>+ AC_TYPE_LONG_DOUBLE
>++AS_IF([@<:@ $ac_cv_type_long_double = yes @:>@],
>++	[AC_DEFINE([GEOGRAPHICLIB_HAVE_LONG_DOUBLE],
>++		[1],[duplication])])
>+ 
>+ # Check endianness
>+ AC_C_BIGENDIAN
>++AS_CASE([$ac_cv_c_bigendian],
>++	[yes],
>++		[AC_DEFINE([GEOGRAPHICLIB_WORDS_BIGENDIAN],
>++			[1], [duplication])],
>++	[universal],
>++		[AC_DEFINE([GEOGRAPHICLIB_WORDS_BIGENDIAN],
>++			[__BIG_ENDIAN__], [duplication])])
>+ 
>+ # Check flags for C++11
>+ AX_CHECK_COMPILE_FLAG([-std=c++11],
>+--- src/Makefile.am.orig	2017-04-09 12:48:27 UTC
>++++ src/Makefile.am
>+@@ -92,11 +92,7 @@ libGeographic_la_SOURCES = Accumulator.c
>+ 		../include/GeographicLib/Config.h
>+ 
>+ ../include/GeographicLib/Config.h: ../include/GeographicLib/Config-ac.h
>+-	( egrep '\bVERSION\b|\bGEOGRAPHICLIB_|\bHAVE_LONG_DOUBLE\b' $< | \
>+-	  sed -e 's/ VERSION / GEOGRAPHICLIB_VERSION_STRING /' \
>+-	      -e 's/ HAVE_LONG_DOUBLE / GEOGRAPHICLIB_HAVE_LONG_DOUBLE /'; \
>+-	  grep WORDS_BIGENDIAN $< | tail -1 | \
>+-	  sed -e 's/ WORDS_BIGENDIAN / GEOGRAPHICLIB_WORDS_BIGENDIAN /' ) > $@
>++	sed -E -n -e '/[[:blank:]]GEOGRAPHICLIB_/p;' $< > $@
>+ 
>+ $(libGeographic_la_OBJECTS): ../include/GeographicLib/Config.h
>+ 
>Index: astro/geographiclib/pkg-plist
>===================================================================
>--- astro/geographiclib/pkg-plist	(revision 437439)
>+++ astro/geographiclib/pkg-plist	(working copy)
>@@ -38,6 +38,7 @@
> include/GeographicLib/MagneticCircle.hpp
> include/GeographicLib/MagneticModel.hpp
> include/GeographicLib/Math.hpp
>+include/GeographicLib/NearestNeighbor.hpp
> include/GeographicLib/NormalGravity.hpp
> include/GeographicLib/OSGB.hpp
> include/GeographicLib/PolarStereographic.hpp
>@@ -51,10 +52,16 @@
> include/GeographicLib/TransverseMercatorExact.hpp
> include/GeographicLib/UTMUPS.hpp
> include/GeographicLib/Utility.hpp
>-lib/libGeographic.a
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-config-version.cmake
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-config.cmake
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-namespace-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-namespace-targets.cmake
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%CMAKE%%lib/cmake/GeographicLib/geographiclib-targets.cmake
>+%%NO_CMAKE%%lib/libGeographic.a
> lib/libGeographic.so
> lib/libGeographic.so.17
>-lib/libGeographic.so.17.0.0
>+lib/libGeographic.so.17.1.1
> lib/node_modules/geographiclib/LICENSE.txt
> lib/node_modules/geographiclib/README.md
> lib/node_modules/geographiclib/geographiclib.js
>@@ -76,6 +83,7 @@
> %%PYTHON_SITELIBDIR%%/geographiclib/polygonarea.py
> %%PYTHON_SITELIBDIR%%/geographiclib/test/__init__.py
> %%PYTHON_SITELIBDIR%%/geographiclib/test/test_geodesic.py
>+libdata/pkgconfig/geographiclib.pc
> man/man1/CartConvert.1.gz
> man/man1/ConicProj.1.gz
> man/man1/GeoConvert.1.gz
>@@ -93,7 +101,7 @@
> sbin/geographiclib-get-geoids
> sbin/geographiclib-get-gravity
> sbin/geographiclib-get-magnetic
>-share/cmake/GeographicLib/FindGeographicLib.cmake
>+%%NO_CMAKE%%share/cmake/Modules/FindGeographicLib.cmake
> %%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm
> %%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm.aux.xml
> %%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.wld

Flags:

tatsuki_makino: maintainer-approval+

Actions: View | Diff

Attachments on bug 218158: 181224 | 181225 | 181226 | 181526 | 181967 | 181968 | 181969 | 190255 | 190287 | 190288